[Security] Move the badges resolution check to AuthenticatorManager

Author: chalasr

Authentication/AuthenticatorManager.php

@@ -19,6 +19,7 @@
 use Symfony\Component\Security\Core\AuthenticationEvents;
 use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
 use Symfony\Component\Security\Http\Authenticator\InteractiveAuthenticatorInterface;
@@ -168,7 +169,11 @@ private function executeAuthenticator(AuthenticatorInterface $authenticator, Req
             $this->eventDispatcher->dispatch($event);
 
             // check if all badges are resolved
-            $passport->checkIfCompletelyResolved();
+            foreach ($passport->getBadges() as $badge) {
+                if (!$badge->isResolved()) {
+                    throw new BadCredentialsException(sprintf('Authentication failed: Security badge "%s" is not resolved, did you forget to register the correct listeners?', get_debug_type($badge)));
+                }
+            }
 
             // create the authenticated token
             $authenticatedToken = $authenticator->createAuthenticatedToken($passport, $this->firewallName);

Authenticator/Passport/PassportInterface.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Security\Http\Authenticator\Passport;
 
-use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\BadgeInterface;
 
 /**
@@ -43,9 +42,7 @@ public function hasBadge(string $badgeFqcn): bool;
     public function getBadge(string $badgeFqcn): ?BadgeInterface;
 
     /**
-     * Checks if all badges are marked as resolved.
-     *
-     * @throws BadCredentialsException when a badge is not marked as resolved
+     * @return array<class-string<BadgeInterface>, BadgeInterface> An array of badge instances indexed by class name
      */
-    public function checkIfCompletelyResolved(): void;
+    public function getBadges(): array;
 }

Authenticator/Passport/PassportTrait.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Security\Http\Authenticator\Passport;
 
-use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\BadgeInterface;
 
 /**
@@ -21,9 +20,6 @@
  */
 trait PassportTrait
 {
-    /**
-     * @var BadgeInterface[]
-     */
     private $badges = [];
 
     public function addBadge(BadgeInterface $badge): PassportInterface
@@ -43,12 +39,11 @@ public function getBadge(string $badgeFqcn): ?BadgeInterface
         return $this->badges[$badgeFqcn] ?? null;
     }
 
-    public function checkIfCompletelyResolved(): void
+    /**
+     * @return array<class-string<BadgeInterface>, BadgeInterface>
+     */
+    public function getBadges(): array
     {
-        foreach ($this->badges as $badge) {
-            if (!$badge->isResolved()) {
-                throw new BadCredentialsException(sprintf('Authentication failed security badge "%s" is not resolved, did you forget to register the correct listeners?', \get_class($badge)));
-            }
-        }
+        return $this->badges;
     }
 }