[DoctrineBridge] Throw AuthenticationException if the user entity cannot be fetched at all

fancyweb · fancyweb · commit 3843cde41602 · 2020-03-26T18:19:54.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
@@ -13,6 +13,7 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry as LegacyManagerRegistry;
 use Doctrine\Persistence\ManagerRegistry;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -51,14 +52,19 @@ public function __construct($registry, $classOrAlias, $property = null, $manager
     public function loadUserByUsername($username)
     {
         $repository = $this->getRepository();
-        if (null !== $this->property) {
-            $user = $repository->findOneBy([$this->property => $username]);
-        } else {
-            if (!$repository instanceof UserLoaderInterface) {
-                throw new \InvalidArgumentException(sprintf('You must either make the "%s" entity Doctrine Repository ("%s") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.', $this->classOrAlias, \get_class($repository)));
-            }
 
-            $user = $repository->loadUserByUsername($username);
+        try {
+            if (null !== $this->property) {
+                $user = $repository->findOneBy([$this->property => $username]);
+            } else {
+                if (!$repository instanceof UserLoaderInterface) {
+                    throw new \InvalidArgumentException(sprintf('You must either make the "%s" entity Doctrine Repository ("%s") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.', $this->classOrAlias, \get_class($repository)));
+                }
+
+                $user = $repository->loadUserByUsername($username);
+            }
+        } catch (\Exception $e) {
+            throw new AuthenticationException('The user entity could not be fetched.', 0, $e);
         }
 
         if (null === $user) {
