AC-10982::[2FA] Integrate with Duo Web SDK to support Universal Prompt-fixes for static issues

Author: glo05363

TwoFactorAuth/Model/Provider/Engine/DuoSecurity/Configure.php

@@ -67,20 +67,15 @@ public function getConfigurationData(string $tfaToken)
 
     /**
      * @inheritDoc
-     * @throws \LocalizedException
      */
     public function activate(string $tfaToken): void
     {
-        try {
-            $user = $this->userAuthenticator->authenticateWithTokenAndProvider($tfaToken, DuoSecurity::CODE);
-            $userId = (int)$user->getId();
+        $user = $this->userAuthenticator->authenticateWithTokenAndProvider($tfaToken, DuoSecurity::CODE);
+        $userId = (int)$user->getId();
 
-            if ($this->duo->assertUserIsValid($user->getUserName()) == "auth") {
-                $this->tfa->getProviderByCode(DuoSecurity::CODE)
-                    ->activate($userId);
-            }
-        } catch (\Exception $e) {
-            throw new \LocalizedException(__('Could not activate Duo Security provider.'));
+        if ($this->duo->assertUserIsValid($user->getUserName()) == "auth") {
+            $this->tfa->getProviderByCode(DuoSecurity::CODE)
+                ->activate($userId);
         }
     }
 }

TwoFactorAuth/Test/Integration/Model/Provider/Engine/DuoSecurity/ConfigureTest.php

@@ -269,13 +269,12 @@ public function testActivateInvalidDataThrowsException()
         $userId = $this->getUserId();
         $tfat = $this->tokenManager->issueFor($userId);
 
-        $this->duo->method('assertUserIsValid')
-            ->with($this->callback(function ($username) use ($userId) {
-                // Assuming $username corresponds to a user object or username string.
-                // Replace 'getUserById' with the relevant logic for obtaining the username
-                $user = $this->userFactory->create()->load($userId);
-                return $username === $user->getUserName();
-            }))
+        $userName = 'adminUser';
+
+        $this->duo
+            ->expects($this->once())
+            ->method('assertUserIsValid')
+            ->with($userName)
             ->willThrowException(new \InvalidArgumentException('Something'));
 
         // Call activate without a signature, as per your updated logic