updated role endpoints

Gaucho-Racing · Aug 30, 2024 · 87ac113 · 87ac113
1 parent e7edc5f
commit 87ac113
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/controller/role_controller.go b/controller/role_controller.go
@@ -7,16 +7,23 @@ import (
 )
 
 func GetAllRolesForUser(c *gin.Context) {
-	RequireAny(c, RequestTokenHasScope(c, "sentinel:all"), RequestTokenHasScope(c, "user:read"))
-	RequireAny(c, RequestUserHasID(c, c.Param("userID")), RequestUserHasRole(c, "d_admin"))
+	Require(c, Any(
+		RequestTokenHasScope(c, "sentinel:all"),
+		All(
+			RequestTokenHasScope(c, "user:read"),
+			Any(RequestUserHasID(c, c.Param("userID")), RequestUserHasRole(c, "d_admin")),
+		),
+	))
 
 	roles := service.GetRolesForUser(c.Param("userID"))
 	c.JSON(200, roles)
 }
 
 func SetRolesForUser(c *gin.Context) {
-	RequireAny(c, RequestTokenHasScope(c, "sentinel:all"))
-	RequireAny(c, RequestUserHasID(c, c.Param("userID")), RequestUserHasRole(c, "d_admin"))
+	Require(c, All(
+		RequestTokenHasScope(c, "sentinel:all"),
+		RequestUserHasRole(c, "d_admin"),
+	))
 
 	var roles []string
 	if err := c.ShouldBindJSON(&roles); err != nil {