Add passport to AuthenticationTokenCreatedEvent

scheb · scheb · commit 7f0fdb0e6cdc · 2021-04-16T18:28:28.000+02:00
diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php
@@ -74,7 +74,7 @@ public function authenticateUser(UserInterface $user, AuthenticatorInterface $au
         $token = $authenticator->createAuthenticatedToken($passport = new SelfValidatingPassport(new UserBadge(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), function () use ($user) { return $user; }), $badges), $this->firewallName);
 
         // announce the authenticated token
-        $token = $this->eventDispatcher->dispatch(new AuthenticationTokenCreatedEvent($token))->getAuthenticatedToken();
+        $token = $this->eventDispatcher->dispatch(new AuthenticationTokenCreatedEvent($token, $passport))->getAuthenticatedToken();
 
         // authenticate this in the system
         return $this->handleAuthenticationSuccess($token, $passport, $request, $authenticator);
@@ -188,7 +188,7 @@ private function executeAuthenticator(AuthenticatorInterface $authenticator, Req
             $authenticatedToken = $authenticator->createAuthenticatedToken($passport, $this->firewallName);
 
             // announce the authenticated token
-            $authenticatedToken = $this->eventDispatcher->dispatch(new AuthenticationTokenCreatedEvent($authenticatedToken))->getAuthenticatedToken();
+            $authenticatedToken = $this->eventDispatcher->dispatch(new AuthenticationTokenCreatedEvent($authenticatedToken, $passport))->getAuthenticatedToken();
 
             if (true === $this->eraseCredentials) {
                 $authenticatedToken->eraseCredentials();
diff --git a/src/Symfony/Component/Security/Http/Event/AuthenticationTokenCreatedEvent.php b/src/Symfony/Component/Security/Http/Event/AuthenticationTokenCreatedEvent.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Http\Event;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface;
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
@@ -22,10 +23,12 @@
 class AuthenticationTokenCreatedEvent extends Event
 {
     private $authenticatedToken;
+    private $passport;
 
-    public function __construct(TokenInterface $token)
+    public function __construct(TokenInterface $token, PassportInterface $passport)
     {
         $this->authenticatedToken = $token;
+        $this->passport = $passport;
     }
 
     public function getAuthenticatedToken(): TokenInterface
@@ -37,4 +40,9 @@ public function setAuthenticatedToken(TokenInterface $authenticatedToken): void
     {
         $this->authenticatedToken = $authenticatedToken;
     }
+
+    public function getPassport(): PassportInterface
+    {
+        return $this->passport;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Security\Http\Event;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;`
	`15`	`+use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface;`
`15`	`16`	`use Symfony\Contracts\EventDispatcher\Event;`
`16`	`17`
`17`	`18`	`/**`
`@@ -22,10 +23,12 @@`
`22`	`23`	`class AuthenticationTokenCreatedEvent extends Event`
`23`	`24`	`{`
`24`	`25`	`private $authenticatedToken;`
	`26`	`+ private $passport;`
`25`	`27`
`26`		`- public function __construct(TokenInterface $token)`
	`28`	`+ public function __construct(TokenInterface $token, PassportInterface $passport)`
`27`	`29`	`{`
`28`	`30`	`$this->authenticatedToken = $token;`
	`31`	`+ $this->passport = $passport;`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`public function getAuthenticatedToken(): TokenInterface`
`@@ -37,4 +40,9 @@ public function setAuthenticatedToken(TokenInterface $authenticatedToken): void`
`37`	`40`	`{`
`38`	`41`	`$this->authenticatedToken = $authenticatedToken;`
`39`	`42`	`}`
	`43`	`+`
	`44`	`+ public function getPassport(): PassportInterface`
	`45`	`+ {`
	`46`	`+ return $this->passport;`
	`47`	`+ }`
`40`	`48`	`}`