OXDEV-9078 Add success message on save 2FA settings

Author: TitaKoleva

src/Authentication/TwoFactorAuth/Controller/AccountSecurityController.php

@@ -15,6 +15,8 @@
 
 class AccountSecurityController extends AccountController
 {
+    private bool $twoFASaved = false;
+
     public function __construct(
         private readonly TwoFAUserSettingsInterface $userSettingsService,
     ) {
@@ -29,6 +31,7 @@ public function render(): string
         $user = $this->getUser();
         if ($user) {
             $this->addTplParam('twoFAEnabledForUser', $this->userSettingsService->isEnabledForUser($user->getId()));
+            $this->addTplParam('twoFASaved', $this->twoFASaved);
         }
 
         return $parentResult;
@@ -43,5 +46,6 @@ public function saveTwoFactorAuth(): void
 
         $enabled = (bool)Registry::getRequest()->getRequestParameter('twofa_enabled');
         $this->userSettingsService->setEnabledForUser($user->getId(), $enabled);
+        $this->twoFASaved = true;
     }
 }

src/Authentication/TwoFactorAuth/Controller/TwoFactorAuthController.php

@@ -43,10 +43,9 @@ public function render(): string
     {
         parent::render();
 
-        $isResendable = $this->twoFAService instanceof TwoFAResendableInterface;
-        $this->addTplParam('resendable', $isResendable);
+        $this->addTplParam('resendable', $this->twoFAService instanceof TwoFAResendableInterface);
 
-        if ($isResendable) {
+        if ($this->twoFAService instanceof TwoFAResendableInterface) {
             $userId = $this->twoFAUserService->getPendingUserId();
             $this->addTplParam('remainingAttempts', $this->twoFAService->getRemainingAttempts($userId));
             $this->addTplParam('resendCooldownRemaining', $this->twoFAService->getCooldownRemaining($userId));

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

@@ -51,6 +51,37 @@ public static function renderSetsTwoFAEnabledDataProvider(): Generator
         yield 'user has 2FA disabled' => ['userSettingEnabled' => false];
     }
 
+    #[Test]
+    public function renderSetsTwoFASavedFalseByDefault(): void
+    {
+        $userId = uniqid();
+
+        $userStub = $this->createStub(User::class);
+        $userStub->method('getId')->willReturn($userId);
+
+        $sut = $this->getSut();
+        $sut->method('getUser')->willReturn($userStub);
+        $sut->render();
+
+        $this->assertFalse($sut->getViewDataElement('twoFASaved'));
+    }
+
+    #[Test]
+    public function renderSetsTwoFASavedTrueAfterSave(): void
+    {
+        $userId = uniqid();
+
+        $userStub = $this->createStub(User::class);
+        $userStub->method('getId')->willReturn($userId);
+
+        $sut = $this->getSut();
+        $sut->method('getUser')->willReturn($userStub);
+        $sut->saveTwoFactorAuth();
+        $sut->render();
+
+        $this->assertTrue($sut->getViewDataElement('twoFASaved'));
+    }
+
     private function getSut(
         TwoFAUserSettingsInterface $userSettingsService = null,
     ): AccountSecurityController {

translations/de/oesecuritymodule_lang.php

@@ -67,4 +67,5 @@
     'OE_SECURITY_TWO_FACTOR_SETTINGS_TITLE'       => 'Zwei-Faktor-Authentifizierung',
     'OE_SECURITY_TWO_FACTOR_SETTINGS_DESCRIPTION' => 'Fügen Sie Ihrem Konto eine zusätzliche Sicherheitsebene hinzu. Wenn aktiviert, müssen Sie bei jeder Anmeldung einen Bestätigungscode eingeben, der an Ihre E-Mail gesendet wird.',
     'OE_SECURITY_TWO_FACTOR_ENABLE'               => 'Zwei-Faktor-Authentifizierung aktivieren',
+    'OE_SECURITY_TWO_FA_SETTINGS_SAVED'           => 'Die Einstellungen für die Zwei-Faktor-Authentifizierung wurden gespeichert.',
 ];

translations/en/oesecuritymodule_lang.php

@@ -67,4 +67,5 @@
     'OE_SECURITY_TWO_FACTOR_SETTINGS_TITLE'       => 'Two-Factor Authentication',
     'OE_SECURITY_TWO_FACTOR_SETTINGS_DESCRIPTION' => 'Add an extra layer of security to your account. When enabled, you will need to enter a verification code sent to your email each time you log in.',
     'OE_SECURITY_TWO_FACTOR_ENABLE'               => 'Enable two-factor authentication',
+    'OE_SECURITY_TWO_FA_SETTINGS_SAVED'           => 'Two-factor authentication settings have been saved.',
 ];

views/twig/templates/account_security.html.twig

@@ -1,4 +1,7 @@
 {% capture append = "oxidBlock_content" %}
+    {% if twoFASaved %}
+        <div class="alert alert-success">{{ translate({ ident: "OE_SECURITY_TWO_FA_SETTINGS_SAVED" }) }}</div>
+    {% endif %}
     <div class="container-xxl py-5">
         <div class="row">
             <h1 class="h3 page-header col pl-0 ml-3">