Rename exitingItem argument to item for access control functions (#4074)

keystonejs · Oct 30, 2020 · 4afaa99 · 4afaa99
1 parent d91a638
commit 4afaa99
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/examples-next/auth/schema.ts b/examples-next/auth/schema.ts
@@ -28,8 +28,8 @@ export const lists = createSchema({
         access: {
           // Passwords can always be set when creating items
           // Users can change their own passwords, and Admins can change anyone's password
-          update: ({ session, existingItem }) =>
-            session && (session.item.isAdmin || session.itemId === existingItem.id),
+          update: ({ session, item }) =>
+            session && (session.item.isAdmin || session.itemId === item.id),
         },
         admin: {
           // Based on the same logic as update access, the password field is editable.

diff --git a/packages-next/keystone/src/lib/createAccessControlContext.ts b/packages-next/keystone/src/lib/createAccessControlContext.ts
@@ -59,7 +59,7 @@ async function validateFieldAccessControl({
   listKey,
   fieldKey,
   originalInput,
-  existingItem,
+  item,
   operation,
   session,
   gqlName,
@@ -76,7 +76,7 @@ async function validateFieldAccessControl({
   itemId: any;
   itemIds: any;
   context: any;
-  existingItem: any;
+  item: any;
   fieldKey: any;
 }) {
   let result;
@@ -88,7 +88,7 @@ async function validateFieldAccessControl({
       listKey,
       fieldKey,
       originalInput,
-      existingItem,
+      item,
       operation,
       gqlName,
       itemId,
@@ -144,14 +144,14 @@ export const accessControlContext = {
     listKey: any,
     fieldKey: any,
     originalInput: any,
-    existingItem: any,
+    item: any,
     operation: any,
     { gqlName, itemId, itemIds, context }: any = {}
   ) {
     return validateFieldAccessControl({
       access: access[context.schemaName],
       originalInput,
-      existingItem,
+      item,
       operation,
       session: context.session,
       fieldKey,

diff --git a/packages-next/types/src/schema/access-control.ts b/packages-next/types/src/schema/access-control.ts
@@ -99,12 +99,16 @@ type FieldCreateAccessArgs<GeneratedListTypes extends BaseGeneratedListTypes> =
   BaseFieldAccessArgs;
 
 type FieldReadAccessArgs<GeneratedListTypes extends BaseGeneratedListTypes> = ReadAccessArgs &
-  BaseFieldAccessArgs & { existingItem: GeneratedListTypes['backing'] };
+  BaseFieldAccessArgs & {
+    item: GeneratedListTypes['backing'];
+  };
 
 type FieldUpdateAccessArgs<GeneratedListTypes extends BaseGeneratedListTypes> = UpdateAccessArgs<
   GeneratedListTypes
 > &
-  BaseFieldAccessArgs & { existingItem: GeneratedListTypes['backing'] };
+  BaseFieldAccessArgs & {
+    item: GeneratedListTypes['backing'];
+  };
 
 type FieldDeleteAccessArgs = DeleteAccessArgs & BaseFieldAccessArgs;