From f966b1bfdc0e251b66938ae102e902ee4f4d2a68 Mon Sep 17 00:00:00 2001 From: xmdhs Date: Fri, 8 Sep 2023 22:22:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=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 | 4 ++++ service/yggdrasil/texture.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/service/utils/auth.go b/service/utils/auth.go index 29cbb3b..69d5116 100644 --- a/service/utils/auth.go +++ b/service/utils/auth.go @@ -53,6 +53,10 @@ func Auth(ctx context.Context, t yggdrasil.ValidateToken, client *ent.Client, pu ut, err := client.UserToken.Query().Where(usertoken.HasUserWith(user.ID(claims.UID))).First(ctx) if err != nil { + var ne *ent.NotFoundError + if !errors.As(err, &ne) { + return nil, fmt.Errorf("Auth: %w", errors.Join(err, ErrTokenInvalid)) + } return nil, fmt.Errorf("Auth: %w", err) } if strconv.FormatUint(ut.TokenID, 10) != claims.Tid { diff --git a/service/yggdrasil/texture.go b/service/yggdrasil/texture.go index e05a0a3..34445a9 100644 --- a/service/yggdrasil/texture.go +++ b/service/yggdrasil/texture.go @@ -99,7 +99,7 @@ func (y *Yggdrasil) PutTexture(ctx context.Context, token string, texturebyte [] } } if t == nil { - err = tx.Texture.Create().SetCreatedUser(u).SetTextureHash(hashstr).Exec(ctx) + t, err = tx.Texture.Create().SetCreatedUser(u).SetTextureHash(hashstr).Save(ctx) if err != nil { return err }