fix: ensures hooks run before access

payloadcms · Aug 30, 2021 · 96629f1 · 96629f1
1 parent c187da0
commit 96629f1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/src/fields/hookPromise.ts b/src/fields/hookPromise.ts
@@ -12,15 +12,15 @@ type Arguments = {
   fullData: Record<string, unknown>
 }
 
-const hookPromise = ({
+const hookPromise = async ({
   data,
   field,
   hook,
   req,
   operation,
   fullOriginalDoc,
   fullData,
-}: Arguments) => async (): Promise<void> => {
+}: Arguments): Promise<void> => {
   const resultingData = data;
 
   if (field.hooks && field.hooks[hook]) {

diff --git a/src/fields/performFieldOperations.ts b/src/fields/performFieldOperations.ts
@@ -107,12 +107,10 @@ export default async function performFieldOperations(this: Payload, entityConfig
     transformActions.forEach((action) => action());
   }
 
-  hookPromises.forEach((promise) => promise());
-
-  await Promise.all(hookPromises);
+  const hookResults = hookPromises.map((promise) => promise());
+  await Promise.all(hookResults);
 
   validationPromises.forEach((promise) => promise());
-
   await Promise.all(validationPromises);
 
   if (errors.length > 0) {
@@ -125,11 +123,11 @@ export default async function performFieldOperations(this: Payload, entityConfig
 
   unflattenLocaleActions.forEach((action) => action());
 
-  await Promise.all(accessPromises);
-
-  const relationshipPopulationPromises = relationshipPopulations.map((population) => population());
+  const accessResults = accessPromises.map((promise) => promise());
+  await Promise.all(accessResults);
 
-  await Promise.all(relationshipPopulationPromises);
+  const relationshipPopulationResults = relationshipPopulations.map((population) => population());
+  await Promise.all(relationshipPopulationResults);
 
   return fullData;
 }
diff --git a/src/fields/traverseFields.ts b/src/fields/traverseFields.ts
@@ -15,7 +15,7 @@ type Arguments = {
   flattenLocales: boolean
   locale: string
   fallbackLocale: string
-  accessPromises: Promise<void>[]
+  accessPromises: (() => Promise<void>)[]
   operation: Operation
   overrideAccess: boolean
   req: PayloadRequest
@@ -173,7 +173,7 @@ const traverseFields = (args: Arguments): void => {
       });
     }
 
-    accessPromises.push(accessPromise({
+    accessPromises.push(() => accessPromise({
       data,
       fullData,
       originalDoc,
@@ -189,7 +189,7 @@ const traverseFields = (args: Arguments): void => {
       payload,
     }));
 
-    hookPromises.push(hookPromise({
+    hookPromises.push(() => hookPromise({
       data,
       field,
       hook,