NGP-5519 Symfony 6 Support

.github/workflows/continuous-integration.yaml

@@ -11,7 +11,7 @@ jobs:
       - name: 'Setup PHP'
         uses: 'shivammathur/setup-php@v2'
         with:
-          php-version: '7.4'
+          php-version: '8.1'
           coverage: 'none'
           extensions: 'json, mbstring, tokenizer'
           tools: 'composer-normalize, php-cs-fixer:3.10.0'
@@ -39,7 +39,7 @@ jobs:
       - name: 'Setup PHP'
         uses: 'shivammathur/setup-php@v2'
         with:
-          php-version: '7.4'
+          php-version: '8.1'
           coverage: 'none'
           extensions: 'json, mbstring, tokenizer'
         env:
@@ -64,8 +64,8 @@ jobs:
         include:
           - dependencies: 'beta'
         symfony_version:
-          - 5.3
           - 5.4
+          - 6.0
     env:
       SYMFONY_VERSION: '${{ matrix.symfony_version }}'
     steps:
@@ -75,7 +75,7 @@ jobs:
       - name: 'Setup PHP'
         uses: 'shivammathur/setup-php@v2'
         with:
-          php-version: '7.4'
+          php-version: '8.1'
           coverage: 'none'
           tools: 'composer:2'
           extensions: 'mongodb'

DependencyInjection/Configuration.php

@@ -27,7 +27,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('fos_oauth_server');
         $rootNode = $treeBuilder->getRootNode();

DependencyInjection/FOSOAuthServerExtension.php

@@ -104,7 +104,7 @@ public function load(array $configs, ContainerBuilder $container)
     /**
      * {@inheritdoc}
      */
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'fos_oauth_server';
     }

DependencyInjection/Security/Factory/OAuthFactory.php

@@ -14,7 +14,6 @@
 namespace FOS\OAuthServerBundle\DependencyInjection\Security\Factory;
 
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AuthenticatorFactoryInterface;
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -25,12 +24,12 @@
  *
  * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
  */
