bug #39878 [doctrine-bridge] Add username to UserNameNotFoundException

qurben · qurben · commit ee9f985ddfe5 · 2021-01-18T18:44:52.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
@@ -62,7 +62,10 @@ public function loadUserByUsername($username)
         }
 
         if (null === $user) {
-            throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $ex = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $ex->setUsername($username);
+
+            throw $ex;
         }
 
         return $user;
@@ -92,7 +95,10 @@ public function refreshUser(UserInterface $user)
 
             $refreshedUser = $repository->find($id);
             if (null === $refreshedUser) {
-                throw new UsernameNotFoundException('User with id '.json_encode($id).' not found.');
+                $ex = new UsernameNotFoundException('User with id '.json_encode($id).' not found.');
+                $ex->setUsername(json_encode($id));
+
+                throw $ex;
             }
         }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php
@@ -34,7 +34,10 @@ public function loadUserByUsername($username)
         $user = $this->getUser($username);
 
         if (null === $user) {
-            throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $ex = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $ex->setUsername($username);
+
+            throw $ex;
         }
 
         return $user;
diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php
@@ -73,14 +73,20 @@ public function loadUserByUsername($username)
             $query = str_replace('{username}', $username, $this->defaultSearch);
             $search = $this->ldap->query($this->baseDn, $query);
         } catch (ConnectionException $e) {
-            throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username), 0, $e);
+            $ex = new UsernameNotFoundException(sprintf('User "%s" not found.', $username), 0, $e);
+            $ex->setUsername($username);
+
+            throw $ex;
         }
 
         $entries = $search->execute();
         $count = \count($entries);
 
         if (!$count) {
-            throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $ex = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $ex->setUsername($username);
+
+            throw $ex;
         }
 
         if ($count > 1) {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,10 @@ public function loadUserByUsername($username)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if (null === $user) {`
`65`		`- throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));`
	`65`	`+ $ex = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));`
	`66`	`+ $ex->setUsername($username);`
	`67`	`+`
	`68`	`+ throw $ex;`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`return $user;`
`@@ -92,7 +95,10 @@ public function refreshUser(UserInterface $user)`
`92`	`95`
`93`	`96`	`$refreshedUser = $repository->find($id);`
`94`	`97`	`if (null === $refreshedUser) {`
`95`		`- throw new UsernameNotFoundException('User with id '.json_encode($id).' not found.');`
	`98`	`+ $ex = new UsernameNotFoundException('User with id '.json_encode($id).' not found.');`
	`99`	`+ $ex->setUsername(json_encode($id));`
	`100`	`+`
	`101`	`+ throw $ex;`
`96`	`102`	`}`
`97`	`103`	`}`
`98`	`104`