Fix bug in "chat-admin"

JiawenZou · Mar 10, 2024 · dbbf737 · dbbf737
1 parent 883572d
commit dbbf737
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/controllers/account.go b/controllers/account.go
@@ -58,7 +58,7 @@ func (c *ApiController) Signin() {
 		return
 	}
 
-	if !claims.IsAdmin {
+	if !claims.IsAdmin && claims.Type != "chat-admin" {
 		claims.Type = "chat-user"
 	}
 

diff --git a/controllers/util.go b/controllers/util.go
@@ -86,22 +86,22 @@ func (c *ApiController) CheckSignedIn() (string, bool) {
 }
 
 func (c *ApiController) RequireAdmin() bool {
-	user := c.GetSessionUser()
-	if user == nil || !user.IsAdmin {
+	if !c.IsAdmin() {
 		c.ResponseError("this operation requires admin privilege")
-		return true
+		return false
 	}
 
-	return false
+	return true
 }
 
 func (c *ApiController) IsAdmin() bool {
 	user := c.GetSessionUser()
-	if user == nil || !user.IsAdmin {
+	if user == nil {
 		return false
 	}
 
-	return true
+	res := user.IsAdmin || user.Type == "chat-admin"
+	return res
 }
 
 func DenyRequest(ctx *context.Context) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,7 @@ func (c *ApiController) Signin() { @@
     		return
     	}
-    	if !claims.IsAdmin {
+    	if !claims.IsAdmin && claims.Type != "chat-admin" {
     		claims.Type = "chat-user"
     	}
@@ Expand Down @@