bug #37177 [Ldap] fix refreshUser() ignoring extra_fields (arkste)

chalasr · chalasr · commit c70241e3d2e5 · 2020-06-10T10:37:06.000+02:00
This PR was squashed before being merged into the 4.4 branch (closes #37177). Discussion ---------- [Ldap] fix refreshUser() ignoring extra_fields | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? |no | Tickets | - | License | MIT | Doc PR | - While #31532 introduced `extra_fields` in general, #32824 later added `LdapUser` & `LdapUserProvider` and ignored `extra_fields` on `refreshUser()`. This PR fixes `refreshUser()` and adds a test which makes sure, that the refreshed ldap user doesn't lose its default values. Commits ------- cb8f129 [Ldap] fix refreshUser() ignoring extra_fields
diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php
@@ -108,7 +108,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 new LdapUser($user->getEntry(), $user->getUsername(), $user->getPassword(), $user->getRoles(), $user->getExtraFields());
     }
 
     /**
diff --git a/src/Symfony/Component/Ldap/Tests/Security/LdapUserProviderTest.php b/src/Symfony/Component/Ldap/Tests/Security/LdapUserProviderTest.php
@@ -330,4 +330,14 @@ public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
         $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, [], 'sAMAccountName', '({uid_key}={username})', 'userpassword', ['email']);
         $this->assertInstanceOf(LdapUser::class, $provider->loadUserByUsername('foo'));
     }
+
+    public function testRefreshUserShouldReturnUserWithSameProperties()
+    {
+        $ldap = $this->createMock(LdapInterface::class);
+        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, [], 'sAMAccountName', '({uid_key}={username})', 'userpassword', ['email']);
+
+        $user = new LdapUser(new Entry('foo'), 'foo', 'bar', ['ROLE_DUMMY'], ['email' => 'foo@symfony.com']);
+
+        $this->assertEquals($user, $provider->refreshUser($user));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function refreshUser(UserInterface $user)`
`108`	`108`	`throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));`
`109`	`109`	`}`
`110`	`110`
`111`		`- return new LdapUser($user->getEntry(), $user->getUsername(), $user->getPassword(), $user->getRoles());`
	`111`	`+ return new LdapUser($user->getEntry(), $user->getUsername(), $user->getPassword(), $user->getRoles(), $user->getExtraFields());`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`/**`