OXDEV-9078 Remove isTwoFAEnabled method from controller

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

Author: Sieg

src/Authentication/TwoFactorAuth/Controller/AccountSecurityController.php

@@ -15,36 +15,32 @@
 
 class AccountSecurityController extends AccountController
 {
-    /**
-     * @var string
-     * @SuppressWarnings("PHPMD.CamelCasePropertyName")
-     */
-    protected $_sThisTemplate = '@oe_security_module/templates/account_security';
-
     public function __construct(
         private readonly TwoFAUserSettingsInterface $userSettingsService,
     ) {
+        $this->setTemplateName('@oe_security_module/templates/account_security');
         parent::__construct();
     }
 
-    public function saveTwoFactorAuth(): void
+    public function render(): string
     {
+        $parentResult = parent::render();
+
         $user = $this->getUser();
-        if (!$user) {
-            return;
-        }
 
-        $enabled = (bool) Registry::getRequest()->getRequestParameter('twofa_enabled');
-        $this->userSettingsService->setEnabledForUser($user->getId(), $enabled);
+        $this->addTplParam('twoFAEnabledForUser', $this->userSettingsService->isEnabledForUser($user->getId()));
+
+        return $parentResult;
     }
 
-    public function isTwoFAEnabled(): bool
+    public function saveTwoFactorAuth(): void
     {
         $user = $this->getUser();
         if (!$user) {
-            return false;
+            return;
         }
 
-        return $this->userSettingsService->isEnabledForUser($user->getId());
+        $enabled = (bool)Registry::getRequest()->getRequestParameter('twofa_enabled');
+        $this->userSettingsService->setEnabledForUser($user->getId(), $enabled);
     }
 }

tests/Integration/Authentication/TwoFactorAuth/Controller/AccountSecurityControllerTest.php

@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\SecurityModule\Tests\Integration\Authentication\TwoFactorAuth\Controller;
+
+use Generator;
+use OxidEsales\Eshop\Application\Controller\AccountController;
+use OxidEsales\Eshop\Application\Model\User;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Controller\AccountSecurityController;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Settings\TwoFAUserSettingsInterface;
+use OxidEsales\SecurityModule\Tests\Integration\IntegrationTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
+
+class AccountSecurityControllerTest extends IntegrationTestCase
+{
+    #[Test]
+    public function extendsAccountController(): void
+    {
+        $this->assertInstanceOf(AccountController::class, $this->getSut());
+    }
+
+    #[Test]
+    #[DataProvider('renderSetsTwoFAEnabledDataProvider')]
+    public function renderSetsTwoFAEnabled(bool $userSettingEnabled): void
+    {
+        $userId = uniqid();
+
+        $userStub = $this->createStub(User::class);
+        $userStub->method('getId')->willReturn($userId);
+
+        $userSettingsStub = $this->createStub(TwoFAUserSettingsInterface::class);
+        $userSettingsStub->method('isEnabledForUser')->with($userId)->willReturn($userSettingEnabled);
+
+        $sut = $this->getSut(userSettingsService: $userSettingsStub);
+        $sut->method('getUser')->willReturn($userStub);
+        $sut->render();
+
+        $this->assertSame($userSettingEnabled, $sut->getViewDataElement('twoFAEnabledForUser'));
+    }
+
+    public static function renderSetsTwoFAEnabledDataProvider(): Generator
+    {
+        yield 'user has 2FA enabled' => ['userSettingEnabled' => true];
+        yield 'user has 2FA disabled' => ['userSettingEnabled' => false];
+    }
+
+    private function getSut(
+        TwoFAUserSettingsInterface $userSettingsService = null,
+    ): AccountSecurityController {
+        return $this->getMockBuilder(AccountSecurityController::class)
+            ->setConstructorArgs([
+                'userSettingsService' => $userSettingsService ?? $this->createStub(TwoFAUserSettingsInterface::class),
+            ])
+            ->onlyMethods(['getUser'])
+            ->getMock();
+    }
+}

views/twig/form/two_factor_auth_settings.html.twig

@@ -13,7 +13,7 @@
                     id="twofa_enabled"
                     name="twofa_enabled"
                     value="1"
-                    {% if oViewConf.isTwoFAEnabled() %}checked{% endif %}
+                    {% if twoFAEnabledForUser %}checked{% endif %}
                 >
                 <label class="form-check-label" for="twofa_enabled">
                     {{ translate({ ident: "OE_SECURITY_TWO_FACTOR_ENABLE" }) }}