diff --git a/controllers/enforcer.go b/controllers/enforcer.go index 44305157..86d12c60 100644 --- a/controllers/enforcer.go +++ b/controllers/enforcer.go @@ -21,12 +21,6 @@ import ( ) func (c *ApiController) Enforce() { - userId := c.GetSessionUsername() - if userId == "" { - c.ResponseError(c.T("EnforcerErr.SignInFirst")) - return - } - var permissionRule object.PermissionRule err := json.Unmarshal(c.Ctx.Input.RequestBody, &permissionRule) if err != nil { @@ -34,17 +28,11 @@ func (c *ApiController) Enforce() { return } - c.Data["json"] = object.Enforce(userId, &permissionRule) + c.Data["json"] = object.Enforce(&permissionRule) c.ServeJSON() } func (c *ApiController) BatchEnforce() { - userId := c.GetSessionUsername() - if userId == "" { - c.ResponseError(c.T("EnforcerErr.SignInFirst")) - return - } - var permissionRules []object.PermissionRule err := json.Unmarshal(c.Ctx.Input.RequestBody, &permissionRules) if err != nil { @@ -52,7 +40,7 @@ func (c *ApiController) BatchEnforce() { return } - c.Data["json"] = object.BatchEnforce(userId, permissionRules) + c.Data["json"] = object.BatchEnforce(permissionRules) c.ServeJSON() } diff --git a/object/permission_enforcer.go b/object/permission_enforcer.go index 57ccb784..1a0278a3 100644 --- a/object/permission_enforcer.go +++ b/object/permission_enforcer.go @@ -152,20 +152,20 @@ func removePolicies(permission *Permission) { } } -func Enforce(userId string, permissionRule *PermissionRule) bool { +func Enforce(permissionRule *PermissionRule) bool { permission := GetPermission(permissionRule.Id) enforcer := getEnforcer(permission) - allow, err := enforcer.Enforce(userId, permissionRule.V1, permissionRule.V2) + allow, err := enforcer.Enforce(permissionRule.V0, permissionRule.V1, permissionRule.V2) if err != nil { panic(err) } return allow } -func BatchEnforce(userId string, permissionRules []PermissionRule) []bool { +func BatchEnforce(permissionRules []PermissionRule) []bool { var requests [][]interface{} for _, permissionRule := range permissionRules { - requests = append(requests, []interface{}{userId, permissionRule.V1, permissionRule.V2}) + requests = append(requests, []interface{}{permissionRule.V0, permissionRule.V1, permissionRule.V2}) } permission := GetPermission(permissionRules[0].Id) enforcer := getEnforcer(permission)