Fix refresh method of LdapUserProvider

Mathieudewet · Mathieudewet · commit 301500a4a631 · 2019-08-19T20:15:18.000+02:00
diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Ldap\Security;
 
+use Doctrine\Common\Persistence\ManagerRegistry;
 use Symfony\Component\Ldap\Entry;
 use Symfony\Component\Ldap\Exception\ConnectionException;
 use Symfony\Component\Ldap\Exception\ExceptionInterface;
@@ -31,6 +32,7 @@
  */
 class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterface
 {
+    private $managerRegistry;
     private $ldap;
     private $baseDn;
     private $searchDn;
@@ -41,7 +43,7 @@ class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterfa
     private $passwordAttribute;
     private $extraFields;
 
-    public function __construct(LdapInterface $ldap, string $baseDn, string $searchDn = null, string $searchPassword = null, array $defaultRoles = [], string $uidKey = null, string $filter = null, string $passwordAttribute = null, array $extraFields = [])
+    public function __construct(ManagerRegistry $managerRegistry, LdapInterface $ldap, string $baseDn, string $searchDn = null, string $searchPassword = null, array $defaultRoles = [], string $uidKey = null, string $filter = null, string $passwordAttribute = null, array $extraFields = [])
     {
         if (null === $uidKey) {
             $uidKey = 'sAMAccountName';
@@ -51,6 +53,7 @@ public function __construct(LdapInterface $ldap, string $baseDn, string $searchD
             $filter = '({uid_key}={username})';
         }
 
+        $this->managerRegistry = $managerRegistry;
         $this->ldap = $ldap;
         $this->baseDn = $baseDn;
         $this->searchDn = $searchDn;
@@ -108,7 +111,7 @@ public function refreshUser(UserInterface $user)
             throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));
         }
 
-        return new LdapUser($user->getEntry(), $user->getUsername(), $user->getPassword(), $user->getRoles());
+        return $this->managerRegistry->getRepository(\get_class($user))->findOneBy(['username' => $user->getUsername()]);
     }
 
     /**
