@payloadcms/next 3.0.0-canary.ef0a8d0 → 3.0.0-canary.f1f97ff

package/dist/views/Login/LoginField/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Login/LoginField/index.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,OAAO,GAAG,iBAAiB,GAAG,UAAU,CAAA;CAC/C,CAAA;AACD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAmGhD,CAAA"}

package/dist/views/Login/LoginField/index.js

@@ -0,0 +1,101 @@
+'use client';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { EmailField, TextField, useConfig, useTranslation } from '@payloadcms/ui';
+import { email, username } from 'payload/shared';
+import React from 'react';
+export const LoginField = ({ type, required = true })=>{
+    const { t } = useTranslation();
+    const config = useConfig();
+    if (type === 'email') {
+        return /*#__PURE__*/ _jsx(EmailField, {
+            autoComplete: "email",
+            label: t('general:email'),
+            name: "email",
+            required: required,
+            validate: (value)=>email(value, {
+                    name: 'email',
+                    type: 'email',
+                    data: {},
+                    preferences: {
+                        fields: {}
+                    },
+                    req: {
+                        t
+                    },
+                    required: true,
+                    siblingData: {}
+                })
+        });
+    }
+    if (type === 'username') {
+        return /*#__PURE__*/ _jsx(TextField, {
+            label: t('authentication:username'),
+            name: "username",
+            required: true,
+            validate: (value)=>username(value, {
+                    name: 'username',
+                    type: 'text',
+                    data: {},
+                    preferences: {
+                        fields: {}
+                    },
+                    req: {
+                        payload: {
+                            config
+                        },
+                        t
+                    },
+                    required: true,
+                    siblingData: {}
+                })
+        });
+    }
+    if (type === 'emailOrUsername') {
+        return /*#__PURE__*/ _jsx(TextField, {
+            label: t('authentication:emailOrUsername'),
+            name: "username",
+            required: true,
+            validate: (value)=>{
+                const passesUsername = username(value, {
+                    name: 'username',
+                    type: 'text',
+                    data: {},
+                    preferences: {
+                        fields: {}
+                    },
+                    req: {
+                        payload: {
+                            config
+                        },
+                        t
+                    },
+                    required: true,
+                    siblingData: {}
+                });
+                const passesEmail = email(value, {
+                    name: 'username',
+                    type: 'email',
+                    data: {},
+                    preferences: {
+                        fields: {}
+                    },
+                    req: {
+                        payload: {
+                            config
+                        },
+                        t
+                    },
+                    required: true,
+                    siblingData: {}
+                });
+                if (!passesEmail && !passesUsername) {
+                    return `${t('general:email')}: ${passesEmail} ${t('general:username')}: ${passesUsername}`;
+                }
+                return true;
+            }
+        });
+    }
+    return null;
+};
+
+//# sourceMappingURL=index.js.map

