From 05288ee08c077019e4432bf385aeacc23a0643f3 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Thu, 23 Dec 2021 11:29:45 -0500
Subject: [PATCH] fix: ensures local findByID retains user

---
 src/collections/operations/local/findByID.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/collections/operations/local/findByID.ts b/src/collections/operations/local/findByID.ts
index 897d18170f..fc209f16db 100644
--- a/src/collections/operations/local/findByID.ts
+++ b/src/collections/operations/local/findByID.ts
@@ -31,6 +31,16 @@ export default async function findByID<T extends TypeWithID = any>(options: Opti
 
   const collection = this.collections[collectionSlug];
 
+  const reqToUse = {
+    ...req || {},
+    payloadAPI: 'local',
+    locale,
+    fallbackLocale,
+    payload: this,
+  };
+
+  if (typeof user !== 'undefined') reqToUse.user = user;
+
   return this.operations.collections.findByID({
     depth,
     id,
@@ -38,13 +48,6 @@ export default async function findByID<T extends TypeWithID = any>(options: Opti
     overrideAccess,
     disableErrors,
     showHiddenFields,
-    req: {
-      ...req,
-      user,
-      payloadAPI: 'local',
-      locale,
-      fallbackLocale,
-      payload: this,
-    },
+    req: reqToUse,
   });
 }