Remove default values from validation functions (#4861)

.changeset/large-dots-attack.md

@@ -0,0 +1,6 @@
+---
+'@keystonejs/access-control': major
+'@keystonejs/keystone': patch
+---
+
+The functions `validate*AccessControl` no longer set default values for the `authentication` value. If you are calling these functions directly you will need to make sure you pass in a value for `authentication`. If you are not directly calling these functions then there are no changes required.

packages/access-control/src/access-control.ts

@@ -293,22 +293,15 @@ export async function validateCustomAccessControl({
   context,
   info,
   access,
-  authentication = {},
+  authentication,
   gqlName,
 }: { access: CustomAccess<CustomAccessArgs> } & CustomAccessArgs) {
   // Either a boolean or an object describing a where clause
   let result: Static | Declarative = false;
   if (typeof access !== 'function') {
     result = access;
   } else {
-    result = await access({
-      item,
-      args,
-      context,
-      info,
-      authentication: authentication.item ? authentication : {},
-      gqlName,
-    });
+    result = await access({ item, args, context, info, authentication, gqlName });
   }
 
   if (!['object', 'boolean'].includes(typeof result)) {
@@ -323,7 +316,7 @@ export async function validateListAccessControl({
   access,
   listKey,
   operation,
-  authentication = {},
+  authentication,
   originalInput,
   gqlName,
   itemId,
@@ -337,7 +330,7 @@ export async function validateListAccessControl({
     result = acc;
   } else {
     result = await acc({
-      authentication: authentication.item ? authentication : {},
+      authentication,
       listKey,
       operation,
       originalInput,
@@ -371,7 +364,7 @@ export async function validateFieldAccessControl({
   originalInput,
   existingItem,
   operation,
-  authentication = {},
+  authentication,
   gqlName,
   itemId,
   itemIds,
@@ -383,7 +376,7 @@ export async function validateFieldAccessControl({
     result = acc;
   } else {
     result = await acc({
-      authentication: authentication.item ? authentication : {},
+      authentication,
       listKey,
       fieldKey,
       originalInput,
@@ -408,7 +401,7 @@ export async function validateFieldAccessControl({
 export async function validateAuthAccessControl({
   access,
   listKey,
-  authentication = {},
+  authentication,
   gqlName,
   context,
 }: { access: AuthAccess<AuthAccessArgs> } & Omit<AuthAccessArgs, 'operation'>) {
@@ -419,13 +412,7 @@ export async function validateAuthAccessControl({
   if (typeof acc !== 'function') {
     result = acc;
   } else {
-    result = await acc({
-      authentication: authentication.item ? authentication : {},
-      listKey,
-      operation,
-      gqlName,
-      context,
-    });
+    result = await acc({ authentication, listKey, operation, gqlName, context });
   }
 
   if (!['object', 'boolean'].includes(typeof result)) {

packages/keystone/lib/Keystone/index.js

@@ -106,7 +106,7 @@ module.exports = class Keystone {
           context,
           info,
           access: access[schemaName],
-          authentication,
+          authentication: authentication && authentication.item ? authentication : {},
           gqlName,
         });
       },
@@ -125,7 +125,7 @@ module.exports = class Keystone {
           access: access[schemaName],
           originalInput,
           operation,
-          authentication,
+          authentication: authentication && authentication.item ? authentication : {},
           listKey,
           gqlName,
           itemId,
@@ -151,7 +151,7 @@ module.exports = class Keystone {
           originalInput,
           existingItem,
           operation,
-          authentication,
+          authentication: authentication && authentication.item ? authentication : {},
           fieldKey,
           listKey,
           gqlName,
@@ -167,7 +167,7 @@ module.exports = class Keystone {
       async (access, listKey, { gqlName, context } = {}) => {
         return validateAuthAccessControl({
           access: access[schemaName],
-          authentication,
+          authentication: authentication && authentication.item ? authentication : {},
           listKey,
           gqlName,
           context,