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

2
server/resolvers/login.go
View File

@@ -58,7 +58,7 @@ func LoginResolver(ctx context.Context, params model.LoginInput) (*model.AuthRes
roles := envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyDefaultRoles)
currentRoles := strings.Split(user.Roles, ",")
if len(params.Roles) > 0 {
if !utils.IsValidRoles(currentRoles, params.Roles) {
if !utils.IsValidRoles(params.Roles, currentRoles) {
return res, fmt.Errorf(`invalid roles`)
}

2
server/resolvers/magic_link_login.go
View File

@@ -52,7 +52,7 @@ func MagicLinkLoginResolver(ctx context.Context, params model.MagicLinkLoginInpu
// define roles for new user
if len(params.Roles) > 0 {
// check if roles exists
if !utils.IsValidRoles(envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyRoles), params.Roles) {
if !utils.IsValidRoles(params.Roles, envstore.EnvStoreObj.GetSliceStoreEnvVariable(constants.EnvKeyRoles)) {
return res, fmt.Errorf(`invalid roles`)
} else {
inputRoles = params.Roles