OXDEV-9078 Check if 2FA enabled in the shop to show the block in dashboard

Signed-off-by: Anton Fedurtsya <anton@fedurtsya.com>

Author: Sieg

src/Authentication/TwoFactorAuth/Service/TwoFAResendableInterface.php

@@ -16,6 +16,7 @@ interface TwoFAResendableInterface
     /** @throws ResendCooldownException */
     public function resend(string $userId): void;
 
+    // todo-medium: looks like this mehtod doesnt belong here? maybe retry interface or something?
     public function getRemainingAttempts(string $userId): int;
 
     public function getCooldownRemaining(string $userId): int;

src/Shared/Core/ViewConfig.php

@@ -14,6 +14,7 @@
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\TwoFAServiceInterface;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\TwoFAUserServiceInterface;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\TwoFAUserSettingsServiceInterface;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Settings\TwoFAShopSettingsInterface;
 use OxidEsales\SecurityModule\Captcha\Captcha\Image\Service\ImageCaptchaService;
 use OxidEsales\SecurityModule\Captcha\Service\CaptchaServiceInterface;
 use OxidEsales\SecurityModule\PasswordPolicy\Service\ModuleSettingsServiceInterface as PasswordSettingsServiceInterface;
@@ -56,13 +57,7 @@ public function getImage(): string
         return 'data:image/jpeg;base64,' . base64_encode($images[ImageCaptchaService::CAPTCHA_NAME]);
     }
 
-    public function getActiveProviders(): iterable
-    {
-        $providers = $this->getService(ProviderCollectorInterface::class)->getProviders();
-
-        return array_filter($providers, fn($provider) => $provider->isActive());
-    }
-
+    // todo-critical: move to controller
     public function getRemainingAttempts(): int
     {
         $twoFAService = $this->getService(TwoFAServiceInterface::class);
@@ -74,6 +69,7 @@ public function getRemainingAttempts(): int
         return $twoFAService->getRemainingAttempts($userId);
     }
 
+    // todo-critical: move to controller
     public function getResendCooldownRemaining(): int
     {
         $twoFAService = $this->getService(TwoFAServiceInterface::class);
@@ -85,14 +81,10 @@ public function getResendCooldownRemaining(): int
         return $twoFAService->getCooldownRemaining($userId);
     }
 
-    public function isTwoFAEnabled(): bool
+    // todo-high: questionable if we want this method here at all, its just for one template - controller instead?
+    public function isTwoFAEnabledForShop(): bool
     {
-        $user = $this->getUser();
-        if (!$user) {
-            return false;
-        }
-
-        return $this->getService(TwoFAUserSettingsServiceInterface::class)->isEnabledForUser($user->getId());
+        return $this->getService(TwoFAShopSettingsInterface::class)->isTwoFactorAuthEnabled();
     }
 
     public function isExternalAuthUser(): bool

tests/Integration/Shared/Core/ViewConfigTest.php

@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\SecurityModule\Tests\Integration\Shared\Core;
+
+use Generator;
+use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Settings\TwoFAShopSettingsInterface;
+use OxidEsales\SecurityModule\Shared\Core\ViewConfig;
+use OxidEsales\SecurityModule\Tests\Integration\IntegrationTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
+
+class ViewConfigTest extends IntegrationTestCase
+{
+    #[DataProvider('isTwoFAEnabledForShopDataProvider')]
+    public function testIsTwoFAEnabledForShop(bool $shopSettingEnabled): void
+    {
+        $shopSettingsStub = $this->createStub(TwoFAShopSettingsInterface::class);
+        $shopSettingsStub->method('isTwoFactorAuthEnabled')->willReturn($shopSettingEnabled);
+
+        $sut = $this->getSut([
+            TwoFAShopSettingsInterface::class => $shopSettingsStub,
+        ]);
+
+        $this->assertSame($shopSettingEnabled, $sut->isTwoFAEnabledForShop());
+    }
+
+    public static function isTwoFAEnabledForShopDataProvider(): Generator
+    {
+        yield 'shop setting enabled' => ['shopSettingEnabled' => true];
+        yield 'shop setting disabled' => ['shopSettingEnabled' => false];
+    }
+
+    private function getSut(array $serviceOverrides = []): ViewConfig
+    {
+        /** @var ViewConfig $sut */
+        $sut = $this->getMockBuilder(ViewConfig::class)
+            ->onlyMethods(['getService'])
+            ->getMock();
+        $sut->method('getService')->willReturnCallback(
+            fn(string $id) => $serviceOverrides[$id] ?? ContainerFacade::get($id)
+        );
+
+        return $sut;
+    }
+}

views/twig/extensions/themes/default/page/account/dashboard.html.twig

@@ -2,14 +2,17 @@
 
 {% block account_dashboard_items %}
     {{ parent() }}
-    <div class="col mb-3">
-        <div class="card card-lg h-100">
-            <h2 class="h4 card-header card-title">{{ translate({ ident: "OE_SECURITY_SECURITY_TITLE" }) }}</h2>
-            <div class="card-body">
-                <a class="btn btn-outline-primary stretched-link" href="{{ seo_url({ ident: oViewConf.getSslSelfLink() ~ "cl=account_security" }) }}">
-                    {{ translate({ ident: "MORE" }) }}
-                </a>
+
+    {% if oViewConf.isTwoFAEnabledForShop() %}
+        <div class="col mb-3">
+            <div class="card card-lg h-100">
+                <h2 class="h4 card-header card-title">{{ translate({ ident: "OE_SECURITY_SECURITY_TITLE" }) }}</h2>
+                <div class="card-body">
+                    <a class="btn btn-outline-primary stretched-link" href="{{ seo_url({ ident: oViewConf.getSslSelfLink() ~ "cl=account_security" }) }}">
+                        {{ translate({ ident: "MORE" }) }}
+                    </a>
+                </div>
             </div>
         </div>
-    </div>
+    {% endif %}
 {% endblock %}