fix: (rbac) role interface

internal/biz/permission.go

@@ -1,57 +1,14 @@
 package biz
 
 import (
-	"fmt"
 	"infini.sh/console/internal/biz/enum"
 )
 
 var ClusterApis = make(map[string][]string)
 var IndexApis = make([]string, 0)
-var EsApis = make(map[string][]string)
+
 var RolePermission = make(map[string][]string)
 
-type RoleType = string
-
-const (
-	Console      RoleType = "console"
-	Elastisearch RoleType = "elasticsearch"
-)
-
-type IRole interface {
-	ListPermission() interface{}
-
-	Create(localUser *User) (id string, err error)
-}
-type ConsoleRole struct {
-	Name        string     `json:"name"`
-	Description string     `json:"description" `
-	RoleType    string     `json:"type" `
-	Permission  Permission `json:"permission"`
-}
-type Permission struct {
-	Api  []string         `json:"api"`
-	Menu []MenuPermission `json:"menu"`
-}
-type MenuPermission struct {
-	Id        string `json:"id"`
-	Name      string `json:"name"`
-	Privilege string `json:"privilege"`
-}
-type ElasticsearchRole struct{}
-
-func NewRole(typ string) (r IRole, err error) {
-	switch typ {
-	case Console:
-		r = &ConsoleRole{}
-
-	case Elastisearch:
-		r = &ElasticsearchRole{}
-	default:
-		err = fmt.Errorf("role type %s not support", typ)
-	}
-	return
-}
-
 type ConsolePermisson struct {
 	Api  []string `json:"api"`
 	Menu []Menu   `json:"menu"`
@@ -63,12 +20,6 @@ type Menu struct {
 	Children  []Menu   `json:"children,omitempty"`
 }
 
-func (role ConsoleRole) Create(localUser *User) (id string, err error) {
-	return
-}
-func (role ElasticsearchRole) Create(localUser *User) (id string, err error) {
-	return
-}
 func (role ConsoleRole) ListPermission() interface{} {
 	menu := []Menu{
 		{

internal/biz/role.go

@@ -12,33 +12,83 @@ import (
 	"time"
 )
 
-func CreateEsRole(localUser *User, req dto.CreateEsRole) (id string, err error) {
+type RoleType = string
-	q := orm.Query{Size: 1000}
+
-	q.Conds = orm.And(orm.Eq("name", req.Name))
+const (
+	Console      RoleType = "console"
+	Elastisearch RoleType = "elasticsearch"
+)
+
+type IRole interface {
+	ListPermission() interface{}
+	Create(localUser *User) (id string, err error)
+}
+type ConsoleRole struct {
+	Name        string     `json:"name"`
+	Description string     `json:"description" `
+	RoleType    string     `json:"type" `
+	Permission  Permission `json:"permission"`
+}
+type Permission struct {
+	Api  []string         `json:"api"`
+	Menu []MenuPermission `json:"menu"`
+}
+type MenuPermission struct {
+	Id        string `json:"id"`
+	Name      string `json:"name"`
+	Privilege string `json:"privilege"`
+}
+type ElasticsearchRole struct {
+	Name        string      `json:"name"`
+	Description string      `json:"description" `
+	RoleType    string      `json:"type" `
+	Permission  interface{} `json:"permission"`
+}
+
+func NewRole(typ string) (r IRole, err error) {
+	switch typ {
+	case Console:
+		r = &ConsoleRole{
+			RoleType: typ,
+		}
+
+	case Elastisearch:
+		r = &ElasticsearchRole{
+			RoleType: typ,
+		}
+	default:
+		err = fmt.Errorf("role type %s not support", typ)
+	}
+	return
+}
+
+func (role ConsoleRole) Create(localUser *User) (id string, err error) {
+	q := orm.Query{Size: 1}
+	q.Conds = orm.And(orm.Eq("name", role.Name))
 
 	err, result := orm.Search(rbac.Role{}, &q)
 	if err != nil {
 		return
 	}
 	if result.Total > 0 {
-		err = fmt.Errorf("role name %s already exists", req.Name)
+		err = fmt.Errorf("role name %s already exists", role.Name)
 		return
 	}
 
-	role := &rbac.Role{
+	newRole := rbac.Role{
-		Name:        req.Name,
+		Name:        role.Name,
-		Description: req.Description,
+		Description: role.Description,
-		RoleType:    req.RoleType,
+		RoleType:    role.RoleType,
-		Permission:  req.Permission,
+		Permission:  role.Permission,
 	}
-	role.ID = util.GetUUID()
+	newRole.ID = util.GetUUID()
-	role.Created = time.Now()
+	newRole.Created = time.Now()
-	role.Updated = time.Now()
+	newRole.Updated = time.Now()
-	err = orm.Save(role)
+	err = orm.Save(&newRole)
 	if err != nil {
 		return
 	}
-	id = role.ID
+	id = newRole.ID
 	err = orm.Save(GenerateEvent(event.ActivityMetadata{
 		Category: "platform",
 		Group:    "rbac",
@@ -46,12 +96,12 @@ func CreateEsRole(localUser *User, req dto.CreateEsRole) (id string, err error)
 		Type:     "create",
 		Labels: util.MapStr{
 			"id":          id,
-			"name":        req.Name,
+			"name":        role.Name,
-			"description": req.Description,
+			"description": role.Description,
-			"permission":  req.Permission,
+			"permission":  role.Permission,
-			"type":        req.RoleType,
+			"type":        role.RoleType,
-			"created":     role.Created.Format("2006-01-02 15:04:05"),
+			"created":     newRole.Created.Format("2006-01-02 15:04:05"),
-			"updated":     role.Updated.Format("2006-01-02 15:04:05"),
+			"updated":     newRole.Updated.Format("2006-01-02 15:04:05"),
 		},
 		User: util.MapStr{
 			"userid":   localUser.UserId,
@@ -63,35 +113,35 @@ func CreateEsRole(localUser *User, req dto.CreateEsRole) (id string, err error)
 		log.Error(err)
 	}
 	return
-}
-func CreateRole(localUser *User, req dto.CreateConsoleRole) (id string, err error) {
 
-	q := orm.Query{Size: 1000}
+}
-	q.Conds = orm.And(orm.Eq("name", req.Name))
+func (role ElasticsearchRole) Create(localUser *User) (id string, err error) {
+	q := orm.Query{Size: 1}
+	q.Conds = orm.And(orm.Eq("name", role.Name))
 
 	err, result := orm.Search(rbac.Role{}, &q)
 	if err != nil {
 		return
 	}
 	if result.Total > 0 {
-		err = fmt.Errorf("role name %s already exists", req.Name)
+		err = fmt.Errorf("role name %s already exists", role.Name)
 		return
 	}
 
-	role := &rbac.Role{
+	newRole := rbac.Role{
-		Name:        req.Name,
+		Name:        role.Name,
-		Description: req.Description,
+		Description: role.Description,
-		RoleType:    req.RoleType,
+		RoleType:    role.RoleType,
-		Permission:  req.Permission,
+		Permission:  role.Permission,
 	}
-	role.ID = util.GetUUID()
+	newRole.ID = util.GetUUID()
-	role.Created = time.Now()
+	newRole.Created = time.Now()
-	role.Updated = time.Now()
+	newRole.Updated = time.Now()
-	err = orm.Save(role)
+	err = orm.Save(&newRole)
 	if err != nil {
 		return
 	}
-	id = role.ID
+	id = newRole.ID
 	err = orm.Save(GenerateEvent(event.ActivityMetadata{
 		Category: "platform",
 		Group:    "rbac",
@@ -99,12 +149,12 @@ func CreateRole(localUser *User, req dto.CreateConsoleRole) (id string, err erro
 		Type:     "create",
 		Labels: util.MapStr{
 			"id":          id,
-			"name":        req.Name,
+			"name":        role.Name,
-			"description": req.Description,
+			"description": role.Description,
-			"permission":  req.Permission,
+			"permission":  role.Permission,
-			"type":        req.RoleType,
+			"type":        role.RoleType,
-			"created":     role.Created.Format("2006-01-02 15:04:05"),
+			"created":     newRole.Created.Format("2006-01-02 15:04:05"),
-			"updated":     role.Updated.Format("2006-01-02 15:04:05"),
+			"updated":     newRole.Updated.Format("2006-01-02 15:04:05"),
 		},
 		User: util.MapStr{
 			"userid":   localUser.UserId,

internal/dto/role.go

@@ -1,11 +1,5 @@
 package dto
 
-type CreateConsoleRole struct {
-	Name        string         `json:"name"`
-	Description string         `json:"description" `
-	RoleType    string         `json:"type" `
-	Permission  RolePermission `json:"permission"`
-}
 type RolePermission struct {
 	Api  []string `json:"api"`
 	Menu []Menu   `json:"menu"`

plugin/api/rbac/role.go

@@ -25,28 +25,20 @@ func (h Rbac) CreateRole(w http.ResponseWriter, r *http.Request, ps httprouter.P
 		h.Error(w, err)
 		return
 	}
-	var id string
+	irole, err := biz.NewRole(roleType)
-	switch roleType {
+	if err != nil {
-	case biz.Console:
+		h.Error(w, err)
-		var req dto.CreateConsoleRole
+		return
-		err = h.DecodeJSON(r, &req)
-		if err != nil {
-			h.Error400(w, err.Error())
-			return
-		}
-		req.RoleType = roleType
-		id, err = biz.CreateRole(localUser, req)
-	case biz.Elastisearch:
-		var req dto.CreateEsRole
-		err = h.DecodeJSON(r, &req)
-		if err != nil {
-			h.Error400(w, err.Error())
-			return
-		}
-		req.RoleType = roleType
-		id, err = biz.CreateEsRole(localUser, req)
 	}
 
+	err = h.DecodeJSON(r, &irole)
+	if err != nil {
+		h.Error400(w, err.Error())
+		return
+	}
+	var id string
+	id, err = irole.Create(localUser)
+
 	if err != nil {
 		_ = log.Error(err.Error())
 		h.Error(w, err)