@payloadcms/next 3.89.0 → 3.90.1

package/dist/utilities/handleServerFunctions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleServerFunctions.d.ts","sourceRoot":"","sources":["../../src/utilities/handleServerFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA6C,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAmC/F,eAAO,MAAM,qBAAqB,EAAE,qBA+BnC,CAAA"}
+{"version":3,"file":"handleServerFunctions.d.ts","sourceRoot":"","sources":["../../src/utilities/handleServerFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA6C,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAmC/F,eAAO,MAAM,qBAAqB,EAAE,qBAgCnC,CAAA"}

package/dist/utilities/handleServerFunctions.js

@@ -37,7 +37,8 @@ export const handleServerFunctions = async args => {
     cookies,
     locale,
     permissions,
-    req
+    req,
+    user
   } = await initReq({
     configPromise,
     importMap,
@@ -49,7 +50,8 @@ export const handleServerFunctions = async args => {
     importMap,
     locale,
     permissions,
-    req
+    req,
+    user
   };
   const fn = extraServerFunctions?.[fnKey] || baseServerFunctions[fnKey];
   if (!fn) {

package/dist/utilities/handleServerFunctions.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleServerFunctions.js","names":["_internal_renderFieldHandler","copyDataFromLocaleHandler","buildFormStateHandler","buildTableStateHandler","getFolderResultsComponentAndDataHandler","getUpcomingScheduledPublishHandler","schedulePublishHandler","getDefaultLayoutHandler","renderWidgetHandler","renderDocumentHandler","renderDocumentSlotsHandler","renderListHandler","initReq","slugifyHandler","baseServerFunctions","slugify","handleServerFunctions","args","name","fnKey","fnArgs","config","configPromise","importMap","serverFunctions","extraServerFunctions","cookies","locale","permissions","req","key","augmentedArgs","fn","Error"],"sources":["../../src/utilities/handleServerFunctions.ts"],"sourcesContent":["import type { DefaultServerFunctionArgs, ServerFunction, ServerFunctionHandler } from 'payload'\n\nimport { _internal_renderFieldHandler, copyDataFromLocaleHandler } from '@payloadcms/ui/rsc'\nimport { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState'\nimport { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState'\nimport { getFolderResultsComponentAndDataHandler } from '@payloadcms/ui/utilities/getFolderResultsComponentAndData'\nimport {\n  getUpcomingScheduledPublishHandler,\n  schedulePublishHandler,\n} from '@payloadcms/ui/utilities/schedulePublishHandler'\n\nimport { getDefaultLayoutHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/getDefaultLayoutServerFn.js'\nimport { renderWidgetHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/renderWidgetServerFn.js'\nimport { renderDocumentHandler } from '../views/Document/handleServerFunction.js'\nimport { renderDocumentSlotsHandler } from '../views/Document/renderDocumentSlots.js'\nimport { renderListHandler } from '../views/List/handleServerFunction.js'\nimport { initReq } from './initReq.js'\nimport { slugifyHandler } from './slugify.js'\n\nconst baseServerFunctions: Record<string, ServerFunction<any, any>> = {\n  'copy-data-from-locale': copyDataFromLocaleHandler,\n  'form-state': buildFormStateHandler,\n  'get-default-layout': getDefaultLayoutHandler,\n  'get-folder-results-component-and-data': getFolderResultsComponentAndDataHandler,\n  'get-upcoming-scheduled-publish': getUpcomingScheduledPublishHandler,\n  'render-document': renderDocumentHandler,\n  'render-document-slots': renderDocumentSlotsHandler,\n  'render-field': _internal_renderFieldHandler,\n  'render-list': renderListHandler,\n  'render-widget': renderWidgetHandler,\n  'schedule-publish': schedulePublishHandler,\n  slugify: slugifyHandler,\n  'table-state': buildTableStateHandler,\n}\n\nexport const handleServerFunctions: ServerFunctionHandler = async (args) => {\n  const {\n    name: fnKey,\n    args: fnArgs,\n    config: configPromise,\n    importMap,\n    serverFunctions: extraServerFunctions,\n  } = args\n\n  const { cookies, locale, permissions, req } = await initReq({\n    configPromise,\n    importMap,\n    key: 'RootLayout',\n  })\n\n  const augmentedArgs: DefaultServerFunctionArgs = {\n    ...fnArgs,\n    cookies,\n    importMap,\n    locale,\n    permissions,\n    req,\n  }\n\n  const fn = extraServerFunctions?.[fnKey] || baseServerFunctions[fnKey]\n\n  if (!fn) {\n    throw new Error(`Unknown Server Function: ${fnKey}`)\n  }\n\n  return fn(augmentedArgs)\n}\n"],"mappings":"AAEA,SAASA,4BAA4B,EAAEC,yBAAyB,QAAQ;AACxE,SAASC,qBAAqB,QAAQ;AACtC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,uCAAuC,QAAQ;AACxD,SACEC,kCAAkC,EAClCC,sBAAsB,QACjB;AAEP,SAASC,uBAAuB,QAAQ;AACxC,SAASC,mBAAmB,QAAQ;AACpC,SAASC,qBAAqB,QAAQ;AACtC,SAASC,0BAA0B,QAAQ;AAC3C,SAASC,iBAAiB,QAAQ;AAClC,SAASC,OAAO,QAAQ;AACxB,SAASC,cAAc,QAAQ;AAE/B,MAAMC,mBAAA,GAAgE;EACpE,yBAAyBb,yBAAA;EACzB,cAAcC,qBAAA;EACd,sBAAsBK,uBAAA;EACtB,yCAAyCH,uCAAA;EACzC,kCAAkCC,kCAAA;EAClC,mBAAmBI,qBAAA;EACnB,yBAAyBC,0BAAA;EACzB,gBAAgBV,4BAAA;EAChB,eAAeW,iBAAA;EACf,iBAAiBH,mBAAA;EACjB,oBAAoBF,sBAAA;EACpBS,OAAA,EAASF,cAAA;EACT,eAAeV;AACjB;AAEA,OAAO,MAAMa,qBAAA,GAA+C,MAAOC,IAAA;EACjE,MAAM;IACJC,IAAA,EAAMC,KAAK;IACXF,IAAA,EAAMG,MAAM;IACZC,MAAA,EAAQC,aAAa;IACrBC,SAAS;IACTC,eAAA,EAAiBC;EAAoB,CACtC,GAAGR,IAAA;EAEJ,MAAM;IAAES,OAAO;IAAEC,MAAM;IAAEC,WAAW;IAAEC;EAAG,CAAE,GAAG,MAAMjB,OAAA,CAAQ;IAC1DU,aAAA;IACAC,SAAA;IACAO,GAAA,EAAK;EACP;EAEA,MAAMC,aAAA,GAA2C;IAC/C,GAAGX,MAAM;IACTM,OAAA;IACAH,SAAA;IACAI,MAAA;IACAC,WAAA;IACAC;EACF;EAEA,MAAMG,EAAA,GAAKP,oBAAA,GAAuBN,KAAA,CAAM,IAAIL,mBAAmB,CAACK,KAAA,CAAM;EAEtE,IAAI,CAACa,EAAA,EAAI;IACP,MAAM,IAAIC,KAAA,CAAM,4BAA4Bd,KAAA,EAAO;EACrD;EAEA,OAAOa,EAAA,CAAGD,aAAA;AACZ","ignoreList":[]}
+{"version":3,"file":"handleServerFunctions.js","names":["_internal_renderFieldHandler","copyDataFromLocaleHandler","buildFormStateHandler","buildTableStateHandler","getFolderResultsComponentAndDataHandler","getUpcomingScheduledPublishHandler","schedulePublishHandler","getDefaultLayoutHandler","renderWidgetHandler","renderDocumentHandler","renderDocumentSlotsHandler","renderListHandler","initReq","slugifyHandler","baseServerFunctions","slugify","handleServerFunctions","args","name","fnKey","fnArgs","config","configPromise","importMap","serverFunctions","extraServerFunctions","cookies","locale","permissions","req","user","key","augmentedArgs","fn","Error"],"sources":["../../src/utilities/handleServerFunctions.ts"],"sourcesContent":["import type { DefaultServerFunctionArgs, ServerFunction, ServerFunctionHandler } from 'payload'\n\nimport { _internal_renderFieldHandler, copyDataFromLocaleHandler } from '@payloadcms/ui/rsc'\nimport { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState'\nimport { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState'\nimport { getFolderResultsComponentAndDataHandler } from '@payloadcms/ui/utilities/getFolderResultsComponentAndData'\nimport {\n  getUpcomingScheduledPublishHandler,\n  schedulePublishHandler,\n} from '@payloadcms/ui/utilities/schedulePublishHandler'\n\nimport { getDefaultLayoutHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/getDefaultLayoutServerFn.js'\nimport { renderWidgetHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/renderWidgetServerFn.js'\nimport { renderDocumentHandler } from '../views/Document/handleServerFunction.js'\nimport { renderDocumentSlotsHandler } from '../views/Document/renderDocumentSlots.js'\nimport { renderListHandler } from '../views/List/handleServerFunction.js'\nimport { initReq } from './initReq.js'\nimport { slugifyHandler } from './slugify.js'\n\nconst baseServerFunctions: Record<string, ServerFunction<any, any>> = {\n  'copy-data-from-locale': copyDataFromLocaleHandler,\n  'form-state': buildFormStateHandler,\n  'get-default-layout': getDefaultLayoutHandler,\n  'get-folder-results-component-and-data': getFolderResultsComponentAndDataHandler,\n  'get-upcoming-scheduled-publish': getUpcomingScheduledPublishHandler,\n  'render-document': renderDocumentHandler,\n  'render-document-slots': renderDocumentSlotsHandler,\n  'render-field': _internal_renderFieldHandler,\n  'render-list': renderListHandler,\n  'render-widget': renderWidgetHandler,\n  'schedule-publish': schedulePublishHandler,\n  slugify: slugifyHandler,\n  'table-state': buildTableStateHandler,\n}\n\nexport const handleServerFunctions: ServerFunctionHandler = async (args) => {\n  const {\n    name: fnKey,\n    args: fnArgs,\n    config: configPromise,\n    importMap,\n    serverFunctions: extraServerFunctions,\n  } = args\n\n  const { cookies, locale, permissions, req, user } = await initReq({\n    configPromise,\n    importMap,\n    key: 'RootLayout',\n  })\n\n  const augmentedArgs: DefaultServerFunctionArgs = {\n    ...fnArgs,\n    cookies,\n    importMap,\n    locale,\n    permissions,\n    req,\n    user,\n  }\n\n  const fn = extraServerFunctions?.[fnKey] || baseServerFunctions[fnKey]\n\n  if (!fn) {\n    throw new Error(`Unknown Server Function: ${fnKey}`)\n  }\n\n  return fn(augmentedArgs)\n}\n"],"mappings":"AAEA,SAASA,4BAA4B,EAAEC,yBAAyB,QAAQ;AACxE,SAASC,qBAAqB,QAAQ;AACtC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,uCAAuC,QAAQ;AACxD,SACEC,kCAAkC,EAClCC,sBAAsB,QACjB;AAEP,SAASC,uBAAuB,QAAQ;AACxC,SAASC,mBAAmB,QAAQ;AACpC,SAASC,qBAAqB,QAAQ;AACtC,SAASC,0BAA0B,QAAQ;AAC3C,SAASC,iBAAiB,QAAQ;AAClC,SAASC,OAAO,QAAQ;AACxB,SAASC,cAAc,QAAQ;AAE/B,MAAMC,mBAAA,GAAgE;EACpE,yBAAyBb,yBAAA;EACzB,cAAcC,qBAAA;EACd,sBAAsBK,uBAAA;EACtB,yCAAyCH,uCAAA;EACzC,kCAAkCC,kCAAA;EAClC,mBAAmBI,qBAAA;EACnB,yBAAyBC,0BAAA;EACzB,gBAAgBV,4BAAA;EAChB,eAAeW,iBAAA;EACf,iBAAiBH,mBAAA;EACjB,oBAAoBF,sBAAA;EACpBS,OAAA,EAASF,cAAA;EACT,eAAeV;AACjB;AAEA,OAAO,MAAMa,qBAAA,GAA+C,MAAOC,IAAA;EACjE,MAAM;IACJC,IAAA,EAAMC,KAAK;IACXF,IAAA,EAAMG,MAAM;IACZC,MAAA,EAAQC,aAAa;IACrBC,SAAS;IACTC,eAAA,EAAiBC;EAAoB,CACtC,GAAGR,IAAA;EAEJ,MAAM;IAAES,OAAO;IAAEC,MAAM;IAAEC,WAAW;IAAEC,GAAG;IAAEC;EAAI,CAAE,GAAG,MAAMlB,OAAA,CAAQ;IAChEU,aAAA;IACAC,SAAA;IACAQ,GAAA,EAAK;EACP;EAEA,MAAMC,aAAA,GAA2C;IAC/C,GAAGZ,MAAM;IACTM,OAAA;IACAH,SAAA;IACAI,MAAA;IACAC,WAAA;IACAC,GAAA;IACAC;EACF;EAEA,MAAMG,EAAA,GAAKR,oBAAA,GAAuBN,KAAA,CAAM,IAAIL,mBAAmB,CAACK,KAAA,CAAM;EAEtE,IAAI,CAACc,EAAA,EAAI;IACP,MAAM,IAAIC,KAAA,CAAM,4BAA4Bf,KAAA,EAAO;EACrD;EAEA,OAAOc,EAAA,CAAGD,aAAA;AACZ","ignoreList":[]}

package/dist/utilities/initReq.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initReq.d.ts","sourceRoot":"","sources":["../../src/utilities/initReq.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAkB,eAAe,EAAE,MAAM,SAAS,CAAA;AAIxF,OAAO,EACL,cAAc,EAMf,MAAM,SAAS,CAAA;AAchB;;;GAGG;AACH,eAAO,MAAM,OAAO,iEAMjB;IACD,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IACzD,SAAS,EAAE,SAAS,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;CACjD,KAAG,OAAO,CAAC,aAAa,CA0FxB,CAAA"}
+{"version":3,"file":"initReq.d.ts","sourceRoot":"","sources":["../../src/utilities/initReq.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAkB,eAAe,EAAE,MAAM,SAAS,CAAA;AAIxF,OAAO,EACL,cAAc,EAMf,MAAM,SAAS,CAAA;AAehB;;;GAGG;AACH,eAAO,MAAM,OAAO,iEAMjB;IACD,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IACzD,SAAS,EAAE,SAAS,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;CACjD,KAAG,OAAO,CAAC,aAAa,CA8HxB,CAAA"}

package/dist/utilities/initReq.js

@@ -1,6 +1,7 @@
 import { initI18n } from '@payloadcms/translations';
 import { headers as getHeaders } from 'next/headers.js';
 import { createLocalReq, executeAuthStrategies, getAccessResults, getPayload, getRequestLanguage, parseCookies } from 'payload';
+import { applyUserReadAccess } from 'payload/internal';
 import { getRequestLocale } from './getRequestLocale.js';
 import { selectiveCache } from './selectiveCache.js';
 // Create cache instances for different parts of our application
@@ -64,6 +65,10 @@ export const initReq = async function ({
       req: reqOverrides,
       ...optionsOverrides
     } = overrides || {};
+    const hasOptionsUserOverride = Object.hasOwn(optionsOverrides, 'user');
+    const hasReqUserOverride = Object.hasOwn(reqOverrides ?? {}, 'user');
+    const hasUserOverride = hasOptionsUserOverride || hasReqUserOverride;
+    const userOverride = hasOptionsUserOverride ? optionsOverrides.user : reqOverrides?.user;
     const req = await createLocalReq({
       req: {
         headers,
@@ -75,10 +80,37 @@ export const initReq = async function ({
       },
       ...(optionsOverrides || {})
     }, payload);
+    if (hasUserOverride && userOverride == null) {
+      req.user = null;
+    }
+    let userWithReadAccess = req.user;
     const locale = await getRequestLocale({
       req
     });
     req.locale = locale?.code;
+    if (!hasUserOverride && req.user) {
+      try {
+        const collectionSlug = req.user.collection ?? payload.config.admin.user;
+        const collection = payload.collections[collectionSlug];
+        if (!collection?.config.auth) {
+          throw new Error('Authenticated user collection not found');
+        }
+        userWithReadAccess = await applyUserReadAccess({
+          collection: collection.config,
+          depth: collection.config.auth.depth,
+          overrideAccess: false,
+          req,
+          showHiddenFields: false,
+          user: req.user
+        });
+      } catch (error) {
+        payload.logger.error({
+          err: error
+        });
+        req.user = null;
+        userWithReadAccess = null;
+      }
+    }
     const permissions = await getAccessResults({
       req
     });
@@ -88,9 +120,10 @@ export const initReq = async function ({
       languageCode,
       locale,
       permissions,
-      req
+      req,
+      user: userWithReadAccess
     };
-  }, key).then(result => {
+  }, key, overrides).then(result => {
     // CRITICAL: Create a shallow copy of req before returning to prevent
     // mutations from propagating to the cached req object.
     // This ensures parallel operations using the same cache key don't affect each other.

package/dist/utilities/initReq.js.map

@@ -1 +1 @@
-{"version":3,"file":"initReq.js","names":["initI18n","headers","getHeaders","createLocalReq","executeAuthStrategies","getAccessResults","getPayload","getRequestLanguage","parseCookies","getRequestLocale","selectiveCache","partialReqCache","reqCache","initReq","canSetHeaders","configPromise","importMap","key","overrides","cookies","partialResult","get","config","payload","cron","languageCode","i18n","context","language","responseHeaders","user","req","reqOverrides","optionsOverrides","host","locale","code","permissions","then","result"],"sources":["../../src/utilities/initReq.ts"],"sourcesContent":["import type { I18n, I18nClient } from '@payloadcms/translations'\nimport type { ImportMap, InitReqResult, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { headers as getHeaders } from 'next/headers.js'\nimport {\n  createLocalReq,\n  executeAuthStrategies,\n  getAccessResults,\n  getPayload,\n  getRequestLanguage,\n  parseCookies,\n} from 'payload'\n\nimport { getRequestLocale } from './getRequestLocale.js'\nimport { selectiveCache } from './selectiveCache.js'\n\ntype PartialResult = {\n  i18n: I18nClient\n} & Pick<InitReqResult, 'languageCode'> &\n  Pick<PayloadRequest, 'payload' | 'responseHeaders' | 'user'>\n\n// Create cache instances for different parts of our application\nconst partialReqCache = selectiveCache<PartialResult>('partialReq')\nconst reqCache = selectiveCache<InitReqResult>('req')\n\n/**\n * Initializes a full request object, including the `req` object and access control.\n * As access control and getting the request locale is dependent on the current URL and\n */\nexport const initReq = async function ({\n  canSetHeaders,\n  configPromise,\n  importMap,\n  key,\n  overrides,\n}: {\n  canSetHeaders?: boolean\n  configPromise: Promise<SanitizedConfig> | SanitizedConfig\n  importMap: ImportMap\n  key: string\n  overrides?: Parameters<typeof createLocalReq>[0]\n}): Promise<InitReqResult> {\n  const headers = await getHeaders()\n  const cookies = parseCookies(headers)\n\n  const partialResult = await partialReqCache.get(async () => {\n    const config = await configPromise\n    const payload = await getPayload({ config, cron: true, importMap })\n    const languageCode = getRequestLanguage({\n      config,\n      cookies,\n      headers,\n    })\n\n    const i18n: I18nClient = await initI18n({\n      config: config.i18n,\n      context: 'client',\n      language: languageCode,\n    })\n\n    const { responseHeaders, user } = await executeAuthStrategies({\n      canSetHeaders,\n      headers,\n      payload,\n    })\n\n    return {\n      i18n,\n      languageCode,\n      payload,\n      responseHeaders,\n      user,\n    }\n  }, 'global')\n\n  return reqCache\n    .get(async () => {\n      const { i18n, languageCode, payload, responseHeaders, user } = partialResult\n\n      const { req: reqOverrides, ...optionsOverrides } = overrides || {}\n\n      const req = await createLocalReq(\n        {\n          req: {\n            headers,\n            host: headers.get('host'),\n            i18n: i18n as I18n,\n            responseHeaders,\n            user,\n            ...(reqOverrides || {}),\n          },\n          ...(optionsOverrides || {}),\n        },\n        payload,\n      )\n\n      const locale = await getRequestLocale({\n        req,\n      })\n\n      req.locale = locale?.code\n\n      const permissions = await getAccessResults({\n        req,\n      })\n\n      return {\n        cookies,\n        headers,\n        languageCode,\n        locale,\n        permissions,\n        req,\n      }\n    }, key)\n    .then((result) => {\n      // CRITICAL: Create a shallow copy of req before returning to prevent\n      // mutations from propagating to the cached req object.\n      // This ensures parallel operations using the same cache key don't affect each other.\n      return {\n        ...result,\n        req: {\n          ...result.req,\n          ...(result.req?.context\n            ? {\n                context: { ...result.req.context },\n              }\n            : {}),\n        },\n      }\n    })\n}\n"],"mappings":"AAGA,SAASA,QAAQ,QAAQ;AACzB,SAASC,OAAA,IAAWC,UAAU,QAAQ;AACtC,SACEC,cAAc,EACdC,qBAAqB,EACrBC,gBAAgB,EAChBC,UAAU,EACVC,kBAAkB,EAClBC,YAAY,QACP;AAEP,SAASC,gBAAgB,QAAQ;AACjC,SAASC,cAAc,QAAQ;AAO/B;AACA,MAAMC,eAAA,GAAkBD,cAAA,CAA8B;AACtD,MAAME,QAAA,GAAWF,cAAA,CAA8B;AAE/C;;;;AAIA,OAAO,MAAMG,OAAA,GAAU,eAAAA,CAAgB;EACrCC,aAAa;EACbC,aAAa;EACbC,SAAS;EACTC,GAAG;EACHC;AAAS,CAOV;EACC,MAAMjB,OAAA,GAAU,MAAMC,UAAA;EACtB,MAAMiB,OAAA,GAAUX,YAAA,CAAaP,OAAA;EAE7B,MAAMmB,aAAA,GAAgB,MAAMT,eAAA,CAAgBU,GAAG,CAAC;IAC9C,MAAMC,MAAA,GAAS,MAAMP,aAAA;IACrB,MAAMQ,OAAA,GAAU,MAAMjB,UAAA,CAAW;MAAEgB,MAAA;MAAQE,IAAA,EAAM;MAAMR;IAAU;IACjE,MAAMS,YAAA,GAAelB,kBAAA,CAAmB;MACtCe,MAAA;MACAH,OAAA;MACAlB;IACF;IAEA,MAAMyB,IAAA,GAAmB,MAAM1B,QAAA,CAAS;MACtCsB,MAAA,EAAQA,MAAA,CAAOI,IAAI;MACnBC,OAAA,EAAS;MACTC,QAAA,EAAUH;IACZ;IAEA,MAAM;MAAEI,eAAe;MAAEC;IAAI,CAAE,GAAG,MAAM1B,qBAAA,CAAsB;MAC5DU,aAAA;MACAb,OAAA;MACAsB;IACF;IAEA,OAAO;MACLG,IAAA;MACAD,YAAA;MACAF,OAAA;MACAM,eAAA;MACAC;IACF;EACF,GAAG;EAEH,OAAOlB,QAAA,CACJS,GAAG,CAAC;IACH,MAAM;MAAEK,IAAI;MAAED,YAAY;MAAEF,OAAO;MAAEM,eAAe;MAAEC;IAAI,CAAE,GAAGV,aAAA;IAE/D,MAAM;MAAEW,GAAA,EAAKC,YAAY;MAAE,GAAGC;IAAA,CAAkB,GAAGf,SAAA,IAAa,CAAC;IAEjE,MAAMa,GAAA,GAAM,MAAM5B,cAAA,CAChB;MACE4B,GAAA,EAAK;QACH9B,OAAA;QACAiC,IAAA,EAAMjC,OAAA,CAAQoB,GAAG,CAAC;QAClBK,IAAA,EAAMA,IAAA;QACNG,eAAA;QACAC,IAAA;QACA,IAAIE,YAAA,IAAgB,CAAC,CAAC;MACxB;MACA,IAAIC,gBAAA,IAAoB,CAAC,CAAC;IAC5B,GACAV,OAAA;IAGF,MAAMY,MAAA,GAAS,MAAM1B,gBAAA,CAAiB;MACpCsB;IACF;IAEAA,GAAA,CAAII,MAAM,GAAGA,MAAA,EAAQC,IAAA;IAErB,MAAMC,WAAA,GAAc,MAAMhC,gBAAA,CAAiB;MACzC0B;IACF;IAEA,OAAO;MACLZ,OAAA;MACAlB,OAAA;MACAwB,YAAA;MACAU,MAAA;MACAE,WAAA;MACAN;IACF;EACF,GAAGd,GAAA,EACFqB,IAAI,CAAEC,MAAA;IACL;IACA;IACA;IACA,OAAO;MACL,GAAGA,MAAM;MACTR,GAAA,EAAK;QACH,GAAGQ,MAAA,CAAOR,GAAG;QACb,IAAIQ,MAAA,CAAOR,GAAG,EAAEJ,OAAA,GACZ;UACEA,OAAA,EAAS;YAAE,GAAGY,MAAA,CAAOR,GAAG,CAACJ;UAAQ;QACnC,IACA,CAAC,CAAC;MACR;IACF;EACF;AACJ","ignoreList":[]}
+{"version":3,"file":"initReq.js","names":["initI18n","headers","getHeaders","createLocalReq","executeAuthStrategies","getAccessResults","getPayload","getRequestLanguage","parseCookies","applyUserReadAccess","getRequestLocale","selectiveCache","partialReqCache","reqCache","initReq","canSetHeaders","configPromise","importMap","key","overrides","cookies","partialResult","get","config","payload","cron","languageCode","i18n","context","language","responseHeaders","user","req","reqOverrides","optionsOverrides","hasOptionsUserOverride","Object","hasOwn","hasReqUserOverride","hasUserOverride","userOverride","host","userWithReadAccess","locale","code","collectionSlug","collection","admin","collections","auth","Error","depth","overrideAccess","showHiddenFields","error","logger","err","permissions","then","result"],"sources":["../../src/utilities/initReq.ts"],"sourcesContent":["import type { I18n, I18nClient } from '@payloadcms/translations'\nimport type { ImportMap, InitReqResult, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { headers as getHeaders } from 'next/headers.js'\nimport {\n  createLocalReq,\n  executeAuthStrategies,\n  getAccessResults,\n  getPayload,\n  getRequestLanguage,\n  parseCookies,\n} from 'payload'\nimport { applyUserReadAccess } from 'payload/internal'\n\nimport { getRequestLocale } from './getRequestLocale.js'\nimport { selectiveCache } from './selectiveCache.js'\n\ntype PartialResult = {\n  i18n: I18nClient\n} & Pick<InitReqResult, 'languageCode'> &\n  Pick<PayloadRequest, 'payload' | 'responseHeaders' | 'user'>\n\n// Create cache instances for different parts of our application\nconst partialReqCache = selectiveCache<PartialResult>('partialReq')\nconst reqCache = selectiveCache<InitReqResult>('req')\n\n/**\n * Initializes a full request object, including the `req` object and access control.\n * As access control and getting the request locale is dependent on the current URL and\n */\nexport const initReq = async function ({\n  canSetHeaders,\n  configPromise,\n  importMap,\n  key,\n  overrides,\n}: {\n  canSetHeaders?: boolean\n  configPromise: Promise<SanitizedConfig> | SanitizedConfig\n  importMap: ImportMap\n  key: string\n  overrides?: Parameters<typeof createLocalReq>[0]\n}): Promise<InitReqResult> {\n  const headers = await getHeaders()\n  const cookies = parseCookies(headers)\n\n  const partialResult = await partialReqCache.get(async () => {\n    const config = await configPromise\n    const payload = await getPayload({ config, cron: true, importMap })\n    const languageCode = getRequestLanguage({\n      config,\n      cookies,\n      headers,\n    })\n\n    const i18n: I18nClient = await initI18n({\n      config: config.i18n,\n      context: 'client',\n      language: languageCode,\n    })\n\n    const { responseHeaders, user } = await executeAuthStrategies({\n      canSetHeaders,\n      headers,\n      payload,\n    })\n\n    return {\n      i18n,\n      languageCode,\n      payload,\n      responseHeaders,\n      user,\n    }\n  }, 'global')\n\n  return reqCache\n    .get(\n      async () => {\n        const { i18n, languageCode, payload, responseHeaders, user } = partialResult\n\n        const { req: reqOverrides, ...optionsOverrides } = overrides || {}\n        const hasOptionsUserOverride = Object.hasOwn(optionsOverrides, 'user')\n        const hasReqUserOverride = Object.hasOwn(reqOverrides ?? {}, 'user')\n        const hasUserOverride = hasOptionsUserOverride || hasReqUserOverride\n        const userOverride = hasOptionsUserOverride ? optionsOverrides.user : reqOverrides?.user\n\n        const req = await createLocalReq(\n          {\n            req: {\n              headers,\n              host: headers.get('host'),\n              i18n: i18n as I18n,\n              responseHeaders,\n              user,\n              ...(reqOverrides || {}),\n            },\n            ...(optionsOverrides || {}),\n          },\n          payload,\n        )\n\n        if (hasUserOverride && userOverride == null) {\n          req.user = null\n        }\n\n        let userWithReadAccess = req.user\n\n        const locale = await getRequestLocale({ req })\n        req.locale = locale?.code\n\n        if (!hasUserOverride && req.user) {\n          try {\n            const collectionSlug = req.user.collection ?? payload.config.admin.user\n            const collection = payload.collections[collectionSlug]\n\n            if (!collection?.config.auth) {\n              throw new Error('Authenticated user collection not found')\n            }\n\n            userWithReadAccess = await applyUserReadAccess({\n              collection: collection.config,\n              depth: collection.config.auth.depth,\n              overrideAccess: false,\n              req,\n              showHiddenFields: false,\n              user: req.user,\n            })\n          } catch (error) {\n            payload.logger.error({ err: error })\n            req.user = null\n            userWithReadAccess = null\n          }\n        }\n\n        const permissions = await getAccessResults({\n          req,\n        })\n\n        return {\n          cookies,\n          headers,\n          languageCode,\n          locale,\n          permissions,\n          req,\n          user: userWithReadAccess,\n        }\n      },\n      key,\n      overrides,\n    )\n    .then((result) => {\n      // CRITICAL: Create a shallow copy of req before returning to prevent\n      // mutations from propagating to the cached req object.\n      // This ensures parallel operations using the same cache key don't affect each other.\n      return {\n        ...result,\n        req: {\n          ...result.req,\n          ...(result.req?.context\n            ? {\n                context: { ...result.req.context },\n              }\n            : {}),\n        },\n      }\n    })\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/utilities/initReq.spec.js

@@ -0,0 +1,240 @@
+import { getAccessResults } from 'payload';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+const mocks = vi.hoisted(() => ({
+  applyUserReadAccess: vi.fn(async ({
+    req,
+    user
+  }) => {
+    mocks.readAccessCalls += 1;
+    if (!mocks.readAccessSucceeds) {
+      throw new Error('User read access failed');
+    }
+    const userWithReadAccess = {
+      ...user,
+      requestLocale: req.locale
+    };
+    delete userWithReadAccess.authorizationRole;
+    return userWithReadAccess;
+  }),
+  authenticationSucceeds: true,
+  cacheStores: new Map(),
+  executeAuthStrategies: vi.fn(async () => ({
+    responseHeaders: new Headers({
+      'x-auth': 'authenticated'
+    }),
+    user: mocks.authenticationSucceeds ? {
+      authorizationRole: 'admin',
+      collection: 'users',
+      id: 'user-id'
+    } : null
+  })),
+  readAccessCalls: 0,
+  readAccessSucceeds: true
+}));
+vi.mock('@payloadcms/translations', () => ({
+  initI18n: vi.fn(async () => ({
+    dateFNSKey: 'en-US',
+    fallbackLanguage: 'en',
+    language: 'en',
+    t: key => key,
+    translations: {}
+  }))
+}));
+vi.mock('next/headers.js', () => ({
+  headers: vi.fn(async () => new Headers())
+}));
+vi.mock('payload', async importOriginal => {
+  const payloadModule = await importOriginal();
+  return {
+    ...payloadModule,
+    createLocalReq: vi.fn(async (options, payload) => {
+      const request = options.req ?? {};
+      const url = new URL(options.urlSuffix ?? '/', 'http://localhost');
+      const user = options.user ?? request.user ?? null;
+      return {
+        ...request,
+        context: options.context ?? request.context ?? {},
+        fallbackLocale: options.fallbackLocale,
+        headers: request.headers ?? new Headers(),
+        locale: options.locale ?? request.locale ?? request.query?.locale ?? 'en',
+        pathname: request.pathname ?? url.pathname,
+        payload,
+        query: request.query ?? {},
+        responseHeaders: request.responseHeaders ?? new Headers(),
+        url: request.url ?? url.href,
+        user: user && !user.collection ? {
+          ...user,
+          collection: payload.config.admin.user
+        } : user
+      };
+    }),
+    executeAuthStrategies: mocks.executeAuthStrategies,
+    getAccessResults: vi.fn(async ({
+      req
+    }) => ({
+      canAccessAdmin: req.user?.authorizationRole === 'admin'
+    })),
+    getPayload: vi.fn(async () => ({
+      collections: {
+        users: {
+          config: {
+            auth: {
+              depth: 0
+            },
+            slug: 'users'
+          }
+        }
+      },
+      config: {
+        admin: {
+          user: 'users'
+        },
+        i18n: {
+          fallbackLanguage: 'en',
+          supportedLanguages: {
+            en: {}
+          },
+          translations: {}
+        }
+      },
+      logger: {
+        error: vi.fn()
+      }
+    })),
+    getRequestLanguage: vi.fn(() => 'en')
+  };
+});
+vi.mock('payload/internal', () => ({
+  applyUserReadAccess: mocks.applyUserReadAccess
+}));
+vi.mock('./getRequestLocale.js', () => ({
+  getRequestLocale: vi.fn(async ({
+    req
+  }) => ({
+    code: req.locale ?? 'en'
+  }))
+}));
+vi.mock('./selectiveCache.js', () => ({
+  selectiveCache: namespace => ({
+    get: async (factory, ...args) => {
+      let cacheEntry = mocks.cacheStores.get(namespace);
+      if (!cacheEntry) {
+        cacheEntry = {
+          children: new Map()
+        };
+        mocks.cacheStores.set(namespace, cacheEntry);
+      }
+      for (const arg of args) {
+        let child = cacheEntry.children.get(arg);
+        if (!child) {
+          child = {
+            children: new Map()
+          };
+          cacheEntry.children.set(arg, child);
+        }
+        cacheEntry = child;
+      }
+      if (!('value' in cacheEntry)) {
+        cacheEntry.value = await factory();
+      }
+      return cacheEntry.value;
+    }
+  })
+}));
+import { initReq } from './initReq.js';
+describe('initReq', () => {
+  beforeEach(() => {
+    mocks.authenticationSucceeds = true;
+    mocks.applyUserReadAccess.mockClear();
+    mocks.cacheStores.clear();
+    mocks.executeAuthStrategies.mockClear();
+    mocks.readAccessCalls = 0;
+    mocks.readAccessSucceeds = true;
+  });
+  it('should authenticate once and apply user read access for each request shape', async () => {
+    const first = await initReq({
+      configPromise: {},
+      importMap: {},
+      key: 'shared-request',
+      overrides: {
+        locale: 'en'
+      }
+    });
+    const second = await initReq({
+      configPromise: {},
+      importMap: {},
+      key: 'shared-request',
+      overrides: {
+        locale: 'fr'
+      }
+    });
+    expect(mocks.executeAuthStrategies).toHaveBeenCalledOnce();
+    expect(mocks.readAccessCalls).toBe(2);
+    expect(first.user).toMatchObject({
+      requestLocale: 'en'
+    });
+    expect(second.user).toMatchObject({
+      requestLocale: 'fr'
+    });
+    expect(first.req.user).toHaveProperty('authorizationRole', 'admin');
+    expect(second.req.user).toHaveProperty('authorizationRole', 'admin');
+  });
+  it('should preserve complete fields for subsequent access checks', async () => {
+    const result = await initReq({
+      configPromise: {},
+      importMap: {},
+      key: 'subsequent-access'
+    });
+    const subsequentPermissions = await getAccessResults({
+      req: result.req
+    });
+    expect(result.req.user).toHaveProperty('authorizationRole', 'admin');
+    expect(result.user).not.toHaveProperty('authorizationRole');
+    expect(subsequentPermissions.canAccessAdmin).toBe(true);
+  });
+  it('should clear authentication when client user processing fails', async () => {
+    mocks.readAccessSucceeds = false;
+    const result = await initReq({
+      configPromise: {},
+      importMap: {},
+      key: 'failed-user-read'
+    });
+    expect(result.user).toBeNull();
+    expect(result.req.user).toBeNull();
+    expect(result.permissions.canAccessAdmin).toBe(false);
+  });
+  it('should preserve an explicit user override without applying read access', async () => {
+    const user = {
+      authorizationRole: 'admin',
+      collection: 'users',
+      id: 'override-user'
+    };
+    const result = await initReq({
+      configPromise: {},
+      importMap: {},
+      key: 'user-override',
+      overrides: {
+        user
+      }
+    });
+    expect(mocks.applyUserReadAccess).not.toHaveBeenCalled();
+    expect(result.user).toBe(user);
+    expect(result.req.user).toBe(user);
+    expect(result.permissions.canAccessAdmin).toBe(true);
+  });
+  it('should preserve an explicit top-level null user override', async () => {
+    const result = await initReq({
+      configPromise: {},
+      importMap: {},
+      key: 'top-level-null-user-override',
+      overrides: {
+        user: null
+      }
+    });
+    expect(mocks.applyUserReadAccess).not.toHaveBeenCalled();
+    expect(result.user).toBeNull();
+    expect(result.req.user).toBeNull();
+    expect(result.permissions.canAccessAdmin).toBe(false);
+  });
+});
+//# sourceMappingURL=initReq.spec.js.map

package/dist/utilities/initReq.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"initReq.spec.js","names":["getAccessResults","beforeEach","describe","expect","it","vi","mocks","hoisted","applyUserReadAccess","fn","req","user","readAccessCalls","readAccessSucceeds","Error","userWithReadAccess","requestLocale","locale","authorizationRole","authenticationSucceeds","cacheStores","Map","executeAuthStrategies","responseHeaders","Headers","collection","id","mock","initI18n","dateFNSKey","fallbackLanguage","language","t","key","translations","headers","importOriginal","payloadModule","createLocalReq","options","payload","request","url","URL","urlSuffix","context","fallbackLocale","query","pathname","href","config","admin","canAccessAdmin","getPayload","collections","users","auth","depth","slug","i18n","supportedLanguages","en","logger","error","getRequestLanguage","getRequestLocale","code","selectiveCache","namespace","get","factory","args","cacheEntry","children","set","arg","child","value","initReq","mockClear","clear","first","configPromise","importMap","overrides","second","toHaveBeenCalledOnce","toBe","toMatchObject","toHaveProperty","result","subsequentPermissions","not","toBeNull","permissions","toHaveBeenCalled"],"sources":["../../src/utilities/initReq.spec.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { getAccessResults } from 'payload'\nimport { beforeEach, describe, expect, it, vi } from 'vitest'\n\ntype CacheEntry = {\n  children: Map<unknown, CacheEntry>\n  value?: object\n}\n\nconst mocks = vi.hoisted(() => ({\n  applyUserReadAccess: vi.fn(\n    async ({ req, user }: { req: PayloadRequest; user: NonNullable<PayloadRequest['user']> }) => {\n      mocks.readAccessCalls += 1\n\n      if (!mocks.readAccessSucceeds) {\n        throw new Error('User read access failed')\n      }\n\n      const userWithReadAccess = {\n        ...user,\n        requestLocale: req.locale,\n      }\n\n      delete userWithReadAccess.authorizationRole\n\n      return userWithReadAccess\n    },\n  ),\n  authenticationSucceeds: true,\n  cacheStores: new Map<string, CacheEntry>(),\n  executeAuthStrategies: vi.fn(async () => ({\n    responseHeaders: new Headers({ 'x-auth': 'authenticated' }),\n    user: mocks.authenticationSucceeds\n      ? {\n          authorizationRole: 'admin',\n          collection: 'users',\n          id: 'user-id',\n        }\n      : null,\n  })),\n  readAccessCalls: 0,\n  readAccessSucceeds: true,\n}))\n\nvi.mock('@payloadcms/translations', () => ({\n  initI18n: vi.fn(async () => ({\n    dateFNSKey: 'en-US',\n    fallbackLanguage: 'en',\n    language: 'en',\n    t: (key: string) => key,\n    translations: {},\n  })),\n}))\n\nvi.mock('next/headers.js', () => ({\n  headers: vi.fn(async () => new Headers()),\n}))\n\nvi.mock('payload', async (importOriginal) => {\n  const payloadModule = await importOriginal<typeof import('payload')>()\n\n  return {\n    ...payloadModule,\n    createLocalReq: vi.fn(async (options, payload) => {\n      const request = options.req ?? {}\n      const url = new URL(options.urlSuffix ?? '/', 'http://localhost')\n      const user = options.user ?? request.user ?? null\n\n      return {\n        ...request,\n        context: options.context ?? request.context ?? {},\n        fallbackLocale: options.fallbackLocale,\n        headers: request.headers ?? new Headers(),\n        locale: options.locale ?? request.locale ?? request.query?.locale ?? 'en',\n        pathname: request.pathname ?? url.pathname,\n        payload,\n        query: request.query ?? {},\n        responseHeaders: request.responseHeaders ?? new Headers(),\n        url: request.url ?? url.href,\n        user: user && !user.collection ? { ...user, collection: payload.config.admin.user } : user,\n      }\n    }),\n    executeAuthStrategies: mocks.executeAuthStrategies,\n    getAccessResults: vi.fn(async ({ req }: { req: PayloadRequest }) => ({\n      canAccessAdmin: req.user?.authorizationRole === 'admin',\n    })),\n    getPayload: vi.fn(async () => ({\n      collections: {\n        users: {\n          config: {\n            auth: { depth: 0 },\n            slug: 'users',\n          },\n        },\n      },\n      config: {\n        admin: { user: 'users' },\n        i18n: {\n          fallbackLanguage: 'en',\n          supportedLanguages: { en: {} },\n          translations: {},\n        },\n      },\n      logger: { error: vi.fn() },\n    })),\n    getRequestLanguage: vi.fn(() => 'en'),\n  }\n})\n\nvi.mock('payload/internal', () => ({\n  applyUserReadAccess: mocks.applyUserReadAccess,\n}))\n\nvi.mock('./getRequestLocale.js', () => ({\n  getRequestLocale: vi.fn(async ({ req }: { req: PayloadRequest }) => ({\n    code: req.locale ?? 'en',\n  })),\n}))\n\nvi.mock('./selectiveCache.js', () => ({\n  selectiveCache: (namespace: string) => ({\n    get: async (factory: () => Promise<object>, ...args: unknown[]) => {\n      let cacheEntry = mocks.cacheStores.get(namespace)\n\n      if (!cacheEntry) {\n        cacheEntry = { children: new Map() }\n        mocks.cacheStores.set(namespace, cacheEntry)\n      }\n\n      for (const arg of args) {\n        let child = cacheEntry.children.get(arg)\n\n        if (!child) {\n          child = { children: new Map() }\n          cacheEntry.children.set(arg, child)\n        }\n\n        cacheEntry = child\n      }\n\n      if (!('value' in cacheEntry)) {\n        cacheEntry.value = await factory()\n      }\n\n      return cacheEntry.value\n    },\n  }),\n}))\n\nimport { initReq } from './initReq.js'\n\ndescribe('initReq', () => {\n  beforeEach(() => {\n    mocks.authenticationSucceeds = true\n    mocks.applyUserReadAccess.mockClear()\n    mocks.cacheStores.clear()\n    mocks.executeAuthStrategies.mockClear()\n    mocks.readAccessCalls = 0\n    mocks.readAccessSucceeds = true\n  })\n\n  it('should authenticate once and apply user read access for each request shape', async () => {\n    const first = await initReq({\n      configPromise: {} as never,\n      importMap: {},\n      key: 'shared-request',\n      overrides: { locale: 'en' },\n    })\n    const second = await initReq({\n      configPromise: {} as never,\n      importMap: {},\n      key: 'shared-request',\n      overrides: { locale: 'fr' },\n    })\n\n    expect(mocks.executeAuthStrategies).toHaveBeenCalledOnce()\n    expect(mocks.readAccessCalls).toBe(2)\n    expect(first.user).toMatchObject({ requestLocale: 'en' })\n    expect(second.user).toMatchObject({ requestLocale: 'fr' })\n    expect(first.req.user).toHaveProperty('authorizationRole', 'admin')\n    expect(second.req.user).toHaveProperty('authorizationRole', 'admin')\n  })\n\n  it('should preserve complete fields for subsequent access checks', async () => {\n    const result = await initReq({\n      configPromise: {} as never,\n      importMap: {},\n      key: 'subsequent-access',\n    })\n\n    const subsequentPermissions = await getAccessResults({ req: result.req })\n\n    expect(result.req.user).toHaveProperty('authorizationRole', 'admin')\n    expect(result.user).not.toHaveProperty('authorizationRole')\n    expect(subsequentPermissions.canAccessAdmin).toBe(true)\n  })\n\n  it('should clear authentication when client user processing fails', async () => {\n    mocks.readAccessSucceeds = false\n\n    const result = await initReq({\n      configPromise: {} as never,\n      importMap: {},\n      key: 'failed-user-read',\n    })\n\n    expect(result.user).toBeNull()\n    expect(result.req.user).toBeNull()\n    expect(result.permissions.canAccessAdmin).toBe(false)\n  })\n\n  it('should preserve an explicit user override without applying read access', async () => {\n    const user = { authorizationRole: 'admin', collection: 'users', id: 'override-user' }\n\n    const result = await initReq({\n      configPromise: {} as never,\n      importMap: {},\n      key: 'user-override',\n      overrides: { user },\n    })\n\n    expect(mocks.applyUserReadAccess).not.toHaveBeenCalled()\n    expect(result.user).toBe(user)\n    expect(result.req.user).toBe(user)\n    expect(result.permissions.canAccessAdmin).toBe(true)\n  })\n\n  it('should preserve an explicit top-level null user override', async () => {\n    const result = await initReq({\n      configPromise: {} as never,\n      importMap: {},\n      key: 'top-level-null-user-override',\n      overrides: { user: null },\n    })\n\n    expect(mocks.applyUserReadAccess).not.toHaveBeenCalled()\n    expect(result.user).toBeNull()\n    expect(result.req.user).toBeNull()\n    expect(result.permissions.canAccessAdmin).toBe(false)\n  })\n})\n"],"mappings":"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","ignoreList":[]}

package/dist/utilities/isPublicAdminRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isPublicAdminRoute.d.ts","sourceRoot":"","sources":["../../src/utilities/isPublicAdminRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAmB9C,eAAO,MAAM,kBAAkB,mCAI5B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAeH,CAAA"}
+{"version":3,"file":"isPublicAdminRoute.d.ts","sourceRoot":"","sources":["../../src/utilities/isPublicAdminRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAmB9C,eAAO,MAAM,kBAAkB,mCAI5B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAuBH,CAAA"}

package/dist/utilities/isPublicAdminRoute.js

@@ -1,25 +1,27 @@
 import { getRouteWithoutAdmin } from './getRouteWithoutAdmin.js';
-// Routes that require admin authentication
+// Routes that are accessible without admin authentication
 const publicAdminRoutes = ['createFirstUser', 'forgot', 'login', 'logout', 'forgot', 'inactivity', 'unauthorized', 'reset'];
 export const isPublicAdminRoute = ({
   adminRoute,
   config,
   route
 }) => {
-  const isPublicAdminRoute = publicAdminRoutes.some(routeSegment => {
+  const routeWithoutAdmin = getRouteWithoutAdmin({
+    adminRoute,
+    route
+  });
+  const routeSegments = routeWithoutAdmin.split('/').filter(Boolean);
+  const isVerifyRoute = routeSegments.length === 3 && routeSegments[1] === 'verify' && config.collections.some(collection => collection.slug === routeSegments[0] && Boolean(collection.auth));
+  if (isVerifyRoute) {
+    return true;
+  }
+  return publicAdminRoutes.some(routeSegment => {
     const segment = config.admin?.routes?.[routeSegment] || routeSegment;
-    const routeWithoutAdmin = getRouteWithoutAdmin({
-      adminRoute,
-      route
-    });
     if (routeWithoutAdmin.startsWith(segment)) {
       return true;
-    } else if (routeWithoutAdmin.includes('/verify/')) {
-      return true;
     } else {
       return false;
     }
   });
-  return isPublicAdminRoute;
 };
 //# sourceMappingURL=isPublicAdminRoute.js.map

package/dist/utilities/isPublicAdminRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"isPublicAdminRoute.js","names":["getRouteWithoutAdmin","publicAdminRoutes","isPublicAdminRoute","adminRoute","config","route","some","routeSegment","segment","admin","routes","routeWithoutAdmin","startsWith","includes"],"sources":["../../src/utilities/isPublicAdminRoute.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\nimport { getRouteWithoutAdmin } from './getRouteWithoutAdmin.js'\n\n// Routes that require admin authentication\nconst publicAdminRoutes: (keyof Pick<\n  SanitizedConfig['admin']['routes'],\n  'createFirstUser' | 'forgot' | 'inactivity' | 'login' | 'logout' | 'reset' | 'unauthorized'\n>)[] = [\n  'createFirstUser',\n  'forgot',\n  'login',\n  'logout',\n  'forgot',\n  'inactivity',\n  'unauthorized',\n  'reset',\n]\n\nexport const isPublicAdminRoute = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  const isPublicAdminRoute = publicAdminRoutes.some((routeSegment) => {\n    const segment = config.admin?.routes?.[routeSegment] || routeSegment\n    const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\n\n    if (routeWithoutAdmin.startsWith(segment)) {\n      return true\n    } else if (routeWithoutAdmin.includes('/verify/')) {\n      return true\n    } else {\n      return false\n    }\n  })\n\n  return isPublicAdminRoute\n}\n"],"mappings":"AAEA,SAASA,oBAAoB,QAAQ;AAErC;AACA,MAAMC,iBAAA,GAGC,CACL,mBACA,UACA,SACA,UACA,UACA,cACA,gBACA,QACD;AAED,OAAO,MAAMC,kBAAA,GAAqBA,CAAC;EACjCC,UAAU;EACVC,MAAM;EACNC;AAAK,CAKN;EACC,MAAMH,kBAAA,GAAqBD,iBAAA,CAAkBK,IAAI,CAAEC,YAAA;IACjD,MAAMC,OAAA,GAAUJ,MAAA,CAAOK,KAAK,EAAEC,MAAA,GAASH,YAAA,CAAa,IAAIA,YAAA;IACxD,MAAMI,iBAAA,GAAoBX,oBAAA,CAAqB;MAAEG,UAAA;MAAYE;IAAM;IAEnE,IAAIM,iBAAA,CAAkBC,UAAU,CAACJ,OAAA,GAAU;MACzC,OAAO;IACT,OAAO,IAAIG,iBAAA,CAAkBE,QAAQ,CAAC,aAAa;MACjD,OAAO;IACT,OAAO;MACL,OAAO;IACT;EACF;EAEA,OAAOX,kBAAA;AACT","ignoreList":[]}
+{"version":3,"file":"isPublicAdminRoute.js","names":["getRouteWithoutAdmin","publicAdminRoutes","isPublicAdminRoute","adminRoute","config","route","routeWithoutAdmin","routeSegments","split","filter","Boolean","isVerifyRoute","length","collections","some","collection","slug","auth","routeSegment","segment","admin","routes","startsWith"],"sources":["../../src/utilities/isPublicAdminRoute.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\nimport { getRouteWithoutAdmin } from './getRouteWithoutAdmin.js'\n\n// Routes that are accessible without admin authentication\nconst publicAdminRoutes: (keyof Pick<\n  SanitizedConfig['admin']['routes'],\n  'createFirstUser' | 'forgot' | 'inactivity' | 'login' | 'logout' | 'reset' | 'unauthorized'\n>)[] = [\n  'createFirstUser',\n  'forgot',\n  'login',\n  'logout',\n  'forgot',\n  'inactivity',\n  'unauthorized',\n  'reset',\n]\n\nexport const isPublicAdminRoute = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\n  const routeSegments = routeWithoutAdmin.split('/').filter(Boolean)\n  const isVerifyRoute =\n    routeSegments.length === 3 &&\n    routeSegments[1] === 'verify' &&\n    config.collections.some(\n      (collection) => collection.slug === routeSegments[0] && Boolean(collection.auth),\n    )\n\n  if (isVerifyRoute) {\n    return true\n  }\n\n  return publicAdminRoutes.some((routeSegment) => {\n    const segment = config.admin?.routes?.[routeSegment] || routeSegment\n\n    if (routeWithoutAdmin.startsWith(segment)) {\n      return true\n    } else {\n      return false\n    }\n  })\n}\n"],"mappings":"AAEA,SAASA,oBAAoB,QAAQ;AAErC;AACA,MAAMC,iBAAA,GAGC,CACL,mBACA,UACA,SACA,UACA,UACA,cACA,gBACA,QACD;AAED,OAAO,MAAMC,kBAAA,GAAqBA,CAAC;EACjCC,UAAU;EACVC,MAAM;EACNC;AAAK,CAKN;EACC,MAAMC,iBAAA,GAAoBN,oBAAA,CAAqB;IAAEG,UAAA;IAAYE;EAAM;EACnE,MAAME,aAAA,GAAgBD,iBAAA,CAAkBE,KAAK,CAAC,KAAKC,MAAM,CAACC,OAAA;EAC1D,MAAMC,aAAA,GACJJ,aAAA,CAAcK,MAAM,KAAK,KACzBL,aAAa,CAAC,EAAE,KAAK,YACrBH,MAAA,CAAOS,WAAW,CAACC,IAAI,CACpBC,UAAA,IAAeA,UAAA,CAAWC,IAAI,KAAKT,aAAa,CAAC,EAAE,IAAIG,OAAA,CAAQK,UAAA,CAAWE,IAAI;EAGnF,IAAIN,aAAA,EAAe;IACjB,OAAO;EACT;EAEA,OAAOV,iBAAA,CAAkBa,IAAI,CAAEI,YAAA;IAC7B,MAAMC,OAAA,GAAUf,MAAA,CAAOgB,KAAK,EAAEC,MAAA,GAASH,YAAA,CAAa,IAAIA,YAAA;IAExD,IAAIZ,iBAAA,CAAkBgB,UAAU,CAACH,OAAA,GAAU;MACzC,OAAO;IACT,OAAO;MACL,OAAO;IACT;EACF;AACF","ignoreList":[]}

package/dist/utilities/isPublicAdminRoute.spec.js

@@ -0,0 +1,34 @@
+import { describe, expect, it } from 'vitest';
+import { isPublicAdminRoute } from './isPublicAdminRoute.js';
+describe('isPublicAdminRoute', () => {
+  const config = {
+    collections: [{
+      auth: true,
+      slug: 'users'
+    }, {
+      slug: 'pages'
+    }]
+  };
+  it('should allow collection verification routes', () => {
+    expect(isPublicAdminRoute({
+      adminRoute: '/admin',
+      config,
+      route: '/admin/users/verify/token'
+    })).toBe(true);
+  });
+  it('should not allow verification routes for collections without auth', () => {
+    expect(isPublicAdminRoute({
+      adminRoute: '/admin',
+      config,
+      route: '/admin/pages/verify/token'
+    })).toBe(false);
+  });
+  it('should not allow unrelated routes containing the verification segment', () => {
+    expect(isPublicAdminRoute({
+      adminRoute: '/admin',
+      config,
+      route: '/admin/custom/verify/dashboard'
+    })).toBe(false);
+  });
+});
+//# sourceMappingURL=isPublicAdminRoute.spec.js.map

package/dist/utilities/isPublicAdminRoute.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isPublicAdminRoute.spec.js","names":["describe","expect","it","isPublicAdminRoute","config","collections","auth","slug","adminRoute","route","toBe"],"sources":["../../src/utilities/isPublicAdminRoute.spec.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\nimport { describe, expect, it } from 'vitest'\n\nimport { isPublicAdminRoute } from './isPublicAdminRoute.js'\n\ndescribe('isPublicAdminRoute', () => {\n  const config = {\n    collections: [{ auth: true, slug: 'users' }, { slug: 'pages' }],\n  } as unknown as SanitizedConfig\n\n  it('should allow collection verification routes', () => {\n    expect(\n      isPublicAdminRoute({\n        adminRoute: '/admin',\n        config,\n        route: '/admin/users/verify/token',\n      }),\n    ).toBe(true)\n  })\n\n  it('should not allow verification routes for collections without auth', () => {\n    expect(\n      isPublicAdminRoute({\n        adminRoute: '/admin',\n        config,\n        route: '/admin/pages/verify/token',\n      }),\n    ).toBe(false)\n  })\n\n  it('should not allow unrelated routes containing the verification segment', () => {\n    expect(\n      isPublicAdminRoute({\n        adminRoute: '/admin',\n        config,\n        route: '/admin/custom/verify/dashboard',\n      }),\n    ).toBe(false)\n  })\n})\n"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ;AAErC,SAASC,kBAAkB,QAAQ;AAEnCH,QAAA,CAAS,sBAAsB;EAC7B,MAAMI,MAAA,GAAS;IACbC,WAAA,EAAa,CAAC;MAAEC,IAAA,EAAM;MAAMC,IAAA,EAAM;IAAQ,GAAG;MAAEA,IAAA,EAAM;IAAQ;EAC/D;EAEAL,EAAA,CAAG,+CAA+C;IAChDD,MAAA,CACEE,kBAAA,CAAmB;MACjBK,UAAA,EAAY;MACZJ,MAAA;MACAK,KAAA,EAAO;IACT,IACAC,IAAI,CAAC;EACT;EAEAR,EAAA,CAAG,qEAAqE;IACtED,MAAA,CACEE,kBAAA,CAAmB;MACjBK,UAAA,EAAY;MACZJ,MAAA;MACAK,KAAA,EAAO;IACT,IACAC,IAAI,CAAC;EACT;EAEAR,EAAA,CAAG,yEAAyE;IAC1ED,MAAA,CACEE,kBAAA,CAAmB;MACjBK,UAAA,EAAY;MACZJ,MAAA;MACAK,KAAA,EAAO;IACT,IACAC,IAAI,CAAC;EACT;AACF","ignoreList":[]}

package/dist/views/Account/index.d.ts

@@ -1,4 +1,4 @@
 import type { AdminViewServerProps } from 'payload';
 import React from 'react';
-export declare function AccountView({ initPageResult, params, searchParams }: AdminViewServerProps): Promise<React.JSX.Element>;
+export declare function AccountView({ initPageResult, params, searchParams, user: userWithReadAccess, }: AdminViewServerProps): Promise<React.JSX.Element>;
 //# sourceMappingURL=index.d.ts.map

package/dist/views/Account/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Account/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAA+B,MAAM,SAAS,CAAA;AAOhF,OAAO,KAAK,MAAM,OAAO,CAAA;AAYzB,wBAAsB,WAAW,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,oBAAoB,8BAgK/F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Account/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAA+B,MAAM,SAAS,CAAA;AAOhF,OAAO,KAAK,MAAM,OAAO,CAAA;AAYzB,wBAAsB,WAAW,CAAC,EAChC,cAAc,EACd,MAAM,EACN,YAAY,EACZ,IAAI,EAAE,kBAAkB,GACzB,EAAE,oBAAoB,8BAkKtB"}

package/dist/views/Account/index.js

@@ -17,7 +17,8 @@ import { Settings } from './Settings/index.js';
 export async function AccountView({
   initPageResult,
   params,
-  searchParams
+  searchParams,
+  user: userWithReadAccess
 }) {
   const {
     languageOptions,
@@ -91,7 +92,8 @@ export async function AccountView({
       renderAllFields: true,
       req,
       schemaPath: collectionConfig.slug,
-      skipValidation: true
+      skipValidation: true,
+      user: userWithReadAccess
     });
     // Fetch document lock state
     const {
@@ -125,11 +127,11 @@ export async function AccountView({
         languageOptions: languageOptions,
         payload: payload,
         theme: theme,
-        user: user
+        user: userWithReadAccess
       }),
       apiURL: formatAdminURL({
         apiRoute: api,
-        path: `/${userSlug}${user?.id ? `/${user.id}` : ''}`
+        path: `/${userSlug}/${user.id}`
       }),
       collectionSlug: userSlug,
       currentEditor: currentEditor,
@@ -139,7 +141,7 @@ export async function AccountView({
       hasPublishPermission: hasPublishPermission,
       hasSavePermission: hasSavePermission,
       hasTrashPermission: hasTrashPermission,
-      id: user?.id,
+      id: user.id,
       initialData: data,
       initialState: formState,
       isEditing: true,
@@ -153,7 +155,8 @@ export async function AccountView({
           collectionConfig: collectionConfig,
           hideTabs: true,
           permissions: permissions,
-          req: req
+          req: req,
+          user: userWithReadAccess
         }), /*#__PURE__*/_jsx(HydrateAuthProvider, {
           permissions: permissions
         }), RenderServerComponent({
@@ -171,7 +174,7 @@ export async function AccountView({
             permissions,
             routeSegments: [],
             searchParams,
-            user
+            user: userWithReadAccess
           }
         }), /*#__PURE__*/_jsx(AccountClient, {})]
       })