@payloadcms/next 3.0.0-beta.110 → 3.0.0-beta.112

package/dist/scss/toasts.scss

@@ -1,140 +1,142 @@
 @import './styles.scss';
 
-.payload-toast-container {
-  padding: 0;
-  margin: 0;
-
-  .payload-toast-close-button {
-    position: absolute;
-    order: 3;
-    left: unset;
-    inset-inline-end: base(0.8);
-    top: 50%;
-    transform: translateY(-50%);
-    color: var(--theme-elevation-600);
-    background: unset;
-    border: none;
-
-    svg {
-      width: base(0.8);
-      height: base(0.8);
-    }
+@layer payload-default {
+  .payload-toast-container {
+    padding: 0;
+    margin: 0;
+
+    .payload-toast-close-button {
+      position: absolute;
+      order: 3;
+      left: unset;
+      inset-inline-end: base(0.8);
+      top: 50%;
+      transform: translateY(-50%);
+      color: var(--theme-elevation-600);
+      background: unset;
+      border: none;
+
+      svg {
+        width: base(0.8);
+        height: base(0.8);
+      }
 
-    &:hover {
-      color: var(--theme-elevation-250);
-      background: none;
-    }
+      &:hover {
+        color: var(--theme-elevation-250);
+        background: none;
+      }
 
-    [dir='RTL'] & {
-      right: unset;
-      left: 0.5rem;
+      [dir='RTL'] & {
+        right: unset;
+        left: 0.5rem;
+      }
     }
-  }
 
-  .toast-title {
-    line-height: base(1);
-    margin-right: base(1);
-  }
+    .toast-title {
+      line-height: base(1);
+      margin-right: base(1);
+    }
 
-  .payload-toast-item {
-    padding: base(0.8);
-    color: var(--theme-elevation-800);
-    font-style: normal;
-    font-weight: 600;
-    display: flex;
-    gap: 1rem;
-    align-items: center;
-    width: 100%;
-    border-radius: 4px;
-    border: 1px solid var(--theme-border-color);
-    background: var(--theme-input-bg);
-    box-shadow:
-      0px 10px 4px -8px rgba(0, 2, 4, 0.02),
-      0px 2px 3px 0px rgba(0, 2, 4, 0.05);
-
-    .toast-content {
-      transition: opacity 100ms cubic-bezier(0.55, 0.055, 0.675, 0.19);
+    .payload-toast-item {
+      padding: base(0.8);
+      color: var(--theme-elevation-800);
+      font-style: normal;
+      font-weight: 600;
+      display: flex;
+      gap: 1rem;
+      align-items: center;
       width: 100%;
-    }
+      border-radius: 4px;
+      border: 1px solid var(--theme-border-color);
+      background: var(--theme-input-bg);
+      box-shadow:
+        0px 10px 4px -8px rgba(0, 2, 4, 0.02),
+        0px 2px 3px 0px rgba(0, 2, 4, 0.05);
 
-    &[data-front='false'] {
       .toast-content {
-        opacity: 0;
+        transition: opacity 100ms cubic-bezier(0.55, 0.055, 0.675, 0.19);
+        width: 100%;
       }
-    }
 
-    &[data-expanded='true'] {
-      .toast-content {
-        opacity: 1;
+      &[data-front='false'] {
+        .toast-content {
+          opacity: 0;
+        }
       }
-    }
 
-    .toast-icon {
-      width: base(0.8);
-      height: base(0.8);
-      margin: 0;
-      display: flex;
-      align-items: center;
-      justify-content: center;
+      &[data-expanded='true'] {
+        .toast-content {
+          opacity: 1;
+        }
+      }
 
-      & > * {
-        width: base(1.2);
-        height: base(1.2);
+      .toast-icon {
+        width: base(0.8);
+        height: base(0.8);
+        margin: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        & > * {
+          width: base(1.2);
+          height: base(1.2);
+        }
       }
-    }
 
-    &.toast-warning {
-      color: var(--theme-warning-800);
-      border-color: var(--theme-warning-250);
-      background-color: var(--theme-warning-100);
+      &.toast-warning {
+        color: var(--theme-warning-800);
+        border-color: var(--theme-warning-250);
+        background-color: var(--theme-warning-100);
 
-      .payload-toast-close-button {
-        color: var(--theme-warning-600);
+        .payload-toast-close-button {
+          color: var(--theme-warning-600);
 
-        &:hover {
-          color: var(--theme-warning-250);
+          &:hover {
+            color: var(--theme-warning-250);
+          }
         }
       }
-    }
 
-    &.toast-error {
-      color: var(--theme-error-800);
-      border-color: var(--theme-error-250);
-      background-color: var(--theme-error-100);
+      &.toast-error {
+        color: var(--theme-error-800);
+        border-color: var(--theme-error-250);
+        background-color: var(--theme-error-100);
 
-      .payload-toast-close-button {
-        color: var(--theme-error-600);
+        .payload-toast-close-button {
+          color: var(--theme-error-600);
 
-        &:hover {
-          color: var(--theme-error-250);
+          &:hover {
+            color: var(--theme-error-250);
+          }
         }
       }
-    }
 
-    &.toast-success {
-      color: var(--theme-success-800);
-      border-color: var(--theme-success-250);
-      background-color: var(--theme-success-100);
+      &.toast-success {
+        color: var(--theme-success-800);
+        border-color: var(--theme-success-250);
+        background-color: var(--theme-success-100);
 
-      .payload-toast-close-button {
-        color: var(--theme-success-600);
+        .payload-toast-close-button {
+          color: var(--theme-success-600);
 
-        &:hover {
-          color: var(--theme-success-250);
+          &:hover {
+            color: var(--theme-success-250);
+          }
         }
       }
-    }
 
-    &.toast-info {
-      color: var(--theme-elevation-800);
-      border-color: var(--theme-elevation-250);
-      background-color: var(--theme-elevation-100);
+      &.toast-info {
+        color: var(--theme-elevation-800);
+        border-color: var(--theme-elevation-250);
+        background-color: var(--theme-elevation-100);
 
-      .payload-toast-close-button {
-        color: var(--theme-elevation-600);
+        .payload-toast-close-button {
+          color: var(--theme-elevation-600);
 
-        &:hover {
-          color: var(--theme-elevation-250);
+          &:hover {
+            color: var(--theme-elevation-250);
+          }
         }
       }
     }

package/dist/scss/type.scss

@@ -4,106 +4,107 @@
 /////////////////////////////
 // HEADINGS
 /////////////////////////////
+@layer payload-default {
+  %h1,
+  %h2,
+  %h3,
+  %h4,
+  %h5,
+  %h6 {
+    font-family: var(--font-body);
+    font-weight: 500;
+  }
 
-%h1,
-%h2,
-%h3,
-%h4,
-%h5,
-%h6 {
-  font-family: var(--font-body);
-  font-weight: 500;
-}
+  %h1 {
+    margin: 0;
+    font-size: base(1.6);
+    line-height: base(1.8);
+
+    @include small-break {
+      letter-spacing: -0.5px;
+      font-size: base(1.25);
+    }
+  }
 
-%h1 {
-  margin: 0;
-  font-size: base(1.6);
-  line-height: base(1.8);
+  %h2 {
+    margin: 0;
+    font-size: base(1.3);
+    line-height: base(1.6);
 
-  @include small-break {
-    letter-spacing: -0.5px;
-    font-size: base(1.25);
+    @include small-break {
+      font-size: base(0.85);
+    }
   }
-}
 
-%h2 {
-  margin: 0;
-  font-size: base(1.3);
-  line-height: base(1.6);
+  %h3 {
+    margin: 0;
+    font-size: base(1);
+    line-height: base(1.2);
 
-  @include small-break {
-    font-size: base(0.85);
+    @include small-break {
+      font-size: base(0.65);
+      line-height: 1.25;
+    }
   }
-}
 
-%h3 {
-  margin: 0;
-  font-size: base(1);
-  line-height: base(1.2);
+  %h4 {
+    margin: 0;
+    font-size: base(0.8);
+    line-height: base(1);
+    letter-spacing: -0.375px;
+  }
 
-  @include small-break {
+  %h5 {
+    margin: 0;
     font-size: base(0.65);
-    line-height: 1.25;
+    line-height: base(0.8);
   }
-}
 
-%h4 {
-  margin: 0;
-  font-size: base(0.8);
-  line-height: base(1);
-  letter-spacing: -0.375px;
-}
-
-%h5 {
-  margin: 0;
-  font-size: base(0.65);
-  line-height: base(0.8);
-}
+  %h6 {
+    margin: 0;
+    font-size: base(0.6);
+    line-height: base(0.8);
+  }
 
-%h6 {
-  margin: 0;
-  font-size: base(0.6);
-  line-height: base(0.8);
-}
+  %small {
+    margin: 0;
+    font-size: 12px;
+    line-height: 20px;
+  }
 
-%small {
-  margin: 0;
-  font-size: 12px;
-  line-height: 20px;
-}
+  /////////////////////////////
+  // TYPE STYLES
+  /////////////////////////////
 
-/////////////////////////////
-// TYPE STYLES
-/////////////////////////////
+  %large-body {
+    font-size: base(0.6);
+    line-height: base(1);
+    letter-spacing: base(0.02);
 
-%large-body {
-  font-size: base(0.6);
-  line-height: base(1);
-  letter-spacing: base(0.02);
+    @include mid-break {
+      font-size: base(0.7);
+      line-height: base(1);
+    }
 
-  @include mid-break {
-    font-size: base(0.7);
-    line-height: base(1);
+    @include small-break {
+      font-size: base(0.55);
+      line-height: base(0.75);
+    }
   }
 
-  @include small-break {
-    font-size: base(0.55);
-    line-height: base(0.75);
+  %body {
+    font-size: $baseline-body-size;
+    line-height: $baseline-px;
+    font-weight: normal;
+    font-family: var(--font-body);
   }
-}
-
-%body {
-  font-size: $baseline-body-size;
-  line-height: $baseline-px;
-  font-weight: normal;
-  font-family: var(--font-body);
-}
 
-%code {
-  font-size: base(0.4);
-  color: var(--theme-elevation-400);
+  %code {
+    font-size: base(0.4);
+    color: var(--theme-elevation-400);
 
-  span {
-    color: var(--theme-elevation-800);
+    span {
+      color: var(--theme-elevation-800);
+    }
   }
 }

package/dist/utilities/getNextRequestI18n.js

@@ -14,8 +14,8 @@ export const getNextRequestI18n = async ({
     context: 'client',
     language: getRequestLanguage({
       config,
-      cookies: cookies(),
-      headers: headers()
+      cookies: await cookies(),
+      headers: await headers()
     })
   });
 };

package/dist/utilities/getNextRequestI18n.js.map

@@ -1 +1 @@
-{"version":3,"file":"getNextRequestI18n.js","names":["initI18n","cookies","headers","getRequestLanguage","getNextRequestI18n","config","i18n","context","language"],"sources":["../../src/utilities/getNextRequestI18n.ts"],"sourcesContent":["import type { ClientTranslationsObject, I18nClient } from '@payloadcms/translations'\nimport type { SanitizedConfig } from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { cookies, headers } from 'next/headers.js'\n\nimport { getRequestLanguage } from './getRequestLanguage.js'\n\n/**\n * In the context of Next.js, this function initializes the i18n object for the current request.\n *\n * It must be called on the server side, and within the lifecycle of a request since it relies on the request headers and cookies.\n */\nexport const getNextRequestI18n = async <\n  // eslint-disable-next-line @typescript-eslint/no-empty-object-type\n  TAdditionalTranslations = {},\n  TAdditionalClientTranslationKeys extends string = never,\n>({\n  config,\n}: {\n  config: SanitizedConfig\n}): Promise<\n  [TAdditionalClientTranslationKeys] extends [never]\n    ? I18nClient\n    : TAdditionalTranslations extends object\n      ? I18nClient<TAdditionalTranslations, TAdditionalClientTranslationKeys>\n      : I18nClient<ClientTranslationsObject, TAdditionalClientTranslationKeys>\n> => {\n  return (await initI18n({\n    config: config.i18n,\n    context: 'client',\n    language: getRequestLanguage({ config, cookies: cookies(), headers: headers() }),\n  })) as any\n}\n"],"mappings":"AAGA,SAASA,QAAQ,QAAQ;AACzB,SAASC,OAAO,EAAEC,OAAO,QAAQ;AAEjC,SAASC,kBAAkB,QAAQ;AAEnC;;;;;AAKA,OAAO,MAAMC,kBAAA,GAAqB,MAAAA,CAIhC;EACAC;AAAM,CAGP;EAOC,OAAQ,MAAML,QAAA,CAAS;IACrBK,MAAA,EAAQA,MAAA,CAAOC,IAAI;IACnBC,OAAA,EAAS;IACTC,QAAA,EAAUL,kBAAA,CAAmB;MAAEE,MAAA;MAAQJ,OAAA,EAASA,OAAA;MAAWC,OAAA,EAASA,OAAA;IAAU;EAChF;AACF","ignoreList":[]}
+{"version":3,"file":"getNextRequestI18n.js","names":["initI18n","cookies","headers","getRequestLanguage","getNextRequestI18n","config","i18n","context","language"],"sources":["../../src/utilities/getNextRequestI18n.ts"],"sourcesContent":["import type { ClientTranslationsObject, I18nClient } from '@payloadcms/translations'\nimport type { SanitizedConfig } from 'payload'\n\nimport { initI18n } from '@payloadcms/translations'\nimport { cookies, headers } from 'next/headers.js'\n\nimport { getRequestLanguage } from './getRequestLanguage.js'\n\n/**\n * In the context of Next.js, this function initializes the i18n object for the current request.\n *\n * It must be called on the server side, and within the lifecycle of a request since it relies on the request headers and cookies.\n */\nexport const getNextRequestI18n = async <\n  // eslint-disable-next-line @typescript-eslint/no-empty-object-type\n  TAdditionalTranslations = {},\n  TAdditionalClientTranslationKeys extends string = never,\n>({\n  config,\n}: {\n  config: SanitizedConfig\n}): Promise<\n  [TAdditionalClientTranslationKeys] extends [never]\n    ? I18nClient\n    : TAdditionalTranslations extends object\n      ? I18nClient<TAdditionalTranslations, TAdditionalClientTranslationKeys>\n      : I18nClient<ClientTranslationsObject, TAdditionalClientTranslationKeys>\n> => {\n  return (await initI18n({\n    config: config.i18n,\n    context: 'client',\n    language: getRequestLanguage({ config, cookies: await cookies(), headers: await headers() }),\n  })) as any\n}\n"],"mappings":"AAGA,SAASA,QAAQ,QAAQ;AACzB,SAASC,OAAO,EAAEC,OAAO,QAAQ;AAEjC,SAASC,kBAAkB,QAAQ;AAEnC;;;;;AAKA,OAAO,MAAMC,kBAAA,GAAqB,MAAAA,CAIhC;EACAC;AAAM,CAGP;EAOC,OAAQ,MAAML,QAAA,CAAS;IACrBK,MAAA,EAAQA,MAAA,CAAOC,IAAI;IACnBC,OAAA,EAAS;IACTC,QAAA,EAAUL,kBAAA,CAAmB;MAAEE,MAAA;MAAQJ,OAAA,EAAS,MAAMA,OAAA;MAAWC,OAAA,EAAS,MAAMA,OAAA;IAAU;EAC5F;AACF","ignoreList":[]}

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

@@ -1,16 +1,16 @@
-import type { Permissions, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
-export declare const handleAdminPage: ({ adminRoute, config, permissions, route, }: {
+import type { SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
+type Args = {
     adminRoute: string;
     config: SanitizedConfig;
-    permissions: Permissions;
     route: string;
-}) => {
-    collectionConfig: SanitizedCollectionConfig;
-    docID: string;
-    globalConfig: SanitizedGlobalConfig;
-} | {
-    collectionConfig?: undefined;
-    docID?: undefined;
-    globalConfig?: undefined;
 };
+type RouteInfo = {
+    collectionConfig?: SanitizedCollectionConfig;
+    collectionSlug?: string;
+    docID?: string;
+    globalConfig?: SanitizedGlobalConfig;
+    globalSlug?: string;
+};
+export declare function getRouteInfo({ adminRoute, config, 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,EAAE,yBAAyB,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAIhG,KAAK,IAAI,GAAG;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AACD,KAAK,SAAS,GAAG;IACf,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAgB,YAAY,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,GAAG,SAAS,CA8B3E"}

package/dist/utilities/initPage/handleAdminPage.js

@@ -1,11 +1,9 @@
-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,
   route
-}) => {
+}) {
   if (isAdminRoute({
     adminRoute,
     config,
@@ -24,29 +22,18 @@ export const handleAdminPage = ({
     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","route","routeWithoutAdmin","routeSegments","split","filter","Boolean","entityType","entitySlug","createOrID","collectionSlug","undefined","globalSlug","docID","collectionConfig","globalConfig","collections","find","collection","slug","globals","global"],"sources":["../../../src/utilities/initPage/handleAdminPage.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload'\n\nimport { getRouteWithoutAdmin, isAdminRoute } from './shared.js'\n\ntype Args = {\n  adminRoute: string\n  config: SanitizedConfig\n  route: string\n}\ntype RouteInfo = {\n  collectionConfig?: SanitizedCollectionConfig\n  collectionSlug?: string\n  docID?: string\n  globalConfig?: SanitizedGlobalConfig\n  globalSlug?: string\n}\n\nexport function getRouteInfo({ adminRoute, config, 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    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\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":"AAEA,SAASA,oBAAoB,EAAEC,YAAY,QAAQ;AAenD,OAAO,SAASC,aAAa;EAAEC,UAAU;EAAEC,MAAM;EAAEC;AAAK,CAAQ;EAC9D,IAAIJ,YAAA,CAAa;IAAEE,UAAA;IAAYC,MAAA;IAAQC;EAAM,IAAI;IAC/C,MAAMC,iBAAA,GAAoBN,oBAAA,CAAqB;MAAEG,UAAA;MAAYE;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,GAAmBd,MAAA,CAAOgB,WAAW,CAACC,IAAI,CAAEC,UAAA,IAAeA,UAAA,CAAWC,IAAI,KAAKT,cAAA;IACjF;IAEA,IAAIE,UAAA,EAAY;MACdG,YAAA,GAAef,MAAA,CAAOoB,OAAO,CAACH,IAAI,CAAEI,MAAA,IAAWA,MAAA,CAAOF,IAAI,KAAKP,UAAA;IACjE;IAEA,OAAO;MACLE,gBAAA;MACAJ,cAAA;MACAG,KAAA;MACAE,YAAA;MACAH;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