Add DomainRole model

oj-lab · Jul 27, 2024 · 8818c9e · 8818c9e
1 parent 6f52428
commit 8818c9e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/models/user/user_db.go b/models/user/user_db.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/alexedwards/argon2id"
 	"github.com/oj-lab/oj-lab-platform/models"
+	casbin_agent "github.com/oj-lab/oj-lab-platform/modules/agent/casbin"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
@@ -86,6 +87,7 @@ func UpdateUser(tx *gorm.DB, update User) error {
 type GetUserOptions struct {
 	AccountQuery string
 	EmailQuery   string
+	DomainRole   *casbin_agent.DomainRole
 	Offset       *int
 	Limit        *int
 }

diff --git a/modules/agent/casbin/model.go b/modules/agent/casbin/model.go
@@ -31,6 +31,14 @@ e = some(where (p.eft == allow)) && !some(where (p.eft == deny))
 m = g(r.sub, p.sub) && eval(p.ext_rule) && r.dom == p.dom && keyMatchGin(r.obj, p.obj) && regexMatch(r.act, p.act)
 `
 
+const UserSubjectPrefix = "user_"
+const RoleSubjectPrefix = "role_"
+
 type ExtraInfo struct {
 	IsVIP bool
 }
+
+type DomainRole struct {
+	Role   string
+	Domain string
+}