From 6cba9ada313b223b98aeda916f9e3917868da733 Mon Sep 17 00:00:00 2001 From: xmdhs Date: Wed, 11 Oct 2023 15:46:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/admin.go | 2 +- service/utils/auth.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/service/admin.go b/service/admin.go index d2cd2df..a2031bf 100644 --- a/service/admin.go +++ b/service/admin.go @@ -21,7 +21,7 @@ var ErrNotAdmin = errors.New("无权限") func (w *WebService) Auth(ctx context.Context, token string) (*model.TokenClaims, error) { t, err := utilsService.Auth(ctx, yggdrasil.ValidateToken{AccessToken: token}, w.client, w.cache, &w.prikey.PublicKey, false) if err != nil { - return nil, fmt.Errorf("Auth: %w", err) + return nil, fmt.Errorf("WebService.Auth: %w", err) } return t, nil } diff --git a/service/utils/auth.go b/service/utils/auth.go index 92e3051..c8dac03 100644 --- a/service/utils/auth.go +++ b/service/utils/auth.go @@ -67,7 +67,7 @@ func Auth(ctx context.Context, t yggdrasil.ValidateToken, client *ent.Client, c if err != nil { var ne *ent.NotFoundError if errors.As(err, &ne) { - return 0, errors.Join(err, ErrTokenInvalid) + return 0, ErrTokenInvalid } return 0, err }