mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-04-24 10:22:36 +08:00
Error code standardization
This commit is contained in:
parent
dac62d62ef
commit
8286fdc4d0
@ -23,7 +23,7 @@ func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcCl
|
|||||||
trace_log.SetContextInfo(nCtx, logFuncName, nil, "apiReq", apiReq)
|
trace_log.SetContextInfo(nCtx, logFuncName, nil, "apiReq", apiReq)
|
||||||
etcdConn, err := getcdv3.GetConn(nCtx, rpcName)
|
etcdConn, err := getcdv3.GetConn(nCtx, rpcName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
trace_log.WriteErrorResponse(nCtx, "GetDefaultConn", err)
|
trace_log.WriteErrorResponse(nCtx, "GetConn", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
rpc := reflect.ValueOf(rpcClientFunc).Call([]reflect.Value{
|
rpc := reflect.ValueOf(rpcClientFunc).Call([]reflect.Value{
|
||||||
|
@ -133,17 +133,17 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
|
|||||||
userIDs = append(userIDs, req.OwnerUserID)
|
userIDs = append(userIDs, req.OwnerUserID)
|
||||||
}
|
}
|
||||||
if groupOwnerNum != 1 {
|
if groupOwnerNum != 1 {
|
||||||
return nil, utils.Wrap(constant.ErrArgs, "")
|
return nil, utils.Wrap(&constant.ErrArgs, "")
|
||||||
}
|
}
|
||||||
if utils.IsRepeatStringSlice(userIDs) {
|
if utils.IsRepeatStringSlice(userIDs) {
|
||||||
return nil, utils.Wrap(constant.ErrArgs, "")
|
return nil, utils.Wrap(&constant.ErrArgs, "")
|
||||||
}
|
}
|
||||||
users, err := rocksCache.GetUserInfoFromCacheBatch(ctx, userIDs)
|
users, err := rocksCache.GetUserInfoFromCacheBatch(ctx, userIDs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if len(users) != len(userIDs) {
|
if len(users) != len(userIDs) {
|
||||||
return nil, utils.Wrap(constant.ErrArgs, "")
|
return nil, utils.Wrap(&constant.ErrArgs, "")
|
||||||
}
|
}
|
||||||
userMap := make(map[string]*imdb.User)
|
userMap := make(map[string]*imdb.User)
|
||||||
for i, user := range users {
|
for i, user := range users {
|
||||||
@ -274,15 +274,15 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
|
|||||||
resp := &pbGroup.InviteUserToGroupResp{}
|
resp := &pbGroup.InviteUserToGroupResp{}
|
||||||
|
|
||||||
if !imdb.IsExistGroupMember(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) {
|
if !imdb.IsExistGroupMember(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) {
|
||||||
constant.SetErrorForResp(constant.ErrIdentity, resp.CommonResp)
|
constant.SetErrorForResp(&constant.ErrIdentity, resp.CommonResp)
|
||||||
return nil, utils.Wrap(constant.ErrIdentity, "")
|
return nil, utils.Wrap(&constant.ErrIdentity, "")
|
||||||
}
|
}
|
||||||
groupInfo, err := (*imdb.Group)(nil).Take(ctx, req.GroupID)
|
groupInfo, err := (*imdb.Group)(nil).Take(ctx, req.GroupID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if groupInfo.Status == constant.GroupStatusDismissed {
|
if groupInfo.Status == constant.GroupStatusDismissed {
|
||||||
return nil, utils.Wrap(constant.ErrDismissedAlready, "")
|
return nil, utils.Wrap(&constant.ErrDismissedAlready, "")
|
||||||
}
|
}
|
||||||
if groupInfo.NeedVerification == constant.AllNeedVerification &&
|
if groupInfo.NeedVerification == constant.AllNeedVerification &&
|
||||||
!imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) {
|
!imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) {
|
||||||
@ -465,7 +465,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if opInfo.RoleLevel == constant.GroupOrdinaryUsers {
|
if opInfo.RoleLevel == constant.GroupOrdinaryUsers {
|
||||||
return nil, utils.Wrap(constant.ErrNoPermission, "")
|
return nil, utils.Wrap(&constant.ErrNoPermission, "")
|
||||||
} else if opInfo.RoleLevel == constant.GroupOwner {
|
} else if opInfo.RoleLevel == constant.GroupOwner {
|
||||||
opFlag = 2 //owner
|
opFlag = 2 //owner
|
||||||
} else {
|
} else {
|
||||||
@ -479,7 +479,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
|
|||||||
if len(req.KickedUserIDList) == 0 {
|
if len(req.KickedUserIDList) == 0 {
|
||||||
//log.NewError(req.OperationID, "failed, kick list 0")
|
//log.NewError(req.OperationID, "failed, kick list 0")
|
||||||
//return &pbGroup.KickGroupMemberResp{ErrCode: constant.ErrArgs.ErrCode, ErrMsg: constant.ErrArgs.ErrMsg}, nil
|
//return &pbGroup.KickGroupMemberResp{ErrCode: constant.ErrArgs.ErrCode, ErrMsg: constant.ErrArgs.ErrMsg}, nil
|
||||||
return nil, utils.Wrap(constant.ErrArgs, "")
|
return nil, utils.Wrap(&constant.ErrArgs, "")
|
||||||
}
|
}
|
||||||
if err := s.DelGroupAndUserCache(ctx, req.GroupID, req.KickedUserIDList); err != nil {
|
if err := s.DelGroupAndUserCache(ctx, req.GroupID, req.KickedUserIDList); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -586,7 +586,7 @@ func FillGroupInfoByGroupID(operationID, groupID string, groupInfo *open_im_sdk.
|
|||||||
}
|
}
|
||||||
if group.Status == constant.GroupStatusDismissed {
|
if group.Status == constant.GroupStatusDismissed {
|
||||||
log.Debug(operationID, " group constant.GroupStatusDismissed ", group.GroupID)
|
log.Debug(operationID, " group constant.GroupStatusDismissed ", group.GroupID)
|
||||||
return utils.Wrap(constant.ErrDismissedAlready, "")
|
return utils.Wrap(&constant.ErrDismissedAlready, "")
|
||||||
}
|
}
|
||||||
return utils.Wrap(cp.GroupDBCopyOpenIM(groupInfo, group), "")
|
return utils.Wrap(cp.GroupDBCopyOpenIM(groupInfo, group), "")
|
||||||
}
|
}
|
||||||
@ -613,7 +613,7 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup.
|
|||||||
node := open_im_sdk.GroupRequest{UserInfo: &open_im_sdk.PublicUserInfo{}, GroupInfo: &open_im_sdk.GroupInfo{}}
|
node := open_im_sdk.GroupRequest{UserInfo: &open_im_sdk.PublicUserInfo{}, GroupInfo: &open_im_sdk.GroupInfo{}}
|
||||||
err := FillGroupInfoByGroupID(req.OperationID, v.GroupID, node.GroupInfo)
|
err := FillGroupInfoByGroupID(req.OperationID, v.GroupID, node.GroupInfo)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !errors.Is(errors.Unwrap(err), constant.ErrDismissedAlready) {
|
if !errors.Is(errors.Unwrap(err), &constant.ErrDismissedAlready) {
|
||||||
errResult = err
|
errResult = err
|
||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
@ -657,7 +657,7 @@ func CheckPermission(ctx context.Context, groupID string, userID string) (err er
|
|||||||
trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupID", groupID, "userID", userID)
|
trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupID", groupID, "userID", userID)
|
||||||
}()
|
}()
|
||||||
if !token_verify.IsManagerUserID(userID) && !imdb.IsGroupOwnerAdmin(groupID, userID) {
|
if !token_verify.IsManagerUserID(userID) && !imdb.IsGroupOwnerAdmin(groupID, userID) {
|
||||||
return utils.Wrap(constant.ErrNoPermission, utils.GetSelfFuncName())
|
return utils.Wrap(&constant.ErrNoPermission, utils.GetSelfFuncName())
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -731,7 +731,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
|
|||||||
} else if req.HandleResult == constant.GroupResponseRefuse {
|
} else if req.HandleResult == constant.GroupResponseRefuse {
|
||||||
chat.GroupApplicationRejectedNotification(req)
|
chat.GroupApplicationRejectedNotification(req)
|
||||||
} else {
|
} else {
|
||||||
return nil, utils.Wrap(constant.ErrArgs, "")
|
return nil, utils.Wrap(&constant.ErrArgs, "")
|
||||||
}
|
}
|
||||||
return resp, nil
|
return resp, nil
|
||||||
}
|
}
|
||||||
@ -747,8 +747,8 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if groupInfo.Status == constant.GroupStatusDismissed {
|
if groupInfo.Status == constant.GroupStatusDismissed {
|
||||||
constant.SetErrorForResp(constant.ErrDismissedAlready, resp.CommonResp)
|
constant.SetErrorForResp(&constant.ErrDismissedAlready, resp.CommonResp)
|
||||||
return nil, utils.Wrap(constant.ErrDismissedAlready, "")
|
return nil, utils.Wrap(&constant.ErrDismissedAlready, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
if groupInfo.NeedVerification == constant.Directly {
|
if groupInfo.NeedVerification == constant.Directly {
|
||||||
@ -797,7 +797,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
|
|||||||
chat.MemberEnterDirectlyNotification(req.GroupID, req.OpUserID, req.OperationID)
|
chat.MemberEnterDirectlyNotification(req.GroupID, req.OpUserID, req.OperationID)
|
||||||
return resp, nil
|
return resp, nil
|
||||||
} else {
|
} else {
|
||||||
constant.SetErrorForResp(constant.ErrGroupTypeNotSupport, resp.CommonResp)
|
constant.SetErrorForResp(&constant.ErrGroupTypeNotSupport, resp.CommonResp)
|
||||||
return resp, nil
|
return resp, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -870,14 +870,14 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
|
|||||||
resp := &pbGroup.SetGroupInfoResp{}
|
resp := &pbGroup.SetGroupInfoResp{}
|
||||||
|
|
||||||
if !hasAccess(req) {
|
if !hasAccess(req) {
|
||||||
return nil, utils.Wrap(constant.ErrIdentity, "")
|
return nil, utils.Wrap(&constant.ErrIdentity, "")
|
||||||
}
|
}
|
||||||
group, err := imdb.GetGroupInfoByGroupID(req.GroupInfoForSet.GroupID)
|
group, err := imdb.GetGroupInfoByGroupID(req.GroupInfoForSet.GroupID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if group.Status == constant.GroupStatusDismissed {
|
if group.Status == constant.GroupStatusDismissed {
|
||||||
return nil, utils.Wrap(constant.ErrDismissedAlready, "")
|
return nil, utils.Wrap(&constant.ErrDismissedAlready, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
var changedType int32
|
var changedType int32
|
||||||
@ -989,7 +989,7 @@ func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbGroup.Trans
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if groupInfo.Status == constant.GroupStatusDismissed {
|
if groupInfo.Status == constant.GroupStatusDismissed {
|
||||||
return nil, utils.Wrap(constant.ErrDismissedAlready, "")
|
return nil, utils.Wrap(&constant.ErrDismissedAlready, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.OldOwnerUserID == req.NewOwnerUserID {
|
if req.OldOwnerUserID == req.NewOwnerUserID {
|
||||||
@ -1125,7 +1125,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
|
|||||||
resp := &pbGroup.DismissGroupResp{}
|
resp := &pbGroup.DismissGroupResp{}
|
||||||
|
|
||||||
if !token_verify.IsManagerUserID(req.OpUserID) && !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) {
|
if !token_verify.IsManagerUserID(req.OpUserID) && !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) {
|
||||||
return nil, utils.Wrap(constant.ErrIdentity, "")
|
return nil, utils.Wrap(&constant.ErrIdentity, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := rocksCache.DelGroupInfoFromCache(ctx, req.GroupID); err != nil {
|
if err := rocksCache.DelGroupInfoFromCache(ctx, req.GroupID); err != nil {
|
||||||
@ -1259,7 +1259,7 @@ func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq)
|
|||||||
//errMsg := req.OperationID + "opFlag == 0 " + req.GroupID + req.OpUserID
|
//errMsg := req.OperationID + "opFlag == 0 " + req.GroupID + req.OpUserID
|
||||||
//log.Error(req.OperationID, errMsg)
|
//log.Error(req.OperationID, errMsg)
|
||||||
//return &pbGroup.MuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}}, nil
|
//return &pbGroup.MuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}}, nil
|
||||||
return nil, utils.Wrap(constant.ErrNoPermission, "")
|
return nil, utils.Wrap(&constant.ErrNoPermission, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
//mutedInfo, err := imdb.GetGroupMemberInfoByGroupIDAndUserID(req.GroupID, req.UserID)
|
//mutedInfo, err := imdb.GetGroupMemberInfoByGroupIDAndUserID(req.GroupID, req.UserID)
|
||||||
@ -1327,7 +1327,7 @@ func (s *groupServer) SetGroupMemberNickname(ctx context.Context, req *pbGroup.S
|
|||||||
resp := &pbGroup.SetGroupMemberNicknameResp{}
|
resp := &pbGroup.SetGroupMemberNicknameResp{}
|
||||||
|
|
||||||
if req.OpUserID != req.UserID && !token_verify.IsManagerUserID(req.OpUserID) {
|
if req.OpUserID != req.UserID && !token_verify.IsManagerUserID(req.OpUserID) {
|
||||||
return nil, utils.Wrap(constant.ErrIdentity, "")
|
return nil, utils.Wrap(&constant.ErrIdentity, "")
|
||||||
}
|
}
|
||||||
cbReq := &pbGroup.SetGroupMemberInfoReq{
|
cbReq := &pbGroup.SetGroupMemberInfoReq{
|
||||||
GroupID: req.GroupID,
|
GroupID: req.GroupID,
|
||||||
|
@ -16,17 +16,16 @@ type ErrInfo struct {
|
|||||||
DetailErrMsg string
|
DetailErrMsg string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e ErrInfo) Error() string {
|
func (e *ErrInfo) Error() string {
|
||||||
return e.ErrMsg
|
return e.ErrMsg
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e ErrInfo) Code() int32 {
|
func (e *ErrInfo) Code() int32 {
|
||||||
return e.ErrCode
|
return e.ErrCode
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrNone = ErrInfo{0, "", ""}
|
ErrNone = ErrInfo{0, "", ""}
|
||||||
ErrRpcConn = ErrInfo{GRPCConnIsNil, "grpc conn is nil", ""}
|
|
||||||
ErrArgs = ErrInfo{ArgsError, "ArgsError", ""}
|
ErrArgs = ErrInfo{ArgsError, "ArgsError", ""}
|
||||||
ErrDatabase = ErrInfo{DatabaseError, "DatabaseError", ""}
|
ErrDatabase = ErrInfo{DatabaseError, "DatabaseError", ""}
|
||||||
ErrInternalServer = ErrInfo{ServerInternalError, "ServerInternalError", ""}
|
ErrInternalServer = ErrInfo{ServerInternalError, "ServerInternalError", ""}
|
||||||
@ -72,42 +71,35 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func NewErrNetwork(err error) error {
|
func NewErrNetwork(err error) error {
|
||||||
newErrNetwork := ErrNetwork
|
return toDetail(err, &ErrNetwork)
|
||||||
newErrNetwork.DetailErrMsg = err.Error()
|
|
||||||
return ErrNetwork
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewErrData(err error) error {
|
func NewErrData(err error) error {
|
||||||
newErrData := ErrData
|
return toDetail(err, &ErrData)
|
||||||
newErrData.DetailErrMsg = err.Error()
|
|
||||||
return ErrNetwork
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func toDetail(err error, info ErrInfo) ErrInfo {
|
func toDetail(err error, info *ErrInfo) *ErrInfo {
|
||||||
errInfo := info
|
errInfo := *info
|
||||||
errInfo.DetailErrMsg = err.Error()
|
errInfo.DetailErrMsg = err.Error()
|
||||||
return errInfo
|
return &errInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
func ToAPIErrWithErr(err error) ErrInfo {
|
func ToAPIErrWithErr(err error) *ErrInfo {
|
||||||
|
errComm := errors.New("")
|
||||||
|
var marshalErr *json.MarshalerError
|
||||||
|
errInfo := &ErrInfo{}
|
||||||
switch {
|
switch {
|
||||||
case errors.Is(err, gorm.ErrRecordNotFound):
|
case errors.As(err, &errComm):
|
||||||
return toDetail(err, ErrRecordNotFound)
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
case errors.Is(err, ErrArgs):
|
return toDetail(err, &ErrRecordNotFound)
|
||||||
return toDetail(err, ErrArgs)
|
|
||||||
case errors.Is(err, ErrDatabase):
|
|
||||||
return ErrDatabase
|
|
||||||
}
|
}
|
||||||
|
return toDetail(err, &ErrData)
|
||||||
errTarget := errors.New("")
|
case errors.As(err, &marshalErr):
|
||||||
var mErr *json.MarshalerError
|
return toDetail(err, &ErrData)
|
||||||
switch {
|
case errors.As(err, &errInfo):
|
||||||
case errors.As(err, &mErr):
|
return toDetail(err, errInfo)
|
||||||
return ErrData
|
|
||||||
case errors.As(err, errTarget):
|
|
||||||
return ErrDatabase
|
|
||||||
}
|
}
|
||||||
return ErrDefaultOther
|
return toDetail(err, &ErrDefaultOther)
|
||||||
}
|
}
|
||||||
|
|
||||||
func SetErrorForResp(err error, commonResp *sdkws.CommonResp) {
|
func SetErrorForResp(err error, commonResp *sdkws.CommonResp) {
|
||||||
|
@ -31,7 +31,7 @@ func Get(url string) (response []byte, err error) {
|
|||||||
return body, nil
|
return body, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
//application/json; charset=utf-8
|
// application/json; charset=utf-8
|
||||||
func Post(url string, data interface{}, timeOutSecond int) (content []byte, err error) {
|
func Post(url string, data interface{}, timeOutSecond int) (content []byte, err error) {
|
||||||
jsonStr, err := json.Marshal(data)
|
jsonStr, err := json.Marshal(data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -65,13 +65,13 @@ func CallBackPostReturn(url, callbackCommand string, input interface{}, output c
|
|||||||
b, err := Post(url, input, timeOut)
|
b, err := Post(url, input, timeOut)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if failedContinue != nil && *failedContinue {
|
if failedContinue != nil && *failedContinue {
|
||||||
return constant.ErrCallbackContinue
|
return &constant.ErrCallbackContinue
|
||||||
}
|
}
|
||||||
return constant.NewErrNetwork(err)
|
return constant.NewErrNetwork(err)
|
||||||
}
|
}
|
||||||
if err = json.Unmarshal(b, output); err != nil {
|
if err = json.Unmarshal(b, output); err != nil {
|
||||||
if failedContinue != nil && *failedContinue {
|
if failedContinue != nil && *failedContinue {
|
||||||
return constant.ErrCallbackContinue
|
return &constant.ErrCallbackContinue
|
||||||
}
|
}
|
||||||
return constant.NewErrData(err)
|
return constant.NewErrData(err)
|
||||||
}
|
}
|
||||||
|
@ -104,22 +104,22 @@ func GetClaimFromToken(tokensString string) (*Claims, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
if ve, ok := err.(*jwt.ValidationError); ok {
|
if ve, ok := err.(*jwt.ValidationError); ok {
|
||||||
if ve.Errors&jwt.ValidationErrorMalformed != 0 {
|
if ve.Errors&jwt.ValidationErrorMalformed != 0 {
|
||||||
return nil, utils.Wrap(constant.ErrTokenMalformed, "")
|
return nil, utils.Wrap(&constant.ErrTokenMalformed, "")
|
||||||
} else if ve.Errors&jwt.ValidationErrorExpired != 0 {
|
} else if ve.Errors&jwt.ValidationErrorExpired != 0 {
|
||||||
return nil, utils.Wrap(constant.ErrTokenExpired, "")
|
return nil, utils.Wrap(&constant.ErrTokenExpired, "")
|
||||||
} else if ve.Errors&jwt.ValidationErrorNotValidYet != 0 {
|
} else if ve.Errors&jwt.ValidationErrorNotValidYet != 0 {
|
||||||
return nil, utils.Wrap(constant.ErrTokenNotValidYet, "")
|
return nil, utils.Wrap(&constant.ErrTokenNotValidYet, "")
|
||||||
} else {
|
} else {
|
||||||
return nil, utils.Wrap(constant.ErrTokenUnknown, "")
|
return nil, utils.Wrap(&constant.ErrTokenUnknown, "")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return nil, utils.Wrap(constant.ErrTokenUnknown, "")
|
return nil, utils.Wrap(&constant.ErrTokenUnknown, "")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if claims, ok := token.Claims.(*Claims); ok && token.Valid {
|
if claims, ok := token.Claims.(*Claims); ok && token.Valid {
|
||||||
return claims, nil
|
return claims, nil
|
||||||
}
|
}
|
||||||
return nil, utils.Wrap(constant.ErrTokenUnknown, "")
|
return nil, utils.Wrap(&constant.ErrTokenUnknown, "")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -162,7 +162,7 @@ func CheckAccessV2(ctx context.Context, OpUserID string, OwnerUserID string) (er
|
|||||||
if OpUserID == OwnerUserID {
|
if OpUserID == OwnerUserID {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return utils.Wrap(constant.ErrIdentity, open_utils.GetSelfFuncName())
|
return utils.Wrap(&constant.ErrIdentity, open_utils.GetSelfFuncName())
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetUserIDFromToken(token string, operationID string) (bool, string, string) {
|
func GetUserIDFromToken(token string, operationID string) (bool, string, string) {
|
||||||
@ -211,26 +211,26 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) {
|
|||||||
m, err := commonDB.DB.GetTokenMapByUidPid(claims.UID, claims.Platform)
|
m, err := commonDB.DB.GetTokenMapByUidPid(claims.UID, claims.Platform)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.NewError(operationID, "get token from redis err", err.Error(), claims.UID, claims.Platform)
|
log.NewError(operationID, "get token from redis err", err.Error(), claims.UID, claims.Platform)
|
||||||
return nil, utils.Wrap(constant.ErrTokenNotExist, "get token from redis err")
|
return nil, utils.Wrap(&constant.ErrTokenNotExist, "get token from redis err")
|
||||||
}
|
}
|
||||||
if m == nil {
|
if m == nil {
|
||||||
log.NewError(operationID, "get token from redis err, not in redis ", "m is nil ", claims.UID, claims.Platform)
|
log.NewError(operationID, "get token from redis err, not in redis ", "m is nil ", claims.UID, claims.Platform)
|
||||||
return nil, utils.Wrap(constant.ErrTokenNotExist, "get token from redis err")
|
return nil, utils.Wrap(&constant.ErrTokenNotExist, "get token from redis err")
|
||||||
}
|
}
|
||||||
if v, ok := m[tokensString]; ok {
|
if v, ok := m[tokensString]; ok {
|
||||||
switch v {
|
switch v {
|
||||||
case constant.NormalToken:
|
case constant.NormalToken:
|
||||||
log.NewDebug(operationID, "this is normal return", claims)
|
log.NewDebug(operationID, "this is normal return ", *claims)
|
||||||
return claims, nil
|
return claims, nil
|
||||||
case constant.KickedToken:
|
case constant.KickedToken:
|
||||||
log.Error(operationID, "this token has been kicked by other same terminal ", constant.ErrTokenKicked)
|
log.Error(operationID, "this token has been kicked by other same terminal ", constant.ErrTokenKicked)
|
||||||
return nil, utils.Wrap(constant.ErrTokenKicked, "this token has been kicked by other same terminal ")
|
return nil, utils.Wrap(&constant.ErrTokenKicked, "this token has been kicked by other same terminal ")
|
||||||
default:
|
default:
|
||||||
return nil, utils.Wrap(constant.ErrTokenUnknown, "")
|
return nil, utils.Wrap(&constant.ErrTokenUnknown, "")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.NewError(operationID, "redis token map not find ", constant.ErrTokenNotExist, tokensString)
|
log.NewError(operationID, "redis token map not find ", constant.ErrTokenNotExist, tokensString)
|
||||||
return nil, utils.Wrap(constant.ErrTokenNotExist, "redis token map not find")
|
return nil, utils.Wrap(&constant.ErrTokenNotExist, "redis token map not find")
|
||||||
}
|
}
|
||||||
|
|
||||||
//func MakeTheTokenInvalid(currentClaims *Claims, platformClass string) (bool, error) {
|
//func MakeTheTokenInvalid(currentClaims *Claims, platformClass string) (bool, error) {
|
||||||
@ -286,11 +286,11 @@ func WsVerifyToken(token, uid string, platformID string, operationID string) (bo
|
|||||||
}
|
}
|
||||||
if claims.UID != uid {
|
if claims.UID != uid {
|
||||||
errMsg := " uid is not same to token uid " + argMsg + " claims.UID: " + claims.UID
|
errMsg := " uid is not same to token uid " + argMsg + " claims.UID: " + claims.UID
|
||||||
return false, utils.Wrap(constant.ErrTokenDifferentUserID, errMsg), errMsg
|
return false, utils.Wrap(&constant.ErrTokenDifferentUserID, errMsg), errMsg
|
||||||
}
|
}
|
||||||
if claims.Platform != constant.PlatformIDToName(utils.StringToInt(platformID)) {
|
if claims.Platform != constant.PlatformIDToName(utils.StringToInt(platformID)) {
|
||||||
errMsg := " platform is not same to token platform " + argMsg + " claims platformID: " + claims.Platform
|
errMsg := " platform is not same to token platform " + argMsg + " claims platformID: " + claims.Platform
|
||||||
return false, utils.Wrap(constant.ErrTokenDifferentPlatformID, errMsg), errMsg
|
return false, utils.Wrap(&constant.ErrTokenDifferentPlatformID, errMsg), errMsg
|
||||||
}
|
}
|
||||||
log.NewDebug(operationID, utils.GetSelfFuncName(), " check ok ", claims.UID, uid, claims.Platform)
|
log.NewDebug(operationID, utils.GetSelfFuncName(), " check ok ", claims.UID, uid, claims.Platform)
|
||||||
return true, nil, ""
|
return true, nil, ""
|
||||||
|
@ -21,7 +21,7 @@ func GetConn(ctx context.Context, serviceName string) (conn *grpc.ClientConn, er
|
|||||||
conn = getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","),
|
conn = getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","),
|
||||||
serviceName, trace_log.GetOperationID(ctx), config.Config.Etcd.UserName, config.Config.Etcd.Password)
|
serviceName, trace_log.GetOperationID(ctx), config.Config.Etcd.UserName, config.Config.Etcd.Password)
|
||||||
if conn == nil {
|
if conn == nil {
|
||||||
return nil, constant.ErrRpcConn
|
return nil, &constant.ErrInternalServer
|
||||||
}
|
}
|
||||||
return conn, nil
|
return conn, nil
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user