TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-18 20:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

兼容用户节点

Browse Source
This commit is contained in:
刘祥超
2020-12-18 21:18:53 +08:00
parent 1b6e2819e3
commit c81deef52d
22 changed files with 288 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/rpc/services/service_base.go
View File

@@ -23,7 +23,7 @@ func (this *BaseService) ValidateAdmin(ctx context.Context, reqAdminId int64) (a
}
// 校验管理员和用户
func (this *BaseService) ValidateAdminAndUser(ctx context.Context, reqUserId int64) (adminId int64, userId int64, err error) {
func (this *BaseService) ValidateAdminAndUser(ctx context.Context, requireAdminId int64, requireUserId int64) (adminId int64, userId int64, err error) {
reqUserType, reqUserId, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeUser)
if err != nil {
return
@@ -38,15 +38,17 @@ func (this *BaseService) ValidateAdminAndUser(ctx context.Context, reqUserId int
err = errors.New("invalid 'adminId'")
return
}
if requireAdminId > 0 && adminId != requireAdminId {
err = this.PermissionError()
return
}
case rpcutils.UserTypeUser:
userId = reqUserId
if userId <= 0 {
err = errors.New("invalid 'userId'")
return
}
// 校验权限
if reqUserId > 0 && reqUserId != userId {
if requireUserId > 0 && userId != requireUserId {
err = this.PermissionError()
return
}