Use one AuthenticatorManager per firewall

Author: wouterj

Authentication/AuthenticatorManager.php

@@ -40,14 +40,16 @@ class AuthenticatorManager implements AuthenticationManagerInterface
     private $authenticators;
     private $eventDispatcher;
     private $eraseCredentials;
+    private $providerKey;
 
     /**
      * @param AuthenticatorInterface[] $authenticators The authenticators, with keys that match what's passed to AuthenticatorManagerListener
      */
-    public function __construct(iterable $authenticators, EventDispatcherInterface $eventDispatcher, bool $eraseCredentials = true)
+    public function __construct(iterable $authenticators, EventDispatcherInterface $eventDispatcher, string $providerKey, bool $eraseCredentials = true)
     {
         $this->authenticators = $authenticators;
         $this->eventDispatcher = $eventDispatcher;
+        $this->providerKey = $providerKey;
         $this->eraseCredentials = $eraseCredentials;
     }
 

Firewall/AuthenticatorManagerListener.php

@@ -33,7 +33,7 @@
  */
 class AuthenticatorManagerListener extends AbstractListener
 {
-    private $authenticationManager;
+    private $authenticatorManager;
     private $authenticatorHandler;
     private $authenticators;
     protected $providerKey;
@@ -45,7 +45,7 @@ class AuthenticatorManagerListener extends AbstractListener
      */
     public function __construct(AuthenticationManagerInterface $authenticationManager, AuthenticatorHandler $authenticatorHandler, iterable $authenticators, string $providerKey, EventDispatcherInterface $eventDispatcher, ?LoggerInterface $logger = null)
     {
-        $this->authenticationManager = $authenticationManager;
+        $this->authenticatorManager = $authenticationManager;
         $this->authenticatorHandler = $authenticatorHandler;
         $this->authenticators = $authenticators;
         $this->providerKey = $providerKey;
@@ -157,7 +157,7 @@ private function executeAuthenticator(string $uniqueAuthenticatorKey, Authentica
             }
             // pass the token into the AuthenticationManager system
             // this indirectly calls AuthenticatorManager::authenticate()
-            $token = $this->authenticationManager->authenticate($token);
+            $token = $this->authenticatorManager->authenticate($token);
 
             if (null !== $this->logger) {
                 $this->logger->info('Authenticator successful!', ['token' => $token, 'authenticator' => \get_class($authenticator)]);