Pass complete auth context to TwoFactorProviderDeciderInterface

scheb · Jan 15, 2024 · c858536 · c858536
1 parent 45a43fb
commit c858536
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/src/bundle/Security/TwoFactor/Provider/TwoFactorProviderDecider.php b/src/bundle/Security/TwoFactor/Provider/TwoFactorProviderDecider.php
@@ -6,14 +6,17 @@
 
 use Scheb\TwoFactorBundle\Model\PreferredProviderInterface;
 use Scheb\TwoFactorBundle\Security\Authentication\Token\TwoFactorTokenInterface;
+use Scheb\TwoFactorBundle\Security\TwoFactor\AuthenticationContextInterface;
 
 class TwoFactorProviderDecider implements TwoFactorProviderDeciderInterface
 {
     /**
      * @param string[] $activeProviders
      */
-    public function getPreferredTwoFactorProvider(array $activeProviders, TwoFactorTokenInterface $token, object $user): string|null
+    public function getPreferredTwoFactorProvider(array $activeProviders, TwoFactorTokenInterface $token, AuthenticationContextInterface $context): string|null
     {
+        $user = $context->getUser();
+
         if ($user instanceof PreferredProviderInterface) {
             return $user->getPreferredTwoFactorProvider();
         }

diff --git a/src/bundle/Security/TwoFactor/Provider/TwoFactorProviderDeciderInterface.php b/src/bundle/Security/TwoFactor/Provider/TwoFactorProviderDeciderInterface.php
@@ -5,6 +5,7 @@
 namespace Scheb\TwoFactorBundle\Security\TwoFactor\Provider;
 
 use Scheb\TwoFactorBundle\Security\Authentication\Token\TwoFactorTokenInterface;
+use Scheb\TwoFactorBundle\Security\TwoFactor\AuthenticationContextInterface;
 
 interface TwoFactorProviderDeciderInterface
 {
@@ -13,5 +14,5 @@ interface TwoFactorProviderDeciderInterface
      *
      * @param string[] $activeProviders
      */
-    public function getPreferredTwoFactorProvider(array $activeProviders, TwoFactorTokenInterface $token, object $user): string|null;
+    public function getPreferredTwoFactorProvider(array $activeProviders, TwoFactorTokenInterface $token, AuthenticationContextInterface $context): string|null;
 }
diff --git a/src/bundle/Security/TwoFactor/Provider/TwoFactorProviderInitiator.php b/src/bundle/Security/TwoFactor/Provider/TwoFactorProviderInitiator.php
@@ -48,7 +48,7 @@ public function beginTwoFactorAuthentication(AuthenticationContextInterface $con
         if ($activeTwoFactorProviders) {
             $twoFactorToken = $this->twoFactorTokenFactory->create($authenticatedToken, $context->getFirewallName(), $activeTwoFactorProviders);
 
-            $preferredProvider = $this->twoFactorProviderDecider->getPreferredTwoFactorProvider($activeTwoFactorProviders, $twoFactorToken, $context->getUser());
+            $preferredProvider = $this->twoFactorProviderDecider->getPreferredTwoFactorProvider($activeTwoFactorProviders, $twoFactorToken, $context);
 
             if (null !== $preferredProvider) {
                 try {

diff --git a/tests/Security/TwoFactor/Provider/TwoFactorProviderDeciderTest.php b/tests/Security/TwoFactor/Provider/TwoFactorProviderDeciderTest.php
@@ -6,10 +6,11 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use Scheb\TwoFactorBundle\Security\Authentication\Token\TwoFactorTokenInterface;
+use Scheb\TwoFactorBundle\Security\TwoFactor\AuthenticationContextInterface;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\TwoFactorProviderDecider;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\TwoFactorProviderDeciderInterface;
 use Scheb\TwoFactorBundle\Tests\Security\TwoFactor\Condition\AbstractAuthenticationContextTestCase;
-use stdClass;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 class TwoFactorProviderDeciderTest extends AbstractAuthenticationContextTestCase
 {
@@ -31,7 +32,7 @@ public function getPreferredTwoFactorProvider_implementsPreferredProvider_return
 
         $this->assertEquals(
             'preferredProvider',
-            $this->twoFactorProviderDecider->getPreferredTwoFactorProvider([], $this->twoFactorToken, $user),
+            $this->twoFactorProviderDecider->getPreferredTwoFactorProvider([], $this->twoFactorToken, $this->createAuthContext($user)),
         );
     }
 
@@ -43,7 +44,7 @@ public function getPreferredTwoFactorProvider_implementsPreferredProvider_return
         $user = $this->createUserWithPreferredProvider(null);
 
         $this->assertNull(
-            $this->twoFactorProviderDecider->getPreferredTwoFactorProvider([], $this->twoFactorToken, $user),
+            $this->twoFactorProviderDecider->getPreferredTwoFactorProvider([], $this->twoFactorToken, $this->createAuthContext($user)),
         );
     }
 
@@ -52,8 +53,10 @@ public function getPreferredTwoFactorProvider_implementsPreferredProvider_return
      */
     public function getPreferredTwoFactorProvider_unexpectedUserObject_returnsNull(): void
     {
+        $user = $this->createMock(UserInterface::class);
+
         $this->assertNull(
-            $this->twoFactorProviderDecider->getPreferredTwoFactorProvider([], $this->twoFactorToken, new stdClass()),
+            $this->twoFactorProviderDecider->getPreferredTwoFactorProvider([], $this->twoFactorToken, $this->createAuthContext($user)),
         );
     }
 
@@ -67,4 +70,15 @@ private function createUserWithPreferredProvider(string|null $preferredProvider)
 
         return $user;
     }
+
+    private function createAuthContext(object $user): MockObject|AuthenticationContextInterface
+    {
+        $authContext = $this->createMock(AuthenticationContextInterface::class);
+        $authContext
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+
+        return $authContext;
+    }
 }