Merge pull request #130 from andrew-demb/fix-tests

Fix working with session

Author: mistraloz

.github/workflows/test.yaml

@@ -12,7 +12,7 @@ jobs:
         strategy:
             matrix:
                 install-args: ['', '--prefer-lowest']
-                php-version: ['7.2', '7.3', '7.4', '8.0']
+                php-version: ['7.4', '8.0']
             fail-fast: false
         steps:
             # Cancel previous runs of the same branch

Controller/GraphQL/LoginController.php

@@ -5,11 +5,9 @@
 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\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -36,22 +34,17 @@ class LoginController
      * @var string
      */
     private $firewallName;
-    /**
-     * @var SessionInterface
-     */
-    private $session;
     /**
      * @var EventDispatcherInterface
      */
     private $eventDispatcher;
 
-    public function __construct(UserProviderInterface $userProvider, UserPasswordHasherInterface $passwordEncoder, TokenStorageInterface $tokenStorage, SessionInterface $session, EventDispatcherInterface $eventDispatcher, string $firewallName)
+    public function __construct(UserProviderInterface $userProvider, UserPasswordHasherInterface $passwordEncoder, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName)
     {
         $this->userProvider = $userProvider;
         $this->passwordEncoder = $passwordEncoder;
         $this->tokenStorage = $tokenStorage;
         $this->firewallName = $firewallName;
-        $this->session = $session;
         $this->eventDispatcher = $eventDispatcher;
     }
 
@@ -83,8 +76,8 @@ public function login(string $userName, string $password, Request $request): Use
         $this->tokenStorage->setToken($token);
 
         // If the firewall name is not main, then the set value would be instead:
-        // $this->get('session')->set('_security_XXXFIREWALLNAMEXXX', serialize($token));
-        $this->session->set('_security_'.$this->firewallName, serialize($token));
+        // $request->getSession()->set('_security_XXXFIREWALLNAMEXXX', serialize($token));
+        $request->getSession()->set('_security_'.$this->firewallName, serialize($token));
 
         // Fire the login event manually
         $event = new InteractiveLoginEvent($request, $token);
@@ -97,11 +90,11 @@ public function login(string $userName, string $password, Request $request): Use
     /**
      * @Mutation()
      */
-    public function logout(): bool
+    public function logout(Request $request): bool
     {
         $this->tokenStorage->setToken(null);
 
-        $this->session->remove('_security_'.$this->firewallName);
+        $request->getSession()->remove('_security_'.$this->firewallName);
 
         return true;
     }

DependencyInjection/GraphQLiteCompilerPass.php

@@ -32,7 +32,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 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\User\UserInterface;
 use TheCodingMachine\CacheUtils\ClassBoundCache;
@@ -106,7 +105,7 @@ public function process(ContainerBuilder $container): void
          && (!$container->has($firewallConfigServiceName) ||
                 !$container->has(UserPasswordHasherInterface::class) ||
                 !$container->has(TokenStorageInterface::class) ||
-                !$container->has(SessionInterface::class)
+                !$container->has('session.factory')
             )) {
             $disableLogin = true;
         }
@@ -119,7 +118,7 @@ public function process(ContainerBuilder $container): void
         }
 
         if ($container->getParameter('graphqlite.security.enable_login') === 'on') {
-            if (!$container->has(SessionInterface::class)) {
+            if (!$container->has('session.factory')) {
                 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(UserPasswordHasherInterface::class) || !$container->has(TokenStorageInterface::class) || !$container->has($firewallConfigServiceName)) {