LDAP: Sync password; Closes #1984

RocketChat · Feb 10, 2016 · 08aa707 · 08aa707
1 parent d2ba3be
commit 08aa707
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
@@ -124,8 +124,9 @@ LDAP = class LDAP {
 		const self = this;
 
 		if (self.options.use_custom_domain_search === true) {
+			let custom_domain_search;
 			try {
-				const custom_domain_search = JSON.parse(self.options.custom_domain_search);
+				custom_domain_search = JSON.parse(self.options.custom_domain_search);
 			} catch(error) {
 				throw new Error('Invalid Custom Domain Search JSON');
 			}

diff --git a/packages/rocketchat-ldap/server/loginHandler.js b/packages/rocketchat-ldap/server/loginHandler.js
@@ -160,7 +160,8 @@ Accounts.registerLoginHandler("ldap", function(loginRequest) {
 			}
 		});
 
-		syncUserData(user._id, ldapUser);
+		syncUserData(user._id, ldapUser, loginRequest.ldapPass);
+		Accounts.setPassword(user._id, loginRequest.ldapPass, {logout: false});
 		return {
 			userId: user._id,
 			token: stampedToken.token
@@ -169,7 +170,8 @@ Accounts.registerLoginHandler("ldap", function(loginRequest) {
 
 	// Create new user
 	var userObject = {
-		username: username
+		username: username,
+		password: loginRequest.ldapPass
 	};
 
 	let userData = getDataToSyncUserData(ldapUser);
@@ -186,7 +188,7 @@ Accounts.registerLoginHandler("ldap", function(loginRequest) {
 
 	let userId = Accounts.createUser(userObject);
 
-	syncUserData(userId, ldapUser);
+	syncUserData(userId, ldapUser, loginRequest.ldapPass);
 
 	let ldapUserService = {
 		ldap: true