-class OAuthFactory implements AuthenticatorFactoryInterface, SecurityFactoryInterface
+class OAuthFactory implements AuthenticatorFactoryInterface
 {
     /**
      * {@inheritdoc}
      */
-    public function createAuthenticator(ContainerBuilder $container, string $id, array $config, string $userProviderId)
+    public function createAuthenticator(ContainerBuilder $container, string $id, array $config, string $userProviderId): array|string
     {
         $providerId = 'fos_oauth_server.security.authentication.authenticator.'.$id;
         $container
@@ -46,7 +45,7 @@ public function createAuthenticator(ContainerBuilder $container, string $id, arr
     /**
      * {@inheritdoc}
      */
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
+    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint): array
     {
         $providerId = 'security.authentication.provider.fos_oauth_server.'.$id;
         $container
@@ -64,15 +63,23 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
     /**
      * {@inheritdoc}
      */
-    public function getPosition()
+    public function getPosition(): string
     {
         return 'pre_auth';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getKey()
+    public function getPriority(): int
+    {
+        return 0;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getKey(): string
     {
         return 'fos_oauth';
     }

FOSOAuthServerBundle.php

@@ -34,7 +34,7 @@ public function build(ContainerBuilder $container)
 
         /** @var SecurityExtension $extension */
         $extension = $container->getExtension('security');
-        $extension->addSecurityListenerFactory(new OAuthFactory());
+        $extension->addAuthenticatorFactory(new OAuthFactory());
 
         $container->addCompilerPass(new GrantExtensionsCompilerPass());
         $container->addCompilerPass(new RequestStackCompilerPass());

Model/AuthCode.php

@@ -34,7 +34,7 @@ public function setRedirectUri($redirectUri)
     /**
      * {@inheritdoc}
      */
-    public function getRedirectUri()
+    public function getRedirectUri(): string
     {
         return $this->redirectUri;
     }

Model/Client.php

@@ -75,7 +75,7 @@ public function getRandomId()
     /**
      * {@inheritdoc}
      */
-    public function getPublicId()
+    public function getPublicId(): string
     {
         return sprintf('%s_%s', $this->getId(), $this->getRandomId());
     }
@@ -115,7 +115,7 @@ public function setRedirectUris(array $redirectUris)
     /**
      * {@inheritdoc}
      */
-    public function getRedirectUris()
+    public function getRedirectUris(): array
     {
         return $this->redirectUris;
     }

Model/Token.php

@@ -55,7 +55,7 @@ public function getId()
     /**
      * {@inheritdoc}
      */
-    public function getClientId()
+    public function getClientId(): string
     {
         return $this->getClient()->getPublicId();
     }
@@ -79,7 +79,7 @@ public function getExpiresAt()
     /**
      * {@inheritdoc}
      */
-    public function getExpiresIn()
+    public function getExpiresIn(): int
     {
         if ($this->expiresAt) {
             return $this->expiresAt - time();
@@ -91,7 +91,7 @@ public function getExpiresIn()
     /**
      * {@inheritdoc}
      */
-    public function hasExpired()
+    public function hasExpired(): bool
     {
         if ($this->expiresAt) {
             return time() > $this->expiresAt;
@@ -111,7 +111,7 @@ public function setToken($token)
     /**
      * {@inheritdoc}
      */
-    public function getToken()
+    public function getToken(): string
     {
         return $this->token;
     }
@@ -127,7 +127,7 @@ public function setScope($scope)
     /**
      * {@inheritdoc}
      */
-    public function getScope()
+    public function getScope(): ?string
     {
         return $this->scope;
     }
@@ -151,7 +151,7 @@ public function getUser()
     /**
      * {@inheritdoc}
      */
-    public function getData()
+    public function getData(): mixed
     {
         return $this->getUser();
     }

Resources/config/security.xml

@@ -6,8 +6,6 @@
 
     <parameters>
         <parameter key="fos_oauth_server.security.authentication.authenticator.class">FOS\OAuthServerBundle\Security\Authentication\Authenticator\OAuthAuthenticator</parameter>
-        <parameter key="fos_oauth_server.security.authentication.provider.class">FOS\OAuthServerBundle\Security\Authentication\Provider\OAuthProvider</parameter>
-        <parameter key="fos_oauth_server.security.authentication.listener.class">FOS\OAuthServerBundle\Security\Firewall\OAuthListener</parameter>
         <parameter key="fos_oauth_server.security.entry_point.class">FOS\OAuthServerBundle\Security\EntryPoint\OAuthEntryPoint</parameter>
     </parameters>
 
@@ -18,18 +16,6 @@
             <argument /> <!-- user provider -->
         </service>
 
-        <service id="fos_oauth_server.security.authentication.provider" class="%fos_oauth_server.security.authentication.provider.class%" public="false">
-            <argument /> <!-- user provider -->
-            <argument type="service" id="fos_oauth_server.server" />
-            <argument type="service" id="security.user_checker" />
-        </service>
-
-        <service id="fos_oauth_server.security.authentication.listener" class="%fos_oauth_server.security.authentication.listener.class%" public="false">
-            <argument type="service" id="security.token_storage"/>
-            <argument type="service" id="security.authentication.manager" />
-            <argument type="service" id="fos_oauth_server.server" />
-        </service>
-
         <service id="fos_oauth_server.security.entry_point" class="%fos_oauth_server.security.entry_point.class%" public="false">
             <argument type="service" id="fos_oauth_server.server" />
         </service>

Security/Authentication/Authenticator/OAuthAuthenticator.php

@@ -29,8 +29,6 @@
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
-use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface;
-use Symfony\Component\Security\Http\Authenticator\Passport\UserPassportInterface;
 
 /**
  * OAuthAuthenticator class.
@@ -67,7 +65,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function authenticate(Request $request): UserPassportInterface
+    public function authenticate(Request $request): Passport
     {
         // remove the authorization header from the request on this check
         $tokenString = $this->serverService->getBearerToken($request, true);
@@ -107,10 +105,21 @@ public function authenticate(Request $request): UserPassportInterface
         return new Passport($userBadge, $credentials);
     }
 
+    /**
+     * Deprecated, here to maintain Symfony 5 support.
+     */
+    public function createAuthenticatedToken(Passport $passport, string $firewallName): TokenInterface
+    {
+        $token = $this->createToken($passport, $firewallName);
+        $token->setAuthenticated(true, false);
+
+        return $token;
+    }
+
     /**
      * {@inheritdoc}
      */
-    public function createAuthenticatedToken(PassportInterface $passport, string $firewallName): TokenInterface
+    public function createToken(Passport $passport, string $firewallName): TokenInterface
     {
         try {
             // expect the badges in the passport from authenticate method above
@@ -137,7 +146,6 @@ public function createAuthenticatedToken(PassportInterface $passport, string $fi
         }
 
         $token = new OAuthToken($credentials->getRoles($user));
-        $token->setAuthenticated(true);
         $token->setToken($credentials->getTokenString());
         $token->setUser($user);