Fixes GraphQL errors when using @keystone-6/auth (#8182)

keystonejs · Dec 20, 2022 · b52713b · b52713b · vercel · Dec 20, 2022
1 parent 71dbfe3
commit b52713b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/.changeset/early-suns-knock.md b/.changeset/early-suns-knock.md
@@ -0,0 +1,5 @@
+---
+'@keystone-6/auth': patch
+---
+
+Fixes GraphQL error when using `autoincrement` for auth list id
diff --git a/.changeset/good-monkeys-complain.md b/.changeset/good-monkeys-complain.md
@@ -0,0 +1,5 @@
+---
+'@keystone-6/auth': patch
+---
+
+Fixes GraphQL error when `sessionStrategy.start` returns null or undefined
diff --git a/packages/auth/src/gql/getBaseAuthSchema.ts b/packages/auth/src/gql/getBaseAuthSchema.ts
@@ -54,7 +54,10 @@ export function getBaseAuthSchema<I extends string, S extends string>({
           resolveType: (root, context) => context.session?.listKey,
         }),
         resolve(root, args, { session, db }) {
-          if (typeof session?.itemId === 'string' && typeof session.listKey === 'string') {
+          if (
+            (typeof session?.itemId === 'string' || typeof session.itemId === 'number') &&
+            typeof session.listKey === 'string'
+          ) {
             return db[session.listKey].findOne({ where: { id: session.itemId } });
           }
           return null;
@@ -88,13 +91,17 @@ export function getBaseAuthSchema<I extends string, S extends string>({
           }
 
           // Update system state
-          const sessionToken = (await context.sessionStrategy.start({
+          const sessionToken = await context.sessionStrategy.start({
             data: {
               listKey,
               itemId: result.item.id,
             },
             context,
-          })) as string;
+          });
+          // return Failure if sessionStrategy.start() returns null
+          if (typeof sessionToken !== 'string' || sessionToken.length === 0) {
+            return { code: 'FAILURE', message: 'Failed to start session.' };
+          }
           return { sessionToken, item: result.item };
         },
       }),