symfony 6 (requires SF 5.3+)

janatjak · janatjak · commit e5bde8028b55 · 2022-01-25T21:41:52.000+01:00
diff --git a/Controller/GraphQL/LoginController.php b/Controller/GraphQL/LoginController.php
@@ -2,13 +2,16 @@
 namespace TheCodingMachine\GraphQLite\Bundle\Controller\GraphQL;
 
 
+use RuntimeException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UserNotFoundException;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
@@ -22,7 +25,7 @@ class LoginController
      */
     private $userProvider;
     /**
-     * @var UserPasswordEncoderInterface
+     * @var UserPasswordHasherInterface
      */
     private $passwordEncoder;
     /**
@@ -42,7 +45,7 @@ class LoginController
      */
     private $eventDispatcher;
 
-    public function __construct(UserProviderInterface $userProvider, UserPasswordEncoderInterface $passwordEncoder, TokenStorageInterface $tokenStorage, SessionInterface $session, EventDispatcherInterface $eventDispatcher, string $firewallName)
+    public function __construct(UserProviderInterface $userProvider, UserPasswordHasherInterface $passwordEncoder, TokenStorageInterface $tokenStorage, SessionInterface $session, EventDispatcherInterface $eventDispatcher, string $firewallName)
     {
         $this->userProvider = $userProvider;
         $this->passwordEncoder = $passwordEncoder;
@@ -58,12 +61,16 @@ public function __construct(UserProviderInterface $userProvider, UserPasswordEnc
     public function login(string $userName, string $password, Request $request): UserInterface
     {
         try {
-            $user = $this->userProvider->loadUserByUsername($userName);
-        } catch (UsernameNotFoundException $e) {
+            $user = $this->userProvider->loadUserByIdentifier($userName);
+        } catch (UserNotFoundException $e) {
             // FIXME: should we return null instead???
             throw InvalidUserPasswordException::create($e);
         }
 
+        if (!$user instanceof PasswordAuthenticatedUserInterface) {
+            throw new RuntimeException('$user has to implements ' . PasswordAuthenticatedUserInterface::class);
+        }
+
         if (!$this->passwordEncoder->isPasswordValid($user, $password)) {
             throw InvalidUserPasswordException::create();
         }
@@ -72,7 +79,7 @@ public function login(string $userName, string $password, Request $request): Use
 
         // Handle getting or creating the user entity likely with a posted form
         // The third parameter "main" can change according to the name of your firewall in security.yml
-        $token = new UsernamePasswordToken($user, null, 'main', $user->getRoles());
+        $token = new UsernamePasswordToken($user, 'main', $user->getRoles());
         $this->tokenStorage->setToken($token);
 
         // If the firewall name is not main, then the set value would be instead:
diff --git a/DependencyInjection/GraphQLiteCompilerPass.php b/DependencyInjection/GraphQLiteCompilerPass.php
@@ -12,6 +12,7 @@
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
 use Symfony\Component\Cache\Psr16Cache;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use TheCodingMachine\GraphQLite\Mappers\StaticClassListTypeMapperFactory;
 use Webmozart\Assert\Assert;
 use function class_exists;
@@ -33,7 +34,6 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use TheCodingMachine\CacheUtils\ClassBoundCache;
 use TheCodingMachine\CacheUtils\ClassBoundCacheContract;
@@ -104,7 +104,7 @@ public function process(ContainerBuilder $container): void
         $disableLogin = false;
         if ($container->getParameter('graphqlite.security.enable_login') === 'auto'
          && (!$container->has($firewallConfigServiceName) ||
-                !$container->has(UserPasswordEncoderInterface::class) ||
+                !$container->has(UserPasswordHasherInterface::class) ||
                 !$container->has(TokenStorageInterface::class) ||
                 !$container->has(SessionInterface::class)
             )) {
@@ -122,7 +122,7 @@ public function process(ContainerBuilder $container): void
             if (!$container->has(SessionInterface::class)) {
                 throw new GraphQLException('In order to enable the login/logout mutations (via the graphqlite.security.enable_login parameter), you need to enable session support (via the "framework.session.enabled" config parameter).');
             }
-            if (!$container->has(UserPasswordEncoderInterface::class) || !$container->has(TokenStorageInterface::class) || !$container->has($firewallConfigServiceName)) {
+            if (!$container->has(UserPasswordHasherInterface::class) || !$container->has(TokenStorageInterface::class) || !$container->has($firewallConfigServiceName)) {
                 throw new GraphQLException('In order to enable the login/logout mutations (via the graphqlite.security.enable_login parameter), you need to install the security bundle. Please be sure to correctly configure the user provider (in the security.providers configuration settings)');
             }
         }
diff --git a/DependencyInjection/GraphQLiteExtension.php b/DependencyInjection/GraphQLiteExtension.php
@@ -18,7 +18,7 @@
 class GraphQLiteExtension extends Extension
 {
 
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'graphqlite';
     }
diff --git a/GraphQLiteBundle.php b/GraphQLiteBundle.php
@@ -3,6 +3,7 @@
 
 namespace TheCodingMachine\GraphQLite\Bundle;
 
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use TheCodingMachine\GraphQLite\Bundle\DependencyInjection\GraphQLiteExtension;
 use TheCodingMachine\GraphQLite\Bundle\DependencyInjection\OverblogGraphiQLEndpointWiringPass;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
@@ -20,7 +21,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new OverblogGraphiQLEndpointWiringPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -1);
     }
 
-    public function getContainerExtension()
+    public function getContainerExtension(): ?ExtensionInterface
     {
         if (null === $this->extension) {
             $this->extension = new GraphQLiteExtension();
diff --git a/README.md b/README.md
@@ -7,6 +7,6 @@
 
 # GraphQLite bundle
 
-Symfony 4 bundle for the thecodingmachine/graphqlite package.
+Symfony 5 bundle for the thecodingmachine/graphqlite package.
 
 See [thecodingmachine/graphqlite](https://github.com/thecodingmachine/graphqlite)
diff --git a/Tests/FunctionalTest.php b/Tests/FunctionalTest.php
@@ -2,14 +2,14 @@
 
 namespace TheCodingMachine\GraphQLite\Bundle\Tests;
 
+use Symfony\Component\Security\Core\User\InMemoryUser;
 use function json_decode;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Core\User\User;
 use TheCodingMachine\GraphQLite\Bundle\Controller\GraphQLiteController;
 use TheCodingMachine\GraphQLite\GraphQLRuntimeException as GraphQLException;
 use TheCodingMachine\GraphQLite\Schema;
@@ -545,9 +545,9 @@ public function testMaxQueryDepth(): void
     private function logIn(ContainerInterface $container)
     {
         // put a token into the storage so the final calls can function
-        $user = new User('foo', 'pass');
-        $token = new UsernamePasswordToken($user, '', 'provider', ['ROLE_USER']);
-        $container->get('security.token_storage')->setToken($token);
+        $user = new InMemoryUser('foo', 'pass');
+        $token = new UsernamePasswordToken($user, 'provider', ['ROLE_USER']);
+        $container->get('security.untracked_token_storage')->setToken($token);
     }
 
     /**
diff --git a/Tests/GraphQLiteTestingKernel.php b/Tests/GraphQLiteTestingKernel.php
@@ -8,15 +8,15 @@
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
 use Symfony\Component\HttpKernel\Kernel;
 use TheCodingMachine\GraphQLite\Bundle\GraphQLiteBundle;
-use Symfony\Component\Security\Core\User\User;
+use Symfony\Component\Security\Core\User\InMemoryUser;
 use function class_exists;
 use function serialize;
 
-class GraphQLiteTestingKernel extends Kernel
+class GraphQLiteTestingKernel extends Kernel implements CompilerPassInterface
 {
     use MicroKernelTrait;
 
@@ -84,7 +84,7 @@ public function __construct(bool $enableSession = true,
         $this->typesNamespace = $typesNamespace;
     }
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         $bundles = [ new FrameworkBundle() ];
         if (class_exists(SecurityBundle::class)) {
@@ -112,7 +112,7 @@ public function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
             if ($this->enableSession) {
                 $frameworkConf['session'] =[
                     'enabled' => true,
-                    'handler_id' => NullSessionHandler::class
+                    'storage_factory_id' => 'session.storage.factory.mock_file',
                 ];
             }
 
@@ -143,12 +143,11 @@ public function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
                     ],
                     'firewalls' => [
                         'main' => [
-                            'anonymous' => true,
                             'provider' => 'in_memory'
                         ]
                     ],
-                    'encoders' => [
-                        User::class => 'plaintext',
+                    'password_hashers' => [
+                        InMemoryUser::class => 'plaintext',
                     ],
                 ));
             }
@@ -196,8 +195,15 @@ protected function configureRoutes(/*RoutingConfigurator*/ $routes)
         $routes->import(__DIR__.'/../Resources/config/routes.xml');
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return __DIR__.'/../cache/'.($this->enableSession?'withSession':'withoutSession').$this->enableLogin.($this->enableSecurity?'withSecurity':'withoutSecurity').$this->enableMe.'_'.($this->introspection?'withIntrospection':'withoutIntrospection').'_'.$this->maximumQueryComplexity.'_'.$this->maximumQueryDepth.'_'.md5(serialize($this->controllersNamespace).'_'.md5(serialize($this->typesNamespace)));
     }
+
+    public function process(ContainerBuilder $container): void
+    {
+        if ($container->hasDefinition('security.untracked_token_storage')) {
+            $container->getDefinition('security.untracked_token_storage')->setPublic(true);
+        }
+    }
 }
diff --git a/composer.json b/composer.json
@@ -20,24 +20,24 @@
     "ext-json": "*",
     "thecodingmachine/graphqlite" : "^5.0",
     "thecodingmachine/graphqlite-symfony-validator-bridge" : "^5.0",
-    "symfony/framework-bundle": "^4.2 || ^5",
-    "symfony/validator": "^4.2 || ^5",
-    "symfony/translation": "^4.2 || ^5",
+    "symfony/framework-bundle": "^5.3 || ^6",
+    "symfony/validator": "^5.3 || ^6",
+    "symfony/translation": "^5.3 || ^6",
     "doctrine/annotations": "^1.13",
     "symfony/psr-http-message-bridge": "^2.0",
     "nyholm/psr7": "^1.1",
     "laminas/laminas-diactoros": "^2.2.2",
     "overblog/graphiql-bundle": "^0.1.2 | ^0.2",
     "thecodingmachine/cache-utils": "^1",
-    "symfony/console": "^4.1.9 | ^5"
+    "symfony/console": "^5.3 || ^6"
   },
   "require-dev": {
-    "symfony/security-bundle": "^4.2 || ^5",
-    "symfony/yaml": "^4.2 || ^5",
+    "symfony/security-bundle": "^5.3 || ^6",
+    "symfony/yaml": "^5.3 || ^6",
     "phpstan/phpstan": "^0.12.90",
     "beberlei/porpaginas": "^1.2",
     "php-coveralls/php-coveralls": "^2.1.0",
-    "symfony/phpunit-bridge": "^5.3",
+    "symfony/phpunit-bridge": "^5.3 || ^6",
     "thecodingmachine/phpstan-strict-rules": "^v0.12.1",
     "composer/package-versions-deprecated": "^1.8",
     "phpstan/phpstan-webmozart-assert": "^0.12.12"

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`class GraphQLiteExtension extends Extension`
`19`	`19`	`{`
`20`	`20`
`21`		`- public function getAlias()`
	`21`	`+ public function getAlias(): string`
`22`	`22`	`{`
`23`	`23`	`return 'graphqlite';`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace TheCodingMachine\GraphQLite\Bundle;`
`5`	`5`
	`6`	`+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
`6`	`7`	`use TheCodingMachine\GraphQLite\Bundle\DependencyInjection\GraphQLiteExtension;`
`7`	`8`	`use TheCodingMachine\GraphQLite\Bundle\DependencyInjection\OverblogGraphiQLEndpointWiringPass;`
`8`	`9`	`use Symfony\Component\DependencyInjection\Compiler\PassConfig;`
`@@ -20,7 +21,7 @@ public function build(ContainerBuilder $container): void`
`20`	`21`	`$container->addCompilerPass(new OverblogGraphiQLEndpointWiringPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -1);`
`21`	`22`	`}`
`22`	`23`
`23`		`- public function getContainerExtension()`
	`24`	`+ public function getContainerExtension(): ?ExtensionInterface`
`24`	`25`	`{`
`25`	`26`	`if (null === $this->extension) {`
`26`	`27`	`$this->extension = new GraphQLiteExtension();`