Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Do not add default roles for users without services field #6594

Merged
merged 1 commit into from
Apr 4, 2017
Merged

[FIX] Do not add default roles for users without services field #6594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Do not add default roles for users without services field
  • Loading branch information
@sampaiodiego
sampaiodiego committed Apr 4, 2017
commit 2d13f078f2feed3b12853e8d9a26b3e14151d595
2 changes: 1 addition & 1 deletion server/lib/accounts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down