Change attribute name

Author: vuongxuongminh

src/Authenticator/Authenticator.php

@@ -43,7 +43,7 @@ public function supports(Request $request): ?bool
 
             if (null !== $payload && false !== is_string($payload[$mapping->userIdentifierClaim()] ?? null)) {
                 $request->attributes->set(
-                    '_user_identifier_and_payload',
+                    '_user_identifier_claim_and_payload',
                     [
                         $mapping->userIdentifierClaim(),
                         $payload,
@@ -59,8 +59,8 @@ public function supports(Request $request): ?bool
 
     public function authenticate(Request $request): PassportInterface
     {
-        [$userIdentifierClaim, $payload] = $request->attributes->get('_user_identifier_and_payload');
-        $request->attributes->remove('_user_identifier_and_payload');
+        [$userIdentifierClaim, $payload] = $request->attributes->get('_user_identifier_claim_and_payload');
+        $request->attributes->remove('_user_identifier_claim_and_payload');
         $userBadge = new UserBadge($payload[$userIdentifierClaim], $this->makeUserLoader($payload));
         $passport = new SelfValidatingPassport($userBadge);
         $passport->setAttribute('_payload', $payload);

tests/Integration/AuthenticatorManagerTest.php

@@ -35,7 +35,7 @@ public function testAuthenticatorControlledByManager()
 
         $this->assertTrue($manager->supports($request));
         $this->assertTrue($request->attributes->has('_security_authenticators'));
-        $this->assertTrue($request->attributes->has('_user_identifier_and_payload'));
+        $this->assertTrue($request->attributes->has('_user_identifier_claim_and_payload'));
 
         $controlledAuthenticators = $request->attributes->get('_security_authenticators');
 

tests/Unit/Authenticator/AuthenticatorTest.php

@@ -36,7 +36,7 @@ public function testSupportValidRequest(Request $request)
         $authenticator = $this->createAuthenticator(new InMemoryUserProvider());
 
         $this->assertTrue($authenticator->supports($request));
-        $this->assertTrue($request->attributes->has('_user_identifier_and_payload'));
+        $this->assertTrue($request->attributes->has('_user_identifier_claim_and_payload'));
     }
 
     /**
@@ -47,7 +47,7 @@ public function testNotSupportInvalidRequest(Request $request)
         $authenticator = $this->createAuthenticator(new InMemoryUserProvider());
 
         $this->assertFalse($authenticator->supports($request));
-        $this->assertFalse($request->attributes->has('_user_identifier_and_payload'));
+        $this->assertFalse($request->attributes->has('_user_identifier_claim_and_payload'));
     }
 
     /**
@@ -57,11 +57,11 @@ public function testNotSupportInvalidRequest(Request $request)
     public function testAuthenticate(Request $request)
     {
         $authenticator = $this->createAuthenticatorWithInMemoryUserProvider(['valid' => []]);
-        $authenticator->supports($request); // call to set `_user_identifier_and_payload` request attribute.
+        $authenticator->supports($request); // call to set `_user_identifier_claim_and_payload` request attribute.
 
         $passport = $authenticator->authenticate($request);
 
-        $this->assertFalse($request->attributes->has('_user_identifier_and_payload'));
+        $this->assertFalse($request->attributes->has('_user_identifier_claim_and_payload'));
         $this->assertInstanceOf(SelfValidatingPassport::class, $passport);
         $this->assertTrue($passport->hasBadge(UserBadge::class));
         $this->assertIsArray($passport->getAttribute('_payload'));
@@ -80,9 +80,9 @@ public function testAuthenticateWithJWTPayloadAwareUserProvider(Request $request
     {
         $payload = [];
         $authenticator = $this->createAuthenticatorWithJWTPayloadAwareUserProvider($payload);
-        $authenticator->supports($request); // call to set `_user_identifier_and_payload` request attribute.
+        $authenticator->supports($request); // call to set `_user_identifier_claim_and_payload` request attribute.
         $payload = $request->attributes->get(
-            '_user_identifier_and_payload'
+            '_user_identifier_claim_and_payload'
         )[1]; // set for mock assert see: [[createAuthenticatorWithJWTPayloadAwareUserProvider()]]
         $passport = $authenticator->authenticate($request);
         $user = $passport->getBadge(UserBadge::class)->getUser();
@@ -98,7 +98,7 @@ public function testCreateAuthenticatedToken(Request $request)
     {
         $authenticator = $this->createAuthenticatorWithInMemoryUserProvider(['valid' => []]);
         $authenticator->supports($request);
-        $payload = $request->attributes->get('_user_identifier_and_payload')[1];
+        $payload = $request->attributes->get('_user_identifier_claim_and_payload')[1];
         $passport = $authenticator->authenticate($request);
         $token = $authenticator->createAuthenticatedToken($passport, 'test');