Default oauth role #6028
Merged
Default oauth role #6028
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rodrigok
reviewed
Feb 15, 2017
server/lib/accounts.js
Outdated
| @@ -95,6 +95,13 @@ Accounts.insertUserDoc = _.wrap(Accounts.insertUserDoc, function(insertUserDoc, | |||
|
|
|||
| delete user.globalRoles; | |||
|
|
|||
| if (!(user.services && user.services.password)) { | |||
There was a problem hiding this comment.
This is a little bit confused to me, why not:
if (!user.services || !user.services.password) {
server/lib/accounts.js
Outdated
| @@ -95,6 +95,13 @@ Accounts.insertUserDoc = _.wrap(Accounts.insertUserDoc, function(insertUserDoc, | |||
|
|
|||
| delete user.globalRoles; | |||
|
|
|||
| if (!(user.services && user.services.password)) { | |||
| const defaultAuthServiceRoles = (RocketChat.settings.get('Accounts_Registration_AuthenticationServices_Default_Roles') + '').split(','); | |||
There was a problem hiding this comment.
This looks less hack:
const defaultAuthServiceRoles = String(RocketChat.settings.get('Accounts_Registration_AuthenticationServices_Default_Roles')).split(',');
What do you think?
server/lib/accounts.js
Outdated
| if (!(user.services && user.services.password)) { | ||
| const defaultAuthServiceRoles = (RocketChat.settings.get('Accounts_Registration_AuthenticationServices_Default_Roles') + '').split(','); | ||
| if (defaultAuthServiceRoles.length > 0) { | ||
| roles = roles.concat(_.map(defaultAuthServiceRoles, s.trim)); |
There was a problem hiding this comment.
Lets try to prevent use underscore when we have native functions?
roles = roles.concat(defaultAuthServiceRoles.map(i => i.trim()));
rodrigok
approved these changes
Feb 15, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@RocketChat/core
Closes #5842