H8-Network/TinySkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改善返回的错误

Browse Source
This commit is contained in:
xmdhs 2023-09-08 01:39:21 +08:00
parent 083d859871
commit ebfd0d325f
No known key found for this signature in database
GPG Key ID: E809D6D43DEFCC95
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/utils/auth.go
View File

@ -24,7 +24,7 @@ func Auth(ctx context.Context, t yggdrasil.ValidateToken, client *ent.Client, pu
return pubkey, nil return pubkey, nil
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("Auth: %w", err) return nil, fmt.Errorf("Auth: %w", errors.Join(err, ErrTokenInvalid))
} }
claims, ok := token.Claims.(*model.TokenClaims) claims, ok := token.Claims.(*model.TokenClaims)
@ -38,11 +38,11 @@ func Auth(ctx context.Context, t yggdrasil.ValidateToken, client *ent.Client, pu
if tmpInvalid { if tmpInvalid {
it, err := claims.GetIssuedAt() it, err := claims.GetIssuedAt()
if err != nil { if err != nil {
return nil, fmt.Errorf("Auth: %w", err) return nil, fmt.Errorf("Auth: %w", errors.Join(err, ErrTokenInvalid))
} }
et, err := claims.GetExpirationTime() et, err := claims.GetExpirationTime()
if err != nil { if err != nil {
return nil, fmt.Errorf("Auth: %w", err) return nil, fmt.Errorf("Auth: %w", errors.Join(err, ErrTokenInvalid))
} }
invalidTime := it.Add(et.Time.Sub(it.Time) / 2) invalidTime := it.Add(et.Time.Sub(it.Time) / 2)
if time.Now().After(invalidTime) { if time.Now().After(invalidTime) {