jager/novatask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

兼容无token下拉取任务列表

Browse Source
This commit is contained in:
lianghuanjie
2024-12-18 15:41:05 +08:00
parent b93614f0df
commit 391a9d3481
6 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
internal/pkg/encrypt/jwt/jwt.go
View File

@@ -40,67 +40,63 @@ func (b *TokenBuilder) GenerateToken(kvs map[string]any) (string, int64, error)
return tkStr, expiredAt, err
}
func (b *TokenBuilder) ParseUidFromToken(tokenStr string) (string, string, string, int64, error) {
func (b *TokenBuilder) ParseUidFromToken(tokenStr string) (int, int64, error) {
r := &http.Request{Header: http.Header{}}
r.Header.Set("Authorization", fmt.Sprintf("Bearer %s", tokenStr))
parser := token.NewTokenParser()
tok, err := parser.ParseToken(r, b.config.AccessSecret, "")
if err != nil {
return "", "", "", 0, err
return 0, 0, err
}
if !tok.Valid {
return "", "", "", 0, errors.New("token is invalid")
return 0, 0, errors.New("token is invalid")
}
var appid, userId, tgId string
var userId int
var expiredAt int64
if claims, ok := tok.Claims.(jwt.MapClaims); ok {
if uid, ok := claims["uid"]; ok {
userId = cast.ToString(uid)
}
if aid, ok := claims["app_id"]; ok {
appid = cast.ToString(aid)
}
if tid, ok := claims["tg_id"]; ok {
tgId = cast.ToString(tid)
if data, ok := claims["data"]; ok {
userId, _ = cast.ToStringMapInt(data)["id"]
}
if exp, ok := claims["exp"]; ok {
expiredAt = cast.ToInt64(exp)
}
}
return appid, userId, tgId, expiredAt, nil
return userId, expiredAt, nil
}
// ParseUid 解析出uid
func (b *TokenBuilder) ParseUid(r *http.Request) (string, error) {
func (b *TokenBuilder) ParseUid(r *http.Request) (int, error) {
parser := token.NewTokenParser()
tok, err := parser.ParseToken(r, b.config.AccessSecret, "")
if err != nil {
return "", err
return 0, err
}
if !tok.Valid {
return "", errors.New("token is invalid")
return 0, errors.New("token is invalid")
}
if claims, ok := tok.Claims.(jwt.MapClaims); ok {
if uid, ok := claims["uid"]; ok {
return cast.ToString(uid), nil
if data, ok := claims["data"]; ok {
uid, _ := cast.ToStringMapInt(data)["id"]
return uid, nil
}
}
return "", errors.New("token not exist uid")
return 0, errors.New("token not exist uid")
}
func ParseUid(r *http.Request, accessSecret string) (string, error) {
func ParseUid(r *http.Request, accessSecret string) (int, error) {
parser := token.NewTokenParser()
tok, err := parser.ParseToken(r, accessSecret, "")
if err != nil {
return "", err
return 0, err
}
if !tok.Valid {
return "", errors.New("token is invalid")
return 0, errors.New("token is invalid")
}
if claims, ok := tok.Claims.(jwt.MapClaims); ok {
if uid, ok := claims["uid"]; ok {
return cast.ToString(uid), nil
if data, ok := claims["data"]; ok {
uid, _ := cast.ToStringMapInt(data)["id"]
return uid, nil
}
}
return "", errors.New("token not exist uid")
return 0, errors.New("token not exist uid")
}