mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix user creation using LDAP Plugin 

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
This commit is contained in:
Vinicius Cubas Brand 2019-03-01 12:12:19 -03:00 committed by Backportbot
parent 70589dfc68
commit 0f3df7609a
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/lib/UserPluginManager.php
View File

@ -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) {

12
apps/user_ldap/lib/User_LDAP.php
View File

@ -613,11 +613,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;
}

2
apps/user_ldap/tests/User_LDAPTest.php
View File

@ -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() {