From: Vinicius Cubas Brand <viniciuscb@gmail.com>
Date: Fri, 1 Mar 2019 15:12:19 +0000 (-0300)
Subject: fix user creation using LDAP Plugin
X-Git-Tag: v16.0.0beta1~6^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c4dbc428f9677a03b3f873eaba9282cfd227d876;p=nextcloud-server.git

fix user creation using LDAP Plugin

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
---

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