diff options
| author | Vinicius Cubas Brand <viniciuscb@gmail.com> | 2019-03-01 12:12:19 -0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2019-03-21 10:20:46 +0100 |
| commit | c4dbc428f9677a03b3f873eaba9282cfd227d876 (patch) | |
| tree | b584651a998097e05f8bbfb064d96f2cbf1bb25e /apps/user_ldap | |
| parent | 651495e3ae549b4c029e2ca177a696fa9701ba4e (diff) | |
| download | nextcloud-server-c4dbc428f9677a03b3f873eaba9282cfd227d876.tar.gz nextcloud-server-c4dbc428f9677a03b3f873eaba9282cfd227d876.zip | |
fix user creation using LDAP Plugin
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/UserPluginManager.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/User_LDAP.php | 12 | ||||
| -rw-r--r-- | apps/user_ldap/tests/User_LDAPTest.php | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/apps/user_ldap/lib/UserPluginManager.php b/apps/user_ldap/lib/UserPluginManager.php index 5bf36dfe08f..85eaae29daa 100644 --- a/apps/user_ldap/lib/UserPluginManager.php +++ b/apps/user_ldap/lib/UserPluginManager.php @@ -84,7 +84,7 @@ class UserPluginManager { * * @param string $username The username of the user to create * @param string $password The password of the new user - * @return bool + * @return string | false The user DN if user creation was successful. * @throws \Exception */ public function createUser($username, $password) { diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php index fbdf1cc2551..855c13e13fb 100644 --- a/apps/user_ldap/lib/User_LDAP.php +++ b/apps/user_ldap/lib/User_LDAP.php @@ -615,11 +615,19 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn * create new user * @param string $username username of the new user * @param string $password password of the new user - * @return bool was the user created? + * @return bool */ public function createUser($username, $password) { if ($this->userPluginManager->implementsActions(Backend::CREATE_USER)) { - return $this->userPluginManager->createUser($username, $password); + if ($dn = $this->userPluginManager->createUser($username, $password)) { + if (is_string($dn)) { + //updates user mapping + $this->access->dn2ocname($dn, $username, true); + } else { + throw new \Exception("LDAP Plugin: Method createUser changed to return the user DN instead of boolean."); + } + } + return (bool) $dn; } return false; } diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index 693159dc72b..f58c5f881f9 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -1422,7 +1422,7 @@ class User_LDAPTest extends TestCase { ->with('uid','password') ->willReturn('result'); - $this->assertEquals($this->backend->createUser('uid', 'password'),'result'); + $this->assertEquals($this->backend->createUser('uid', 'password'),true); } public function testCreateUserFailing() { |