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 }