From ebfd0d325f223584db0d7c1f4c66cbbd89551ab3 Mon Sep 17 00:00:00 2001 From: xmdhs Date: Fri, 8 Sep 2023 01:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=96=84=E8=BF=94=E5=9B=9E=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/utils/auth.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/utils/auth.go b/service/utils/auth.go index 1c824f2..1f38236 100644 --- a/service/utils/auth.go +++ b/service/utils/auth.go @@ -24,7 +24,7 @@ func Auth(ctx context.Context, t yggdrasil.ValidateToken, client *ent.Client, pu return pubkey, 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) @@ -38,11 +38,11 @@ func Auth(ctx context.Context, t yggdrasil.ValidateToken, client *ent.Client, pu if tmpInvalid { it, err := claims.GetIssuedAt() if err != nil { - return nil, fmt.Errorf("Auth: %w", err) + return nil, fmt.Errorf("Auth: %w", errors.Join(err, ErrTokenInvalid)) } et, err := claims.GetExpirationTime() 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) if time.Now().After(invalidTime) {