bug #1133 #1083. Fixed issue with option user_id_claim. (Konstantin L…

…itvinov)

This PR was merged into the 2.x branch.

Discussion
----------

#1083. Fixed issue with option user_id_claim.

Fixed issue with configuration option `user_id_claim`

Commits
-------

d5d2b6f #1083. Fixed issue with option user_id_claim.

Services/JWTManager.php

@@ -144,15 +144,16 @@ public function parse(string $jwtToken): array
      */
     protected function addUserIdentityToPayload(UserInterface $user, array &$payload)
     {
-        $accessor = PropertyAccess::createPropertyAccessor();
+        $accessor      = PropertyAccess::createPropertyAccessor();
+        $identityField = $this->userIdClaim ?: $this->userIdentityField;
 
-        if ($user instanceof InMemoryUser && ('username' === $this->userIdClaim || 'username' === $this->userIdentityField)) {
-            $payload[$this->userIdClaim ?: $this->userIdentityField] = $accessor->getValue($user, 'userIdentifier');
+        if ($user instanceof InMemoryUser && 'username' === $identityField) {
+            $payload[$identityField] = $accessor->getValue($user, 'userIdentifier');
 
             return;
         }
 
-        $payload[$this->userIdClaim ?: $this->userIdentityField] = $accessor->getValue($user, $accessor->isReadable($user, $this->userIdentityField) ? $this->userIdentityField : 'user_identifier');
+        $payload[$identityField] = $accessor->getValue($user, $accessor->isReadable($user, $identityField) ? $identityField : 'user_identifier');
     }
 
     /**