chore(symfony) #57 : bump symfony to version 6.4 and fix deprecations

src/Security/SQLLoginUserAuthenticator.php

@@ -10,16 +10,16 @@ use App\SQLLogin\Exception\EmptyResultException;
 use App\SQLLogin\Exception\InvalidSQLPasswordException;
 use App\SQLLogin\Exception\SecurityPatternConfigurationException;
 use App\SQLLogin\SQLLoginRequest;
-use PDOException;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Security\Core\Exception\UserNotFoundException;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Http\Authenticator\AbstractLoginFormAuthenticator;
-use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport;
+use Symfony\Component\Security\Http\SecurityRequestAttributes;
 
 class SQLLoginUserAuthenticator extends AbstractLoginFormAuthenticator
 {
@@ -27,18 +27,12 @@ class SQLLoginUserAuthenticator extends AbstractLoginFormAuthenticator
     public const ERROR_LOGIN = 'error_login';
     public const TECHNICAL_ERROR = 'technical_error';
 
-    private string $baseUrl;
-
     public function __construct(
-        string $baseUrl,
-        private SQLLoginService $sqlLoginService,
-        private PasswordEncoder $passwordHasher,
-        private SQLLoginRequest $sqlLoginRequest
-    ) {
-        $this->baseUrl = $baseUrl;
-        $this->sqlLoginService = $sqlLoginService;
-        $this->passwordHasher = $passwordHasher;
-        $this->sqlLoginRequest = $sqlLoginRequest;
+        private readonly string $baseUrl,
+        private readonly SQLLoginService $sqlLoginService,
+        private readonly PasswordEncoder $passwordHasher,
+        private readonly SQLLoginRequest $sqlLoginRequest
+    ){
     }
 
     /**
@@ -58,24 +52,23 @@ class SQLLoginUserAuthenticator extends AbstractLoginFormAuthenticator
 
     public function onAuthenticationFailure(Request $request, AuthenticationException $exception): RedirectResponse
     {
-        $request->getSession()->set(Security::AUTHENTICATION_ERROR, $exception);
+        $request->getSession()->set(SecurityRequestAttributes::AUTHENTICATION_ERROR, $exception);
 
         return new RedirectResponse($this->baseUrl.'/login');
     }
 
     public function authenticate(Request $request): SelfValidatingPassport
     {
-        $form = $request->request->get('login');
+        $form = $request->request->all(key: 'login');
         $login = $form['login'];
         $plaintextPassword = $form['password'];
-        $rememberMe = isset($form['_remember_me']) ? true : false;
         $session = $request->getSession();
         try {
             $datas = $this->sqlLoginService->fetchPasswordAndDatas($login);
         } catch (EmptyResultException $e) {
             $session->set(self::ERROR_LOGIN, true);
             throw new AuthenticationException();
-        } catch (DataToFetchConfigurationException|PDOException $e) {
+        } catch (DataToFetchConfigurationException|\PDOException $e) {
             \Sentry\captureException($e);
             $session->set(self::TECHNICAL_ERROR, true);
             throw new AuthenticationException();
@@ -101,14 +94,18 @@ class SQLLoginUserAuthenticator extends AbstractLoginFormAuthenticator
             $session->set(self::TECHNICAL_ERROR, true);
             throw new AuthenticationException();
         }
-        $user = new User($login, $remoteHashedPassword, $datas, $rememberMe);
-        $loader = function (string $userIdentifier) use ($user) {
-            return $user->getLogin() == $userIdentifier ? $user : null;
+
+        $user = new User($login, $remoteHashedPassword, $datas);
+
+        $loader = function (string $userIdentifier) use ($user): UserInterface {
+            if ($user->getLogin() !== $userIdentifier) {
+                throw new UserNotFoundException(sprintf('User "%s" not found.', $userIdentifier));
+            }
+        
+            return $user;
         };
+        
         $passport = new SelfValidatingPassport(new UserBadge($login, $loader));
-        if ($rememberMe) {
-            $passport->addBadge(new RememberMeBadge());
-        }
         $passport->setAttribute('attributes', $user->getAttributes());
 
         return $passport;

src/Security/SQLLoginUserProvider.php

@@ -3,45 +3,48 @@
 namespace App\Security;
 
 use App\Entity\User;
+use App\Service\SQLLoginService;
+use App\SQLLogin\SQLLoginRequest;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
+use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 class SQLLoginUserProvider implements UserProviderInterface
 {
-    protected RequestStack $requestStack;
-
-    public function __construct(RequestStack $requestStack)
-    {
-        $this->requestStack = $requestStack;
+    public function __construct(
+        private readonly RequestStack $requestStack,
+        private readonly SQLLoginService $sqlLoginService,
+        private readonly SQLLoginRequest $sqlLoginRequest
+    ){
     }
 
-    public function loadUserByIdentifier(string $identifier, ?User $user): ?UserInterface
+    public function loadUserByIdentifier(string $identifier): UserInterface
     {
-        if ($user->getUserIdentifier() === $identifier) {
-            return $user;
+        $user = $this->sqlLoginService->fetchPasswordAndDatas($identifier);
+
+        $attributes = $user;
+        unset($attributes[$this->sqlLoginRequest->getPasswordColumnName()]);
+
+        if (empty($user[$this->sqlLoginRequest->getLoginColumnName()]) || empty($user[$this->sqlLoginRequest->getPasswordColumnName()])) {
+            throw new UserNotFoundException('email or password not found');
         }
 
-        return null;
+        return new User($user[$this->sqlLoginRequest->getLoginColumnName()], $user[$this->sqlLoginRequest->getPasswordColumnName()], $attributes);
     }
 
-    public function loadUserByUsername(string $username): ?UserInterface
-    {
-        return $this->loadUserByIdentifier($username, null);
-    }
-
-    public function refreshUser(UserInterface $user): UserInterface|null
+    public function refreshUser(UserInterface $user): UserInterface
     {
         if (!$user instanceof User) {
             throw new UnsupportedUserException(sprintf('Invalid user class "%s".', get_class($user)));
         }
 
-        return $this->loadUserByIdentifier($user->getUserIdentifier(), $user);
+        return $this->loadUserByIdentifier($user->getUserIdentifier());
     }
 
     public function supportsClass(string $class): bool
     {
-        return User::class === $class || is_subclass_of($class, User::class);
+        return User::class === $class || \is_subclass_of($class, User::class);
     }
 }