devstack/authorizer
4
0
Fork 0
Code Pull Requests Actions Activity

Inverted userRoles by role fix. Roles can now be updated

Browse Source
This commit is contained in:
Vicg853
2022-05-12 16:40:19 -03:00
parent 773213e5a4
commit 9edc8d0fb5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/resolvers/update_user.go
View File

@@ -26,6 +26,7 @@ func UpdateUserResolver(ctx context.Context, params model.UpdateUserInput) (*mod
if err != nil {
return res, err
}
fmt.Println(token.IsSuperAdmin(gc))
if !token.IsSuperAdmin(gc) {
return res, fmt.Errorf("unauthorized")
@@ -133,6 +134,8 @@ func UpdateUserResolver(ctx context.Context, params model.UpdateUserInput) (*mod
inputRoles = append(inputRoles, *item)
}
fmt.Println(envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyRoles))
fmt.Println(envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyProtectedRoles))
if !utils.IsValidRoles(inputRoles, append([]string{}, append(envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyRoles), envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyProtectedRoles)...)...)) {
return res, fmt.Errorf("invalid list of roles")
}

4
server/utils/validator.go
View File

@@ -54,8 +54,8 @@ func IsValidOrigin(url string) bool {
// IsValidRoles validates roles
func IsValidRoles(userRoles []string, roles []string) bool {
valid := true
for _, role := range roles {
if !StringSliceContains(userRoles, role) {
for _, userRole := range userRoles {
if !StringSliceContains(roles, userRole) {
valid = false
break
}