Make sure token is always authenticated

Author: yoshz

.github/workflows/unit-tests.yml

@@ -10,8 +10,8 @@ jobs:
             fail-fast: false
             matrix:
                 #Stable supported versions
-                php: ['7.3', '7.4', '8.0']
-                symfony: ['5.3.*']
+                php: ['7.3', '7.4', '8.0', '8.1']
+                symfony: ['5.3.*', '5.4.*']
                 composer-flags: ['--prefer-stable']
                 can-fail: [false]
                 include:
@@ -20,13 +20,18 @@ jobs:
                       symfony: '5.3.*'
                       composer-flags: '--prefer-stable --prefer-lowest'
                       can-fail: false
-                    # Development versions
-                    - php: '8.1-rc'
-                      symfony: '5.4.x-dev'
-                      composer-flags: ''
+                    # Symfony 6
+                    - php: '8.0'
+                      symfony: '6.0.*'
+                      composer-flags: '--prefer-stable'
                       can-fail: false
+                    - php: '8.1'
+                      symfony: '6.0.*'
+                      composer-flags: '--prefer-stable'
+                      can-fail: false
+                    # Development versions
                     - php: '8.1-rc'
-                      symfony: '6.0.x-dev'
+                      symfony: '6.1.x-dev'
                       composer-flags: ''
                       can-fail: false
 

src/Security/Authenticator/OAuth2Authenticator.php

@@ -157,6 +157,11 @@ public function createToken(Passport $passport, string $firewallName): TokenInte
         $oauthClientId = $passport->getAttribute('oauthClientId', '');
 
         $token = new OAuth2Token($passport->getUser(), $accessTokenId, $oauthClientId, $scopeBadge->getScopes(), $this->rolePrefix);
+        if (method_exists(AuthenticatorInterface::class, 'createAuthenticatedToken') && !method_exists(AuthenticatorInterface::class, 'createToken')) {
+            // symfony 5.4 only
+            /** @psalm-suppress TooManyArguments */
+            $token->setAuthenticated(true, false);
+        }
 
         return $token;
     }