as per wxiaoguang

zeripath · zeripath · commit 8b8abaaecc4e · 2021-09-27T10:40:50.000+01:00
Signed-off-by: Andrew Thornton &lt;art27@cantab.net&gt;
diff --git a/routers/web/user/auth.go b/routers/web/user/auth.go
@@ -674,11 +674,7 @@ func claimValueToStringSlice(claimValue interface{}) []string {
 		groups = rawGroup
 	default:
 		str := fmt.Sprintf("%s", rawGroup)
-		if strings.Contains(str, ",") {
-			groups = strings.Split(str, ",")
-		} else {
-			groups = []string{str}
-		}
+		groups = strings.Split(str, ",")
 	}
 	return groups
 }
@@ -714,7 +710,7 @@ func setUserGroupClaims(loginSource *login.Source, u *models.User, gothUser *got
 		}
 	}
 
-	return wasAdmin == u.IsAdmin && wasRestricted == u.IsRestricted
+	return wasAdmin != u.IsAdmin || wasRestricted != u.IsRestricted
 }
 
 func getUserName(gothUser *goth.User) string {

Original file line number	Diff line number	Diff line change
`@@ -674,11 +674,7 @@ func claimValueToStringSlice(claimValue interface{}) []string {`
`674`	`674`	`groups = rawGroup`
`675`	`675`	`default:`
`676`	`676`	`str := fmt.Sprintf("%s", rawGroup)`
`677`		`- if strings.Contains(str, ",") {`
`678`		`- groups = strings.Split(str, ",")`
`679`		`- } else {`
`680`		`- groups = []string{str}`
`681`		`- }`
	`677`	`+ groups = strings.Split(str, ",")`
`682`	`678`	`}`
`683`	`679`	`return groups`
`684`	`680`	`}`
`@@ -714,7 +710,7 @@ func setUserGroupClaims(loginSource login.Source, u models.User, gothUser *got`
`714`	`710`	`}`
`715`	`711`	`}`
`716`	`712`
`717`		`- return wasAdmin == u.IsAdmin && wasRestricted == u.IsRestricted`
	`713`	`+ return wasAdmin != u.IsAdmin \|\| wasRestricted != u.IsRestricted`
`718`	`714`	`}`
`719`	`715`
`720`	`716`	`func getUserName(gothUser *goth.User) string {`