diff options
| author | George Goldberg <george@gberg.me> | 2018-02-06 15:34:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 15:34:08 +0000 |
| commit | e1cd64613591cf5a990442a69ebf188258bd0cb5 (patch) | |
| tree | ad9f247a2c75b0bc03de93dbbfc038afb6b69545 /model/user.go | |
| parent | 1c7f25773a77ceb9e84feabe3907e7f93f6870e4 (diff) | |
| download | chat-e1cd64613591cf5a990442a69ebf188258bd0cb5.tar.gz chat-e1cd64613591cf5a990442a69ebf188258bd0cb5.tar.bz2 chat-e1cd64613591cf5a990442a69ebf188258bd0cb5.zip | |
XYZ-37: Advanced Permissions Phase 1 Backend. (#8159)
* XYZ-13: Update Permission and Role structs to new design.
* XYZ-10: Role store.
* XYZ-9/XYZ-44: Roles API endpoints and WebSocket message.
* XYZ-8: Switch server permissions checks to store backed roles.
* XYZ-58: Proper validation of roles where required.
* XYZ-11/XYZ-55: Migration to store backed roles from policy config.
* XYZ-37: Update unit tests to work with database roles.
* XYZ-56: Remove the "guest" role.
* Changes to SetDefaultRolesFromConfig.
* Short-circuit the store if nothing has changed.
* Address first round of review comments.
* Address second round of review comments.
Diffstat (limited to 'model/user.go')
| -rw-r--r-- | model/user.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/model/user.go b/model/user.go index 4c08eac24..556ebb1f7 100644 --- a/model/user.go +++ b/model/user.go @@ -432,7 +432,7 @@ func IsValidUserRoles(userRoles string) bool { roles := strings.Fields(userRoles) for _, r := range roles { - if !isValidRole(r) { + if !IsValidRoleName(r) { return false } } @@ -445,11 +445,6 @@ func IsValidUserRoles(userRoles string) bool { return true } -func isValidRole(roleId string) bool { - _, ok := DefaultRoles[roleId] - return ok -} - // Make sure you acually want to use this function. In context.go there are functions to check permissions // This function should not be used to check permissions. func (u *User) IsInRole(inRole string) bool { |