fix: merge conflict

This commit is contained in:
Lakhan Samani
2022-05-23 11:54:46 +05:30
28 changed files with 1460 additions and 743 deletions

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
}