Merge pull request #6594 from RocketChat/fix-livechat-guests-getting-…

…user-role [FIX] Do not add default roles for users without services field
RocketChat · Apr 4, 2017 · 3da9821 · 3da9821
2 parents d65e976 + 2d13f07
commit 3da9821
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/lib/accounts.js b/server/lib/accounts.js
@@ -103,7 +103,7 @@ Accounts.insertUserDoc = _.wrap(Accounts.insertUserDoc, function(insertUserDoc,
 
 	delete user.globalRoles;
 
-	if (!user.services || !user.services.password) {
+	if (user.services && !user.services.password) {
 		const defaultAuthServiceRoles = String(RocketChat.settings.get('Accounts_Registration_AuthenticationServices_Default_Roles')).split(',');
 		if (defaultAuthServiceRoles.length > 0) {
 			roles = roles.concat(defaultAuthServiceRoles.map(s => s.trim()));