From 4bdb243933916ce702a3747a39bbcc095f1c1bc9 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Wed, 9 Mar 2022 21:37:23 -0800 Subject: [PATCH] Fix resolver bugs uncovered by test --- .../skin-database/api/graphql/resolvers/RootResolver.ts | 5 ++++- .../skin-database/api/graphql/resolvers/UserResolver.ts | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/skin-database/api/graphql/resolvers/RootResolver.ts b/packages/skin-database/api/graphql/resolvers/RootResolver.ts index 976c7e77..ee771f10 100644 --- a/packages/skin-database/api/graphql/resolvers/RootResolver.ts +++ b/packages/skin-database/api/graphql/resolvers/RootResolver.ts @@ -76,6 +76,9 @@ class RootResolver extends MutationResolver { return new SkinsConnection(first, offset, sort, filter); } async skin_to_review(_args, { ctx }) { + if (!ctx.authed()) { + return null; + } const { md5 } = await Skins.getSkinToReview(); const model = await SkinModel.fromMd5Assert(ctx, md5); return new SkinResolver(model); @@ -90,7 +93,7 @@ class RootResolver extends MutationResolver { return new UserResolver(); } async upload_statuses_by_md5({ md5s }, { ctx }) { - return this._upload_statuses({ keyName: "md5", keys: md5s }, ctx); + return this._upload_statuses({ keyName: "skin_md5", keys: md5s }, ctx); } async upload_statuses({ ids }, { ctx }) { diff --git a/packages/skin-database/api/graphql/resolvers/UserResolver.ts b/packages/skin-database/api/graphql/resolvers/UserResolver.ts index 2bbac658..b6a7e6be 100644 --- a/packages/skin-database/api/graphql/resolvers/UserResolver.ts +++ b/packages/skin-database/api/graphql/resolvers/UserResolver.ts @@ -1,6 +1,7 @@ +import UserContext from "../../../data/UserContext"; + export default class UserResolver { - username(_args, ctx) { - // For now every user is the current user. - return ctx.user?.username; + username(_args, { ctx }) { + return ctx.username; } }