blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-08-07 11:40:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

token add operationID

Browse Source
This commit is contained in:
Gordon 2022-03-30 15:52:04 +08:00
parent 009ae6a235
commit 6744745152
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/manage/management_chat.go
View File

@ -140,7 +140,7 @@ func ManagementSendMsg(c *gin.Context) {
} }
log.NewInfo("", data, params) log.NewInfo("", data, params)
token := c.Request.Header.Get("token") token := c.Request.Header.Get("token")
claims, err := token_verify.ParseToken(token) claims, err := token_verify.ParseToken(token, params.OperationID)
if err != nil { if err != nil {
log.NewError(params.OperationID, "parse token failed", err.Error()) log.NewError(params.OperationID, "parse token failed", err.Error())
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "parse token failed", "sendTime": 0, "MsgID": ""}) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "parse token failed", "sendTime": 0, "MsgID": ""})

2
internal/rpc/msg/send_msg.go
View File

@ -571,6 +571,6 @@ func Notification(n *NotificationMsg) {
if err != nil { if err != nil {
log.NewError(req.OperationID, "SendMsg rpc failed, ", req.String(), err.Error()) log.NewError(req.OperationID, "SendMsg rpc failed, ", req.String(), err.Error())
} else if reply.ErrCode != 0 { } else if reply.ErrCode != 0 {
log.NewError(req.OperationID, "SendMsg rpc failed, ", req.String()) log.NewError(req.OperationID, "SendMsg rpc failed, ", req.String(), reply.ErrCode, reply.ErrMsg)
} }
} }

2
internal/utils/jwt_token_test.go
View File

@ -76,7 +76,7 @@ func Test_ParseToken(t *testing.T) {
uid := "1" uid := "1"
platform := int32(1) platform := int32(1)
tokenString, _, _ := token_verify.CreateToken(uid, platform) tokenString, _, _ := token_verify.CreateToken(uid, platform)
claims, err := token_verify.ParseToken(tokenString) claims, err := token_verify.ParseToken(tokenString, "")
if err == nil { if err == nil {
assert.Equal(t, claims.UID, uid) assert.Equal(t, claims.UID, uid)
} }

16
pkg/common/token_verify/jwt_token.go
View File

@ -101,7 +101,7 @@ func GetClaimFromToken(tokensString string) (*Claims, error) {
} }
func IsAppManagerAccess(token string, OpUserID string) bool { func IsAppManagerAccess(token string, OpUserID string) bool {
claims, err := ParseToken(token) claims, err := ParseToken(token, "")
if err != nil { if err != nil {
return false return false
} }
@ -130,7 +130,7 @@ func CheckAccess(OpUserID string, OwnerUserID string) bool {
} }
func GetUserIDFromToken(token string, operationID string) (bool, string) { func GetUserIDFromToken(token string, operationID string) (bool, string) {
claims, err := ParseToken(token) claims, err := ParseToken(token, operationID)
if err != nil { if err != nil {
log.Error(operationID, "ParseToken failed, ", err.Error(), token) log.Error(operationID, "ParseToken failed, ", err.Error(), token)
return false, "" return false, ""
@ -138,21 +138,21 @@ func GetUserIDFromToken(token string, operationID string) (bool, string) {
return true, claims.UID return true, claims.UID
} }
func ParseToken(tokensString string) (claims *Claims, err error) { func ParseToken(tokensString, operationID string) (claims *Claims, err error) {
claims, err = GetClaimFromToken(tokensString) claims, err = GetClaimFromToken(tokensString)
if err != nil { if err != nil {
log.NewError("", "token validate err", err.Error()) log.NewError(operationID, "token validate err", err.Error(), tokensString)
return nil, err return nil, err
} }
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("", "get token from redis err", err.Error()) log.NewError(operationID, "get token from redis err", err.Error(), tokensString)
return nil, &constant.ErrTokenInvalid return nil, &constant.ErrTokenInvalid
} }
if m == nil { if m == nil {
log.NewError("", "get token from redis err", "m is nil") log.NewError(operationID, "get token from redis err", "m is nil", tokensString)
return nil, &constant.ErrTokenInvalid return nil, &constant.ErrTokenInvalid
} }
if v, ok := m[tokensString]; ok { if v, ok := m[tokensString]; ok {
@ -195,7 +195,7 @@ func ParseRedisInterfaceToken(redisToken interface{}) (*Claims, error) {
//Validation token, false means failure, true means successful verification //Validation token, false means failure, true means successful verification
func VerifyToken(token, uid string) (bool, error) { func VerifyToken(token, uid string) (bool, error) {
claims, err := ParseToken(token) claims, err := ParseToken(token, "")
if err != nil { if err != nil {
return false, err return false, err
} }
@ -207,7 +207,7 @@ func VerifyToken(token, uid string) (bool, error) {
return true, nil return true, nil
} }
func WsVerifyToken(token, uid string, platformID string) (bool, error, string) { func WsVerifyToken(token, uid string, platformID string) (bool, error, string) {
claims, err := ParseToken(token) claims, err := ParseToken(token, "")
if err != nil { if err != nil {
return false, err, "parse token err" return false, err, "parse token err"
} }