diff --git a/internal/api/msg.go b/internal/api/msg.go index 04643893f..cff83ac87 100644 --- a/internal/api/msg.go +++ b/internal/api/msg.go @@ -206,7 +206,7 @@ func (m *MessageApi) SendMessage(c *gin.Context) { // Check if the user has the app manager role. if !authverify.IsAppManagerUid(c, m.manager, m.imAdmin) { // Respond with a permission error if the user is not an app manager. - apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message")) + apiresp.GinError(c, errs.ErrNoPermission.WrapMsg("only app manager can send message")) return } @@ -263,7 +263,7 @@ func (m *MessageApi) SendBusinessNotification(c *gin.Context) { } if !authverify.IsAppManagerUid(c, m.manager, m.imAdmin) { - apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message")) + apiresp.GinError(c, errs.ErrNoPermission.WrapMsg("only app manager can send message")) return } sendMsgReq := msg.SendMsgReq{ @@ -307,7 +307,7 @@ func (m *MessageApi) BatchSendMsg(c *gin.Context) { } log.ZInfo(c, "BatchSendMsg", "req", req) if err := authverify.CheckAdmin(c, m.manager, m.imAdmin); err != nil { - apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message")) + apiresp.GinError(c, errs.ErrNoPermission.WrapMsg("only app manager can send message")) return } diff --git a/internal/msggateway/hub_server.go b/internal/msggateway/hub_server.go index fe3b06582..18b0f0880 100644 --- a/internal/msggateway/hub_server.go +++ b/internal/msggateway/hub_server.go @@ -91,7 +91,7 @@ func (s *Server) GetUsersOnlineStatus( req *msggateway.GetUsersOnlineStatusReq, ) (*msggateway.GetUsersOnlineStatusResp, error) { if !authverify.IsAppManagerUid(ctx, &s.config.Manager, &s.config.IMAdmin) { - return nil, errs.ErrNoPermission.Wrap("only app manager") + return nil, errs.ErrNoPermission.WrapMsg("only app manager") } var resp msggateway.GetUsersOnlineStatusResp for _, userID := range req.UserIDs { diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index a031ed38c..0319bc6ca 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -64,7 +64,7 @@ func Start(config *config.GlobalConfig, client discoveryregistry.SvcDiscoveryReg func (s *authServer) UserToken(ctx context.Context, req *pbauth.UserTokenReq) (*pbauth.UserTokenResp, error) { resp := pbauth.UserTokenResp{} if req.Secret != s.config.Secret { - return nil, errs.ErrNoPermission.Wrap("secret invalid") + return nil, errs.ErrNoPermission.WrapMsg("secret invalid") } if _, err := s.userRpcClient.GetUserInfo(ctx, req.UserID); err != nil { return nil, err @@ -86,7 +86,7 @@ func (s *authServer) GetUserToken(ctx context.Context, req *pbauth.GetUserTokenR resp := pbauth.GetUserTokenResp{} if authverify.IsManagerUserID(req.UserID, &s.config.Manager, &s.config.IMAdmin) { - return nil, errs.ErrNoPermission.Wrap("don't get Admin token") + return nil, errs.ErrNoPermission.WrapMsg("don't get Admin token") } if _, err := s.userRpcClient.GetUserInfo(ctx, req.UserID); err != nil { diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 418442e89..44cf771e4 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -139,7 +139,7 @@ func (s *groupServer) CheckGroupAdmin(ctx context.Context, groupID string) error return err } if !(groupMember.RoleLevel == constant.GroupOwner || groupMember.RoleLevel == constant.GroupAdmin) { - return errs.ErrNoPermission.Wrap("no group owner or admin") + return errs.ErrNoPermission.WrapMsg("no group owner or admin") } } return nil @@ -572,22 +572,22 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou for _, userID := range req.KickedUserIDs { member, ok := memberMap[userID] if !ok { - return nil, errs.ErrUserIDNotFound.Wrap(userID) + return nil, errs.ErrUserIDNotFound.WrapMsg(userID) } if !isAppManagerUid { if opMember == nil { - return nil, errs.ErrNoPermission.Wrap("opUserID no in group") + return nil, errs.ErrNoPermission.WrapMsg("opUserID no in group") } switch opMember.RoleLevel { case constant.GroupOwner: case constant.GroupAdmin: if member.RoleLevel == constant.GroupOwner || member.RoleLevel == constant.GroupAdmin { - return nil, errs.ErrNoPermission.Wrap("group admins cannot remove the group owner and other admins") + return nil, errs.ErrNoPermission.WrapMsg("group admins cannot remove the group owner and other admins") } case constant.GroupOrdinaryUsers: - return nil, errs.ErrNoPermission.Wrap("opUserID no permission") + return nil, errs.ErrNoPermission.WrapMsg("opUserID no permission") default: - return nil, errs.ErrNoPermission.Wrap("opUserID roleLevel unknown") + return nil, errs.ErrNoPermission.WrapMsg("opUserID roleLevel unknown") } } } @@ -706,7 +706,7 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbgroup. return e.GroupID }) if ids := utils.Single(utils.Keys(groupMap), groupIDs); len(ids) > 0 { - return nil, errs.ErrGroupIDNotFound.Wrap(strings.Join(ids, ",")) + return nil, errs.ErrGroupIDNotFound.WrapMsg(strings.Join(ids, ",")) } groupMemberNumMap, err := s.db.MapGroupMemberNum(ctx, groupIDs) if err != nil { @@ -776,7 +776,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbgroup return nil, err } if !(groupMember.RoleLevel == constant.GroupOwner || groupMember.RoleLevel == constant.GroupAdmin) { - return nil, errs.ErrNoPermission.Wrap("no group owner or admin") + return nil, errs.ErrNoPermission.WrapMsg("no group owner or admin") } } group, err := s.db.TakeGroup(ctx, req.GroupID) @@ -788,7 +788,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbgroup return nil, err } if groupRequest.HandleResult != 0 { - return nil, errs.ErrGroupRequestHandled.Wrap("group request already processed") + return nil, errs.ErrGroupRequestHandled.WrapMsg("group request already processed") } var inGroup bool if _, err := s.db.TakeGroupMember(ctx, req.GroupID, req.FromUserID); err == nil { diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go index ee4fab31c..9d2ad0285 100644 --- a/internal/rpc/msg/revoke.go +++ b/internal/rpc/msg/revoke.go @@ -80,10 +80,10 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg. case constant.GroupOwner: case constant.GroupAdmin: if members[msgs[0].SendID].RoleLevel != constant.GroupOrdinaryUsers { - return nil, errs.ErrNoPermission.Wrap("no permission") + return nil, errs.ErrNoPermission.WrapMsg("no permission") } default: - return nil, errs.ErrNoPermission.Wrap("no permission") + return nil, errs.ErrNoPermission.WrapMsg("no permission") } } if member := members[req.UserID]; member != nil { diff --git a/internal/rpc/third/tool.go b/internal/rpc/third/tool.go index 477da8974..c155c1d5c 100644 --- a/internal/rpc/third/tool.go +++ b/internal/rpc/third/tool.go @@ -54,7 +54,7 @@ func (t *thirdServer) checkUploadName(ctx context.Context, name string) error { } opUserID := mcontext.GetOpUserID(ctx) if opUserID == "" { - return errs.ErrNoPermission.Wrap("opUserID is empty") + return errs.ErrNoPermission.WrapMsg("opUserID is empty") } if !authverify.IsManagerUserID(opUserID, t.config) { if !strings.HasPrefix(name, opUserID+"/") { diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 0ffaecfd6..907cc8fe0 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -246,7 +246,7 @@ func (s *userServer) UserRegister(ctx context.Context, req *pbuser.UserRegisterR } if req.Secret != s.config.Secret { log.ZDebug(ctx, "UserRegister", s.config.Secret, req.Secret) - return nil, errs.ErrNoPermission.Wrap("secret invalid") + return nil, errs.ErrNoPermission.WrapMsg("secret invalid") } if utils.DuplicateAny(req.Users, func(e *sdkws.UserInfo) string { return e.UserID }) { return nil, errs.ErrArgs.Wrap("userID repeated") @@ -649,7 +649,7 @@ func (s *userServer) GetNotificationAccount(ctx context.Context, req *pbuser.Get return &pbuser.GetNotificationAccountResp{}, nil } - return nil, errs.ErrNoPermission.Wrap("notification messages cannot be sent for this ID") + return nil, errs.ErrNoPermission.WrapMsg("notification messages cannot be sent for this ID") } func (s *userServer) genUserID() string {