@payloadcms/next 3.0.0-canary.a7293f6 → 3.0.0-canary.ab70b75

package/dist/templates/Minimal/index.scss

@@ -1,28 +1,30 @@
 @import '../../scss/styles';
 
-.template-minimal {
-  display: flex;
-  width: 100%;
-  justify-content: center;
-  align-items: center;
-  padding: base(3) $baseline;
-  margin-left: auto;
-  margin-right: auto;
-  min-height: 100%;
-  background-color: var(--theme-bg-color);
-  color: var(--theme-text);
+@layer payload-default {
+  .template-minimal {
+    display: flex;
+    width: 100%;
+    justify-content: center;
+    align-items: center;
+    padding: base(3) $baseline;
+    margin-left: auto;
+    margin-right: auto;
+    min-height: 100%;
+    background-color: var(--theme-bg-color);
+    color: var(--theme-text);
 
-  &--width-normal {
-    .template-minimal__wrap {
-      max-width: base(24);
-      width: 100%;
+    &--width-normal {
+      .template-minimal__wrap {
+        max-width: base(24);
+        width: 100%;
+      }
     }
-  }
 
-  &--width-wide {
-    .template-minimal__wrap {
-      max-width: base(48);
-      width: 100%;
+    &--width-wide {
+      .template-minimal__wrap {
+        max-width: base(48);
+        width: 100%;
+      }
     }
   }
 }

package/dist/utilities/initPage/handleAdminPage.d.ts

@@ -1,16 +1,17 @@
-import type { Permissions, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
-export declare const handleAdminPage: ({ adminRoute, config, permissions, route, }: {
+import type { Payload, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
+type Args = {
     adminRoute: string;
     config: SanitizedConfig;
-    permissions: Permissions;
+    defaultIDType: Payload['db']['defaultIDType'];
     route: string;
-}) => {
-    collectionConfig: SanitizedCollectionConfig;
-    docID: string;
-    globalConfig: SanitizedGlobalConfig;
-} | {
-    collectionConfig?: undefined;
-    docID?: undefined;
-    globalConfig?: undefined;
 };
+type RouteInfo = {
+    collectionConfig?: SanitizedCollectionConfig;
+    collectionSlug?: string;
+    docID?: number | string;
+    globalConfig?: SanitizedGlobalConfig;
+    globalSlug?: string;
+};
+export declare function getRouteInfo({ adminRoute, config, defaultIDType, route }: Args): RouteInfo;
+export {};
 //# sourceMappingURL=handleAdminPage.d.ts.map

package/dist/utilities/initPage/handleAdminPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleAdminPage.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,yBAAyB,EACzB,eAAe,EACf,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAMhB,eAAO,MAAM,eAAe,gDAKzB;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,WAAW,EAAE,WAAW,CAAA;IACxB,KAAK,EAAE,MAAM,CAAA;CACd;;;;;;;;CAwCA,CAAA"}
+{"version":3,"file":"handleAdminPage.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,yBAAyB,EACzB,eAAe,EACf,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAIhB,KAAK,IAAI,GAAG;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAA;IAC7C,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,KAAK,SAAS,GAAG;IACf,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAgB,YAAY,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,IAAI,GAAG,SAAS,CAoC1F"}

package/dist/utilities/initPage/handleAdminPage.js

@@ -1,11 +1,10 @@
-import { notFound } from 'next/navigation.js';
-import { getRouteWithoutAdmin, isAdminAuthRoute, isAdminRoute } from './shared.js';
-export const handleAdminPage = ({
+import { getRouteWithoutAdmin, isAdminRoute } from './shared.js';
+export function getRouteInfo({
   adminRoute,
   config,
-  permissions,
+  defaultIDType,
   route
-}) => {
+}) {
   if (isAdminRoute({
     adminRoute,
     config,
@@ -19,34 +18,23 @@ export const handleAdminPage = ({
     const [entityType, entitySlug, createOrID] = routeSegments;
     const collectionSlug = entityType === 'collections' ? entitySlug : undefined;
     const globalSlug = entityType === 'globals' ? entitySlug : undefined;
-    const docID = collectionSlug && createOrID !== 'create' ? createOrID : undefined;
+    const docID = collectionSlug && createOrID !== 'create' ? defaultIDType === 'number' ? Number(createOrID) : createOrID : undefined;
     let collectionConfig;
     let globalConfig;
     if (collectionSlug) {
       collectionConfig = config.collections.find(collection => collection.slug === collectionSlug);
-      if (!collectionConfig) {
-        notFound();
-      }
     }
     if (globalSlug) {
       globalConfig = config.globals.find(global => global.slug === globalSlug);
-      if (!globalConfig) {
-        notFound();
-      }
-    }
-    if (!permissions.canAccessAdmin && !isAdminAuthRoute({
-      adminRoute,
-      config,
-      route
-    })) {
-      notFound();
     }
     return {
       collectionConfig,
+      collectionSlug,
       docID,
-      globalConfig
+      globalConfig,
+      globalSlug
     };
   }
   return {};
-};
+}
 //# sourceMappingURL=handleAdminPage.js.map

package/dist/utilities/initPage/handleAdminPage.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleAdminPage.js","names":["notFound","getRouteWithoutAdmin","isAdminAuthRoute","isAdminRoute","handleAdminPage","adminRoute","config","permissions","route","routeWithoutAdmin","routeSegments","split","filter","Boolean","entityType","entitySlug","createOrID","collectionSlug","undefined","globalSlug","docID","collectionConfig","globalConfig","collections","find","collection","slug","globals","global","canAccessAdmin"],"sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"sourcesContent":["import type {\n  Permissions,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { notFound } from 'next/navigation.js'\n\nimport { getRouteWithoutAdmin, isAdminAuthRoute, isAdminRoute } from './shared.js'\n\nexport const handleAdminPage = ({\n  adminRoute,\n  config,\n  permissions,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  permissions: Permissions\n  route: string\n}) => {\n  if (isAdminRoute({ adminRoute, config, route })) {\n    const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\n    const routeSegments = routeWithoutAdmin.split('/').filter(Boolean)\n    const [entityType, entitySlug, createOrID] = routeSegments\n    const collectionSlug = entityType === 'collections' ? entitySlug : undefined\n    const globalSlug = entityType === 'globals' ? entitySlug : undefined\n    const docID = collectionSlug && createOrID !== 'create' ? createOrID : undefined\n\n    let collectionConfig: SanitizedCollectionConfig | undefined\n    let globalConfig: SanitizedGlobalConfig | undefined\n\n    if (collectionSlug) {\n      collectionConfig = config.collections.find((collection) => collection.slug === collectionSlug)\n\n      if (!collectionConfig) {\n        notFound()\n      }\n    }\n\n    if (globalSlug) {\n      globalConfig = config.globals.find((global) => global.slug === globalSlug)\n\n      if (!globalConfig) {\n        notFound()\n      }\n    }\n\n    if (!permissions.canAccessAdmin && !isAdminAuthRoute({ adminRoute, config, route })) {\n      notFound()\n    }\n\n    return {\n      collectionConfig,\n      docID,\n      globalConfig,\n    }\n  }\n\n  return {}\n}\n"],"mappings":"AAOA,SAASA,QAAQ,QAAQ;AAEzB,SAASC,oBAAoB,EAAEC,gBAAgB,EAAEC,YAAY,QAAQ;AAErE,OAAO,MAAMC,eAAA,GAAkBA,CAAC;EAC9BC,UAAU;EACVC,MAAM;EACNC,WAAW;EACXC;AAAK,CAMN;EACC,IAAIL,YAAA,CAAa;IAAEE,UAAA;IAAYC,MAAA;IAAQE;EAAM,IAAI;IAC/C,MAAMC,iBAAA,GAAoBR,oBAAA,CAAqB;MAAEI,UAAA;MAAYG;IAAM;IACnE,MAAME,aAAA,GAAgBD,iBAAA,CAAkBE,KAAK,CAAC,KAAKC,MAAM,CAACC,OAAA;IAC1D,MAAM,CAACC,UAAA,EAAYC,UAAA,EAAYC,UAAA,CAAW,GAAGN,aAAA;IAC7C,MAAMO,cAAA,GAAiBH,UAAA,KAAe,gBAAgBC,UAAA,GAAaG,SAAA;IACnE,MAAMC,UAAA,GAAaL,UAAA,KAAe,YAAYC,UAAA,GAAaG,SAAA;IAC3D,MAAME,KAAA,GAAQH,cAAA,IAAkBD,UAAA,KAAe,WAAWA,UAAA,GAAaE,SAAA;IAEvE,IAAIG,gBAAA;IACJ,IAAIC,YAAA;IAEJ,IAAIL,cAAA,EAAgB;MAClBI,gBAAA,GAAmBf,MAAA,CAAOiB,WAAW,CAACC,IAAI,CAAEC,UAAA,IAAeA,UAAA,CAAWC,IAAI,KAAKT,cAAA;MAE/E,IAAI,CAACI,gBAAA,EAAkB;QACrBrB,QAAA;MACF;IACF;IAEA,IAAImB,UAAA,EAAY;MACdG,YAAA,GAAehB,MAAA,CAAOqB,OAAO,CAACH,IAAI,CAAEI,MAAA,IAAWA,MAAA,CAAOF,IAAI,KAAKP,UAAA;MAE/D,IAAI,CAACG,YAAA,EAAc;QACjBtB,QAAA;MACF;IACF;IAEA,IAAI,CAACO,WAAA,CAAYsB,cAAc,IAAI,CAAC3B,gBAAA,CAAiB;MAAEG,UAAA;MAAYC,MAAA;MAAQE;IAAM,IAAI;MACnFR,QAAA;IACF;IAEA,OAAO;MACLqB,gBAAA;MACAD,KAAA;MACAE;IACF;EACF;EAEA,OAAO,CAAC;AACV","ignoreList":[]}
+{"version":3,"file":"handleAdminPage.js","names":["getRouteWithoutAdmin","isAdminRoute","getRouteInfo","adminRoute","config","defaultIDType","route","routeWithoutAdmin","routeSegments","split","filter","Boolean","entityType","entitySlug","createOrID","collectionSlug","undefined","globalSlug","docID","Number","collectionConfig","globalConfig","collections","find","collection","slug","globals","global"],"sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"sourcesContent":["import type {\n  Payload,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { getRouteWithoutAdmin, isAdminRoute } from './shared.js'\n\ntype Args = {\n  adminRoute: string\n  config: SanitizedConfig\n  defaultIDType: Payload['db']['defaultIDType']\n  route: string\n}\n\ntype RouteInfo = {\n  collectionConfig?: SanitizedCollectionConfig\n  collectionSlug?: string\n  docID?: number | string\n  globalConfig?: SanitizedGlobalConfig\n  globalSlug?: string\n}\n\nexport function getRouteInfo({ adminRoute, config, defaultIDType, route }: Args): RouteInfo {\n  if (isAdminRoute({ adminRoute, config, route })) {\n    const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\n    const routeSegments = routeWithoutAdmin.split('/').filter(Boolean)\n    const [entityType, entitySlug, createOrID] = routeSegments\n    const collectionSlug = entityType === 'collections' ? entitySlug : undefined\n    const globalSlug = entityType === 'globals' ? entitySlug : undefined\n\n    const docID =\n      collectionSlug && createOrID !== 'create'\n        ? defaultIDType === 'number'\n          ? Number(createOrID)\n          : createOrID\n        : undefined\n\n    let collectionConfig: SanitizedCollectionConfig | undefined\n    let globalConfig: SanitizedGlobalConfig | undefined\n\n    if (collectionSlug) {\n      collectionConfig = config.collections.find((collection) => collection.slug === collectionSlug)\n    }\n\n    if (globalSlug) {\n      globalConfig = config.globals.find((global) => global.slug === globalSlug)\n    }\n\n    return {\n      collectionConfig,\n      collectionSlug,\n      docID,\n      globalConfig,\n      globalSlug,\n    }\n  }\n\n  return {}\n}\n"],"mappings":"AAOA,SAASA,oBAAoB,EAAEC,YAAY,QAAQ;AAiBnD,OAAO,SAASC,aAAa;EAAEC,UAAU;EAAEC,MAAM;EAAEC,aAAa;EAAEC;AAAK,CAAQ;EAC7E,IAAIL,YAAA,CAAa;IAAEE,UAAA;IAAYC,MAAA;IAAQE;EAAM,IAAI;IAC/C,MAAMC,iBAAA,GAAoBP,oBAAA,CAAqB;MAAEG,UAAA;MAAYG;IAAM;IACnE,MAAME,aAAA,GAAgBD,iBAAA,CAAkBE,KAAK,CAAC,KAAKC,MAAM,CAACC,OAAA;IAC1D,MAAM,CAACC,UAAA,EAAYC,UAAA,EAAYC,UAAA,CAAW,GAAGN,aAAA;IAC7C,MAAMO,cAAA,GAAiBH,UAAA,KAAe,gBAAgBC,UAAA,GAAaG,SAAA;IACnE,MAAMC,UAAA,GAAaL,UAAA,KAAe,YAAYC,UAAA,GAAaG,SAAA;IAE3D,MAAME,KAAA,GACJH,cAAA,IAAkBD,UAAA,KAAe,WAC7BT,aAAA,KAAkB,WAChBc,MAAA,CAAOL,UAAA,IACPA,UAAA,GACFE,SAAA;IAEN,IAAII,gBAAA;IACJ,IAAIC,YAAA;IAEJ,IAAIN,cAAA,EAAgB;MAClBK,gBAAA,GAAmBhB,MAAA,CAAOkB,WAAW,CAACC,IAAI,CAAEC,UAAA,IAAeA,UAAA,CAAWC,IAAI,KAAKV,cAAA;IACjF;IAEA,IAAIE,UAAA,EAAY;MACdI,YAAA,GAAejB,MAAA,CAAOsB,OAAO,CAACH,IAAI,CAAEI,MAAA,IAAWA,MAAA,CAAOF,IAAI,KAAKR,UAAA;IACjE;IAEA,OAAO;MACLG,gBAAA;MACAL,cAAA;MACAG,KAAA;MACAG,YAAA;MACAJ;IACF;EACF;EAEA,OAAO,CAAC;AACV","ignoreList":[]}

package/dist/utilities/initPage/handleAuthRedirect.d.ts

@@ -1,9 +1,12 @@
-export declare const handleAuthRedirect: ({ config, redirectUnauthenticatedUser, route, searchParams, }: {
+import type { User } from 'payload';
+type Args = {
     config: any;
-    redirectUnauthenticatedUser: boolean | string;
     route: string;
     searchParams: {
         [key: string]: string | string[];
     };
-}) => void;
+    user?: User;
+};
+export declare const handleAuthRedirect: ({ config, route, searchParams, user }: Args) => string;
+export {};
 //# sourceMappingURL=handleAuthRedirect.d.ts.map

package/dist/utilities/initPage/handleAuthRedirect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleAuthRedirect.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/handleAuthRedirect.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,kBAAkB,kEAK5B;IACD,MAAM,MAAA;IACN,2BAA2B,EAAE,OAAO,GAAG,MAAM,CAAA;IAC7C,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CACnD,SAwCA,CAAA"}
+{"version":3,"file":"handleAuthRedirect.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/handleAuthRedirect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAKnC,KAAK,IAAI,GAAG;IACV,MAAM,MAAA;IACN,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;IAClD,IAAI,CAAC,EAAE,IAAI,CAAA;CACZ,CAAA;AACD,eAAO,MAAM,kBAAkB,0CAA2C,IAAI,KAAG,MAkChF,CAAA"}

package/dist/utilities/initPage/handleAuthRedirect.js

@@ -1,54 +1,41 @@
 import { formatAdminURL } from '@payloadcms/ui/shared';
-import { redirect } from 'next/navigation.js';
 import * as qs from 'qs-esm';
-import { isAdminAuthRoute, isAdminRoute } from './shared.js';
 export const handleAuthRedirect = ({
   config,
-  redirectUnauthenticatedUser,
   route,
-  searchParams
+  searchParams,
+  user
 }) => {
   const {
     admin: {
       routes: {
-        login: loginRouteFromConfig
+        login: loginRouteFromConfig,
+        unauthorized: unauthorizedRoute
       }
     },
     routes: {
       admin: adminRoute
     }
   } = config;
-  if (!isAdminAuthRoute({
-    adminRoute,
-    config,
-    route
-  })) {
-    if (searchParams && 'redirect' in searchParams) {
-      delete searchParams.redirect;
-    }
-    const redirectRoute = encodeURIComponent(route + Object.keys(searchParams ?? {}).length ? `${qs.stringify(searchParams, {
-      addQueryPrefix: true
-    })}` : undefined);
-    const adminLoginRoute = formatAdminURL({
-      adminRoute,
-      path: loginRouteFromConfig
-    });
-    const customLoginRoute = typeof redirectUnauthenticatedUser === 'string' ? redirectUnauthenticatedUser : undefined;
-    const loginRoute = isAdminRoute({
-      adminRoute,
-      config,
-      route
-    }) ? adminLoginRoute : customLoginRoute || loginRouteFromConfig;
-    const parsedLoginRouteSearchParams = qs.parse(loginRoute.split('?')[1] ?? '');
-    const searchParamsWithRedirect = `${qs.stringify({
-      ...parsedLoginRouteSearchParams,
-      ...(redirectRoute ? {
-        redirect: redirectRoute
-      } : {})
-    }, {
-      addQueryPrefix: true
-    })}`;
-    redirect(`${loginRoute.split('?')[0]}${searchParamsWithRedirect}`);
+  if (searchParams && 'redirect' in searchParams) {
+    delete searchParams.redirect;
   }
+  const redirectRoute = encodeURIComponent(route + Object.keys(searchParams ?? {}).length ? `${qs.stringify(searchParams, {
+    addQueryPrefix: true
+  })}` : undefined);
+  const redirectTo = formatAdminURL({
+    adminRoute,
+    path: user ? unauthorizedRoute : loginRouteFromConfig
+  });
+  const parsedLoginRouteSearchParams = qs.parse(redirectTo.split('?')[1] ?? '');
+  const searchParamsWithRedirect = `${qs.stringify({
+    ...parsedLoginRouteSearchParams,
+    ...(redirectRoute ? {
+      redirect: redirectRoute
+    } : {})
+  }, {
+    addQueryPrefix: true
+  })}`;
+  return `${redirectTo.split('?')[0]}${searchParamsWithRedirect}`;
 };
 //# sourceMappingURL=handleAuthRedirect.js.map

package/dist/utilities/initPage/handleAuthRedirect.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleAuthRedirect.js","names":["formatAdminURL","redirect","qs","isAdminAuthRoute","isAdminRoute","handleAuthRedirect","config","redirectUnauthenticatedUser","route","searchParams","admin","routes","login","loginRouteFromConfig","adminRoute","redirectRoute","encodeURIComponent","Object","keys","length","stringify","addQueryPrefix","undefined","adminLoginRoute","path","customLoginRoute","loginRoute","parsedLoginRouteSearchParams","parse","split","searchParamsWithRedirect"],"sources":["../../../src/utilities/initPage/handleAuthRedirect.ts"],"sourcesContent":["import { formatAdminURL } from '@payloadcms/ui/shared'\nimport { redirect } from 'next/navigation.js'\nimport * as qs from 'qs-esm'\n\nimport { isAdminAuthRoute, isAdminRoute } from './shared.js'\n\nexport const handleAuthRedirect = ({\n  config,\n  redirectUnauthenticatedUser,\n  route,\n  searchParams,\n}: {\n  config\n  redirectUnauthenticatedUser: boolean | string\n  route: string\n  searchParams: { [key: string]: string | string[] }\n}) => {\n  const {\n    admin: {\n      routes: { login: loginRouteFromConfig },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  if (!isAdminAuthRoute({ adminRoute, config, route })) {\n    if (searchParams && 'redirect' in searchParams) {\n      delete searchParams.redirect\n    }\n\n    const redirectRoute = encodeURIComponent(\n      route + Object.keys(searchParams ?? {}).length\n        ? `${qs.stringify(searchParams, { addQueryPrefix: true })}`\n        : undefined,\n    )\n\n    const adminLoginRoute = formatAdminURL({ adminRoute, path: loginRouteFromConfig })\n\n    const customLoginRoute =\n      typeof redirectUnauthenticatedUser === 'string' ? redirectUnauthenticatedUser : undefined\n\n    const loginRoute = isAdminRoute({ adminRoute, config, route })\n      ? adminLoginRoute\n      : customLoginRoute || loginRouteFromConfig\n\n    const parsedLoginRouteSearchParams = qs.parse(loginRoute.split('?')[1] ?? '')\n\n    const searchParamsWithRedirect = `${qs.stringify(\n      {\n        ...parsedLoginRouteSearchParams,\n        ...(redirectRoute ? { redirect: redirectRoute } : {}),\n      },\n      { addQueryPrefix: true },\n    )}`\n\n    redirect(`${loginRoute.split('?')[0]}${searchParamsWithRedirect}`)\n  }\n}\n"],"mappings":"AAAA,SAASA,cAAc,QAAQ;AAC/B,SAASC,QAAQ,QAAQ;AACzB,YAAYC,EAAA,MAAQ;AAEpB,SAASC,gBAAgB,EAAEC,YAAY,QAAQ;AAE/C,OAAO,MAAMC,kBAAA,GAAqBA,CAAC;EACjCC,MAAM;EACNC,2BAA2B;EAC3BC,KAAK;EACLC;AAAY,CAMb;EACC,MAAM;IACJC,KAAA,EAAO;MACLC,MAAA,EAAQ;QAAEC,KAAA,EAAOC;MAAoB;IAAE,CACxC;IACDF,MAAA,EAAQ;MAAED,KAAA,EAAOI;IAAU;EAAE,CAC9B,GAAGR,MAAA;EAEJ,IAAI,CAACH,gBAAA,CAAiB;IAAEW,UAAA;IAAYR,MAAA;IAAQE;EAAM,IAAI;IACpD,IAAIC,YAAA,IAAgB,cAAcA,YAAA,EAAc;MAC9C,OAAOA,YAAA,CAAaR,QAAQ;IAC9B;IAEA,MAAMc,aAAA,GAAgBC,kBAAA,CACpBR,KAAA,GAAQS,MAAA,CAAOC,IAAI,CAACT,YAAA,IAAgB,CAAC,GAAGU,MAAM,GAC1C,GAAGjB,EAAA,CAAGkB,SAAS,CAACX,YAAA,EAAc;MAAEY,cAAA,EAAgB;IAAK,IAAI,GACzDC,SAAA;IAGN,MAAMC,eAAA,GAAkBvB,cAAA,CAAe;MAAEc,UAAA;MAAYU,IAAA,EAAMX;IAAqB;IAEhF,MAAMY,gBAAA,GACJ,OAAOlB,2BAAA,KAAgC,WAAWA,2BAAA,GAA8Be,SAAA;IAElF,MAAMI,UAAA,GAAatB,YAAA,CAAa;MAAEU,UAAA;MAAYR,MAAA;MAAQE;IAAM,KACxDe,eAAA,GACAE,gBAAA,IAAoBZ,oBAAA;IAExB,MAAMc,4BAAA,GAA+BzB,EAAA,CAAG0B,KAAK,CAACF,UAAA,CAAWG,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI;IAE1E,MAAMC,wBAAA,GAA2B,GAAG5B,EAAA,CAAGkB,SAAS,CAC9C;MACE,GAAGO,4BAA4B;MAC/B,IAAIZ,aAAA,GAAgB;QAAEd,QAAA,EAAUc;MAAc,IAAI,CAAC,CAAC;IACtD,GACA;MAAEM,cAAA,EAAgB;IAAK,IACtB;IAEHpB,QAAA,CAAS,GAAGyB,UAAA,CAAWG,KAAK,CAAC,IAAI,CAAC,EAAE,GAAGC,wBAAA,EAA0B;EACnE;AACF","ignoreList":[]}
+{"version":3,"file":"handleAuthRedirect.js","names":["formatAdminURL","qs","handleAuthRedirect","config","route","searchParams","user","admin","routes","login","loginRouteFromConfig","unauthorized","unauthorizedRoute","adminRoute","redirect","redirectRoute","encodeURIComponent","Object","keys","length","stringify","addQueryPrefix","undefined","redirectTo","path","parsedLoginRouteSearchParams","parse","split","searchParamsWithRedirect"],"sources":["../../../src/utilities/initPage/handleAuthRedirect.ts"],"sourcesContent":["import type { User } from 'payload'\n\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport * as qs from 'qs-esm'\n\ntype Args = {\n  config\n  route: string\n  searchParams: { [key: string]: string | string[] }\n  user?: User\n}\nexport const handleAuthRedirect = ({ config, route, searchParams, user }: Args): string => {\n  const {\n    admin: {\n      routes: { login: loginRouteFromConfig, unauthorized: unauthorizedRoute },\n    },\n    routes: { admin: adminRoute },\n  } = config\n\n  if (searchParams && 'redirect' in searchParams) {\n    delete searchParams.redirect\n  }\n\n  const redirectRoute = encodeURIComponent(\n    route + Object.keys(searchParams ?? {}).length\n      ? `${qs.stringify(searchParams, { addQueryPrefix: true })}`\n      : undefined,\n  )\n\n  const redirectTo = formatAdminURL({\n    adminRoute,\n    path: user ? unauthorizedRoute : loginRouteFromConfig,\n  })\n\n  const parsedLoginRouteSearchParams = qs.parse(redirectTo.split('?')[1] ?? '')\n\n  const searchParamsWithRedirect = `${qs.stringify(\n    {\n      ...parsedLoginRouteSearchParams,\n      ...(redirectRoute ? { redirect: redirectRoute } : {}),\n    },\n    { addQueryPrefix: true },\n  )}`\n\n  return `${redirectTo.split('?')[0]}${searchParamsWithRedirect}`\n}\n"],"mappings":"AAEA,SAASA,cAAc,QAAQ;AAC/B,YAAYC,EAAA,MAAQ;AAQpB,OAAO,MAAMC,kBAAA,GAAqBA,CAAC;EAAEC,MAAM;EAAEC,KAAK;EAAEC,YAAY;EAAEC;AAAI,CAAQ;EAC5E,MAAM;IACJC,KAAA,EAAO;MACLC,MAAA,EAAQ;QAAEC,KAAA,EAAOC,oBAAoB;QAAEC,YAAA,EAAcC;MAAiB;IAAE,CACzE;IACDJ,MAAA,EAAQ;MAAED,KAAA,EAAOM;IAAU;EAAE,CAC9B,GAAGV,MAAA;EAEJ,IAAIE,YAAA,IAAgB,cAAcA,YAAA,EAAc;IAC9C,OAAOA,YAAA,CAAaS,QAAQ;EAC9B;EAEA,MAAMC,aAAA,GAAgBC,kBAAA,CACpBZ,KAAA,GAAQa,MAAA,CAAOC,IAAI,CAACb,YAAA,IAAgB,CAAC,GAAGc,MAAM,GAC1C,GAAGlB,EAAA,CAAGmB,SAAS,CAACf,YAAA,EAAc;IAAEgB,cAAA,EAAgB;EAAK,IAAI,GACzDC,SAAA;EAGN,MAAMC,UAAA,GAAavB,cAAA,CAAe;IAChCa,UAAA;IACAW,IAAA,EAAMlB,IAAA,GAAOM,iBAAA,GAAoBF;EACnC;EAEA,MAAMe,4BAAA,GAA+BxB,EAAA,CAAGyB,KAAK,CAACH,UAAA,CAAWI,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI;EAE1E,MAAMC,wBAAA,GAA2B,GAAG3B,EAAA,CAAGmB,SAAS,CAC9C;IACE,GAAGK,4BAA4B;IAC/B,IAAIV,aAAA,GAAgB;MAAED,QAAA,EAAUC;IAAc,IAAI,CAAC,CAAC;EACtD,GACA;IAAEM,cAAA,EAAgB;EAAK,IACtB;EAEH,OAAO,GAAGE,UAAA,CAAWI,KAAK,CAAC,IAAI,CAAC,EAAE,GAAGC,wBAAA,EAA0B;AACjE","ignoreList":[]}

package/dist/utilities/initPage/index.d.ts

@@ -1,4 +1,4 @@
 import type { InitPageResult } from 'payload';
 import type { Args } from './types.js';
-export declare const initPage: ({ config: configPromise, importMap, redirectUnauthenticatedUser, route, searchParams, }: Args) => Promise<InitPageResult>;
+export declare const initPage: ({ config: configPromise, importMap, route, searchParams, }: Args) => Promise<InitPageResult>;
 //# sourceMappingURL=index.d.ts.map

package/dist/utilities/initPage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA2C,MAAM,SAAS,CAAA;AAOtF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAOtC,eAAO,MAAM,QAAQ,4FAMlB,IAAI,KAAG,OAAO,CAAC,cAAc,CA0I/B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA2C,MAAM,SAAS,CAAA;AAQtF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAQtC,eAAO,MAAM,QAAQ,+DAKlB,IAAI,KAAG,OAAO,CAAC,cAAc,CAoJ/B,CAAA"}

package/dist/utilities/initPage/index.js

@@ -1,15 +1,16 @@
 import { findLocaleFromCode } from '@payloadcms/ui/shared';
 import { headers as getHeaders } from 'next/headers.js';
+import { notFound } from 'next/navigation.js';
 import { createLocalReq, isEntityHidden, parseCookies } from 'payload';
 import * as qs from 'qs-esm';
 import { getPayloadHMR } from '../getPayloadHMR.js';
 import { initReq } from '../initReq.js';
-import { handleAdminPage } from './handleAdminPage.js';
+import { getRouteInfo } from './handleAdminPage.js';
 import { handleAuthRedirect } from './handleAuthRedirect.js';
+import { isPublicAdminRoute } from './shared.js';
 export const initPage = async ({
   config: configPromise,
   importMap,
-  redirectUnauthenticatedUser = false,
   route,
   searchParams
 }) => {
@@ -118,24 +119,34 @@ export const initPage = async ({
       user
     }) ? slug : null).filter(Boolean)
   };
-  if (redirectUnauthenticatedUser && !user) {
-    handleAuthRedirect({
+  let redirectTo = null;
+  if (!permissions.canAccessAdmin && !isPublicAdminRoute({
+    adminRoute,
+    config: payload.config,
+    route
+  })) {
+    redirectTo = handleAuthRedirect({
       config: payload.config,
-      redirectUnauthenticatedUser,
       route,
-      searchParams
+      searchParams,
+      user
     });
   }
   const {
     collectionConfig,
+    collectionSlug,
     docID,
-    globalConfig
-  } = handleAdminPage({
+    globalConfig,
+    globalSlug
+  } = getRouteInfo({
     adminRoute,
     config: payload.config,
-    permissions,
+    defaultIDType: payload.db.defaultIDType,
     route
   });
+  if (collectionSlug && !collectionConfig || globalSlug && !globalConfig) {
+    return notFound();
+  }
   return {
     collectionConfig,
     cookies,
@@ -144,6 +155,7 @@ export const initPage = async ({
     languageOptions,
     locale,
     permissions,
+    redirectTo,
     req,
     translations: i18n.translations,
     visibleEntities

package/dist/utilities/initPage/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["findLocaleFromCode","headers","getHeaders","createLocalReq","isEntityHidden","parseCookies","qs","getPayloadHMR","initReq","handleAdminPage","handleAuthRedirect","initPage","config","configPromise","importMap","redirectUnauthenticatedUser","route","searchParams","payload","queryString","stringify","addQueryPrefix","collections","globals","localization","routes","admin","adminRoute","cookies","i18n","permissions","user","req","fallbackLocale","host","get","query","parse","depth","ignoreQueryPrefix","url","serverURL","languageOptions","Object","entries","supportedLanguages","reduce","acc","language","languageConfig","keys","includes","push","label","translations","general","thisLanguage","value","localeParam","locale","defaultLocaleCode","defaultLocale","localeCode","find","collection","limit","where","and","equals","id","key","then","res","docs","error","code","visibleEntities","map","slug","hidden","filter","Boolean","collectionConfig","docID","globalConfig"],"sources":["../../../src/utilities/initPage/index.ts"],"sourcesContent":["import type { InitPageResult, Locale, PayloadRequest, VisibleEntities } from 'payload'\n\nimport { findLocaleFromCode } from '@payloadcms/ui/shared'\nimport { headers as getHeaders } from 'next/headers.js'\nimport { createLocalReq, isEntityHidden, parseCookies } from 'payload'\nimport * as qs from 'qs-esm'\n\nimport type { Args } from './types.js'\n\nimport { getPayloadHMR } from '../getPayloadHMR.js'\nimport { initReq } from '../initReq.js'\nimport { handleAdminPage } from './handleAdminPage.js'\nimport { handleAuthRedirect } from './handleAuthRedirect.js'\n\nexport const initPage = async ({\n  config: configPromise,\n  importMap,\n  redirectUnauthenticatedUser = false,\n  route,\n  searchParams,\n}: Args): Promise<InitPageResult> => {\n  const headers = await getHeaders()\n  const payload = await getPayloadHMR({ config: configPromise, importMap })\n  const queryString = `${qs.stringify(searchParams ?? {}, { addQueryPrefix: true })}`\n\n  const {\n    collections,\n    globals,\n    localization,\n    routes: { admin: adminRoute },\n  } = payload.config\n\n  const cookies = parseCookies(headers)\n\n  const { i18n, permissions, user } = await initReq(payload.config)\n\n  // Ideally, we should not need to recreate the req, because\n  // we can get it from the above initReq.\n\n  // We just need to -overwrite- the url and query of the req\n  // we get above. Clone the req? We'll look into that eventually.\n  const req = await createLocalReq(\n    {\n      fallbackLocale: null,\n      req: {\n        headers,\n        host: headers.get('host'),\n        i18n,\n        query: qs.parse(queryString, {\n          depth: 10,\n          ignoreQueryPrefix: true,\n        }),\n        url: `${payload.config.serverURL}${route}${searchParams ? queryString : ''}`,\n      } as PayloadRequest,\n    },\n    payload,\n  )\n\n  const languageOptions = Object.entries(payload.config.i18n.supportedLanguages || {}).reduce(\n    (acc, [language, languageConfig]) => {\n      if (Object.keys(payload.config.i18n.supportedLanguages).includes(language)) {\n        acc.push({\n          label: languageConfig.translations.general.thisLanguage,\n          value: language,\n        })\n      }\n\n      return acc\n    },\n    [],\n  )\n\n  req.user = user\n\n  const localeParam = searchParams?.locale as string\n  let locale: Locale\n\n  if (localization) {\n    const defaultLocaleCode = localization.defaultLocale ? localization.defaultLocale : 'en'\n    let localeCode: string = localeParam\n\n    if (!localeCode) {\n      try {\n        localeCode = await payload\n          .find({\n            collection: 'payload-preferences',\n            depth: 0,\n            limit: 1,\n            user,\n            where: {\n              and: [\n                {\n                  'user.relationTo': {\n                    equals: payload.config.admin.user,\n                  },\n                },\n                {\n                  'user.value': {\n                    equals: user.id,\n                  },\n                },\n                {\n                  key: {\n                    equals: 'locale',\n                  },\n                },\n              ],\n            },\n          })\n          ?.then((res) => res.docs?.[0]?.value as string)\n      } catch (error) {} // eslint-disable-line no-empty\n    }\n\n    locale = findLocaleFromCode(localization, localeCode)\n\n    if (!locale) {\n      locale = findLocaleFromCode(localization, defaultLocaleCode)\n    }\n    req.locale = locale.code\n  }\n\n  const visibleEntities: VisibleEntities = {\n    collections: collections\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n    globals: globals\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n  }\n\n  if (redirectUnauthenticatedUser && !user) {\n    handleAuthRedirect({\n      config: payload.config,\n      redirectUnauthenticatedUser,\n      route,\n      searchParams,\n    })\n  }\n\n  const { collectionConfig, docID, globalConfig } = handleAdminPage({\n    adminRoute,\n    config: payload.config,\n    permissions,\n    route,\n  })\n\n  return {\n    collectionConfig,\n    cookies,\n    docID,\n    globalConfig,\n    languageOptions,\n    locale,\n    permissions,\n    req,\n    translations: i18n.translations,\n    visibleEntities,\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["findLocaleFromCode","headers","getHeaders","notFound","createLocalReq","isEntityHidden","parseCookies","qs","getPayloadHMR","initReq","getRouteInfo","handleAuthRedirect","isPublicAdminRoute","initPage","config","configPromise","importMap","route","searchParams","payload","queryString","stringify","addQueryPrefix","collections","globals","localization","routes","admin","adminRoute","cookies","i18n","permissions","user","req","fallbackLocale","host","get","query","parse","depth","ignoreQueryPrefix","url","serverURL","languageOptions","Object","entries","supportedLanguages","reduce","acc","language","languageConfig","keys","includes","push","label","translations","general","thisLanguage","value","localeParam","locale","defaultLocaleCode","defaultLocale","localeCode","find","collection","limit","where","and","equals","id","key","then","res","docs","error","code","visibleEntities","map","slug","hidden","filter","Boolean","redirectTo","canAccessAdmin","collectionConfig","collectionSlug","docID","globalConfig","globalSlug","defaultIDType","db"],"sources":["../../../src/utilities/initPage/index.ts"],"sourcesContent":["import type { InitPageResult, Locale, PayloadRequest, VisibleEntities } from 'payload'\n\nimport { findLocaleFromCode } from '@payloadcms/ui/shared'\nimport { headers as getHeaders } from 'next/headers.js'\nimport { notFound } from 'next/navigation.js'\nimport { createLocalReq, isEntityHidden, parseCookies } from 'payload'\nimport * as qs from 'qs-esm'\n\nimport type { Args } from './types.js'\n\nimport { getPayloadHMR } from '../getPayloadHMR.js'\nimport { initReq } from '../initReq.js'\nimport { getRouteInfo } from './handleAdminPage.js'\nimport { handleAuthRedirect } from './handleAuthRedirect.js'\nimport { isPublicAdminRoute } from './shared.js'\n\nexport const initPage = async ({\n  config: configPromise,\n  importMap,\n  route,\n  searchParams,\n}: Args): Promise<InitPageResult> => {\n  const headers = await getHeaders()\n  const payload = await getPayloadHMR({ config: configPromise, importMap })\n  const queryString = `${qs.stringify(searchParams ?? {}, { addQueryPrefix: true })}`\n\n  const {\n    collections,\n    globals,\n    localization,\n    routes: { admin: adminRoute },\n  } = payload.config\n\n  const cookies = parseCookies(headers)\n\n  const { i18n, permissions, user } = await initReq(payload.config)\n\n  // Ideally, we should not need to recreate the req, because\n  // we can get it from the above initReq.\n\n  // We just need to -overwrite- the url and query of the req\n  // we get above. Clone the req? We'll look into that eventually.\n  const req = await createLocalReq(\n    {\n      fallbackLocale: null,\n      req: {\n        headers,\n        host: headers.get('host'),\n        i18n,\n        query: qs.parse(queryString, {\n          depth: 10,\n          ignoreQueryPrefix: true,\n        }),\n        url: `${payload.config.serverURL}${route}${searchParams ? queryString : ''}`,\n      } as PayloadRequest,\n    },\n    payload,\n  )\n\n  const languageOptions = Object.entries(payload.config.i18n.supportedLanguages || {}).reduce(\n    (acc, [language, languageConfig]) => {\n      if (Object.keys(payload.config.i18n.supportedLanguages).includes(language)) {\n        acc.push({\n          label: languageConfig.translations.general.thisLanguage,\n          value: language,\n        })\n      }\n\n      return acc\n    },\n    [],\n  )\n\n  req.user = user\n\n  const localeParam = searchParams?.locale as string\n  let locale: Locale\n\n  if (localization) {\n    const defaultLocaleCode = localization.defaultLocale ? localization.defaultLocale : 'en'\n    let localeCode: string = localeParam\n\n    if (!localeCode) {\n      try {\n        localeCode = await payload\n          .find({\n            collection: 'payload-preferences',\n            depth: 0,\n            limit: 1,\n            user,\n            where: {\n              and: [\n                {\n                  'user.relationTo': {\n                    equals: payload.config.admin.user,\n                  },\n                },\n                {\n                  'user.value': {\n                    equals: user.id,\n                  },\n                },\n                {\n                  key: {\n                    equals: 'locale',\n                  },\n                },\n              ],\n            },\n          })\n          ?.then((res) => res.docs?.[0]?.value as string)\n      } catch (error) {} // eslint-disable-line no-empty\n    }\n\n    locale = findLocaleFromCode(localization, localeCode)\n\n    if (!locale) {\n      locale = findLocaleFromCode(localization, defaultLocaleCode)\n    }\n    req.locale = locale.code\n  }\n\n  const visibleEntities: VisibleEntities = {\n    collections: collections\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n    globals: globals\n      .map(({ slug, admin: { hidden } }) => (!isEntityHidden({ hidden, user }) ? slug : null))\n      .filter(Boolean),\n  }\n\n  let redirectTo = null\n\n  if (\n    !permissions.canAccessAdmin &&\n    !isPublicAdminRoute({ adminRoute, config: payload.config, route })\n  ) {\n    redirectTo = handleAuthRedirect({\n      config: payload.config,\n      route,\n      searchParams,\n      user,\n    })\n  }\n\n  const { collectionConfig, collectionSlug, docID, globalConfig, globalSlug } = getRouteInfo({\n    adminRoute,\n    config: payload.config,\n    defaultIDType: payload.db.defaultIDType,\n    route,\n  })\n\n  if ((collectionSlug && !collectionConfig) || (globalSlug && !globalConfig)) {\n    return notFound()\n  }\n\n  return {\n    collectionConfig,\n    cookies,\n    docID,\n    globalConfig,\n    languageOptions,\n    locale,\n    permissions,\n    redirectTo,\n    req,\n    translations: i18n.translations,\n    visibleEntities,\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/utilities/initPage/shared.d.ts

@@ -1,10 +1,10 @@
 import type { SanitizedConfig } from 'payload';
-export declare const isAdminRoute: ({ adminRoute, config, route, }: {
+export declare const isAdminRoute: ({ adminRoute, route, }: {
     adminRoute: string;
     config: SanitizedConfig;
     route: string;
 }) => boolean;
-export declare const isAdminAuthRoute: ({ adminRoute, config, route, }: {
+export declare const isPublicAdminRoute: ({ adminRoute, config, route, }: {
     adminRoute: string;
     config: SanitizedConfig;
     route: string;

package/dist/utilities/initPage/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAa9C,eAAO,MAAM,YAAY,mCAItB;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAEH,CAAA;AAED,eAAO,MAAM,gBAAgB,mCAI1B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAQH,CAAA;AAED,eAAO,MAAM,oBAAoB,2BAG9B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,MAEH,CAAA"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/utilities/initPage/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAiB9C,eAAO,MAAM,YAAY,2BAGtB;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAEH,CAAA;AAED,eAAO,MAAM,kBAAkB,mCAI5B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,OAYH,CAAA;AAED,eAAO,MAAM,oBAAoB,2BAG9B;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,KAAG,MAEH,CAAA"}

package/dist/utilities/initPage/shared.js

@@ -1,25 +1,30 @@
-const authRouteKeys = ['createFirstUser', 'forgot', 'login', 'logout', 'forgot', 'inactivity', 'unauthorized', 'reset'];
+// Routes that require admin authentication
+const publicAdminRoutes = ['createFirstUser', 'forgot', 'login', 'logout', 'forgot', 'inactivity', 'unauthorized', 'reset'];
 export const isAdminRoute = ({
   adminRoute,
-  config,
   route
 }) => {
-  return route.startsWith(adminRoute) && !isAdminAuthRoute({
-    adminRoute,
-    config,
-    route
-  });
+  return route.startsWith(adminRoute);
 };
-export const isAdminAuthRoute = ({
+export const isPublicAdminRoute = ({
   adminRoute,
   config,
   route
 }) => {
-  const authRoutes = config.admin?.routes ? Object.entries(config.admin.routes).filter(([key]) => authRouteKeys.includes(key)).map(([_, value]) => value) : [];
-  return authRoutes.some(r => getRouteWithoutAdmin({
-    adminRoute,
-    route
-  }).startsWith(r));
+  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;
+    }
+  });
 };
 export const getRouteWithoutAdmin = ({
   adminRoute,

package/dist/utilities/initPage/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","names":["authRouteKeys","isAdminRoute","adminRoute","config","route","startsWith","isAdminAuthRoute","authRoutes","admin","routes","Object","entries","filter","key","includes","map","_","value","some","r","getRouteWithoutAdmin","replace"],"sources":["../../../src/utilities/initPage/shared.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\nconst authRouteKeys: (keyof SanitizedConfig['admin']['routes'])[] = [\n  'createFirstUser',\n  'forgot',\n  'login',\n  'logout',\n  'forgot',\n  'inactivity',\n  'unauthorized',\n  'reset',\n]\n\nexport const isAdminRoute = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  return route.startsWith(adminRoute) && !isAdminAuthRoute({ adminRoute, config, route })\n}\n\nexport const isAdminAuthRoute = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  const authRoutes = config.admin?.routes\n    ? Object.entries(config.admin.routes)\n        .filter(([key]) => authRouteKeys.includes(key as keyof SanitizedConfig['admin']['routes']))\n        .map(([_, value]) => value)\n    : []\n\n  return authRoutes.some((r) => getRouteWithoutAdmin({ adminRoute, route }).startsWith(r))\n}\n\nexport const getRouteWithoutAdmin = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  route: string\n}): string => {\n  return adminRoute && adminRoute !== '/' ? route.replace(adminRoute, '') : route\n}\n"],"mappings":"AAEA,MAAMA,aAAA,GAA8D,CAClE,mBACA,UACA,SACA,UACA,UACA,cACA,gBACA,QACD;AAED,OAAO,MAAMC,YAAA,GAAeA,CAAC;EAC3BC,UAAU;EACVC,MAAM;EACNC;AAAK,CAKN;EACC,OAAOA,KAAA,CAAMC,UAAU,CAACH,UAAA,KAAe,CAACI,gBAAA,CAAiB;IAAEJ,UAAA;IAAYC,MAAA;IAAQC;EAAM;AACvF;AAEA,OAAO,MAAME,gBAAA,GAAmBA,CAAC;EAC/BJ,UAAU;EACVC,MAAM;EACNC;AAAK,CAKN;EACC,MAAMG,UAAA,GAAaJ,MAAA,CAAOK,KAAK,EAAEC,MAAA,GAC7BC,MAAA,CAAOC,OAAO,CAACR,MAAA,CAAOK,KAAK,CAACC,MAAM,EAC/BG,MAAM,CAAC,CAAC,CAACC,GAAA,CAAI,KAAKb,aAAA,CAAcc,QAAQ,CAACD,GAAA,GACzCE,GAAG,CAAC,CAAC,CAACC,CAAA,EAAGC,KAAA,CAAM,KAAKA,KAAA,IACvB,EAAE;EAEN,OAAOV,UAAA,CAAWW,IAAI,CAAEC,CAAA,IAAMC,oBAAA,CAAqB;IAAElB,UAAA;IAAYE;EAAM,GAAGC,UAAU,CAACc,CAAA;AACvF;AAEA,OAAO,MAAMC,oBAAA,GAAuBA,CAAC;EACnClB,UAAU;EACVE;AAAK,CAIN;EACC,OAAOF,UAAA,IAAcA,UAAA,KAAe,MAAME,KAAA,CAAMiB,OAAO,CAACnB,UAAA,EAAY,MAAME,KAAA;AAC5E","ignoreList":[]}
+{"version":3,"file":"shared.js","names":["publicAdminRoutes","isAdminRoute","adminRoute","route","startsWith","isPublicAdminRoute","config","some","routeSegment","segment","admin","routes","routeWithoutAdmin","getRouteWithoutAdmin","includes","replace"],"sources":["../../../src/utilities/initPage/shared.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\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 isAdminRoute = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  return route.startsWith(adminRoute)\n}\n\nexport const isPublicAdminRoute = ({\n  adminRoute,\n  config,\n  route,\n}: {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}): boolean => {\n  return publicAdminRoutes.some((routeSegment) => {\n    const segment = config.admin?.routes?.[routeSegment] || routeSegment\n    const routeWithoutAdmin = getRouteWithoutAdmin({ adminRoute, route })\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\nexport const getRouteWithoutAdmin = ({\n  adminRoute,\n  route,\n}: {\n  adminRoute: string\n  route: string\n}): string => {\n  return adminRoute && adminRoute !== '/' ? route.replace(adminRoute, '') : route\n}\n"],"mappings":"AAEA;AACA,MAAMA,iBAAA,GAGC,CACL,mBACA,UACA,SACA,UACA,UACA,cACA,gBACA,QACD;AAED,OAAO,MAAMC,YAAA,GAAeA,CAAC;EAC3BC,UAAU;EACVC;AAAK,CAKN;EACC,OAAOA,KAAA,CAAMC,UAAU,CAACF,UAAA;AAC1B;AAEA,OAAO,MAAMG,kBAAA,GAAqBA,CAAC;EACjCH,UAAU;EACVI,MAAM;EACNH;AAAK,CAKN;EACC,OAAOH,iBAAA,CAAkBO,IAAI,CAAEC,YAAA;IAC7B,MAAMC,OAAA,GAAUH,MAAA,CAAOI,KAAK,EAAEC,MAAA,GAASH,YAAA,CAAa,IAAIA,YAAA;IACxD,MAAMI,iBAAA,GAAoBC,oBAAA,CAAqB;MAAEX,UAAA;MAAYC;IAAM;IACnE,IAAIS,iBAAA,CAAkBR,UAAU,CAACK,OAAA,GAAU;MACzC,OAAO;IACT,OAAO,IAAIG,iBAAA,CAAkBE,QAAQ,CAAC,aAAa;MACjD,OAAO;IACT,OAAO;MACL,OAAO;IACT;EACF;AACF;AAEA,OAAO,MAAMD,oBAAA,GAAuBA,CAAC;EACnCX,UAAU;EACVC;AAAK,CAIN;EACC,OAAOD,UAAA,IAAcA,UAAA,KAAe,MAAMC,KAAA,CAAMY,OAAO,CAACb,UAAA,EAAY,MAAMC,KAAA;AAC5E","ignoreList":[]}