This commit is contained in:
wenxu12345 2022-06-21 19:44:02 +08:00
parent 1bfae7627e
commit c2686beb9b

View File

@ -101,23 +101,23 @@ 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, &constant.ErrTokenMalformed return nil, constant.ErrTokenMalformed
} else if ve.Errors&jwt.ValidationErrorExpired != 0 { } else if ve.Errors&jwt.ValidationErrorExpired != 0 {
return nil, &constant.ErrTokenExpired return nil, constant.ErrTokenExpired
} else if ve.Errors&jwt.ValidationErrorNotValidYet != 0 { } else if ve.Errors&jwt.ValidationErrorNotValidYet != 0 {
return nil, &constant.ErrTokenNotValidYet return nil, constant.ErrTokenNotValidYet
} else { } else {
return nil, &constant.ErrTokenUnknown return nil, constant.ErrTokenUnknown
} }
} else { } else {
return nil, &constant.ErrTokenNotValidYet return nil, constant.ErrTokenNotValidYet
} }
} else { } else {
if claims, ok := token.Claims.(*Claims); ok && token.Valid { if claims, ok := token.Claims.(*Claims); ok && token.Valid {
//log.NewDebug("", claims.UID, claims.Platform) //log.NewDebug("", claims.UID, claims.Platform)
return claims, nil return claims, nil
} }
return nil, &constant.ErrTokenNotValidYet return nil, constant.ErrTokenNotValidYet
} }
} }
@ -184,11 +184,11 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) {
errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error()
log.Error(operationID, errMsg) log.Error(operationID, errMsg)
} }
//info := err.(constant.ErrInfo) info := err.(constant.ErrInfo)
//if info == constant.ErrTokenUnknown { if info == constant.ErrTokenUnknown {
// errMsg := "info == constant.ErrTokenUnknown " + err.Error() errMsg := "info == constant.ErrTokenUnknown " + err.Error()
// log.Error(operationID, errMsg) log.Error(operationID, errMsg)
//} }
e := errors.Unwrap(err) e := errors.Unwrap(err)
if errors.Is(e, constant.ErrTokenUnknown) { if errors.Is(e, constant.ErrTokenUnknown) {