WIP

keystonejs · Apr 23, 2021 · 3f9077f · 3f9077f
1 parent 1418aa8
commit 3f9077f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/packages-next/auth/src/gql/getBaseAuthSchema.ts b/packages-next/auth/src/gql/getBaseAuthSchema.ts
@@ -58,15 +58,15 @@ export function getBaseAuthSchema<I extends string, S extends string>({
           }
 
           const list = context.keystone.lists[listKey];
-          const itemAPI = context.sudo().lists[listKey];
+          const dbItemAPI = context.sudo().db.lists[listKey];
           const result = await validateSecret(
             list,
             identityField,
             args[identityField],
             secretField,
             protectIdentities,
             args[secretField],
-            itemAPI
+            dbItemAPI
           );
 
           if (!result.success) {

diff --git a/packages-next/auth/src/gql/getMagicAuthLinkSchema.ts b/packages-next/auth/src/gql/getMagicAuthLinkSchema.ts
@@ -107,7 +107,7 @@ export function getMagicAuthLinkSchema<I extends string>({
           }
 
           const list = context.keystone.lists[listKey];
-          const itemAPI = context.sudo().lists[listKey];
+          const dbItemAPI = context.sudo().db.lists[listKey];
           const tokenType = 'magicAuth';
           const result = await validateAuthToken(
             tokenType,
@@ -117,7 +117,7 @@ export function getMagicAuthLinkSchema<I extends string>({
             protectIdentities,
             magicAuthLink.tokensValidForMins,
             args.token,
-            itemAPI
+            dbItemAPI
           );
 
           if (!result.success) {
@@ -132,7 +132,7 @@ export function getMagicAuthLinkSchema<I extends string>({
           }
           // Update system state
           // Save the token and related info back to the item
-          await itemAPI.updateOne({
+          await dbItemAPI.updateOne({
             id: result.item.id,
             data: { [`${tokenType}RedeemedAt`]: new Date().toISOString() },
           });

diff --git a/packages-next/auth/src/gql/getPasswordResetSchema.ts b/packages-next/auth/src/gql/getPasswordResetSchema.ts
@@ -108,7 +108,7 @@ export function getPasswordResetSchema<I extends string, S extends string>({
           context
         ) {
           const list = context.keystone.lists[listKey];
-          const itemAPI = context.sudo().lists[listKey];
+          const dbItemAPI = context.sudo().db.lists[listKey];
           const tokenType = 'passwordReset';
           const result = await validateAuthToken(
             tokenType,
@@ -118,7 +118,7 @@ export function getPasswordResetSchema<I extends string, S extends string>({
             protectIdentities,
             passwordResetLink.tokensValidForMins,
             args.token,
-            itemAPI
+            dbItemAPI
           );
 
           if (!result.success) {
@@ -137,15 +137,15 @@ export function getPasswordResetSchema<I extends string, S extends string>({
           // Update system state
           const itemId = result.item.id;
           // Save the token and related info back to the item
-          await itemAPI.updateOne({
+          await dbItemAPI.updateOne({
             id: itemId,
             data: { [`${tokenType}RedeemedAt`]: new Date().toISOString() },
           });
 
           // Save the provided secret. Do this as a separate step as password validation
           // may fail, in which case we still want to mark the token as redeemed
           // (NB: Is this *really* what we want? -TL)
-          await itemAPI.updateOne({
+          await dbItemAPI.updateOne({
             id: itemId,
             data: { [secretField]: args[secretField] },
           });
@@ -160,7 +160,7 @@ export function getPasswordResetSchema<I extends string, S extends string>({
           context
         ) {
           const list = context.keystone.lists[listKey];
-          const itemAPI = context.sudo().lists[listKey];
+          const dbItemAPI = context.sudo().db.lists[listKey];
           const tokenType = 'passwordReset';
           const result = await validateAuthToken(
             tokenType,
@@ -170,7 +170,7 @@ export function getPasswordResetSchema<I extends string, S extends string>({
             protectIdentities,
             passwordResetLink.tokensValidForMins,
             args.token,
-            itemAPI
+            dbItemAPI
           );
 
           if (!result.success && result.code) {

diff --git a/packages-next/auth/src/lib/validateAuthToken.ts b/packages-next/auth/src/lib/validateAuthToken.ts
@@ -1,4 +1,4 @@
-import type { KeystoneListsAPI } from '@keystone-next/types';
+import type { KeystoneDbAPI } from '@keystone-next/types';
 import { AuthTokenRedemptionErrorCode } from '../types';
 import { validateSecret } from './validateSecret';
 
@@ -17,7 +17,7 @@ export async function validateAuthToken(
   protectIdentities: boolean,
   tokenValidMins: number | undefined,
   token: string,
-  itemAPI: KeystoneListsAPI<any>[string]
+  dbItemAPI: KeystoneDbAPI<any>[string]
 ): Promise<
   | { success: false; code: AuthTokenRedemptionErrorCode }
   | { success: true; item: { id: any; [prop: string]: any } }
@@ -29,7 +29,7 @@ export async function validateAuthToken(
     `${tokenType}Token`,
     protectIdentities,
     token,
-    itemAPI
+    dbItemAPI
   );
   if (!result.success) {
     // Rewrite error codes