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

fix: merge conflict

Browse Source
This commit is contained in:
Lakhan Samani
2022-05-23 11:54:46 +05:30
parent b35d86fd40 2c4bc9adb6
commit f5515bec28
28 changed files with 1460 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/handlers/oauth_login.go
View File

@@ -56,8 +56,7 @@ func OAuthLoginHandler() gin.HandlerFunc {
// use protected roles verification for admin login only.
// though if not associated with user, it will be rejected from oauth_callback
if !utils.IsValidRoles(append([]string{}, append(envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyRoles), envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyProtectedRoles)...)...), rolesSplit) {
log.Debug("Invalid roles: ", roles)
if !utils.IsValidRoles(rolesSplit, append([]string{}, append(envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyRoles), envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyProtectedRoles)...)...)) {
c.JSON(400, gin.H{
"error": "invalid role",
})