Skip to content

Commit 1b9d625

Browse files
OXDEV-9885 Fix providers visibility tests
1 parent a9367e2 commit 1b9d625

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

src/Authentication/OAuth2/Service/ModuleSettingsService.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ public function isGoogleLoginEnabled(): bool
5858
return $this->moduleSettingService->getBoolean(self::GOOGLE_LOGIN_ENABLED, Module::MODULE_ID);
5959
}
6060

61+
public function saveGoogleEnabled(bool $value): void
62+
{
63+
$this->moduleSettingService->saveBoolean(self::GOOGLE_LOGIN_ENABLED, $value, Module::MODULE_ID);
64+
}
65+
6166
public function getGoogleClientId(): string
6267
{
6368
return $this->getStringValue(self::GOOGLE_CLIENT_ID);

src/Shared/Core/ViewConfig.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@ public function getImage(): string
5252
return 'data:image/jpeg;base64,' . base64_encode($images[ImageCaptchaService::CAPTCHA_NAME]);
5353
}
5454

55-
public function getProviders(): iterable
55+
public function getActiveProviders(): iterable
5656
{
57-
return $this->getService(ProviderCollectorInterface::class)->getProviders();
57+
$providers = $this->getService(ProviderCollectorInterface::class)->getProviders();
58+
59+
return array_filter($providers, fn($provider) => $provider->isActive());
5860
}
5961
}

tests/Codeception/Acceptance/BaseCest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ protected function setCaptchaState(bool $state)
4040

4141
protected function setProviderState(bool $state)
4242
{
43-
ContainerFacade::get(OAuthModuleSettingsServiceInterface::class)
44-
->saveFacebookEnabled($state);
43+
$moduleSettings = ContainerFacade::get(OAuthModuleSettingsServiceInterface::class);
44+
$moduleSettings->saveFacebookEnabled($state);
45+
$moduleSettings->saveGoogleEnabled($state);
4546
}
4647
}

views/twig/form/providers.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{% if oViewConf.getProviders() %}
1+
{% if oViewConf.getActiveProviders() %}
22
<div class="sign-in-providers">
3-
{% for provider in oViewConf.getProviders() %}
3+
{% for provider in oViewConf.getActiveProviders() %}
44
<div class="provider">
55
<a href="{{ seo_url({ ident: oViewConf.getSelfLink() ~ "cl=oauth&fnc=login&provider=" ~ provider.getName() }) }}">
66
{{ translate({ ident: 'SIGN_IN_PROVIDER', args: provider.getName()|capitalize }) }}

0 commit comments

Comments
 (0)