Support sf6 - drop sf4

Author: marsoder

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

@@ -25,7 +25,7 @@
  *
  * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
  */
-class OAuthFactory implements AuthenticatorFactoryInterface, SecurityFactoryInterface
+class OAuthFactory implements AuthenticatorFactoryInterface
 {
     /**
      * {@inheritdoc}
@@ -83,4 +83,9 @@ public function getKey(): string
     public function addConfiguration(NodeDefinition $node)
     {
     }
+
+    public function getPriority(): int
+    {
+        return 0;
+    }
 }

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());

Security/Authentication/Authenticator/OAuthAuthenticator.php

@@ -31,8 +31,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.
@@ -69,7 +67,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function authenticate(Request $request): PassportInterface
+    public function authenticate(Request $request): Passport
     {
         // remove the authorization header from the request on this check
         $tokenString = $this->serverService->getBearerToken($request, true);
@@ -126,7 +124,7 @@ public function authenticate(Request $request): PassportInterface
     /**
      * {@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
@@ -163,7 +161,6 @@ public function createAuthenticatedToken(PassportInterface $passport, string $fi
         }
 
         $token = new OAuthToken($credentials->getRoles($user));
-        $token->setAuthenticated(true);
         $token->setToken($credentials->getTokenString());
         $token->setUser($user);
 

composer.json

@@ -21,11 +21,11 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "friendsofsymfony/oauth2-php": "~1.1",
-        "symfony/dependency-injection": "^4.4 || ^5.1",
-        "symfony/framework-bundle": "^4.4 || ^5.1",
-        "symfony/security-bundle": "^4.4 || ^5.1",
-        "symfony/twig-bundle": "^4.4 || ^5.1"
+        "friendsofsymfony/oauth2-php": "dev-sf6",
+        "symfony/dependency-injection": "~5.3|~6.0",
+        "symfony/framework-bundle": "~5.3|~6.0",
+        "symfony/security-bundle": "~5.3|~6.0",
+        "symfony/twig-bundle": "~5.3|~6.0"
     },
     "conflict": {
         "twig/twig": "<1.40 || >=2.0,<2.9"
@@ -46,6 +46,12 @@
         "symfony/yaml": "^4.4 || ^5.1",
         "willdurand/propel-typehintable-behavior": "~1.0"
     },
+    "repositories": [
+        {
+          "type": "vcs",
+          "url": "https://github.com/Pushappy/oauth2-php.git"
+        }
+    ],
     "suggest": {
         "doctrine/doctrine-bundle": "*",
         "doctrine/mongodb-odm-bundle": "*",