package/dist/views/Login/LoginField/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/views/Login/LoginField/index.tsx"],"sourcesContent":["'use client'\nimport type { PayloadRequest } from 'payload'\n\nimport { EmailField, TextField, useConfig, useTranslation } from '@payloadcms/ui'\nimport { email, username } from 'payload/shared'\nimport React from 'react'\nexport type LoginFieldProps = {\n  required?: boolean\n  type: 'email' | 'emailOrUsername' | 'username'\n}\nexport const LoginField: React.FC<LoginFieldProps> = ({ type, required = true }) => {\n  const { t } = useTranslation()\n  const config = useConfig()\n\n  if (type === 'email') {\n    return (\n      <EmailField\n        autoComplete=\"email\"\n        label={t('general:email')}\n        name=\"email\"\n        required={required}\n        validate={(value) =>\n          email(value, {\n            name: 'email',\n            type: 'email',\n            data: {},\n            preferences: { fields: {} },\n            req: { t } as PayloadRequest,\n            required: true,\n            siblingData: {},\n          })\n        }\n      />\n    )\n  }\n\n  if (type === 'username') {\n    return (\n      <TextField\n        label={t('authentication:username')}\n        name=\"username\"\n        required\n        validate={(value) =>\n          username(value, {\n            name: 'username',\n            type: 'text',\n            data: {},\n            preferences: { fields: {} },\n            req: {\n              payload: {\n                config,\n              },\n              t,\n            } as PayloadRequest,\n            required: true,\n            siblingData: {},\n          })\n        }\n      />\n    )\n  }\n\n  if (type === 'emailOrUsername') {\n    return (\n      <TextField\n        label={t('authentication:emailOrUsername')}\n        name=\"username\"\n        required\n        validate={(value) => {\n          const passesUsername = username(value, {\n            name: 'username',\n            type: 'text',\n            data: {},\n            preferences: { fields: {} },\n            req: {\n              payload: {\n                config,\n              },\n              t,\n            } as PayloadRequest,\n            required: true,\n            siblingData: {},\n          })\n          const passesEmail = email(value, {\n            name: 'username',\n            type: 'email',\n            data: {},\n            preferences: { fields: {} },\n            req: {\n              payload: {\n                config,\n              },\n              t,\n            } as PayloadRequest,\n            required: true,\n            siblingData: {},\n          })\n\n          if (!passesEmail && !passesUsername) {\n            return `${t('general:email')}: ${passesEmail} ${t('general:username')}: ${passesUsername}`\n          }\n\n          return true\n        }}\n      />\n    )\n  }\n\n  return null\n}\n"],"names":["EmailField","TextField","useConfig","useTranslation","email","username","React","LoginField","type","required","t","config","autoComplete","label","name","validate","value","data","preferences","fields","req","siblingData","payload","passesUsername","passesEmail"],"mappings":"AAAA;;AAGA,SAASA,UAAU,EAAEC,SAAS,EAAEC,SAAS,EAAEC,cAAc,QAAQ,iBAAgB;AACjF,SAASC,KAAK,EAAEC,QAAQ,QAAQ,iBAAgB;AAChD,OAAOC,WAAW,QAAO;AAKzB,OAAO,MAAMC,aAAwC,CAAC,EAAEC,IAAI,EAAEC,WAAW,IAAI,EAAE;IAC7E,MAAM,EAAEC,CAAC,EAAE,GAAGP;IACd,MAAMQ,SAAST;IAEf,IAAIM,SAAS,SAAS;QACpB,qBACE,KAACR;YACCY,cAAa;YACbC,OAAOH,EAAE;YACTI,MAAK;YACLL,UAAUA;YACVM,UAAU,CAACC,QACTZ,MAAMY,OAAO;oBACXF,MAAM;oBACNN,MAAM;oBACNS,MAAM,CAAC;oBACPC,aAAa;wBAAEC,QAAQ,CAAC;oBAAE;oBAC1BC,KAAK;wBAAEV;oBAAE;oBACTD,UAAU;oBACVY,aAAa,CAAC;gBAChB;;IAIR;IAEA,IAAIb,SAAS,YAAY;QACvB,qBACE,KAACP;YACCY,OAAOH,EAAE;YACTI,MAAK;YACLL,QAAQ;YACRM,UAAU,CAACC,QACTX,SAASW,OAAO;oBACdF,MAAM;oBACNN,MAAM;oBACNS,MAAM,CAAC;oBACPC,aAAa;wBAAEC,QAAQ,CAAC;oBAAE;oBAC1BC,KAAK;wBACHE,SAAS;4BACPX;wBACF;wBACAD;oBACF;oBACAD,UAAU;oBACVY,aAAa,CAAC;gBAChB;;IAIR;IAEA,IAAIb,SAAS,mBAAmB;QAC9B,qBACE,KAACP;YACCY,OAAOH,EAAE;YACTI,MAAK;YACLL,QAAQ;YACRM,UAAU,CAACC;gBACT,MAAMO,iBAAiBlB,SAASW,OAAO;oBACrCF,MAAM;oBACNN,MAAM;oBACNS,MAAM,CAAC;oBACPC,aAAa;wBAAEC,QAAQ,CAAC;oBAAE;oBAC1BC,KAAK;wBACHE,SAAS;4BACPX;wBACF;wBACAD;oBACF;oBACAD,UAAU;oBACVY,aAAa,CAAC;gBAChB;gBACA,MAAMG,cAAcpB,MAAMY,OAAO;oBAC/BF,MAAM;oBACNN,MAAM;oBACNS,MAAM,CAAC;oBACPC,aAAa;wBAAEC,QAAQ,CAAC;oBAAE;oBAC1BC,KAAK;wBACHE,SAAS;4BACPX;wBACF;wBACAD;oBACF;oBACAD,UAAU;oBACVY,aAAa,CAAC;gBAChB;gBAEA,IAAI,CAACG,eAAe,CAACD,gBAAgB;oBACnC,OAAO,CAAC,EAAEb,EAAE,iBAAiB,EAAE,EAAEc,YAAY,CAAC,EAAEd,EAAE,oBAAoB,EAAE,EAAEa,eAAe,CAAC;gBAC5F;gBAEA,OAAO;YACT;;IAGN;IAEA,OAAO;AACT,EAAC"}

package/dist/views/Login/LoginForm/index.d.ts

@@ -1,6 +1,9 @@
 import React from 'react';
 import './index.scss';
 export declare const LoginForm: React.FC<{
+    prefillEmail?: string;
+    prefillPassword?: string;
+    prefillUsername?: string;
     searchParams: {
         [key: string]: string | string[] | undefined;
     };

package/dist/views/Login/LoginForm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Login/LoginForm/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAA;AAkBzB,OAAO,cAAc,CAAA;AAErB,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;IAC/B,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,CAAA;CAC/D,CAwHA,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Login/LoginForm/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAA;AAczB,OAAO,cAAc,CAAA;AAErB,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,CAAA;CAC/D,CA8FA,CAAA"}

package/dist/views/Login/LoginForm/index.js

@@ -4,85 +4,58 @@ import LinkImport from 'next/link.js';
 import React from 'react';
 const baseClass = 'login__form';
 const Link = LinkImport.default || LinkImport;
-import { EmailField, Form, FormSubmit, PasswordField, TextField, useConfig, useTranslation } from '@payloadcms/ui';
-import { email, password, text } from 'payload/shared';
-export const LoginForm = ({ searchParams })=>{
+import { Form, FormSubmit, PasswordField, useConfig, useTranslation } from '@payloadcms/ui';
+import { formatAdminURL } from '@payloadcms/ui/shared';
+import { password } from 'payload/shared';
+import { LoginField } from '../LoginField/index.js';
+export const LoginForm = ({ prefillEmail, prefillPassword, prefillUsername, searchParams })=>{
     const config = useConfig();
-    const { admin: { autoLogin, routes: { forgot: forgotRoute }, user: userSlug }, routes: { admin, api } } = config;
+    const { admin: { routes: { forgot: forgotRoute }, user: userSlug }, routes: { admin: adminRoute, api: apiRoute } } = config;
     const collectionConfig = config.collections?.find((collection)=>collection?.slug === userSlug);
-    const loginWithUsername = collectionConfig?.auth?.loginWithUsername;
+    const { auth: authOptions } = collectionConfig;
+    const loginWithUsername = authOptions.loginWithUsername;
+    const canLoginWithEmail = !authOptions.loginWithUsername || authOptions.loginWithUsername.allowEmailLogin;
+    const canLoginWithUsername = authOptions.loginWithUsername;
+    const [loginType] = React.useState(()=>{
+        if (canLoginWithEmail && canLoginWithUsername) return 'emailOrUsername';
+        if (canLoginWithUsername) return 'username';
+        return 'email';
+    });
     const { t } = useTranslation();
-    const prefillForm = autoLogin && autoLogin.prefillOnly;
     const initialState = {
         password: {
-            initialValue: prefillForm ? autoLogin.password : undefined,
+            initialValue: prefillPassword ?? undefined,
             valid: true,
-            value: prefillForm ? autoLogin.password : undefined
+            value: prefillPassword ?? undefined
         }
     };
     if (loginWithUsername) {
         initialState.username = {
-            initialValue: prefillForm ? autoLogin.username : undefined,
+            initialValue: prefillUsername ?? undefined,
             valid: true,
-            value: prefillForm ? autoLogin.username : undefined
+            value: prefillUsername ?? undefined
         };
     } else {
         initialState.email = {
-            initialValue: prefillForm ? autoLogin.email : undefined,
+            initialValue: prefillEmail ?? undefined,
             valid: true,
-            value: prefillForm ? autoLogin.email : undefined
+            value: prefillEmail ?? undefined
         };
     }
     return /*#__PURE__*/ _jsxs(Form, {
-        action: `${api}/${userSlug}/login`,
+        action: `${apiRoute}/${userSlug}/login`,
         className: baseClass,
         disableSuccessStatus: true,
         initialState: initialState,
         method: "POST",
-        redirect: typeof searchParams?.redirect === 'string' ? searchParams.redirect : admin,
+        redirect: typeof searchParams?.redirect === 'string' ? searchParams.redirect : adminRoute,
         waitForAutocomplete: true,
         children: [
             /*#__PURE__*/ _jsxs("div", {
                 className: `${baseClass}__inputWrap`,
                 children: [
-                    loginWithUsername ? /*#__PURE__*/ _jsx(TextField, {
-                        label: t('authentication:username'),
-                        name: "username",
-                        required: true,
-                        validate: (value)=>text(value, {
-                                name: 'username',
-                                type: 'text',
-                                data: {},
-                                preferences: {
-                                    fields: {}
-                                },
-                                req: {
-                                    payload: {
-                                        config
-                                    },
-                                    t
-                                },
-                                required: true,
-                                siblingData: {}
-                            })
-                    }) : /*#__PURE__*/ _jsx(EmailField, {
-                        autoComplete: "email",
-                        label: t('general:email'),
-                        name: "email",
-                        required: true,
-                        validate: (value)=>email(value, {
-                                name: 'email',
-                                type: 'email',
-                                data: {},
-                                preferences: {
-                                    fields: {}
-                                },
-                                req: {
-                                    t
-                                },
-                                required: true,
-                                siblingData: {}
-                            })
+                    /*#__PURE__*/ _jsx(LoginField, {
+                        type: loginType
                     }),
                     /*#__PURE__*/ _jsx(PasswordField, {
                         autoComplete: "off",
@@ -109,7 +82,10 @@ export const LoginForm = ({ searchParams })=>{
                 ]
             }),
             /*#__PURE__*/ _jsx(Link, {
-                href: `${admin}${forgotRoute}`,
+                href: formatAdminURL({
+                    adminRoute,
+                    path: forgotRoute
+                }),
                 children: t('authentication:forgotPasswordQuestion')
             }),
             /*#__PURE__*/ _jsx(FormSubmit, {

package/dist/views/Login/LoginForm/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Login/LoginForm/index.tsx"],"sourcesContent":["'use client'\n\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\nconst baseClass = 'login__form'\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nimport type { FormState, PayloadRequest } from 'payload'\n\nimport {\n  EmailField,\n  Form,\n  FormSubmit,\n  PasswordField,\n  TextField,\n  useConfig,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { email, password, text } from 'payload/shared'\n\nimport './index.scss'\n\nexport const LoginForm: React.FC<{\n  searchParams: { [key: string]: string | string[] | undefined }\n}> = ({ searchParams }) => {\n  const config = useConfig()\n\n  const {\n    admin: {\n      autoLogin,\n      routes: { forgot: forgotRoute },\n      user: userSlug,\n    },\n    routes: { admin, api },\n  } = config\n\n  const collectionConfig = config.collections?.find((collection) => collection?.slug === userSlug)\n  const loginWithUsername = collectionConfig?.auth?.loginWithUsername\n\n  const { t } = useTranslation()\n\n  const prefillForm = autoLogin && autoLogin.prefillOnly\n\n  const initialState: FormState = {\n    password: {\n      initialValue: prefillForm ? autoLogin.password : undefined,\n      valid: true,\n      value: prefillForm ? autoLogin.password : undefined,\n    },\n  }\n\n  if (loginWithUsername) {\n    initialState.username = {\n      initialValue: prefillForm ? autoLogin.username : undefined,\n      valid: true,\n      value: prefillForm ? autoLogin.username : undefined,\n    }\n  } else {\n    initialState.email = {\n      initialValue: prefillForm ? autoLogin.email : undefined,\n      valid: true,\n      value: prefillForm ? autoLogin.email : undefined,\n    }\n  }\n\n  return (\n    <Form\n      action={`${api}/${userSlug}/login`}\n      className={baseClass}\n      disableSuccessStatus\n      initialState={initialState}\n      method=\"POST\"\n      redirect={typeof searchParams?.redirect === 'string' ? searchParams.redirect : admin}\n      waitForAutocomplete\n    >\n      <div className={`${baseClass}__inputWrap`}>\n        {loginWithUsername ? (\n          <TextField\n            label={t('authentication:username')}\n            name=\"username\"\n            required\n            validate={(value) =>\n              text(value, {\n                name: 'username',\n                type: 'text',\n                data: {},\n                preferences: { fields: {} },\n                req: {\n                  payload: {\n                    config,\n                  },\n                  t,\n                } as PayloadRequest,\n                required: true,\n                siblingData: {},\n              })\n            }\n          />\n        ) : (\n          <EmailField\n            autoComplete=\"email\"\n            label={t('general:email')}\n            name=\"email\"\n            required\n            validate={(value) =>\n              email(value, {\n                name: 'email',\n                type: 'email',\n                data: {},\n                preferences: { fields: {} },\n                req: { t } as PayloadRequest,\n                required: true,\n                siblingData: {},\n              })\n            }\n          />\n        )}\n        <PasswordField\n          autoComplete=\"off\"\n          label={t('general:password')}\n          name=\"password\"\n          required\n          validate={(value) =>\n            password(value, {\n              name: 'password',\n              type: 'text',\n              data: {},\n              preferences: { fields: {} },\n              req: {\n                payload: {\n                  config,\n                },\n                t,\n              } as PayloadRequest,\n              required: true,\n              siblingData: {},\n            })\n          }\n        />\n      </div>\n      <Link href={`${admin}${forgotRoute}`}>{t('authentication:forgotPasswordQuestion')}</Link>\n      <FormSubmit>{t('authentication:login')}</FormSubmit>\n    </Form>\n  )\n}\n"],"names":["LinkImport","React","baseClass","Link","default","EmailField","Form","FormSubmit","PasswordField","TextField","useConfig","useTranslation","email","password","text","LoginForm","searchParams","config","admin","autoLogin","routes","forgot","forgotRoute","user","userSlug","api","collectionConfig","collections","find","collection","slug","loginWithUsername","auth","t","prefillForm","prefillOnly","initialState","initialValue","undefined","valid","value","username","action","className","disableSuccessStatus","method","redirect","waitForAutocomplete","div","label","name","required","validate","type","data","preferences","fields","req","payload","siblingData","autoComplete","href"],"mappings":"AAAA;;AAEA,OAAOA,gBAAgB,eAAc;AACrC,OAAOC,WAAW,QAAO;AAEzB,MAAMC,YAAY;AAClB,MAAMC,OAAQH,WAAWI,OAAO,IAAIJ;AAIpC,SACEK,UAAU,EACVC,IAAI,EACJC,UAAU,EACVC,aAAa,EACbC,SAAS,EACTC,SAAS,EACTC,cAAc,QACT,iBAAgB;AACvB,SAASC,KAAK,EAAEC,QAAQ,EAAEC,IAAI,QAAQ,iBAAgB;AAItD,OAAO,MAAMC,YAER,CAAC,EAAEC,YAAY,EAAE;IACpB,MAAMC,SAASP;IAEf,MAAM,EACJQ,OAAO,EACLC,SAAS,EACTC,QAAQ,EAAEC,QAAQC,WAAW,EAAE,EAC/BC,MAAMC,QAAQ,EACf,EACDJ,QAAQ,EAAEF,KAAK,EAAEO,GAAG,EAAE,EACvB,GAAGR;IAEJ,MAAMS,mBAAmBT,OAAOU,WAAW,EAAEC,KAAK,CAACC,aAAeA,YAAYC,SAASN;IACvF,MAAMO,oBAAoBL,kBAAkBM,MAAMD;IAElD,MAAM,EAAEE,CAAC,EAAE,GAAGtB;IAEd,MAAMuB,cAAcf,aAAaA,UAAUgB,WAAW;IAEtD,MAAMC,eAA0B;QAC9BvB,UAAU;YACRwB,cAAcH,cAAcf,UAAUN,QAAQ,GAAGyB;YACjDC,OAAO;YACPC,OAAON,cAAcf,UAAUN,QAAQ,GAAGyB;QAC5C;IACF;IAEA,IAAIP,mBAAmB;QACrBK,aAAaK,QAAQ,GAAG;YACtBJ,cAAcH,cAAcf,UAAUsB,QAAQ,GAAGH;YACjDC,OAAO;YACPC,OAAON,cAAcf,UAAUsB,QAAQ,GAAGH;QAC5C;IACF,OAAO;QACLF,aAAaxB,KAAK,GAAG;YACnByB,cAAcH,cAAcf,UAAUP,KAAK,GAAG0B;YAC9CC,OAAO;YACPC,OAAON,cAAcf,UAAUP,KAAK,GAAG0B;QACzC;IACF;IAEA,qBACE,MAAChC;QACCoC,QAAQ,CAAC,EAAEjB,IAAI,CAAC,EAAED,SAAS,MAAM,CAAC;QAClCmB,WAAWzC;QACX0C,oBAAoB;QACpBR,cAAcA;QACdS,QAAO;QACPC,UAAU,OAAO9B,cAAc8B,aAAa,WAAW9B,aAAa8B,QAAQ,GAAG5B;QAC/E6B,mBAAmB;;0BAEnB,MAACC;gBAAIL,WAAW,CAAC,EAAEzC,UAAU,WAAW,CAAC;;oBACtC6B,kCACC,KAACtB;wBACCwC,OAAOhB,EAAE;wBACTiB,MAAK;wBACLC,QAAQ;wBACRC,UAAU,CAACZ,QACT1B,KAAK0B,OAAO;gCACVU,MAAM;gCACNG,MAAM;gCACNC,MAAM,CAAC;gCACPC,aAAa;oCAAEC,QAAQ,CAAC;gCAAE;gCAC1BC,KAAK;oCACHC,SAAS;wCACPzC;oCACF;oCACAgB;gCACF;gCACAkB,UAAU;gCACVQ,aAAa,CAAC;4BAChB;uCAIJ,KAACtD;wBACCuD,cAAa;wBACbX,OAAOhB,EAAE;wBACTiB,MAAK;wBACLC,QAAQ;wBACRC,UAAU,CAACZ,QACT5B,MAAM4B,OAAO;gCACXU,MAAM;gCACNG,MAAM;gCACNC,MAAM,CAAC;gCACPC,aAAa;oCAAEC,QAAQ,CAAC;gCAAE;gCAC1BC,KAAK;oCAAExB;gCAAE;gCACTkB,UAAU;gCACVQ,aAAa,CAAC;4BAChB;;kCAIN,KAACnD;wBACCoD,cAAa;wBACbX,OAAOhB,EAAE;wBACTiB,MAAK;wBACLC,QAAQ;wBACRC,UAAU,CAACZ,QACT3B,SAAS2B,OAAO;gCACdU,MAAM;gCACNG,MAAM;gCACNC,MAAM,CAAC;gCACPC,aAAa;oCAAEC,QAAQ,CAAC;gCAAE;gCAC1BC,KAAK;oCACHC,SAAS;wCACPzC;oCACF;oCACAgB;gCACF;gCACAkB,UAAU;gCACVQ,aAAa,CAAC;4BAChB;;;;0BAIN,KAACxD;gBAAK0D,MAAM,CAAC,EAAE3C,MAAM,EAAEI,YAAY,CAAC;0BAAGW,EAAE;;0BACzC,KAAC1B;0BAAY0B,EAAE;;;;AAGrB,EAAC"}
+{"version":3,"sources":["../../../../src/views/Login/LoginForm/index.tsx"],"sourcesContent":["'use client'\n\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\nconst baseClass = 'login__form'\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nimport type { FormState, PayloadRequest } from 'payload'\n\nimport { Form, FormSubmit, PasswordField, useConfig, useTranslation } from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport { password } from 'payload/shared'\n\nimport type { LoginFieldProps } from '../LoginField/index.js'\n\nimport { LoginField } from '../LoginField/index.js'\nimport './index.scss'\n\nexport const LoginForm: React.FC<{\n  prefillEmail?: string\n  prefillPassword?: string\n  prefillUsername?: string\n  searchParams: { [key: string]: string | string[] | undefined }\n}> = ({ prefillEmail, prefillPassword, prefillUsername, searchParams }) => {\n  const config = useConfig()\n\n  const {\n    admin: {\n      routes: { forgot: forgotRoute },\n      user: userSlug,\n    },\n    routes: { admin: adminRoute, api: apiRoute },\n  } = config\n\n  const collectionConfig = config.collections?.find((collection) => collection?.slug === userSlug)\n  const { auth: authOptions } = collectionConfig\n  const loginWithUsername = authOptions.loginWithUsername\n  const canLoginWithEmail =\n    !authOptions.loginWithUsername || authOptions.loginWithUsername.allowEmailLogin\n  const canLoginWithUsername = authOptions.loginWithUsername\n\n  const [loginType] = React.useState<LoginFieldProps['type']>(() => {\n    if (canLoginWithEmail && canLoginWithUsername) return 'emailOrUsername'\n    if (canLoginWithUsername) return 'username'\n    return 'email'\n  })\n\n  const { t } = useTranslation()\n\n  const initialState: FormState = {\n    password: {\n      initialValue: prefillPassword ?? undefined,\n      valid: true,\n      value: prefillPassword ?? undefined,\n    },\n  }\n\n  if (loginWithUsername) {\n    initialState.username = {\n      initialValue: prefillUsername ?? undefined,\n      valid: true,\n      value: prefillUsername ?? undefined,\n    }\n  } else {\n    initialState.email = {\n      initialValue: prefillEmail ?? undefined,\n      valid: true,\n      value: prefillEmail ?? undefined,\n    }\n  }\n\n  return (\n    <Form\n      action={`${apiRoute}/${userSlug}/login`}\n      className={baseClass}\n      disableSuccessStatus\n      initialState={initialState}\n      method=\"POST\"\n      redirect={typeof searchParams?.redirect === 'string' ? searchParams.redirect : adminRoute}\n      waitForAutocomplete\n    >\n      <div className={`${baseClass}__inputWrap`}>\n        <LoginField type={loginType} />\n        <PasswordField\n          autoComplete=\"off\"\n          label={t('general:password')}\n          name=\"password\"\n          required\n          validate={(value) =>\n            password(value, {\n              name: 'password',\n              type: 'text',\n              data: {},\n              preferences: { fields: {} },\n              req: {\n                payload: {\n                  config,\n                },\n                t,\n              } as PayloadRequest,\n              required: true,\n              siblingData: {},\n            })\n          }\n        />\n      </div>\n      <Link\n        href={formatAdminURL({\n          adminRoute,\n          path: forgotRoute,\n        })}\n      >\n        {t('authentication:forgotPasswordQuestion')}\n      </Link>\n      <FormSubmit>{t('authentication:login')}</FormSubmit>\n    </Form>\n  )\n}\n"],"names":["LinkImport","React","baseClass","Link","default","Form","FormSubmit","PasswordField","useConfig","useTranslation","formatAdminURL","password","LoginField","LoginForm","prefillEmail","prefillPassword","prefillUsername","searchParams","config","admin","routes","forgot","forgotRoute","user","userSlug","adminRoute","api","apiRoute","collectionConfig","collections","find","collection","slug","auth","authOptions","loginWithUsername","canLoginWithEmail","allowEmailLogin","canLoginWithUsername","loginType","useState","t","initialState","initialValue","undefined","valid","value","username","email","action","className","disableSuccessStatus","method","redirect","waitForAutocomplete","div","type","autoComplete","label","name","required","validate","data","preferences","fields","req","payload","siblingData","href","path"],"mappings":"AAAA;;AAEA,OAAOA,gBAAgB,eAAc;AACrC,OAAOC,WAAW,QAAO;AAEzB,MAAMC,YAAY;AAClB,MAAMC,OAAQH,WAAWI,OAAO,IAAIJ;AAIpC,SAASK,IAAI,EAAEC,UAAU,EAAEC,aAAa,EAAEC,SAAS,EAAEC,cAAc,QAAQ,iBAAgB;AAC3F,SAASC,cAAc,QAAQ,wBAAuB;AACtD,SAASC,QAAQ,QAAQ,iBAAgB;AAIzC,SAASC,UAAU,QAAQ,yBAAwB;AAGnD,OAAO,MAAMC,YAKR,CAAC,EAAEC,YAAY,EAAEC,eAAe,EAAEC,eAAe,EAAEC,YAAY,EAAE;IACpE,MAAMC,SAASV;IAEf,MAAM,EACJW,OAAO,EACLC,QAAQ,EAAEC,QAAQC,WAAW,EAAE,EAC/BC,MAAMC,QAAQ,EACf,EACDJ,QAAQ,EAAED,OAAOM,UAAU,EAAEC,KAAKC,QAAQ,EAAE,EAC7C,GAAGT;IAEJ,MAAMU,mBAAmBV,OAAOW,WAAW,EAAEC,KAAK,CAACC,aAAeA,YAAYC,SAASR;IACvF,MAAM,EAAES,MAAMC,WAAW,EAAE,GAAGN;IAC9B,MAAMO,oBAAoBD,YAAYC,iBAAiB;IACvD,MAAMC,oBACJ,CAACF,YAAYC,iBAAiB,IAAID,YAAYC,iBAAiB,CAACE,eAAe;IACjF,MAAMC,uBAAuBJ,YAAYC,iBAAiB;IAE1D,MAAM,CAACI,UAAU,GAAGtC,MAAMuC,QAAQ,CAA0B;QAC1D,IAAIJ,qBAAqBE,sBAAsB,OAAO;QACtD,IAAIA,sBAAsB,OAAO;QACjC,OAAO;IACT;IAEA,MAAM,EAAEG,CAAC,EAAE,GAAGhC;IAEd,MAAMiC,eAA0B;QAC9B/B,UAAU;YACRgC,cAAc5B,mBAAmB6B;YACjCC,OAAO;YACPC,OAAO/B,mBAAmB6B;QAC5B;IACF;IAEA,IAAIT,mBAAmB;QACrBO,aAAaK,QAAQ,GAAG;YACtBJ,cAAc3B,mBAAmB4B;YACjCC,OAAO;YACPC,OAAO9B,mBAAmB4B;QAC5B;IACF,OAAO;QACLF,aAAaM,KAAK,GAAG;YACnBL,cAAc7B,gBAAgB8B;YAC9BC,OAAO;YACPC,OAAOhC,gBAAgB8B;QACzB;IACF;IAEA,qBACE,MAACvC;QACC4C,QAAQ,CAAC,EAAEtB,SAAS,CAAC,EAAEH,SAAS,MAAM,CAAC;QACvC0B,WAAWhD;QACXiD,oBAAoB;QACpBT,cAAcA;QACdU,QAAO;QACPC,UAAU,OAAOpC,cAAcoC,aAAa,WAAWpC,aAAaoC,QAAQ,GAAG5B;QAC/E6B,mBAAmB;;0BAEnB,MAACC;gBAAIL,WAAW,CAAC,EAAEhD,UAAU,WAAW,CAAC;;kCACvC,KAACU;wBAAW4C,MAAMjB;;kCAClB,KAAChC;wBACCkD,cAAa;wBACbC,OAAOjB,EAAE;wBACTkB,MAAK;wBACLC,QAAQ;wBACRC,UAAU,CAACf,QACTnC,SAASmC,OAAO;gCACda,MAAM;gCACNH,MAAM;gCACNM,MAAM,CAAC;gCACPC,aAAa;oCAAEC,QAAQ,CAAC;gCAAE;gCAC1BC,KAAK;oCACHC,SAAS;wCACPhD;oCACF;oCACAuB;gCACF;gCACAmB,UAAU;gCACVO,aAAa,CAAC;4BAChB;;;;0BAIN,KAAChE;gBACCiE,MAAM1D,eAAe;oBACnBe;oBACA4C,MAAM/C;gBACR;0BAECmB,EAAE;;0BAEL,KAACnC;0BAAYmC,EAAE;;;;AAGrB,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Login/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,OAAO,KAAmB,MAAM,OAAO,CAAA;AAIvC,OAAO,cAAc,CAAA;AAErB,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,eAAO,MAAM,cAAc,UAAU,CAAA;AAErC,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA4E9C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Login/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,OAAO,KAAmB,MAAM,OAAO,CAAA;AAIvC,OAAO,cAAc,CAAA;AAErB,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,eAAO,MAAM,cAAc,UAAU,CAAA;AAErC,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAqG9C,CAAA"}

package/dist/views/Login/index.js

@@ -38,6 +38,10 @@ export const LoginView = ({ initPageResult, params, searchParams })=>{
         redirect(admin);
     }
     const collectionConfig = collections.find(({ slug })=>slug === userSlug);
+    const prefillAutoLogin = typeof config.admin?.autoLogin === 'object' && config.admin?.autoLogin.prefillOnly;
+    const prefillUsername = prefillAutoLogin && typeof config.admin?.autoLogin === 'object' ? config.admin?.autoLogin.username : undefined;
+    const prefillEmail = prefillAutoLogin && typeof config.admin?.autoLogin === 'object' ? config.admin?.autoLogin.email : undefined;
+    const prefillPassword = prefillAutoLogin && typeof config.admin?.autoLogin === 'object' ? config.admin?.autoLogin.password : undefined;
     return /*#__PURE__*/ _jsxs(Fragment, {
         children: [
             /*#__PURE__*/ _jsx("div", {
@@ -54,6 +58,9 @@ export const LoginView = ({ initPageResult, params, searchParams })=>{
             }),
             Array.isArray(BeforeLogins) && BeforeLogins.map((Component)=>Component),
             !collectionConfig?.auth?.disableLocalStrategy && /*#__PURE__*/ _jsx(LoginForm, {
+                prefillEmail: prefillEmail,
+                prefillPassword: prefillPassword,
+                prefillUsername: prefillUsername,
                 searchParams: searchParams
             }),
             Array.isArray(AfterLogins) && AfterLogins.map((Component)=>Component)

package/dist/views/Login/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Login/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport { WithServerSideProps } from '@payloadcms/ui/shared'\nimport { redirect } from 'next/navigation.js'\nimport React, { Fragment } from 'react'\n\nimport { Logo } from '../../elements/Logo/index.js'\nimport { LoginForm } from './LoginForm/index.js'\nimport './index.scss'\n\nexport { generateLoginMetadata } from './meta.js'\n\nexport const loginBaseClass = 'login'\n\nexport const LoginView: React.FC<AdminViewProps> = ({ initPageResult, params, searchParams }) => {\n  const { locale, permissions, req } = initPageResult\n\n  const {\n    i18n,\n    payload: { config },\n    payload,\n    user,\n  } = req\n\n  const {\n    admin: { components: { afterLogin, beforeLogin } = {}, user: userSlug },\n    collections,\n    routes: { admin },\n  } = config\n\n  const BeforeLogins = Array.isArray(beforeLogin)\n    ? beforeLogin.map((Component, i) => (\n        <WithServerSideProps\n          Component={Component}\n          key={i}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      ))\n    : null\n\n  const AfterLogins = Array.isArray(afterLogin)\n    ? afterLogin.map((Component, i) => (\n        <WithServerSideProps\n          Component={Component}\n          key={i}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      ))\n    : null\n\n  if (user) {\n    redirect(admin)\n  }\n\n  const collectionConfig = collections.find(({ slug }) => slug === userSlug)\n\n  return (\n    <Fragment>\n      <div className={`${loginBaseClass}__brand`}>\n        <Logo\n          i18n={i18n}\n          locale={locale}\n          params={params}\n          payload={payload}\n          permissions={permissions}\n          searchParams={searchParams}\n          user={user}\n        />\n      </div>\n      {Array.isArray(BeforeLogins) && BeforeLogins.map((Component) => Component)}\n      {!collectionConfig?.auth?.disableLocalStrategy && <LoginForm searchParams={searchParams} />}\n      {Array.isArray(AfterLogins) && AfterLogins.map((Component) => Component)}\n    </Fragment>\n  )\n}\n"],"names":["WithServerSideProps","redirect","React","Fragment","Logo","LoginForm","generateLoginMetadata","loginBaseClass","LoginView","initPageResult","params","searchParams","locale","permissions","req","i18n","payload","config","user","admin","components","afterLogin","beforeLogin","userSlug","collections","routes","BeforeLogins","Array","isArray","map","Component","i","serverOnlyProps","AfterLogins","collectionConfig","find","slug","div","className","auth","disableLocalStrategy"],"mappings":";AAEA,SAASA,mBAAmB,QAAQ,wBAAuB;AAC3D,SAASC,QAAQ,QAAQ,qBAAoB;AAC7C,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,IAAI,QAAQ,+BAA8B;AACnD,SAASC,SAAS,QAAQ,uBAAsB;AAGhD,SAASC,qBAAqB,QAAQ,YAAW;AAEjD,OAAO,MAAMC,iBAAiB,QAAO;AAErC,OAAO,MAAMC,YAAsC,CAAC,EAAEC,cAAc,EAAEC,MAAM,EAAEC,YAAY,EAAE;IAC1F,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAEC,GAAG,EAAE,GAAGL;IAErC,MAAM,EACJM,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACnBD,OAAO,EACPE,IAAI,EACL,GAAGJ;IAEJ,MAAM,EACJK,OAAO,EAAEC,YAAY,EAAEC,UAAU,EAAEC,WAAW,EAAE,GAAG,CAAC,CAAC,EAAEJ,MAAMK,QAAQ,EAAE,EACvEC,WAAW,EACXC,QAAQ,EAAEN,KAAK,EAAE,EAClB,GAAGF;IAEJ,MAAMS,eAAeC,MAAMC,OAAO,CAACN,eAC/BA,YAAYO,GAAG,CAAC,CAACC,WAAWC,kBAC1B,KAAC/B;YACC8B,WAAWA;YAEXE,iBAAiB;gBACfjB;gBACAH;gBACAF;gBACAM;gBACAH;gBACAF;gBACAO;YACF;WATKa,MAYT;IAEJ,MAAME,cAAcN,MAAMC,OAAO,CAACP,cAC9BA,WAAWQ,GAAG,CAAC,CAACC,WAAWC,kBACzB,KAAC/B;YACC8B,WAAWA;YAEXE,iBAAiB;gBACfjB;gBACAH;gBACAF;gBACAM;gBACAH;gBACAF;gBACAO;YACF;WATKa,MAYT;IAEJ,IAAIb,MAAM;QACRjB,SAASkB;IACX;IAEA,MAAMe,mBAAmBV,YAAYW,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASb;IAEjE,qBACE,MAACpB;;0BACC,KAACkC;gBAAIC,WAAW,CAAC,EAAE/B,eAAe,OAAO,CAAC;0BACxC,cAAA,KAACH;oBACCW,MAAMA;oBACNH,QAAQA;oBACRF,QAAQA;oBACRM,SAASA;oBACTH,aAAaA;oBACbF,cAAcA;oBACdO,MAAMA;;;YAGTS,MAAMC,OAAO,CAACF,iBAAiBA,aAAaG,GAAG,CAAC,CAACC,YAAcA;YAC/D,CAACI,kBAAkBK,MAAMC,sCAAwB,KAACnC;gBAAUM,cAAcA;;YAC1EgB,MAAMC,OAAO,CAACK,gBAAgBA,YAAYJ,GAAG,CAAC,CAACC,YAAcA;;;AAGpE,EAAC"}
+{"version":3,"sources":["../../../src/views/Login/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport { WithServerSideProps } from '@payloadcms/ui/shared'\nimport { redirect } from 'next/navigation.js'\nimport React, { Fragment } from 'react'\n\nimport { Logo } from '../../elements/Logo/index.js'\nimport { LoginForm } from './LoginForm/index.js'\nimport './index.scss'\n\nexport { generateLoginMetadata } from './meta.js'\n\nexport const loginBaseClass = 'login'\n\nexport const LoginView: React.FC<AdminViewProps> = ({ initPageResult, params, searchParams }) => {\n  const { locale, permissions, req } = initPageResult\n\n  const {\n    i18n,\n    payload: { config },\n    payload,\n    user,\n  } = req\n\n  const {\n    admin: { components: { afterLogin, beforeLogin } = {}, user: userSlug },\n    collections,\n    routes: { admin },\n  } = config\n\n  const BeforeLogins = Array.isArray(beforeLogin)\n    ? beforeLogin.map((Component, i) => (\n        <WithServerSideProps\n          Component={Component}\n          key={i}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      ))\n    : null\n\n  const AfterLogins = Array.isArray(afterLogin)\n    ? afterLogin.map((Component, i) => (\n        <WithServerSideProps\n          Component={Component}\n          key={i}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      ))\n    : null\n\n  if (user) {\n    redirect(admin)\n  }\n\n  const collectionConfig = collections.find(({ slug }) => slug === userSlug)\n\n  const prefillAutoLogin =\n    typeof config.admin?.autoLogin === 'object' && config.admin?.autoLogin.prefillOnly\n\n  const prefillUsername =\n    prefillAutoLogin && typeof config.admin?.autoLogin === 'object'\n      ? config.admin?.autoLogin.username\n      : undefined\n\n  const prefillEmail =\n    prefillAutoLogin && typeof config.admin?.autoLogin === 'object'\n      ? config.admin?.autoLogin.email\n      : undefined\n\n  const prefillPassword =\n    prefillAutoLogin && typeof config.admin?.autoLogin === 'object'\n      ? config.admin?.autoLogin.password\n      : undefined\n\n  return (\n    <Fragment>\n      <div className={`${loginBaseClass}__brand`}>\n        <Logo\n          i18n={i18n}\n          locale={locale}\n          params={params}\n          payload={payload}\n          permissions={permissions}\n          searchParams={searchParams}\n          user={user}\n        />\n      </div>\n      {Array.isArray(BeforeLogins) && BeforeLogins.map((Component) => Component)}\n      {!collectionConfig?.auth?.disableLocalStrategy && (\n        <LoginForm\n          prefillEmail={prefillEmail}\n          prefillPassword={prefillPassword}\n          prefillUsername={prefillUsername}\n          searchParams={searchParams}\n        />\n      )}\n      {Array.isArray(AfterLogins) && AfterLogins.map((Component) => Component)}\n    </Fragment>\n  )\n}\n"],"names":["WithServerSideProps","redirect","React","Fragment","Logo","LoginForm","generateLoginMetadata","loginBaseClass","LoginView","initPageResult","params","searchParams","locale","permissions","req","i18n","payload","config","user","admin","components","afterLogin","beforeLogin","userSlug","collections","routes","BeforeLogins","Array","isArray","map","Component","i","serverOnlyProps","AfterLogins","collectionConfig","find","slug","prefillAutoLogin","autoLogin","prefillOnly","prefillUsername","username","undefined","prefillEmail","email","prefillPassword","password","div","className","auth","disableLocalStrategy"],"mappings":";AAEA,SAASA,mBAAmB,QAAQ,wBAAuB;AAC3D,SAASC,QAAQ,QAAQ,qBAAoB;AAC7C,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,IAAI,QAAQ,+BAA8B;AACnD,SAASC,SAAS,QAAQ,uBAAsB;AAGhD,SAASC,qBAAqB,QAAQ,YAAW;AAEjD,OAAO,MAAMC,iBAAiB,QAAO;AAErC,OAAO,MAAMC,YAAsC,CAAC,EAAEC,cAAc,EAAEC,MAAM,EAAEC,YAAY,EAAE;IAC1F,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAEC,GAAG,EAAE,GAAGL;IAErC,MAAM,EACJM,IAAI,EACJC,SAAS,EAAEC,MAAM,EAAE,EACnBD,OAAO,EACPE,IAAI,EACL,GAAGJ;IAEJ,MAAM,EACJK,OAAO,EAAEC,YAAY,EAAEC,UAAU,EAAEC,WAAW,EAAE,GAAG,CAAC,CAAC,EAAEJ,MAAMK,QAAQ,EAAE,EACvEC,WAAW,EACXC,QAAQ,EAAEN,KAAK,EAAE,EAClB,GAAGF;IAEJ,MAAMS,eAAeC,MAAMC,OAAO,CAACN,eAC/BA,YAAYO,GAAG,CAAC,CAACC,WAAWC,kBAC1B,KAAC/B;YACC8B,WAAWA;YAEXE,iBAAiB;gBACfjB;gBACAH;gBACAF;gBACAM;gBACAH;gBACAF;gBACAO;YACF;WATKa,MAYT;IAEJ,MAAME,cAAcN,MAAMC,OAAO,CAACP,cAC9BA,WAAWQ,GAAG,CAAC,CAACC,WAAWC,kBACzB,KAAC/B;YACC8B,WAAWA;YAEXE,iBAAiB;gBACfjB;gBACAH;gBACAF;gBACAM;gBACAH;gBACAF;gBACAO;YACF;WATKa,MAYT;IAEJ,IAAIb,MAAM;QACRjB,SAASkB;IACX;IAEA,MAAMe,mBAAmBV,YAAYW,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASb;IAEjE,MAAMc,mBACJ,OAAOpB,OAAOE,KAAK,EAAEmB,cAAc,YAAYrB,OAAOE,KAAK,EAAEmB,UAAUC;IAEzE,MAAMC,kBACJH,oBAAoB,OAAOpB,OAAOE,KAAK,EAAEmB,cAAc,WACnDrB,OAAOE,KAAK,EAAEmB,UAAUG,WACxBC;IAEN,MAAMC,eACJN,oBAAoB,OAAOpB,OAAOE,KAAK,EAAEmB,cAAc,WACnDrB,OAAOE,KAAK,EAAEmB,UAAUM,QACxBF;IAEN,MAAMG,kBACJR,oBAAoB,OAAOpB,OAAOE,KAAK,EAAEmB,cAAc,WACnDrB,OAAOE,KAAK,EAAEmB,UAAUQ,WACxBJ;IAEN,qBACE,MAACvC;;0BACC,KAAC4C;gBAAIC,WAAW,CAAC,EAAEzC,eAAe,OAAO,CAAC;0BACxC,cAAA,KAACH;oBACCW,MAAMA;oBACNH,QAAQA;oBACRF,QAAQA;oBACRM,SAASA;oBACTH,aAAaA;oBACbF,cAAcA;oBACdO,MAAMA;;;YAGTS,MAAMC,OAAO,CAACF,iBAAiBA,aAAaG,GAAG,CAAC,CAACC,YAAcA;YAC/D,CAACI,kBAAkBe,MAAMC,sCACxB,KAAC7C;gBACCsC,cAAcA;gBACdE,iBAAiBA;gBACjBL,iBAAiBA;gBACjB7B,cAAcA;;YAGjBgB,MAAMC,OAAO,CAACK,gBAAgBA,YAAYJ,GAAG,CAAC,CAACC,YAAcA;;;AAGpE,EAAC"}

package/dist/views/Logout/LogoutClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LogoutClient.d.ts","sourceRoot":"","sources":["../../../src/views/Logout/LogoutClient.tsx"],"names":[],"mappings":"AAGA,OAAO,KAA8B,MAAM,OAAO,CAAA;AAIlD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAkCA,CAAA"}
+{"version":3,"file":"LogoutClient.d.ts","sourceRoot":"","sources":["../../../src/views/Logout/LogoutClient.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA8B,MAAM,OAAO,CAAA;AAIlD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAqCA,CAAA"}

package/dist/views/Logout/LogoutClient.js

@@ -1,6 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Button, useAuth, useTranslation } from '@payloadcms/ui';
+import { formatAdminURL } from '@payloadcms/ui/shared';
 import LinkImport from 'next/link.js';
 import React, { Fragment, useEffect } from 'react';
 const Link = LinkImport.default || LinkImport;
@@ -31,7 +32,10 @@ export const LogoutClient = (props)=>{
                     Link: Link,
                     buttonStyle: "secondary",
                     el: "link",
-                    url: `${adminRoute}/login${redirect && redirect.length > 0 ? `?redirect=${encodeURIComponent(redirect)}` : ''}`,
+                    url: formatAdminURL({
+                        adminRoute,
+                        path: `/login${redirect && redirect.length > 0 ? `?redirect=${encodeURIComponent(redirect)}` : ''}`
+                    }),
                     children: t('authentication:logBackIn')
                 })
             ]

package/dist/views/Logout/LogoutClient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Logout/LogoutClient.tsx"],"sourcesContent":["'use client'\nimport { Button, useAuth, useTranslation } from '@payloadcms/ui'\nimport LinkImport from 'next/link.js'\nimport React, { Fragment, useEffect } from 'react'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport const LogoutClient: React.FC<{\n  adminRoute: string\n  inactivity?: boolean\n  redirect: string\n}> = (props) => {\n  const { adminRoute, inactivity, redirect } = props\n\n  const [isLoggingOut, setIsLoggingOut] = React.useState<boolean | undefined>(undefined)\n  const { logOut } = useAuth()\n  const { t } = useTranslation()\n\n  useEffect(() => {\n    if (!isLoggingOut) {\n      setIsLoggingOut(true)\n      logOut()\n    }\n  }, [isLoggingOut, logOut])\n\n  if (isLoggingOut) {\n    return (\n      <Fragment>\n        {inactivity && <h2>{t('authentication:loggedOutInactivity')}</h2>}\n        {!inactivity && <h2>{t('authentication:loggedOutSuccessfully')}</h2>}\n        <Button\n          Link={Link}\n          buttonStyle=\"secondary\"\n          el=\"link\"\n          url={`${adminRoute}/login${\n            redirect && redirect.length > 0 ? `?redirect=${encodeURIComponent(redirect)}` : ''\n          }`}\n        >\n          {t('authentication:logBackIn')}\n        </Button>\n      </Fragment>\n    )\n  }\n\n  return <Fragment>{t('authentication:loggingOut')}</Fragment>\n}\n"],"names":["Button","useAuth","useTranslation","LinkImport","React","Fragment","useEffect","Link","default","LogoutClient","props","adminRoute","inactivity","redirect","isLoggingOut","setIsLoggingOut","useState","undefined","logOut","t","h2","buttonStyle","el","url","length","encodeURIComponent"],"mappings":"AAAA;;AACA,SAASA,MAAM,EAAEC,OAAO,EAAEC,cAAc,QAAQ,iBAAgB;AAChE,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,SAASC,QAAQ,EAAEC,SAAS,QAAQ,QAAO;AAElD,MAAMC,OAAQJ,WAAWK,OAAO,IAAIL;AAEpC,OAAO,MAAMM,eAIR,CAACC;IACJ,MAAM,EAAEC,UAAU,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGH;IAE7C,MAAM,CAACI,cAAcC,gBAAgB,GAAGX,MAAMY,QAAQ,CAAsBC;IAC5E,MAAM,EAAEC,MAAM,EAAE,GAAGjB;IACnB,MAAM,EAAEkB,CAAC,EAAE,GAAGjB;IAEdI,UAAU;QACR,IAAI,CAACQ,cAAc;YACjBC,gBAAgB;YAChBG;QACF;IACF,GAAG;QAACJ;QAAcI;KAAO;IAEzB,IAAIJ,cAAc;QAChB,qBACE,MAACT;;gBACEO,4BAAc,KAACQ;8BAAID,EAAE;;gBACrB,CAACP,4BAAc,KAACQ;8BAAID,EAAE;;8BACvB,KAACnB;oBACCO,MAAMA;oBACNc,aAAY;oBACZC,IAAG;oBACHC,KAAK,CAAC,EAAEZ,WAAW,MAAM,EACvBE,YAAYA,SAASW,MAAM,GAAG,IAAI,CAAC,UAAU,EAAEC,mBAAmBZ,UAAU,CAAC,GAAG,GACjF,CAAC;8BAEDM,EAAE;;;;IAIX;IAEA,qBAAO,KAACd;kBAAUc,EAAE;;AACtB,EAAC"}
+{"version":3,"sources":["../../../src/views/Logout/LogoutClient.tsx"],"sourcesContent":["'use client'\nimport { Button, useAuth, useTranslation } from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport LinkImport from 'next/link.js'\nimport React, { Fragment, useEffect } from 'react'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport const LogoutClient: React.FC<{\n  adminRoute: string\n  inactivity?: boolean\n  redirect: string\n}> = (props) => {\n  const { adminRoute, inactivity, redirect } = props\n\n  const [isLoggingOut, setIsLoggingOut] = React.useState<boolean | undefined>(undefined)\n  const { logOut } = useAuth()\n  const { t } = useTranslation()\n\n  useEffect(() => {\n    if (!isLoggingOut) {\n      setIsLoggingOut(true)\n      logOut()\n    }\n  }, [isLoggingOut, logOut])\n\n  if (isLoggingOut) {\n    return (\n      <Fragment>\n        {inactivity && <h2>{t('authentication:loggedOutInactivity')}</h2>}\n        {!inactivity && <h2>{t('authentication:loggedOutSuccessfully')}</h2>}\n        <Button\n          Link={Link}\n          buttonStyle=\"secondary\"\n          el=\"link\"\n          url={formatAdminURL({\n            adminRoute,\n            path: `/login${\n              redirect && redirect.length > 0 ? `?redirect=${encodeURIComponent(redirect)}` : ''\n            }`,\n          })}\n        >\n          {t('authentication:logBackIn')}\n        </Button>\n      </Fragment>\n    )\n  }\n\n  return <Fragment>{t('authentication:loggingOut')}</Fragment>\n}\n"],"names":["Button","useAuth","useTranslation","formatAdminURL","LinkImport","React","Fragment","useEffect","Link","default","LogoutClient","props","adminRoute","inactivity","redirect","isLoggingOut","setIsLoggingOut","useState","undefined","logOut","t","h2","buttonStyle","el","url","path","length","encodeURIComponent"],"mappings":"AAAA;;AACA,SAASA,MAAM,EAAEC,OAAO,EAAEC,cAAc,QAAQ,iBAAgB;AAChE,SAASC,cAAc,QAAQ,wBAAuB;AACtD,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,SAASC,QAAQ,EAAEC,SAAS,QAAQ,QAAO;AAElD,MAAMC,OAAQJ,WAAWK,OAAO,IAAIL;AAEpC,OAAO,MAAMM,eAIR,CAACC;IACJ,MAAM,EAAEC,UAAU,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGH;IAE7C,MAAM,CAACI,cAAcC,gBAAgB,GAAGX,MAAMY,QAAQ,CAAsBC;IAC5E,MAAM,EAAEC,MAAM,EAAE,GAAGlB;IACnB,MAAM,EAAEmB,CAAC,EAAE,GAAGlB;IAEdK,UAAU;QACR,IAAI,CAACQ,cAAc;YACjBC,gBAAgB;YAChBG;QACF;IACF,GAAG;QAACJ;QAAcI;KAAO;IAEzB,IAAIJ,cAAc;QAChB,qBACE,MAACT;;gBACEO,4BAAc,KAACQ;8BAAID,EAAE;;gBACrB,CAACP,4BAAc,KAACQ;8BAAID,EAAE;;8BACvB,KAACpB;oBACCQ,MAAMA;oBACNc,aAAY;oBACZC,IAAG;oBACHC,KAAKrB,eAAe;wBAClBS;wBACAa,MAAM,CAAC,MAAM,EACXX,YAAYA,SAASY,MAAM,GAAG,IAAI,CAAC,UAAU,EAAEC,mBAAmBb,UAAU,CAAC,GAAG,GACjF,CAAC;oBACJ;8BAECM,EAAE;;;;IAIX;IAEA,qBAAO,KAACd;kBAAUc,EAAE;;AACtB,EAAC"}

package/dist/views/Logout/index.js

@@ -4,11 +4,11 @@ import { LogoutClient } from './LogoutClient.js';
 const baseClass = 'logout';
 export { generateLogoutMetadata } from './meta.js';
 export const LogoutView = ({ inactivity, initPageResult, searchParams })=>{
-    const { req: { payload: { config: { routes: { admin } } } } } = initPageResult;
+    const { req: { payload: { config: { routes: { admin: adminRoute } } } } } = initPageResult;
     return /*#__PURE__*/ _jsx("div", {
         className: `${baseClass}__wrap`,
         children: /*#__PURE__*/ _jsx(LogoutClient, {
-            adminRoute: admin,
+            adminRoute: adminRoute,
             inactivity: inactivity,
             redirect: searchParams.redirect
         })

package/dist/views/Logout/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Logout/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport React from 'react'\n\nimport { LogoutClient } from './LogoutClient.js'\nimport './index.scss'\n\nconst baseClass = 'logout'\n\nexport { generateLogoutMetadata } from './meta.js'\n\nexport const LogoutView: React.FC<\n  {\n    inactivity?: boolean\n  } & AdminViewProps\n> = ({ inactivity, initPageResult, searchParams }) => {\n  const {\n    req: {\n      payload: {\n        config: {\n          routes: { admin },\n        },\n      },\n    },\n  } = initPageResult\n\n  return (\n    <div className={`${baseClass}__wrap`}>\n      <LogoutClient\n        adminRoute={admin}\n        inactivity={inactivity}\n        redirect={searchParams.redirect as string}\n      />\n    </div>\n  )\n}\n\nexport const LogoutInactivity: React.FC<AdminViewProps> = (props) => {\n  return <LogoutView inactivity {...props} />\n}\n"],"names":["React","LogoutClient","baseClass","generateLogoutMetadata","LogoutView","inactivity","initPageResult","searchParams","req","payload","config","routes","admin","div","className","adminRoute","redirect","LogoutInactivity","props"],"mappings":";AAEA,OAAOA,WAAW,QAAO;AAEzB,SAASC,YAAY,QAAQ,oBAAmB;AAGhD,MAAMC,YAAY;AAElB,SAASC,sBAAsB,QAAQ,YAAW;AAElD,OAAO,MAAMC,aAIT,CAAC,EAAEC,UAAU,EAAEC,cAAc,EAAEC,YAAY,EAAE;IAC/C,MAAM,EACJC,KAAK,EACHC,SAAS,EACPC,QAAQ,EACNC,QAAQ,EAAEC,KAAK,EAAE,EAClB,EACF,EACF,EACF,GAAGN;IAEJ,qBACE,KAACO;QAAIC,WAAW,CAAC,EAAEZ,UAAU,MAAM,CAAC;kBAClC,cAAA,KAACD;YACCc,YAAYH;YACZP,YAAYA;YACZW,UAAUT,aAAaS,QAAQ;;;AAIvC,EAAC;AAED,OAAO,MAAMC,mBAA6C,CAACC;IACzD,qBAAO,KAACd;QAAWC,UAAU;QAAE,GAAGa,KAAK;;AACzC,EAAC"}
+{"version":3,"sources":["../../../src/views/Logout/index.tsx"],"sourcesContent":["import type { AdminViewProps } from 'payload'\n\nimport React from 'react'\n\nimport { LogoutClient } from './LogoutClient.js'\nimport './index.scss'\n\nconst baseClass = 'logout'\n\nexport { generateLogoutMetadata } from './meta.js'\n\nexport const LogoutView: React.FC<\n  {\n    inactivity?: boolean\n  } & AdminViewProps\n> = ({ inactivity, initPageResult, searchParams }) => {\n  const {\n    req: {\n      payload: {\n        config: {\n          routes: { admin: adminRoute },\n        },\n      },\n    },\n  } = initPageResult\n\n  return (\n    <div className={`${baseClass}__wrap`}>\n      <LogoutClient\n        adminRoute={adminRoute}\n        inactivity={inactivity}\n        redirect={searchParams.redirect as string}\n      />\n    </div>\n  )\n}\n\nexport const LogoutInactivity: React.FC<AdminViewProps> = (props) => {\n  return <LogoutView inactivity {...props} />\n}\n"],"names":["React","LogoutClient","baseClass","generateLogoutMetadata","LogoutView","inactivity","initPageResult","searchParams","req","payload","config","routes","admin","adminRoute","div","className","redirect","LogoutInactivity","props"],"mappings":";AAEA,OAAOA,WAAW,QAAO;AAEzB,SAASC,YAAY,QAAQ,oBAAmB;AAGhD,MAAMC,YAAY;AAElB,SAASC,sBAAsB,QAAQ,YAAW;AAElD,OAAO,MAAMC,aAIT,CAAC,EAAEC,UAAU,EAAEC,cAAc,EAAEC,YAAY,EAAE;IAC/C,MAAM,EACJC,KAAK,EACHC,SAAS,EACPC,QAAQ,EACNC,QAAQ,EAAEC,OAAOC,UAAU,EAAE,EAC9B,EACF,EACF,EACF,GAAGP;IAEJ,qBACE,KAACQ;QAAIC,WAAW,CAAC,EAAEb,UAAU,MAAM,CAAC;kBAClC,cAAA,KAACD;YACCY,YAAYA;YACZR,YAAYA;YACZW,UAAUT,aAAaS,QAAQ;;;AAIvC,EAAC;AAED,OAAO,MAAMC,mBAA6C,CAACC;IACzD,qBAAO,KAACd;QAAWC,UAAU;QAAE,GAAGa,KAAK;;AACzC,EAAC"}

package/dist/views/NotFound/index.client.js

@@ -9,7 +9,7 @@ export const NotFoundClient = (props)=>{
     const { marginTop = 'large' } = props;
     const { setStepNav } = useStepNav();
     const { t } = useTranslation();
-    const { routes: { admin } } = useConfig();
+    const { routes: { admin: adminRoute } } = useConfig();
     useEffect(()=>{
         setStepNav([
             {
@@ -38,7 +38,7 @@ export const NotFoundClient = (props)=>{
                     Link: Link,
                     className: `${baseClass}__button`,
                     el: "link",
-                    to: `${admin}`,
+                    to: adminRoute,
                     children: t('general:backToDashboard')
                 })
             ]

package/dist/views/NotFound/index.client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/NotFound/index.client.tsx"],"sourcesContent":["'use client'\nimport { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui'\nimport LinkImport from 'next/link.js'\nimport React, { useEffect } from 'react'\n\nimport './index.scss'\n\nconst baseClass = 'not-found'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport const NotFoundClient: React.FC<{\n  marginTop?: 'large'\n}> = (props) => {\n  const { marginTop = 'large' } = props\n\n  const { setStepNav } = useStepNav()\n  const { t } = useTranslation()\n\n  const {\n    routes: { admin },\n  } = useConfig()\n\n  useEffect(() => {\n    setStepNav([\n      {\n        label: t('general:notFound'),\n      },\n    ])\n  }, [setStepNav, t])\n\n  return (\n    <div\n      className={[baseClass, marginTop && `${baseClass}--margin-top-${marginTop}`]\n        .filter(Boolean)\n        .join(' ')}\n    >\n      <Gutter className={`${baseClass}__wrap`}>\n        <h1>{t('general:nothingFound')}</h1>\n        <p>{t('general:sorryNotFound')}</p>\n        <Button Link={Link} className={`${baseClass}__button`} el=\"link\" to={`${admin}`}>\n          {t('general:backToDashboard')}\n        </Button>\n      </Gutter>\n    </div>\n  )\n}\n"],"names":["Button","Gutter","useConfig","useStepNav","useTranslation","LinkImport","React","useEffect","baseClass","Link","default","NotFoundClient","props","marginTop","setStepNav","t","routes","admin","label","div","className","filter","Boolean","join","h1","p","el","to"],"mappings":"AAAA;;AACA,SAASA,MAAM,EAAEC,MAAM,EAAEC,SAAS,EAAEC,UAAU,EAAEC,cAAc,QAAQ,iBAAgB;AACtF,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,SAASC,SAAS,QAAQ,QAAO;AAIxC,MAAMC,YAAY;AAElB,MAAMC,OAAQJ,WAAWK,OAAO,IAAIL;AAEpC,OAAO,MAAMM,iBAER,CAACC;IACJ,MAAM,EAAEC,YAAY,OAAO,EAAE,GAAGD;IAEhC,MAAM,EAAEE,UAAU,EAAE,GAAGX;IACvB,MAAM,EAAEY,CAAC,EAAE,GAAGX;IAEd,MAAM,EACJY,QAAQ,EAAEC,KAAK,EAAE,EAClB,GAAGf;IAEJK,UAAU;QACRO,WAAW;YACT;gBACEI,OAAOH,EAAE;YACX;SACD;IACH,GAAG;QAACD;QAAYC;KAAE;IAElB,qBACE,KAACI;QACCC,WAAW;YAACZ;YAAWK,aAAa,CAAC,EAAEL,UAAU,aAAa,EAAEK,UAAU,CAAC;SAAC,CACzEQ,MAAM,CAACC,SACPC,IAAI,CAAC;kBAER,cAAA,MAACtB;YAAOmB,WAAW,CAAC,EAAEZ,UAAU,MAAM,CAAC;;8BACrC,KAACgB;8BAAIT,EAAE;;8BACP,KAACU;8BAAGV,EAAE;;8BACN,KAACf;oBAAOS,MAAMA;oBAAMW,WAAW,CAAC,EAAEZ,UAAU,QAAQ,CAAC;oBAAEkB,IAAG;oBAAOC,IAAI,CAAC,EAAEV,MAAM,CAAC;8BAC5EF,EAAE;;;;;AAKb,EAAC"}
+{"version":3,"sources":["../../../src/views/NotFound/index.client.tsx"],"sourcesContent":["'use client'\nimport { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui'\nimport LinkImport from 'next/link.js'\nimport React, { useEffect } from 'react'\n\nimport './index.scss'\n\nconst baseClass = 'not-found'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport const NotFoundClient: React.FC<{\n  marginTop?: 'large'\n}> = (props) => {\n  const { marginTop = 'large' } = props\n\n  const { setStepNav } = useStepNav()\n  const { t } = useTranslation()\n\n  const {\n    routes: { admin: adminRoute },\n  } = useConfig()\n\n  useEffect(() => {\n    setStepNav([\n      {\n        label: t('general:notFound'),\n      },\n    ])\n  }, [setStepNav, t])\n\n  return (\n    <div\n      className={[baseClass, marginTop && `${baseClass}--margin-top-${marginTop}`]\n        .filter(Boolean)\n        .join(' ')}\n    >\n      <Gutter className={`${baseClass}__wrap`}>\n        <h1>{t('general:nothingFound')}</h1>\n        <p>{t('general:sorryNotFound')}</p>\n        <Button Link={Link} className={`${baseClass}__button`} el=\"link\" to={adminRoute}>\n          {t('general:backToDashboard')}\n        </Button>\n      </Gutter>\n    </div>\n  )\n}\n"],"names":["Button","Gutter","useConfig","useStepNav","useTranslation","LinkImport","React","useEffect","baseClass","Link","default","NotFoundClient","props","marginTop","setStepNav","t","routes","admin","adminRoute","label","div","className","filter","Boolean","join","h1","p","el","to"],"mappings":"AAAA;;AACA,SAASA,MAAM,EAAEC,MAAM,EAAEC,SAAS,EAAEC,UAAU,EAAEC,cAAc,QAAQ,iBAAgB;AACtF,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,SAASC,SAAS,QAAQ,QAAO;AAIxC,MAAMC,YAAY;AAElB,MAAMC,OAAQJ,WAAWK,OAAO,IAAIL;AAEpC,OAAO,MAAMM,iBAER,CAACC;IACJ,MAAM,EAAEC,YAAY,OAAO,EAAE,GAAGD;IAEhC,MAAM,EAAEE,UAAU,EAAE,GAAGX;IACvB,MAAM,EAAEY,CAAC,EAAE,GAAGX;IAEd,MAAM,EACJY,QAAQ,EAAEC,OAAOC,UAAU,EAAE,EAC9B,GAAGhB;IAEJK,UAAU;QACRO,WAAW;YACT;gBACEK,OAAOJ,EAAE;YACX;SACD;IACH,GAAG;QAACD;QAAYC;KAAE;IAElB,qBACE,KAACK;QACCC,WAAW;YAACb;YAAWK,aAAa,CAAC,EAAEL,UAAU,aAAa,EAAEK,UAAU,CAAC;SAAC,CACzES,MAAM,CAACC,SACPC,IAAI,CAAC;kBAER,cAAA,MAACvB;YAAOoB,WAAW,CAAC,EAAEb,UAAU,MAAM,CAAC;;8BACrC,KAACiB;8BAAIV,EAAE;;8BACP,KAACW;8BAAGX,EAAE;;8BACN,KAACf;oBAAOS,MAAMA;oBAAMY,WAAW,CAAC,EAAEb,UAAU,QAAQ,CAAC;oBAAEmB,IAAG;oBAAOC,IAAIV;8BAClEH,EAAE;;;;;AAKb,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAGlE,OAAO,KAAmB,MAAM,OAAO,CAAA;AAOvC,eAAO,MAAM,oBAAoB,+BAE9B;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAG,OAAO,CAAC,QAAQ,CAUnB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE;IACxC,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;IACV,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEvB,eAAO,MAAM,YAAY,qDAItB;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAChC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,EAAE,CAAA;KACnB,CAAA;IACD,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;CACF,+BA4BA,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,kBAE1B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAIlE,OAAO,KAAmB,MAAM,OAAO,CAAA;AAOvC,eAAO,MAAM,oBAAoB,+BAE9B;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAG,OAAO,CAAC,QAAQ,CAUnB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE;IACxC,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;IACV,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAA;CAC9C,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEvB,eAAO,MAAM,YAAY,qDAItB;IACD,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAChC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,EAAE,CAAA;KACnB,CAAA;IACD,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KACjC,CAAA;CACF,+BA4BA,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,kBAE1B,CAAA"}

package/dist/views/NotFound/index.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { HydrateClientUser } from '@payloadcms/ui';
+import { formatAdminURL } from '@payloadcms/ui/shared';
 import React, { Fragment } from 'react';
 import { DefaultTemplate } from '../../templates/Default/index.js';
 import { getNextRequestI18n } from '../../utilities/getNextRequestI18n.js';
@@ -20,7 +21,10 @@ export const NotFoundPage = async ({ config: configPromise, params, searchParams
     const initPageResult = await initPage({
         config,
         redirectUnauthenticatedUser: true,
-        route: `${adminRoute}/not-found`,
+        route: formatAdminURL({
+            adminRoute,
+            path: '/not-found'
+        }),
         searchParams
     });
     return /*#__PURE__*/ _jsxs(Fragment, {

package/dist/views/NotFound/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/NotFound/index.tsx"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { AdminViewComponent, SanitizedConfig } from 'payload'\n\nimport { HydrateClientUser } from '@payloadcms/ui'\nimport React, { Fragment } from 'react'\n\nimport { DefaultTemplate } from '../../templates/Default/index.js'\nimport { getNextRequestI18n } from '../../utilities/getNextRequestI18n.js'\nimport { initPage } from '../../utilities/initPage/index.js'\nimport { NotFoundClient } from './index.client.js'\n\nexport const generatePageMetadata = async ({\n  config: configPromise,\n}: {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  params?: { [key: string]: string | string[] }\n}): Promise<Metadata> => {\n  const config = await configPromise\n\n  const i18n = await getNextRequestI18n({\n    config,\n  })\n\n  return {\n    title: i18n.t('general:notFound'),\n  }\n}\n\nexport type GenerateViewMetadata = (args: {\n  config: SanitizedConfig\n  i18n: I18n\n  params?: { [key: string]: string | string[] }\n}) => Promise<Metadata>\n\nexport const NotFoundPage = async ({\n  config: configPromise,\n  params,\n  searchParams,\n}: {\n  config: Promise<SanitizedConfig>\n  params: {\n    segments: string[]\n  }\n  searchParams: {\n    [key: string]: string | string[]\n  }\n}) => {\n  const config = await configPromise\n  const { routes: { admin: adminRoute } = {} } = config\n\n  const initPageResult = await initPage({\n    config,\n    redirectUnauthenticatedUser: true,\n    route: `${adminRoute}/not-found`,\n    searchParams,\n  })\n\n  return (\n    <Fragment>\n      <HydrateClientUser permissions={initPageResult.permissions} user={initPageResult.req.user} />\n      <DefaultTemplate\n        i18n={initPageResult.req.i18n}\n        locale={initPageResult.locale}\n        params={params}\n        payload={initPageResult.req.payload}\n        permissions={initPageResult.permissions}\n        searchParams={searchParams}\n        user={initPageResult.req.user}\n        visibleEntities={initPageResult.visibleEntities}\n      >\n        <NotFoundClient />\n      </DefaultTemplate>\n    </Fragment>\n  )\n}\n\nexport const NotFoundView: AdminViewComponent = () => {\n  return <NotFoundClient marginTop=\"large\" />\n}\n"],"names":["HydrateClientUser","React","Fragment","DefaultTemplate","getNextRequestI18n","initPage","NotFoundClient","generatePageMetadata","config","configPromise","i18n","title","t","NotFoundPage","params","searchParams","routes","admin","adminRoute","initPageResult","redirectUnauthenticatedUser","route","permissions","user","req","locale","payload","visibleEntities","NotFoundView","marginTop"],"mappings":";AAIA,SAASA,iBAAiB,QAAQ,iBAAgB;AAClD,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,eAAe,QAAQ,mCAAkC;AAClE,SAASC,kBAAkB,QAAQ,wCAAuC;AAC1E,SAASC,QAAQ,QAAQ,oCAAmC;AAC5D,SAASC,cAAc,QAAQ,oBAAmB;AAElD,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,QAAQC,aAAa,EAItB;IACC,MAAMD,SAAS,MAAMC;IAErB,MAAMC,OAAO,MAAMN,mBAAmB;QACpCI;IACF;IAEA,OAAO;QACLG,OAAOD,KAAKE,CAAC,CAAC;IAChB;AACF,EAAC;AAQD,OAAO,MAAMC,eAAe,OAAO,EACjCL,QAAQC,aAAa,EACrBK,MAAM,EACNC,YAAY,EASb;IACC,MAAMP,SAAS,MAAMC;IACrB,MAAM,EAAEO,QAAQ,EAAEC,OAAOC,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE,GAAGV;IAE/C,MAAMW,iBAAiB,MAAMd,SAAS;QACpCG;QACAY,6BAA6B;QAC7BC,OAAO,CAAC,EAAEH,WAAW,UAAU,CAAC;QAChCH;IACF;IAEA,qBACE,MAACb;;0BACC,KAACF;gBAAkBsB,aAAaH,eAAeG,WAAW;gBAAEC,MAAMJ,eAAeK,GAAG,CAACD,IAAI;;0BACzF,KAACpB;gBACCO,MAAMS,eAAeK,GAAG,CAACd,IAAI;gBAC7Be,QAAQN,eAAeM,MAAM;gBAC7BX,QAAQA;gBACRY,SAASP,eAAeK,GAAG,CAACE,OAAO;gBACnCJ,aAAaH,eAAeG,WAAW;gBACvCP,cAAcA;gBACdQ,MAAMJ,eAAeK,GAAG,CAACD,IAAI;gBAC7BI,iBAAiBR,eAAeQ,eAAe;0BAE/C,cAAA,KAACrB;;;;AAIT,EAAC;AAED,OAAO,MAAMsB,eAAmC;IAC9C,qBAAO,KAACtB;QAAeuB,WAAU;;AACnC,EAAC"}
+{"version":3,"sources":["../../../src/views/NotFound/index.tsx"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { AdminViewComponent, SanitizedConfig } from 'payload'\n\nimport { HydrateClientUser } from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport React, { Fragment } from 'react'\n\nimport { DefaultTemplate } from '../../templates/Default/index.js'\nimport { getNextRequestI18n } from '../../utilities/getNextRequestI18n.js'\nimport { initPage } from '../../utilities/initPage/index.js'\nimport { NotFoundClient } from './index.client.js'\n\nexport const generatePageMetadata = async ({\n  config: configPromise,\n}: {\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  params?: { [key: string]: string | string[] }\n}): Promise<Metadata> => {\n  const config = await configPromise\n\n  const i18n = await getNextRequestI18n({\n    config,\n  })\n\n  return {\n    title: i18n.t('general:notFound'),\n  }\n}\n\nexport type GenerateViewMetadata = (args: {\n  config: SanitizedConfig\n  i18n: I18n\n  params?: { [key: string]: string | string[] }\n}) => Promise<Metadata>\n\nexport const NotFoundPage = async ({\n  config: configPromise,\n  params,\n  searchParams,\n}: {\n  config: Promise<SanitizedConfig>\n  params: {\n    segments: string[]\n  }\n  searchParams: {\n    [key: string]: string | string[]\n  }\n}) => {\n  const config = await configPromise\n  const { routes: { admin: adminRoute } = {} } = config\n\n  const initPageResult = await initPage({\n    config,\n    redirectUnauthenticatedUser: true,\n    route: formatAdminURL({ adminRoute, path: '/not-found' }),\n    searchParams,\n  })\n\n  return (\n    <Fragment>\n      <HydrateClientUser permissions={initPageResult.permissions} user={initPageResult.req.user} />\n      <DefaultTemplate\n        i18n={initPageResult.req.i18n}\n        locale={initPageResult.locale}\n        params={params}\n        payload={initPageResult.req.payload}\n        permissions={initPageResult.permissions}\n        searchParams={searchParams}\n        user={initPageResult.req.user}\n        visibleEntities={initPageResult.visibleEntities}\n      >\n        <NotFoundClient />\n      </DefaultTemplate>\n    </Fragment>\n  )\n}\n\nexport const NotFoundView: AdminViewComponent = () => {\n  return <NotFoundClient marginTop=\"large\" />\n}\n"],"names":["HydrateClientUser","formatAdminURL","React","Fragment","DefaultTemplate","getNextRequestI18n","initPage","NotFoundClient","generatePageMetadata","config","configPromise","i18n","title","t","NotFoundPage","params","searchParams","routes","admin","adminRoute","initPageResult","redirectUnauthenticatedUser","route","path","permissions","user","req","locale","payload","visibleEntities","NotFoundView","marginTop"],"mappings":";AAIA,SAASA,iBAAiB,QAAQ,iBAAgB;AAClD,SAASC,cAAc,QAAQ,wBAAuB;AACtD,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,eAAe,QAAQ,mCAAkC;AAClE,SAASC,kBAAkB,QAAQ,wCAAuC;AAC1E,SAASC,QAAQ,QAAQ,oCAAmC;AAC5D,SAASC,cAAc,QAAQ,oBAAmB;AAElD,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,QAAQC,aAAa,EAItB;IACC,MAAMD,SAAS,MAAMC;IAErB,MAAMC,OAAO,MAAMN,mBAAmB;QACpCI;IACF;IAEA,OAAO;QACLG,OAAOD,KAAKE,CAAC,CAAC;IAChB;AACF,EAAC;AAQD,OAAO,MAAMC,eAAe,OAAO,EACjCL,QAAQC,aAAa,EACrBK,MAAM,EACNC,YAAY,EASb;IACC,MAAMP,SAAS,MAAMC;IACrB,MAAM,EAAEO,QAAQ,EAAEC,OAAOC,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE,GAAGV;IAE/C,MAAMW,iBAAiB,MAAMd,SAAS;QACpCG;QACAY,6BAA6B;QAC7BC,OAAOrB,eAAe;YAAEkB;YAAYI,MAAM;QAAa;QACvDP;IACF;IAEA,qBACE,MAACb;;0BACC,KAACH;gBAAkBwB,aAAaJ,eAAeI,WAAW;gBAAEC,MAAML,eAAeM,GAAG,CAACD,IAAI;;0BACzF,KAACrB;gBACCO,MAAMS,eAAeM,GAAG,CAACf,IAAI;gBAC7BgB,QAAQP,eAAeO,MAAM;gBAC7BZ,QAAQA;gBACRa,SAASR,eAAeM,GAAG,CAACE,OAAO;gBACnCJ,aAAaJ,eAAeI,WAAW;gBACvCR,cAAcA;gBACdS,MAAML,eAAeM,GAAG,CAACD,IAAI;gBAC7BI,iBAAiBT,eAAeS,eAAe;0BAE/C,cAAA,KAACtB;;;;AAIT,EAAC;AAED,OAAO,MAAMuB,eAAmC;IAC9C,qBAAO,KAACvB;QAAewB,WAAU;;AACnC,EAAC"}

package/dist/views/NotFound/meta.d.ts

@@ -1,8 +1,8 @@
-import type { I18n } from '@payloadcms/translations';
+import type { I18nClient } from '@payloadcms/translations';
 import type { Metadata } from 'next';
 import type { SanitizedConfig } from 'payload';
 export declare const generateNotFoundMeta: ({ config, i18n, }: {
     config: SanitizedConfig;
-    i18n: I18n;
+    i18n: I18nClient;
 }) => Promise<Metadata>;
 //# sourceMappingURL=meta.d.ts.map

package/dist/views/NotFound/meta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C,eAAO,MAAM,oBAAoB,sBAG9B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;CACX,KAAG,OAAO,CAAC,QAAQ,CAMhB,CAAA"}
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/views/NotFound/meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C,eAAO,MAAM,oBAAoB,sBAG9B;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,UAAU,CAAA;CACjB,KAAG,OAAO,CAAC,QAAQ,CAMhB,CAAA"}

package/dist/views/NotFound/meta.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/NotFound/meta.ts"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { SanitizedConfig } from 'payload'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateNotFoundMeta = async ({\n  config,\n  i18n,\n}: {\n  config: SanitizedConfig\n  i18n: I18n\n}): Promise<Metadata> =>\n  meta({\n    description: i18n.t('general:pageNotFound'),\n    keywords: `404 ${i18n.t('general:notFound')}`,\n    serverURL: config.serverURL,\n    title: i18n.t('general:notFound'),\n  })\n"],"names":["meta","generateNotFoundMeta","config","i18n","description","t","keywords","serverURL","title"],"mappings":"AAIA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,MAAM,EACNC,IAAI,EAIL,GACCH,KAAK;QACHI,aAAaD,KAAKE,CAAC,CAAC;QACpBC,UAAU,CAAC,IAAI,EAAEH,KAAKE,CAAC,CAAC,oBAAoB,CAAC;QAC7CE,WAAWL,OAAOK,SAAS;QAC3BC,OAAOL,KAAKE,CAAC,CAAC;IAChB,GAAE"}
+{"version":3,"sources":["../../../src/views/NotFound/meta.ts"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type { Metadata } from 'next'\nimport type { SanitizedConfig } from 'payload'\n\nimport { meta } from '../../utilities/meta.js'\n\nexport const generateNotFoundMeta = async ({\n  config,\n  i18n,\n}: {\n  config: SanitizedConfig\n  i18n: I18nClient\n}): Promise<Metadata> =>\n  meta({\n    description: i18n.t('general:pageNotFound'),\n    keywords: `404 ${i18n.t('general:notFound')}`,\n    serverURL: config.serverURL,\n    title: i18n.t('general:notFound'),\n  })\n"],"names":["meta","generateNotFoundMeta","config","i18n","description","t","keywords","serverURL","title"],"mappings":"AAIA,SAASA,IAAI,QAAQ,0BAAyB;AAE9C,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,MAAM,EACNC,IAAI,EAIL,GACCH,KAAK;QACHI,aAAaD,KAAKE,CAAC,CAAC;QACpBC,UAAU,CAAC,IAAI,EAAEH,KAAKE,CAAC,CAAC,oBAAoB,CAAC;QAC7CE,WAAWL,OAAOK,SAAS;QAC3BC,OAAOL,KAAKE,CAAC,CAAC;IAChB,GAAE"}

package/dist/views/ResetPassword/index.client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/index.client.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,KAAK,IAAI,GAAG;IACV,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAeD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAsC9C,CAAA"}
+{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/ResetPassword/index.client.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,KAAK,IAAI,GAAG;IACV,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAeD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CA8C9C,CAAA"}

package/dist/views/ResetPassword/index.client.js

@@ -1,6 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { ConfirmPasswordField, Form, FormSubmit, HiddenField, PasswordField, useAuth, useConfig, useFormFields, useTranslation } from '@payloadcms/ui';
+import { formatAdminURL } from '@payloadcms/ui/shared';
 import { useRouter } from 'next/navigation.js';
 import React from 'react';
 import { toast } from 'sonner';
@@ -18,25 +19,28 @@ const initialState = {
 };
 export const ResetPasswordClient = ({ token })=>{
     const i18n = useTranslation();
-    const { admin: { user: userSlug }, routes: { admin, api }, serverURL } = useConfig();
+    const { admin: { routes: { login: loginRoute }, user: userSlug }, routes: { admin: adminRoute, api: apiRoute }, serverURL } = useConfig();
     const history = useRouter();
     const { fetchFullUser } = useAuth();
     const onSuccess = React.useCallback(async (data)=>{
         if (data.token) {
             await fetchFullUser();
-            history.push(`${admin}`);
+            history.push(adminRoute);
         } else {
-            history.push(`${admin}/login`);
+            history.push(formatAdminURL({
+                adminRoute,
+                path: loginRoute
+            }));
             toast.success(i18n.t('general:updatedSuccessfully'));
         }
     }, [
         fetchFullUser,
         history,
-        admin,
+        adminRoute,
         i18n
     ]);
     return /*#__PURE__*/ _jsxs(Form, {
-        action: `${serverURL}${api}/${userSlug}/reset-password`,
+        action: `${serverURL}${apiRoute}/${userSlug}/reset-password`,
         initialState: initialState,
         method: "POST",
         onSuccess: onSuccess,