payload 3.0.0-beta.4 → 3.0.0-beta.40

package/dist/auth/baseFields/apiKey.js

@@ -11,7 +11,6 @@ export default [
                 Field: ()=>null
             }
         },
-        defaultValue: false,
         label: ({ t })=>t('authentication:enableAPIKey')
     },
     {
@@ -42,12 +41,15 @@ export default [
         hooks: {
             beforeValidate: [
                 ({ data, req, value })=>{
-                    if (data.apiKey) {
-                        return crypto.createHmac('sha1', req.payload.secret).update(data.apiKey).digest('hex');
+                    if (data.apiKey === false || data.apiKey === null) {
+                        return null;
                     }
-                    if (data.enableAPIKey === false) {
+                    if (data.enableAPIKey === false || data.enableAPIKey === null) {
                         return null;
                     }
+                    if (data.apiKey) {
+                        return crypto.createHmac('sha1', req.payload.secret).update(data.apiKey).digest('hex');
+                    }
                     return value;
                 }
             ]

package/dist/auth/baseFields/apiKey.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/auth/baseFields/apiKey.ts"],"sourcesContent":["import crypto from 'crypto'\n\nimport type { Field, FieldHook } from '../../fields/config/types.js'\n\nconst encryptKey: FieldHook = ({ req, value }) =>\n  value ? req.payload.encrypt(value as string) : null\nconst decryptKey: FieldHook = ({ req, value }) =>\n  value ? req.payload.decrypt(value as string) : undefined\n\n// eslint-disable-next-line no-restricted-exports\nexport default [\n  {\n    name: 'enableAPIKey',\n    type: 'checkbox',\n    admin: {\n      components: {\n        Field: () => null,\n      },\n    },\n    defaultValue: false,\n    label: ({ t }) => t('authentication:enableAPIKey'),\n  },\n  {\n    name: 'apiKey',\n    type: 'text',\n    admin: {\n      components: {\n        Field: () => null,\n      },\n    },\n    hooks: {\n      afterRead: [decryptKey],\n      beforeChange: [encryptKey],\n    },\n    label: ({ t }) => t('authentication:apiKey'),\n  },\n  {\n    name: 'apiKeyIndex',\n    type: 'text',\n    admin: {\n      disabled: true,\n    },\n    hidden: true,\n    hooks: {\n      beforeValidate: [\n        ({ data, req, value }) => {\n          if (data.apiKey) {\n            return crypto\n              .createHmac('sha1', req.payload.secret)\n              .update(data.apiKey as string)\n              .digest('hex')\n          }\n          if (data.enableAPIKey === false) {\n            return null\n          }\n          return value\n        },\n      ],\n    },\n  },\n] as Field[]\n"],"names":["crypto","encryptKey","req","value","payload","encrypt","decryptKey","decrypt","undefined","name","type","admin","components","Field","defaultValue","label","t","hooks","afterRead","beforeChange","disabled","hidden","beforeValidate","data","apiKey","createHmac","secret","update","digest","enableAPIKey"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,YAAY,SAAQ;AAI3B,MAAMC,aAAwB,CAAC,EAAEC,GAAG,EAAEC,KAAK,EAAE,GAC3CA,QAAQD,IAAIE,OAAO,CAACC,OAAO,CAACF,SAAmB;AACjD,MAAMG,aAAwB,CAAC,EAAEJ,GAAG,EAAEC,KAAK,EAAE,GAC3CA,QAAQD,IAAIE,OAAO,CAACG,OAAO,CAACJ,SAAmBK;AAEjD,iDAAiD;AACjD,eAAe;IACb;QACEC,MAAM;QACNC,MAAM;QACNC,OAAO;YACLC,YAAY;gBACVC,OAAO,IAAM;YACf;QACF;QACAC,cAAc;QACdC,OAAO,CAAC,EAAEC,CAAC,EAAE,GAAKA,EAAE;IACtB;IACA;QACEP,MAAM;QACNC,MAAM;QACNC,OAAO;YACLC,YAAY;gBACVC,OAAO,IAAM;YACf;QACF;QACAI,OAAO;YACLC,WAAW;gBAACZ;aAAW;YACvBa,cAAc;gBAAClB;aAAW;QAC5B;QACAc,OAAO,CAAC,EAAEC,CAAC,EAAE,GAAKA,EAAE;IACtB;IACA;QACEP,MAAM;QACNC,MAAM;QACNC,OAAO;YACLS,UAAU;QACZ;QACAC,QAAQ;QACRJ,OAAO;YACLK,gBAAgB;gBACd,CAAC,EAAEC,IAAI,EAAErB,GAAG,EAAEC,KAAK,EAAE;oBACnB,IAAIoB,KAAKC,MAAM,EAAE;wBACf,OAAOxB,OACJyB,UAAU,CAAC,QAAQvB,IAAIE,OAAO,CAACsB,MAAM,EACrCC,MAAM,CAACJ,KAAKC,MAAM,EAClBI,MAAM,CAAC;oBACZ;oBACA,IAAIL,KAAKM,YAAY,KAAK,OAAO;wBAC/B,OAAO;oBACT;oBACA,OAAO1B;gBACT;aACD;QACH;IACF;CACD,CAAW"}
+{"version":3,"sources":["../../../src/auth/baseFields/apiKey.ts"],"sourcesContent":["import crypto from 'crypto'\n\nimport type { Field, FieldHook } from '../../fields/config/types.js'\n\nconst encryptKey: FieldHook = ({ req, value }) =>\n  value ? req.payload.encrypt(value as string) : null\nconst decryptKey: FieldHook = ({ req, value }) =>\n  value ? req.payload.decrypt(value as string) : undefined\n\n// eslint-disable-next-line no-restricted-exports\nexport default [\n  {\n    name: 'enableAPIKey',\n    type: 'checkbox',\n    admin: {\n      components: {\n        Field: () => null,\n      },\n    },\n    label: ({ t }) => t('authentication:enableAPIKey'),\n  },\n  {\n    name: 'apiKey',\n    type: 'text',\n    admin: {\n      components: {\n        Field: () => null,\n      },\n    },\n    hooks: {\n      afterRead: [decryptKey],\n      beforeChange: [encryptKey],\n    },\n    label: ({ t }) => t('authentication:apiKey'),\n  },\n  {\n    name: 'apiKeyIndex',\n    type: 'text',\n    admin: {\n      disabled: true,\n    },\n    hidden: true,\n    hooks: {\n      beforeValidate: [\n        ({ data, req, value }) => {\n          if (data.apiKey === false || data.apiKey === null) {\n            return null\n          }\n          if (data.enableAPIKey === false || data.enableAPIKey === null) {\n            return null\n          }\n          if (data.apiKey) {\n            return crypto\n              .createHmac('sha1', req.payload.secret)\n              .update(data.apiKey as string)\n              .digest('hex')\n          }\n          return value\n        },\n      ],\n    },\n  },\n] as Field[]\n"],"names":["crypto","encryptKey","req","value","payload","encrypt","decryptKey","decrypt","undefined","name","type","admin","components","Field","label","t","hooks","afterRead","beforeChange","disabled","hidden","beforeValidate","data","apiKey","enableAPIKey","createHmac","secret","update","digest"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,YAAY,SAAQ;AAI3B,MAAMC,aAAwB,CAAC,EAAEC,GAAG,EAAEC,KAAK,EAAE,GAC3CA,QAAQD,IAAIE,OAAO,CAACC,OAAO,CAACF,SAAmB;AACjD,MAAMG,aAAwB,CAAC,EAAEJ,GAAG,EAAEC,KAAK,EAAE,GAC3CA,QAAQD,IAAIE,OAAO,CAACG,OAAO,CAACJ,SAAmBK;AAEjD,iDAAiD;AACjD,eAAe;IACb;QACEC,MAAM;QACNC,MAAM;QACNC,OAAO;YACLC,YAAY;gBACVC,OAAO,IAAM;YACf;QACF;QACAC,OAAO,CAAC,EAAEC,CAAC,EAAE,GAAKA,EAAE;IACtB;IACA;QACEN,MAAM;QACNC,MAAM;QACNC,OAAO;YACLC,YAAY;gBACVC,OAAO,IAAM;YACf;QACF;QACAG,OAAO;YACLC,WAAW;gBAACX;aAAW;YACvBY,cAAc;gBAACjB;aAAW;QAC5B;QACAa,OAAO,CAAC,EAAEC,CAAC,EAAE,GAAKA,EAAE;IACtB;IACA;QACEN,MAAM;QACNC,MAAM;QACNC,OAAO;YACLQ,UAAU;QACZ;QACAC,QAAQ;QACRJ,OAAO;YACLK,gBAAgB;gBACd,CAAC,EAAEC,IAAI,EAAEpB,GAAG,EAAEC,KAAK,EAAE;oBACnB,IAAImB,KAAKC,MAAM,KAAK,SAASD,KAAKC,MAAM,KAAK,MAAM;wBACjD,OAAO;oBACT;oBACA,IAAID,KAAKE,YAAY,KAAK,SAASF,KAAKE,YAAY,KAAK,MAAM;wBAC7D,OAAO;oBACT;oBACA,IAAIF,KAAKC,MAAM,EAAE;wBACf,OAAOvB,OACJyB,UAAU,CAAC,QAAQvB,IAAIE,OAAO,CAACsB,MAAM,EACrCC,MAAM,CAACL,KAAKC,MAAM,EAClBK,MAAM,CAAC;oBACZ;oBACA,OAAOzB;gBACT;aACD;QACH;IACF;CACD,CAAW"}

package/dist/auth/cookies.d.ts

@@ -7,12 +7,23 @@ type CookieOptions = {
     maxAge?: number;
     name: string;
     path?: string;
+    returnCookieAsObject: boolean;
     sameSite?: 'Lax' | 'None' | 'Strict';
     secure?: boolean;
     value?: string;
 };
-export declare const generateCookies: (cookies: CookieOptions[]) => string;
-export declare const generateCookie: (args: CookieOptions) => string;
+type CookieObject = {
+    domain?: string;
+    expires?: string;
+    httpOnly?: boolean;
+    maxAge?: number;
+    name: string;
+    path?: string;
+    sameSite?: 'Lax' | 'None' | 'Strict';
+    secure?: boolean;
+    value: string;
+};
+export declare const generateCookie: <ReturnCookieAsObject = boolean>(args: CookieOptions) => ReturnCookieAsObject extends true ? CookieObject : string;
 type GetCookieExpirationArgs = {
     seconds: number;
 };
@@ -20,10 +31,11 @@ export declare const getCookieExpiration: ({ seconds }: GetCookieExpirationArgs)
 type GeneratePayloadCookieArgs = {
     collectionConfig: SanitizedCollectionConfig;
     payload: Payload;
+    returnCookieAsObject?: boolean;
     token: string;
 };
-export declare const generatePayloadCookie: ({ collectionConfig, payload, token, }: GeneratePayloadCookieArgs) => string;
-export declare const generateExpiredPayloadCookie: ({ collectionConfig, payload, }: Omit<GeneratePayloadCookieArgs, 'token'>) => string;
+export declare const generatePayloadCookie: <T extends GeneratePayloadCookieArgs>({ collectionConfig, payload, returnCookieAsObject, token, }: T) => T['returnCookieAsObject'] extends true ? CookieObject : string;
+export declare const generateExpiredPayloadCookie: <T extends Omit<GeneratePayloadCookieArgs, "token">>({ collectionConfig, payload, returnCookieAsObject, }: T) => T['returnCookieAsObject'] extends true ? CookieObject : string;
 export declare const parseCookies: (headers: Request['headers']) => Map<string, string>;
 export {};
 //# sourceMappingURL=cookies.d.ts.map

package/dist/auth/cookies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../src/auth/cookies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAA;AACjF,KAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAA;IACpC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,eAAe,YAAa,aAAa,EAAE,KAAG,MAE1D,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,aAAa,KAAG,MAoCpD,CAAA;AAED,KAAK,uBAAuB,GAAG;IAK7B,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AACD,eAAO,MAAM,mBAAmB,gBAAwB,uBAAuB,SAI9E,CAAA;AAED,KAAK,yBAAyB,GAAG;IAE/B,gBAAgB,EAAE,yBAAyB,CAAA;IAE3C,OAAO,EAAE,OAAO,CAAA;IAEhB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AACD,eAAO,MAAM,qBAAqB,0CAI/B,yBAAyB,KAAG,MAkB9B,CAAA;AAED,eAAO,MAAM,4BAA4B,mCAGtC,KAAK,yBAAyB,EAAE,OAAO,CAAC,KAAG,MAmB7C,CAAA;AAED,eAAO,MAAM,YAAY,YAAa,OAAO,CAAC,SAAS,CAAC,KAAG,IAAI,MAAM,EAAE,MAAM,CAoB5E,CAAA"}
+{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../src/auth/cookies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAA;AAEjF,KAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oBAAoB,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAA;IACpC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAA;IACpC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,eAAO,MAAM,cAAc,yCACnB,aAAa,KAClB,oBAAoB,SAAS,IAAI,GAAG,YAAY,GAAG,MAiFrD,CAAA;AACD,KAAK,uBAAuB,GAAG;IAK7B,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AACD,eAAO,MAAM,mBAAmB,gBAAwB,uBAAuB,SAI9E,CAAA;AAED,KAAK,yBAAyB,GAAG;IAE/B,gBAAgB,EAAE,yBAAyB,CAAA;IAE3C,OAAO,EAAE,OAAO,CAAA;IAEhB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAE9B,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AACD,eAAO,MAAM,qBAAqB,qGAK/B,CAAC,KAAG,CAAC,CAAC,sBAAsB,CAAC,SAAS,IAAI,GAAG,YAAY,GAAG,MAmB9D,CAAA;AAED,eAAO,MAAM,4BAA4B,6GAItC,CAAC,KAAG,CAAC,CAAC,sBAAsB,CAAC,SAAS,IAAI,GAAG,YAAY,GAAG,MAoB9D,CAAA;AAED,eAAO,MAAM,YAAY,YAAa,OAAO,CAAC,SAAS,CAAC,KAAG,IAAI,MAAM,EAAE,MAAM,CAoB5E,CAAA"}

package/dist/auth/cookies.js

@@ -1,39 +1,68 @@
-export const generateCookies = (cookies)=>{
-    return cookies.map((options)=>generateCookie(options)).join('; ');
-};
 export const generateCookie = (args)=>{
-    const { name, domain, expires, httpOnly, maxAge, path, sameSite, secure: secureArg, value } = args;
+    const { name, domain, expires, httpOnly, maxAge, path, returnCookieAsObject, sameSite, secure: secureArg, value } = args;
     let cookieString = `${name}=${value || ''}`;
+    const cookieObject = {
+        name,
+        value
+    };
     const secure = secureArg || sameSite === 'None';
     if (expires) {
-        cookieString += `; Expires=${expires.toUTCString()}`;
+        if (returnCookieAsObject) {
+            cookieObject.expires = expires.toUTCString();
+        } else {
+            cookieString += `; Expires=${expires.toUTCString()}`;
+        }
     }
     if (maxAge) {
-        cookieString += `; Max-Age=${maxAge}`;
+        if (returnCookieAsObject) {
+            cookieObject.maxAge = maxAge;
+        } else {
+            cookieString += `; Max-Age=${maxAge.toString()}`;
+        }
     }
     if (domain) {
-        cookieString += `; Domain=${domain}`;
+        if (returnCookieAsObject) {
+            cookieObject.domain = domain;
+        } else {
+            cookieString += `; Domain=${domain}`;
+        }
     }
     if (path) {
-        cookieString += `; Path=${path}`;
+        if (returnCookieAsObject) {
+            cookieObject.path = path;
+        } else {
+            cookieString += `; Path=${path}`;
+        }
     }
     if (secure) {
-        cookieString += '; Secure';
+        if (returnCookieAsObject) {
+            cookieObject.secure = secure;
+        } else {
+            cookieString += `; Secure=${secure}`;
+        }
     }
     if (httpOnly) {
-        cookieString += '; HttpOnly';
+        if (returnCookieAsObject) {
+            cookieObject.httpOnly = httpOnly;
+        } else {
+            cookieString += `; HttpOnly=${httpOnly}`;
+        }
     }
     if (sameSite) {
-        cookieString += `; SameSite=${sameSite}`;
+        if (returnCookieAsObject) {
+            cookieObject.sameSite = sameSite;
+        } else {
+            cookieString += `; SameSite=${sameSite}`;
+        }
     }
-    return cookieString;
+    return returnCookieAsObject ? cookieObject : cookieString;
 };
 export const getCookieExpiration = ({ seconds = 7200 })=>{
     const currentTime = new Date();
     currentTime.setSeconds(currentTime.getSeconds() + seconds);
     return currentTime;
 };
-export const generatePayloadCookie = ({ collectionConfig, payload, token })=>{
+export const generatePayloadCookie = ({ collectionConfig, payload, returnCookieAsObject = false, token })=>{
     const sameSite = typeof collectionConfig.auth.cookies.sameSite === 'string' ? collectionConfig.auth.cookies.sameSite : collectionConfig.auth.cookies.sameSite ? 'Strict' : undefined;
     return generateCookie({
         name: `${payload.config.cookiePrefix}-token`,
@@ -43,12 +72,13 @@ export const generatePayloadCookie = ({ collectionConfig, payload, token })=>{
         }),
         httpOnly: true,
         path: '/',
+        returnCookieAsObject,
         sameSite,
         secure: collectionConfig.auth.cookies.secure,
         value: token
     });
 };
-export const generateExpiredPayloadCookie = ({ collectionConfig, payload })=>{
+export const generateExpiredPayloadCookie = ({ collectionConfig, payload, returnCookieAsObject = false })=>{
     const sameSite = typeof collectionConfig.auth.cookies.sameSite === 'string' ? collectionConfig.auth.cookies.sameSite : collectionConfig.auth.cookies.sameSite ? 'Strict' : undefined;
     const expires = new Date(Date.now() - 1000);
     return generateCookie({
@@ -57,6 +87,7 @@ export const generateExpiredPayloadCookie = ({ collectionConfig, payload })=>{
         expires,
         httpOnly: true,
         path: '/',
+        returnCookieAsObject,
         sameSite,
         secure: collectionConfig.auth.cookies.secure
     });

package/dist/auth/cookies.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/auth/cookies.ts"],"sourcesContent":["import type { Payload } from '../index.js'\nimport type { SanitizedCollectionConfig } from './../collections/config/types.js'\ntype CookieOptions = {\n  domain?: string\n  expires?: Date\n  httpOnly?: boolean\n  maxAge?: number\n  name: string\n  path?: string\n  sameSite?: 'Lax' | 'None' | 'Strict'\n  secure?: boolean\n  value?: string\n}\n\nexport const generateCookies = (cookies: CookieOptions[]): string => {\n  return cookies.map((options) => generateCookie(options)).join('; ')\n}\n\nexport const generateCookie = (args: CookieOptions): string => {\n  const { name, domain, expires, httpOnly, maxAge, path, sameSite, secure: secureArg, value } = args\n\n  let cookieString = `${name}=${value || ''}`\n\n  const secure = secureArg || sameSite === 'None'\n\n  if (expires) {\n    cookieString += `; Expires=${expires.toUTCString()}`\n  }\n\n  if (maxAge) {\n    cookieString += `; Max-Age=${maxAge}`\n  }\n\n  if (domain) {\n    cookieString += `; Domain=${domain}`\n  }\n\n  if (path) {\n    cookieString += `; Path=${path}`\n  }\n\n  if (secure) {\n    cookieString += '; Secure'\n  }\n\n  if (httpOnly) {\n    cookieString += '; HttpOnly'\n  }\n\n  if (sameSite) {\n    cookieString += `; SameSite=${sameSite}`\n  }\n\n  return cookieString\n}\n\ntype GetCookieExpirationArgs = {\n  /*\n    The number of seconds until the cookie expires\n    @default 7200 seconds (2 hours)\n  */\n  seconds: number\n}\nexport const getCookieExpiration = ({ seconds = 7200 }: GetCookieExpirationArgs) => {\n  const currentTime = new Date()\n  currentTime.setSeconds(currentTime.getSeconds() + seconds)\n  return currentTime\n}\n\ntype GeneratePayloadCookieArgs = {\n  /* The auth collection config */\n  collectionConfig: SanitizedCollectionConfig\n  /* An instance of payload */\n  payload: Payload\n  /* The token to be stored in the cookie */\n  token: string\n}\nexport const generatePayloadCookie = ({\n  collectionConfig,\n  payload,\n  token,\n}: GeneratePayloadCookieArgs): string => {\n  const sameSite =\n    typeof collectionConfig.auth.cookies.sameSite === 'string'\n      ? collectionConfig.auth.cookies.sameSite\n      : collectionConfig.auth.cookies.sameSite\n        ? 'Strict'\n        : undefined\n\n  return generateCookie({\n    name: `${payload.config.cookiePrefix}-token`,\n    domain: collectionConfig.auth.cookies.domain ?? undefined,\n    expires: getCookieExpiration({ seconds: collectionConfig.auth.tokenExpiration }),\n    httpOnly: true,\n    path: '/',\n    sameSite,\n    secure: collectionConfig.auth.cookies.secure,\n    value: token,\n  })\n}\n\nexport const generateExpiredPayloadCookie = ({\n  collectionConfig,\n  payload,\n}: Omit<GeneratePayloadCookieArgs, 'token'>): string => {\n  const sameSite =\n    typeof collectionConfig.auth.cookies.sameSite === 'string'\n      ? collectionConfig.auth.cookies.sameSite\n      : collectionConfig.auth.cookies.sameSite\n        ? 'Strict'\n        : undefined\n\n  const expires = new Date(Date.now() - 1000)\n\n  return generateCookie({\n    name: `${payload.config.cookiePrefix}-token`,\n    domain: collectionConfig.auth.cookies.domain ?? undefined,\n    expires,\n    httpOnly: true,\n    path: '/',\n    sameSite,\n    secure: collectionConfig.auth.cookies.secure,\n  })\n}\n\nexport const parseCookies = (headers: Request['headers']): Map<string, string> => {\n  const cookieMap = new Map<string, string>()\n  const cookie = headers.get('Cookie')\n\n  if (cookie) {\n    cookie.split(';').forEach((cookie) => {\n      const parts = cookie.split('=')\n      const key = parts.shift().trim()\n      const encodedValue = parts.join('=')\n\n      try {\n        const decodedValue = decodeURI(encodedValue)\n        cookieMap.set(key, decodedValue)\n      } catch (e) {\n        return null\n      }\n    })\n  }\n\n  return cookieMap\n}\n"],"names":["generateCookies","cookies","map","options","generateCookie","join","args","name","domain","expires","httpOnly","maxAge","path","sameSite","secure","secureArg","value","cookieString","toUTCString","getCookieExpiration","seconds","currentTime","Date","setSeconds","getSeconds","generatePayloadCookie","collectionConfig","payload","token","auth","undefined","config","cookiePrefix","tokenExpiration","generateExpiredPayloadCookie","now","parseCookies","headers","cookieMap","Map","cookie","get","split","forEach","parts","key","shift","trim","encodedValue","decodedValue","decodeURI","set","e"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/auth/cookies.ts"],"sourcesContent":["import type { Payload } from '../index.js'\nimport type { SanitizedCollectionConfig } from './../collections/config/types.js'\n\ntype CookieOptions = {\n  domain?: string\n  expires?: Date\n  httpOnly?: boolean\n  maxAge?: number\n  name: string\n  path?: string\n  returnCookieAsObject: boolean\n  sameSite?: 'Lax' | 'None' | 'Strict'\n  secure?: boolean\n  value?: string\n}\n\ntype CookieObject = {\n  domain?: string\n  expires?: string\n  httpOnly?: boolean\n  maxAge?: number\n  name: string\n  path?: string\n  sameSite?: 'Lax' | 'None' | 'Strict'\n  secure?: boolean\n  value: string\n}\n\nexport const generateCookie = <ReturnCookieAsObject = boolean>(\n  args: CookieOptions,\n): ReturnCookieAsObject extends true ? CookieObject : string => {\n  const {\n    name,\n    domain,\n    expires,\n    httpOnly,\n    maxAge,\n    path,\n    returnCookieAsObject,\n    sameSite,\n    secure: secureArg,\n    value,\n  } = args\n\n  let cookieString = `${name}=${value || ''}`\n  const cookieObject: CookieObject = {\n    name,\n    value,\n  }\n\n  const secure = secureArg || sameSite === 'None'\n\n  if (expires) {\n    if (returnCookieAsObject) {\n      cookieObject.expires = expires.toUTCString()\n    } else {\n      cookieString += `; Expires=${expires.toUTCString()}`\n    }\n  }\n\n  if (maxAge) {\n    if (returnCookieAsObject) {\n      cookieObject.maxAge = maxAge\n    } else {\n      cookieString += `; Max-Age=${maxAge.toString()}`\n    }\n  }\n\n  if (domain) {\n    if (returnCookieAsObject) {\n      cookieObject.domain = domain\n    } else {\n      cookieString += `; Domain=${domain}`\n    }\n  }\n\n  if (path) {\n    if (returnCookieAsObject) {\n      cookieObject.path = path\n    } else {\n      cookieString += `; Path=${path}`\n    }\n  }\n\n  if (secure) {\n    if (returnCookieAsObject) {\n      cookieObject.secure = secure\n    } else {\n      cookieString += `; Secure=${secure}`\n    }\n  }\n\n  if (httpOnly) {\n    if (returnCookieAsObject) {\n      cookieObject.httpOnly = httpOnly\n    } else {\n      cookieString += `; HttpOnly=${httpOnly}`\n    }\n  }\n\n  if (sameSite) {\n    if (returnCookieAsObject) {\n      cookieObject.sameSite = sameSite\n    } else {\n      cookieString += `; SameSite=${sameSite}`\n    }\n  }\n\n  return (returnCookieAsObject ? cookieObject : cookieString) as ReturnCookieAsObject extends true\n    ? CookieObject\n    : string\n}\ntype GetCookieExpirationArgs = {\n  /*\n    The number of seconds until the cookie expires\n    @default 7200 seconds (2 hours)\n  */\n  seconds: number\n}\nexport const getCookieExpiration = ({ seconds = 7200 }: GetCookieExpirationArgs) => {\n  const currentTime = new Date()\n  currentTime.setSeconds(currentTime.getSeconds() + seconds)\n  return currentTime\n}\n\ntype GeneratePayloadCookieArgs = {\n  /* The auth collection config */\n  collectionConfig: SanitizedCollectionConfig\n  /* An instance of payload */\n  payload: Payload\n  /* The returnAs value */\n  returnCookieAsObject?: boolean\n  /* The token to be stored in the cookie */\n  token: string\n}\nexport const generatePayloadCookie = <T extends GeneratePayloadCookieArgs>({\n  collectionConfig,\n  payload,\n  returnCookieAsObject = false,\n  token,\n}: T): T['returnCookieAsObject'] extends true ? CookieObject : string => {\n  const sameSite =\n    typeof collectionConfig.auth.cookies.sameSite === 'string'\n      ? collectionConfig.auth.cookies.sameSite\n      : collectionConfig.auth.cookies.sameSite\n        ? 'Strict'\n        : undefined\n\n  return generateCookie<T['returnCookieAsObject']>({\n    name: `${payload.config.cookiePrefix}-token`,\n    domain: collectionConfig.auth.cookies.domain ?? undefined,\n    expires: getCookieExpiration({ seconds: collectionConfig.auth.tokenExpiration }),\n    httpOnly: true,\n    path: '/',\n    returnCookieAsObject,\n    sameSite,\n    secure: collectionConfig.auth.cookies.secure,\n    value: token,\n  })\n}\n\nexport const generateExpiredPayloadCookie = <T extends Omit<GeneratePayloadCookieArgs, 'token'>>({\n  collectionConfig,\n  payload,\n  returnCookieAsObject = false,\n}: T): T['returnCookieAsObject'] extends true ? CookieObject : string => {\n  const sameSite =\n    typeof collectionConfig.auth.cookies.sameSite === 'string'\n      ? collectionConfig.auth.cookies.sameSite\n      : collectionConfig.auth.cookies.sameSite\n        ? 'Strict'\n        : undefined\n\n  const expires = new Date(Date.now() - 1000)\n\n  return generateCookie<T['returnCookieAsObject']>({\n    name: `${payload.config.cookiePrefix}-token`,\n    domain: collectionConfig.auth.cookies.domain ?? undefined,\n    expires,\n    httpOnly: true,\n    path: '/',\n    returnCookieAsObject,\n    sameSite,\n    secure: collectionConfig.auth.cookies.secure,\n  })\n}\n\nexport const parseCookies = (headers: Request['headers']): Map<string, string> => {\n  const cookieMap = new Map<string, string>()\n  const cookie = headers.get('Cookie')\n\n  if (cookie) {\n    cookie.split(';').forEach((cookie) => {\n      const parts = cookie.split('=')\n      const key = parts.shift().trim()\n      const encodedValue = parts.join('=')\n\n      try {\n        const decodedValue = decodeURI(encodedValue)\n        cookieMap.set(key, decodedValue)\n      } catch (e) {\n        return null\n      }\n    })\n  }\n\n  return cookieMap\n}\n"],"names":["generateCookie","args","name","domain","expires","httpOnly","maxAge","path","returnCookieAsObject","sameSite","secure","secureArg","value","cookieString","cookieObject","toUTCString","toString","getCookieExpiration","seconds","currentTime","Date","setSeconds","getSeconds","generatePayloadCookie","collectionConfig","payload","token","auth","cookies","undefined","config","cookiePrefix","tokenExpiration","generateExpiredPayloadCookie","now","parseCookies","headers","cookieMap","Map","cookie","get","split","forEach","parts","key","shift","trim","encodedValue","join","decodedValue","decodeURI","set","e"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AA4BA,OAAO,MAAMA,iBAAiB,CAC5BC;IAEA,MAAM,EACJC,IAAI,EACJC,MAAM,EACNC,OAAO,EACPC,QAAQ,EACRC,MAAM,EACNC,IAAI,EACJC,oBAAoB,EACpBC,QAAQ,EACRC,QAAQC,SAAS,EACjBC,KAAK,EACN,GAAGX;IAEJ,IAAIY,eAAe,CAAC,EAAEX,KAAK,CAAC,EAAEU,SAAS,GAAG,CAAC;IAC3C,MAAME,eAA6B;QACjCZ;QACAU;IACF;IAEA,MAAMF,SAASC,aAAaF,aAAa;IAEzC,IAAIL,SAAS;QACX,IAAII,sBAAsB;YACxBM,aAAaV,OAAO,GAAGA,QAAQW,WAAW;QAC5C,OAAO;YACLF,gBAAgB,CAAC,UAAU,EAAET,QAAQW,WAAW,GAAG,CAAC;QACtD;IACF;IAEA,IAAIT,QAAQ;QACV,IAAIE,sBAAsB;YACxBM,aAAaR,MAAM,GAAGA;QACxB,OAAO;YACLO,gBAAgB,CAAC,UAAU,EAAEP,OAAOU,QAAQ,GAAG,CAAC;QAClD;IACF;IAEA,IAAIb,QAAQ;QACV,IAAIK,sBAAsB;YACxBM,aAAaX,MAAM,GAAGA;QACxB,OAAO;YACLU,gBAAgB,CAAC,SAAS,EAAEV,OAAO,CAAC;QACtC;IACF;IAEA,IAAII,MAAM;QACR,IAAIC,sBAAsB;YACxBM,aAAaP,IAAI,GAAGA;QACtB,OAAO;YACLM,gBAAgB,CAAC,OAAO,EAAEN,KAAK,CAAC;QAClC;IACF;IAEA,IAAIG,QAAQ;QACV,IAAIF,sBAAsB;YACxBM,aAAaJ,MAAM,GAAGA;QACxB,OAAO;YACLG,gBAAgB,CAAC,SAAS,EAAEH,OAAO,CAAC;QACtC;IACF;IAEA,IAAIL,UAAU;QACZ,IAAIG,sBAAsB;YACxBM,aAAaT,QAAQ,GAAGA;QAC1B,OAAO;YACLQ,gBAAgB,CAAC,WAAW,EAAER,SAAS,CAAC;QAC1C;IACF;IAEA,IAAII,UAAU;QACZ,IAAID,sBAAsB;YACxBM,aAAaL,QAAQ,GAAGA;QAC1B,OAAO;YACLI,gBAAgB,CAAC,WAAW,EAAEJ,SAAS,CAAC;QAC1C;IACF;IAEA,OAAQD,uBAAuBM,eAAeD;AAGhD,EAAC;AAQD,OAAO,MAAMI,sBAAsB,CAAC,EAAEC,UAAU,IAAI,EAA2B;IAC7E,MAAMC,cAAc,IAAIC;IACxBD,YAAYE,UAAU,CAACF,YAAYG,UAAU,KAAKJ;IAClD,OAAOC;AACT,EAAC;AAYD,OAAO,MAAMI,wBAAwB,CAAsC,EACzEC,gBAAgB,EAChBC,OAAO,EACPjB,uBAAuB,KAAK,EAC5BkB,KAAK,EACH;IACF,MAAMjB,WACJ,OAAOe,iBAAiBG,IAAI,CAACC,OAAO,CAACnB,QAAQ,KAAK,WAC9Ce,iBAAiBG,IAAI,CAACC,OAAO,CAACnB,QAAQ,GACtCe,iBAAiBG,IAAI,CAACC,OAAO,CAACnB,QAAQ,GACpC,WACAoB;IAER,OAAO7B,eAA0C;QAC/CE,MAAM,CAAC,EAAEuB,QAAQK,MAAM,CAACC,YAAY,CAAC,MAAM,CAAC;QAC5C5B,QAAQqB,iBAAiBG,IAAI,CAACC,OAAO,CAACzB,MAAM,IAAI0B;QAChDzB,SAASa,oBAAoB;YAAEC,SAASM,iBAAiBG,IAAI,CAACK,eAAe;QAAC;QAC9E3B,UAAU;QACVE,MAAM;QACNC;QACAC;QACAC,QAAQc,iBAAiBG,IAAI,CAACC,OAAO,CAAClB,MAAM;QAC5CE,OAAOc;IACT;AACF,EAAC;AAED,OAAO,MAAMO,+BAA+B,CAAqD,EAC/FT,gBAAgB,EAChBC,OAAO,EACPjB,uBAAuB,KAAK,EAC1B;IACF,MAAMC,WACJ,OAAOe,iBAAiBG,IAAI,CAACC,OAAO,CAACnB,QAAQ,KAAK,WAC9Ce,iBAAiBG,IAAI,CAACC,OAAO,CAACnB,QAAQ,GACtCe,iBAAiBG,IAAI,CAACC,OAAO,CAACnB,QAAQ,GACpC,WACAoB;IAER,MAAMzB,UAAU,IAAIgB,KAAKA,KAAKc,GAAG,KAAK;IAEtC,OAAOlC,eAA0C;QAC/CE,MAAM,CAAC,EAAEuB,QAAQK,MAAM,CAACC,YAAY,CAAC,MAAM,CAAC;QAC5C5B,QAAQqB,iBAAiBG,IAAI,CAACC,OAAO,CAACzB,MAAM,IAAI0B;QAChDzB;QACAC,UAAU;QACVE,MAAM;QACNC;QACAC;QACAC,QAAQc,iBAAiBG,IAAI,CAACC,OAAO,CAAClB,MAAM;IAC9C;AACF,EAAC;AAED,OAAO,MAAMyB,eAAe,CAACC;IAC3B,MAAMC,YAAY,IAAIC;IACtB,MAAMC,SAASH,QAAQI,GAAG,CAAC;IAE3B,IAAID,QAAQ;QACVA,OAAOE,KAAK,CAAC,KAAKC,OAAO,CAAC,CAACH;YACzB,MAAMI,QAAQJ,OAAOE,KAAK,CAAC;YAC3B,MAAMG,MAAMD,MAAME,KAAK,GAAGC,IAAI;YAC9B,MAAMC,eAAeJ,MAAMK,IAAI,CAAC;YAEhC,IAAI;gBACF,MAAMC,eAAeC,UAAUH;gBAC/BV,UAAUc,GAAG,CAACP,KAAKK;YACrB,EAAE,OAAOG,GAAG;gBACV,OAAO;YACT;QACF;IACF;IAEA,OAAOf;AACT,EAAC"}

package/dist/auth/defaultAccess.d.ts

@@ -1,6 +1,6 @@
-import type { PayloadRequest } from '../types/index.js';
+import type { PayloadRequestWithData } from '../types/index.js';
 declare const _default: ({ req: { user } }: {
-    req: PayloadRequest;
+    req: PayloadRequestWithData;
 }) => boolean;
 export default _default;
 //# sourceMappingURL=defaultAccess.d.ts.map

package/dist/auth/defaultAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultAccess.d.ts","sourceRoot":"","sources":["../../src/auth/defaultAccess.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;4CAEpB;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,KAAG,OAAO;AAApE,wBAAqF"}
+{"version":3,"file":"defaultAccess.d.ts","sourceRoot":"","sources":["../../src/auth/defaultAccess.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;4CAE5B;IAAE,GAAG,EAAE,sBAAsB,CAAA;CAAE,KAAG,OAAO;AAA5E,wBAA6F"}

package/dist/auth/defaultAccess.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/auth/defaultAccess.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\nexport default ({ req: { user } }: { req: PayloadRequest }): boolean => Boolean(user)\n"],"names":["req","user","Boolean"],"rangeMappings":"","mappings":"AAEA,eAAe,CAAA,CAAC,EAAEA,KAAK,EAAEC,IAAI,EAAE,EAA2B,GAAcC,QAAQD,KAAI,EAAC"}
+{"version":3,"sources":["../../src/auth/defaultAccess.ts"],"sourcesContent":["import type { PayloadRequestWithData } from '../types/index.js'\n\nexport default ({ req: { user } }: { req: PayloadRequestWithData }): boolean => Boolean(user)\n"],"names":["req","user","Boolean"],"rangeMappings":"","mappings":"AAEA,eAAe,CAAA,CAAC,EAAEA,KAAK,EAAEC,IAAI,EAAE,EAAmC,GAAcC,QAAQD,KAAI,EAAC"}

package/dist/auth/executeAccess.d.ts

@@ -1,11 +1,11 @@
 import type { Access, AccessResult } from '../config/types.js';
-import type { PayloadRequest } from '../types/index.js';
+import type { PayloadRequestWithData } from '../types/index.js';
 type OperationArgs = {
     data?: any;
     disableErrors?: boolean;
     id?: number | string;
     isReadingStaticFile?: boolean;
-    req: PayloadRequest;
+    req: PayloadRequestWithData;
 };
 declare const executeAccess: ({ id, data, disableErrors, isReadingStaticFile, req }: OperationArgs, access: Access) => Promise<AccessResult>;
 export default executeAccess;

package/dist/auth/executeAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executeAccess.d.ts","sourceRoot":"","sources":["../../src/auth/executeAccess.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAIvD,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AACD,QAAA,MAAM,aAAa,0DAC8C,aAAa,UACpE,MAAM,KACb,QAAQ,YAAY,CAsBtB,CAAA;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"executeAccess.d.ts","sourceRoot":"","sources":["../../src/auth/executeAccess.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAI/D,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,GAAG,EAAE,sBAAsB,CAAA;CAC5B,CAAA;AACD,QAAA,MAAM,aAAa,0DAC8C,aAAa,UACpE,MAAM,KACb,QAAQ,YAAY,CAsBtB,CAAA;AAED,eAAe,aAAa,CAAA"}

package/dist/auth/executeAccess.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/auth/executeAccess.ts"],"sourcesContent":["import type { Access, AccessResult } from '../config/types.js'\nimport type { PayloadRequest } from '../types/index.js'\n\nimport { Forbidden } from '../errors/index.js'\n\ntype OperationArgs = {\n  data?: any\n  disableErrors?: boolean\n  id?: number | string\n  isReadingStaticFile?: boolean\n  req: PayloadRequest\n}\nconst executeAccess = async (\n  { id, data, disableErrors, isReadingStaticFile = false, req }: OperationArgs,\n  access: Access,\n): Promise<AccessResult> => {\n  if (access) {\n    const result = await access({\n      id,\n      data,\n      isReadingStaticFile,\n      req,\n    })\n\n    if (!result) {\n      if (!disableErrors) throw new Forbidden(req.t)\n    }\n\n    return result\n  }\n\n  if (req.user) {\n    return true\n  }\n\n  if (!disableErrors) throw new Forbidden(req.t)\n  return false\n}\n\nexport default executeAccess\n"],"names":["Forbidden","executeAccess","id","data","disableErrors","isReadingStaticFile","req","access","result","t","user"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,SAAS,QAAQ,qBAAoB;AAS9C,MAAMC,gBAAgB,OACpB,EAAEC,EAAE,EAAEC,IAAI,EAAEC,aAAa,EAAEC,sBAAsB,KAAK,EAAEC,GAAG,EAAiB,EAC5EC;IAEA,IAAIA,QAAQ;QACV,MAAMC,SAAS,MAAMD,OAAO;YAC1BL;YACAC;YACAE;YACAC;QACF;QAEA,IAAI,CAACE,QAAQ;YACX,IAAI,CAACJ,eAAe,MAAM,IAAIJ,UAAUM,IAAIG,CAAC;QAC/C;QAEA,OAAOD;IACT;IAEA,IAAIF,IAAII,IAAI,EAAE;QACZ,OAAO;IACT;IAEA,IAAI,CAACN,eAAe,MAAM,IAAIJ,UAAUM,IAAIG,CAAC;IAC7C,OAAO;AACT;AAEA,eAAeR,cAAa"}
+{"version":3,"sources":["../../src/auth/executeAccess.ts"],"sourcesContent":["import type { Access, AccessResult } from '../config/types.js'\nimport type { PayloadRequestWithData } from '../types/index.js'\n\nimport { Forbidden } from '../errors/index.js'\n\ntype OperationArgs = {\n  data?: any\n  disableErrors?: boolean\n  id?: number | string\n  isReadingStaticFile?: boolean\n  req: PayloadRequestWithData\n}\nconst executeAccess = async (\n  { id, data, disableErrors, isReadingStaticFile = false, req }: OperationArgs,\n  access: Access,\n): Promise<AccessResult> => {\n  if (access) {\n    const result = await access({\n      id,\n      data,\n      isReadingStaticFile,\n      req,\n    })\n\n    if (!result) {\n      if (!disableErrors) throw new Forbidden(req.t)\n    }\n\n    return result\n  }\n\n  if (req.user) {\n    return true\n  }\n\n  if (!disableErrors) throw new Forbidden(req.t)\n  return false\n}\n\nexport default executeAccess\n"],"names":["Forbidden","executeAccess","id","data","disableErrors","isReadingStaticFile","req","access","result","t","user"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,SAAS,QAAQ,qBAAoB;AAS9C,MAAMC,gBAAgB,OACpB,EAAEC,EAAE,EAAEC,IAAI,EAAEC,aAAa,EAAEC,sBAAsB,KAAK,EAAEC,GAAG,EAAiB,EAC5EC;IAEA,IAAIA,QAAQ;QACV,MAAMC,SAAS,MAAMD,OAAO;YAC1BL;YACAC;YACAE;YACAC;QACF;QAEA,IAAI,CAACE,QAAQ;YACX,IAAI,CAACJ,eAAe,MAAM,IAAIJ,UAAUM,IAAIG,CAAC;QAC/C;QAEA,OAAOD;IACT;IAEA,IAAIF,IAAII,IAAI,EAAE;QACZ,OAAO;IACT;IAEA,IAAI,CAACN,eAAe,MAAM,IAAIJ,UAAUM,IAAIG,CAAC;IAC7C,OAAO;AACT;AAEA,eAAeR,cAAa"}

package/dist/auth/getAccessResults.d.ts

@@ -1,7 +1,7 @@
-import type { PayloadRequest } from '../types/index.js';
+import type { PayloadRequestWithData } from '../types/index.js';
 import type { Permissions } from './types.js';
 type GetAccessResultsArgs = {
-    req: PayloadRequest;
+    req: PayloadRequestWithData;
 };
 export declare function getAccessResults({ req }: GetAccessResultsArgs): Promise<Permissions>;
 export {};

package/dist/auth/getAccessResults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAccessResults.d.ts","sourceRoot":"","sources":["../../src/auth/getAccessResults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAK7C,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AACD,wBAAsB,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,WAAW,CAAC,CAyE1F"}
+{"version":3,"file":"getAccessResults.d.ts","sourceRoot":"","sources":["../../src/auth/getAccessResults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAK7C,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,sBAAsB,CAAA;CAC5B,CAAA;AACD,wBAAsB,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,WAAW,CAAC,CAyE1F"}

package/dist/auth/getAccessResults.js

@@ -5,7 +5,7 @@ export async function getAccessResults({ req }) {
     const { payload, user } = req;
     const isLoggedIn = !!user;
     const userCollectionConfig = user && user.collection ? payload.config.collections.find((collection)=>collection.slug === user.collection) : null;
-    if (userCollectionConfig) {
+    if (userCollectionConfig && payload.config.admin.user === user.collection) {
         results.canAccessAdmin = userCollectionConfig.access.admin ? await userCollectionConfig.access.admin({
             req
         }) : isLoggedIn;

package/dist/auth/getAccessResults.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/auth/getAccessResults.ts"],"sourcesContent":["import type { AllOperations, PayloadRequest } from '../types/index.js'\nimport type { Permissions } from './types.js'\n\nimport { getEntityPolicies } from '../utilities/getEntityPolicies.js'\nimport isolateObjectProperty from '../utilities/isolateObjectProperty.js'\n\ntype GetAccessResultsArgs = {\n  req: PayloadRequest\n}\nexport async function getAccessResults({ req }: GetAccessResultsArgs): Promise<Permissions> {\n  const results = {} as Permissions\n  const { payload, user } = req\n\n  const isLoggedIn = !!user\n  const userCollectionConfig =\n    user && user.collection\n      ? payload.config.collections.find((collection) => collection.slug === user.collection)\n      : null\n\n  if (userCollectionConfig) {\n    results.canAccessAdmin = userCollectionConfig.access.admin\n      ? await userCollectionConfig.access.admin({ req })\n      : isLoggedIn\n  } else {\n    results.canAccessAdmin = false\n  }\n\n  await Promise.all(\n    payload.config.collections.map(async (collection) => {\n      const collectionOperations: AllOperations[] = ['create', 'read', 'update', 'delete']\n\n      if (\n        collection.auth &&\n        typeof collection.auth.maxLoginAttempts !== 'undefined' &&\n        collection.auth.maxLoginAttempts !== 0\n      ) {\n        collectionOperations.push('unlock')\n      }\n\n      if (collection.versions) {\n        collectionOperations.push('readVersions')\n      }\n\n      const collectionPolicy = await getEntityPolicies({\n        type: 'collection',\n        entity: collection,\n        operations: collectionOperations,\n        // Do not re-use our existing req object, as we need a new req.transactionID. Cannot re-use our existing one, as this is run in parallel (Promise.all above) which is\n        // not supported on the same transaction ID. Not passing a transaction ID here creates a new transaction ID.\n        req: isolateObjectProperty(req, 'transactionID'),\n      })\n      results.collections = {\n        ...results.collections,\n        [collection.slug]: collectionPolicy,\n      }\n    }),\n  )\n\n  await Promise.all(\n    payload.config.globals.map(async (global) => {\n      const globalOperations: AllOperations[] = ['read', 'update']\n\n      if (global.versions) {\n        globalOperations.push('readVersions')\n      }\n\n      const globalPolicy = await getEntityPolicies({\n        type: 'global',\n        entity: global,\n        operations: globalOperations,\n        // Do not re-use our existing req object, as we need a new req.transactionID. Cannot re-use our existing one, as this is run in parallel (Promise.all above) which is\n        // not supported on the same transaction ID. Not passing a transaction ID here creates a new transaction ID.\n        req: isolateObjectProperty(req, 'transactionID'),\n      })\n      results.globals = {\n        ...results.globals,\n        [global.slug]: globalPolicy,\n      }\n    }),\n  )\n\n  return results\n}\n"],"names":["getEntityPolicies","isolateObjectProperty","getAccessResults","req","results","payload","user","isLoggedIn","userCollectionConfig","collection","config","collections","find","slug","canAccessAdmin","access","admin","Promise","all","map","collectionOperations","auth","maxLoginAttempts","push","versions","collectionPolicy","type","entity","operations","globals","global","globalOperations","globalPolicy"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,iBAAiB,QAAQ,oCAAmC;AACrE,OAAOC,2BAA2B,wCAAuC;AAKzE,OAAO,eAAeC,iBAAiB,EAAEC,GAAG,EAAwB;IAClE,MAAMC,UAAU,CAAC;IACjB,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAGH;IAE1B,MAAMI,aAAa,CAAC,CAACD;IACrB,MAAME,uBACJF,QAAQA,KAAKG,UAAU,GACnBJ,QAAQK,MAAM,CAACC,WAAW,CAACC,IAAI,CAAC,CAACH,aAAeA,WAAWI,IAAI,KAAKP,KAAKG,UAAU,IACnF;IAEN,IAAID,sBAAsB;QACxBJ,QAAQU,cAAc,GAAGN,qBAAqBO,MAAM,CAACC,KAAK,GACtD,MAAMR,qBAAqBO,MAAM,CAACC,KAAK,CAAC;YAAEb;QAAI,KAC9CI;IACN,OAAO;QACLH,QAAQU,cAAc,GAAG;IAC3B;IAEA,MAAMG,QAAQC,GAAG,CACfb,QAAQK,MAAM,CAACC,WAAW,CAACQ,GAAG,CAAC,OAAOV;QACpC,MAAMW,uBAAwC;YAAC;YAAU;YAAQ;YAAU;SAAS;QAEpF,IACEX,WAAWY,IAAI,IACf,OAAOZ,WAAWY,IAAI,CAACC,gBAAgB,KAAK,eAC5Cb,WAAWY,IAAI,CAACC,gBAAgB,KAAK,GACrC;YACAF,qBAAqBG,IAAI,CAAC;QAC5B;QAEA,IAAId,WAAWe,QAAQ,EAAE;YACvBJ,qBAAqBG,IAAI,CAAC;QAC5B;QAEA,MAAME,mBAAmB,MAAMzB,kBAAkB;YAC/C0B,MAAM;YACNC,QAAQlB;YACRmB,YAAYR;YACZ,qKAAqK;YACrK,4GAA4G;YAC5GjB,KAAKF,sBAAsBE,KAAK;QAClC;QACAC,QAAQO,WAAW,GAAG;YACpB,GAAGP,QAAQO,WAAW;YACtB,CAACF,WAAWI,IAAI,CAAC,EAAEY;QACrB;IACF;IAGF,MAAMR,QAAQC,GAAG,CACfb,QAAQK,MAAM,CAACmB,OAAO,CAACV,GAAG,CAAC,OAAOW;QAChC,MAAMC,mBAAoC;YAAC;YAAQ;SAAS;QAE5D,IAAID,OAAON,QAAQ,EAAE;YACnBO,iBAAiBR,IAAI,CAAC;QACxB;QAEA,MAAMS,eAAe,MAAMhC,kBAAkB;YAC3C0B,MAAM;YACNC,QAAQG;YACRF,YAAYG;YACZ,qKAAqK;YACrK,4GAA4G;YAC5G5B,KAAKF,sBAAsBE,KAAK;QAClC;QACAC,QAAQyB,OAAO,GAAG;YAChB,GAAGzB,QAAQyB,OAAO;YAClB,CAACC,OAAOjB,IAAI,CAAC,EAAEmB;QACjB;IACF;IAGF,OAAO5B;AACT"}
+{"version":3,"sources":["../../src/auth/getAccessResults.ts"],"sourcesContent":["import type { AllOperations, PayloadRequestWithData } from '../types/index.js'\nimport type { Permissions } from './types.js'\n\nimport { getEntityPolicies } from '../utilities/getEntityPolicies.js'\nimport isolateObjectProperty from '../utilities/isolateObjectProperty.js'\n\ntype GetAccessResultsArgs = {\n  req: PayloadRequestWithData\n}\nexport async function getAccessResults({ req }: GetAccessResultsArgs): Promise<Permissions> {\n  const results = {} as Permissions\n  const { payload, user } = req\n\n  const isLoggedIn = !!user\n  const userCollectionConfig =\n    user && user.collection\n      ? payload.config.collections.find((collection) => collection.slug === user.collection)\n      : null\n\n  if (userCollectionConfig && payload.config.admin.user === user.collection) {\n    results.canAccessAdmin = userCollectionConfig.access.admin\n      ? await userCollectionConfig.access.admin({ req })\n      : isLoggedIn\n  } else {\n    results.canAccessAdmin = false\n  }\n\n  await Promise.all(\n    payload.config.collections.map(async (collection) => {\n      const collectionOperations: AllOperations[] = ['create', 'read', 'update', 'delete']\n\n      if (\n        collection.auth &&\n        typeof collection.auth.maxLoginAttempts !== 'undefined' &&\n        collection.auth.maxLoginAttempts !== 0\n      ) {\n        collectionOperations.push('unlock')\n      }\n\n      if (collection.versions) {\n        collectionOperations.push('readVersions')\n      }\n\n      const collectionPolicy = await getEntityPolicies({\n        type: 'collection',\n        entity: collection,\n        operations: collectionOperations,\n        // Do not re-use our existing req object, as we need a new req.transactionID. Cannot re-use our existing one, as this is run in parallel (Promise.all above) which is\n        // not supported on the same transaction ID. Not passing a transaction ID here creates a new transaction ID.\n        req: isolateObjectProperty(req, 'transactionID'),\n      })\n      results.collections = {\n        ...results.collections,\n        [collection.slug]: collectionPolicy,\n      }\n    }),\n  )\n\n  await Promise.all(\n    payload.config.globals.map(async (global) => {\n      const globalOperations: AllOperations[] = ['read', 'update']\n\n      if (global.versions) {\n        globalOperations.push('readVersions')\n      }\n\n      const globalPolicy = await getEntityPolicies({\n        type: 'global',\n        entity: global,\n        operations: globalOperations,\n        // Do not re-use our existing req object, as we need a new req.transactionID. Cannot re-use our existing one, as this is run in parallel (Promise.all above) which is\n        // not supported on the same transaction ID. Not passing a transaction ID here creates a new transaction ID.\n        req: isolateObjectProperty(req, 'transactionID'),\n      })\n      results.globals = {\n        ...results.globals,\n        [global.slug]: globalPolicy,\n      }\n    }),\n  )\n\n  return results\n}\n"],"names":["getEntityPolicies","isolateObjectProperty","getAccessResults","req","results","payload","user","isLoggedIn","userCollectionConfig","collection","config","collections","find","slug","admin","canAccessAdmin","access","Promise","all","map","collectionOperations","auth","maxLoginAttempts","push","versions","collectionPolicy","type","entity","operations","globals","global","globalOperations","globalPolicy"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,iBAAiB,QAAQ,oCAAmC;AACrE,OAAOC,2BAA2B,wCAAuC;AAKzE,OAAO,eAAeC,iBAAiB,EAAEC,GAAG,EAAwB;IAClE,MAAMC,UAAU,CAAC;IACjB,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAGH;IAE1B,MAAMI,aAAa,CAAC,CAACD;IACrB,MAAME,uBACJF,QAAQA,KAAKG,UAAU,GACnBJ,QAAQK,MAAM,CAACC,WAAW,CAACC,IAAI,CAAC,CAACH,aAAeA,WAAWI,IAAI,KAAKP,KAAKG,UAAU,IACnF;IAEN,IAAID,wBAAwBH,QAAQK,MAAM,CAACI,KAAK,CAACR,IAAI,KAAKA,KAAKG,UAAU,EAAE;QACzEL,QAAQW,cAAc,GAAGP,qBAAqBQ,MAAM,CAACF,KAAK,GACtD,MAAMN,qBAAqBQ,MAAM,CAACF,KAAK,CAAC;YAAEX;QAAI,KAC9CI;IACN,OAAO;QACLH,QAAQW,cAAc,GAAG;IAC3B;IAEA,MAAME,QAAQC,GAAG,CACfb,QAAQK,MAAM,CAACC,WAAW,CAACQ,GAAG,CAAC,OAAOV;QACpC,MAAMW,uBAAwC;YAAC;YAAU;YAAQ;YAAU;SAAS;QAEpF,IACEX,WAAWY,IAAI,IACf,OAAOZ,WAAWY,IAAI,CAACC,gBAAgB,KAAK,eAC5Cb,WAAWY,IAAI,CAACC,gBAAgB,KAAK,GACrC;YACAF,qBAAqBG,IAAI,CAAC;QAC5B;QAEA,IAAId,WAAWe,QAAQ,EAAE;YACvBJ,qBAAqBG,IAAI,CAAC;QAC5B;QAEA,MAAME,mBAAmB,MAAMzB,kBAAkB;YAC/C0B,MAAM;YACNC,QAAQlB;YACRmB,YAAYR;YACZ,qKAAqK;YACrK,4GAA4G;YAC5GjB,KAAKF,sBAAsBE,KAAK;QAClC;QACAC,QAAQO,WAAW,GAAG;YACpB,GAAGP,QAAQO,WAAW;YACtB,CAACF,WAAWI,IAAI,CAAC,EAAEY;QACrB;IACF;IAGF,MAAMR,QAAQC,GAAG,CACfb,QAAQK,MAAM,CAACmB,OAAO,CAACV,GAAG,CAAC,OAAOW;QAChC,MAAMC,mBAAoC;YAAC;YAAQ;SAAS;QAE5D,IAAID,OAAON,QAAQ,EAAE;YACnBO,iBAAiBR,IAAI,CAAC;QACxB;QAEA,MAAMS,eAAe,MAAMhC,kBAAkB;YAC3C0B,MAAM;YACNC,QAAQG;YACRF,YAAYG;YACZ,qKAAqK;YACrK,4GAA4G;YAC5G5B,KAAKF,sBAAsBE,KAAK;QAClC;QACAC,QAAQyB,OAAO,GAAG;YAChB,GAAGzB,QAAQyB,OAAO;YAClB,CAACC,OAAOjB,IAAI,CAAC,EAAEmB;QACjB;IACF;IAGF,OAAO5B;AACT"}

package/dist/auth/getFieldsToSign.d.ts

@@ -1,8 +1,8 @@
 import type { CollectionConfig } from '../collections/config/types.js';
-import type { PayloadRequest } from '../types/index.js';
+import type { PayloadRequestWithData } from '../types/index.js';
 export declare const getFieldsToSign: (args: {
     collectionConfig: CollectionConfig;
     email: string;
-    user: PayloadRequest['user'];
+    user: PayloadRequestWithData['user'];
 }) => Record<string, unknown>;
 //# sourceMappingURL=getFieldsToSign.d.ts.map

package/dist/auth/getFieldsToSign.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFieldsToSign.d.ts","sourceRoot":"","sources":["../../src/auth/getFieldsToSign.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAsGvD,eAAO,MAAM,eAAe,SAAU;IACpC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;CAC7B,KAAG,OAAO,MAAM,EAAE,OAAO,CAgBzB,CAAA"}
+{"version":3,"file":"getFieldsToSign.d.ts","sourceRoot":"","sources":["../../src/auth/getFieldsToSign.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAqG/D,eAAO,MAAM,eAAe,SAAU;IACpC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;CACrC,KAAG,OAAO,MAAM,EAAE,OAAO,CAgBzB,CAAA"}

package/dist/auth/getFieldsToSign.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/auth/getFieldsToSign.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport type { CollectionConfig } from '../collections/config/types.js'\nimport type { Field, TabAsField } from '../fields/config/types.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { User } from './index.js'\n\nimport { fieldAffectsData, tabHasName } from '../fields/config/types.js'\n\ntype TraverseFieldsArgs = {\n  data: Record<string, unknown>\n  fields: (Field | TabAsField)[]\n  result: Record<string, unknown>\n}\nconst traverseFields = ({\n  data,\n  // parent,\n  fields,\n  result,\n}: TraverseFieldsArgs) => {\n  fields.forEach((field) => {\n    switch (field.type) {\n      case 'row':\n      case 'collapsible': {\n        traverseFields({\n          data,\n          fields: field.fields,\n          result,\n        })\n        break\n      }\n      case 'group': {\n        let targetResult\n        if (typeof field.saveToJWT === 'string') {\n          targetResult = field.saveToJWT\n          result[field.saveToJWT] = data[field.name]\n        } else if (field.saveToJWT) {\n          targetResult = field.name\n          result[field.name] = data[field.name]\n        }\n        const groupData: Record<string, unknown> = data[field.name] as Record<string, unknown>\n        const groupResult = (targetResult ? result[targetResult] : result) as Record<\n          string,\n          unknown\n        >\n        traverseFields({\n          data: groupData,\n          fields: field.fields,\n          result: groupResult,\n        })\n        break\n      }\n      case 'tabs': {\n        traverseFields({\n          data,\n          fields: field.tabs.map((tab) => ({ ...tab, type: 'tab' })),\n          result,\n        })\n        break\n      }\n      case 'tab': {\n        if (tabHasName(field)) {\n          let targetResult\n          if (typeof field.saveToJWT === 'string') {\n            targetResult = field.saveToJWT\n            result[field.saveToJWT] = data[field.name]\n          } else if (field.saveToJWT) {\n            targetResult = field.name\n            result[field.name] = data[field.name]\n          }\n          const tabData: Record<string, unknown> = data[field.name] as Record<string, unknown>\n          const tabResult = (targetResult ? result[targetResult] : result) as Record<\n            string,\n            unknown\n          >\n          traverseFields({\n            data: tabData,\n            fields: field.fields,\n            result: tabResult,\n          })\n        } else {\n          traverseFields({\n            data,\n            fields: field.fields,\n            result,\n          })\n        }\n        break\n      }\n      default:\n        if (fieldAffectsData(field)) {\n          if (field.saveToJWT) {\n            if (typeof field.saveToJWT === 'string') {\n              result[field.saveToJWT] = data[field.name]\n              delete result[field.name]\n            } else {\n              result[field.name] = data[field.name] as Record<string, unknown>\n            }\n          } else if (field.saveToJWT === false) {\n            delete result[field.name]\n          }\n        }\n    }\n  })\n  return result\n}\nexport const getFieldsToSign = (args: {\n  collectionConfig: CollectionConfig\n  email: string\n  user: PayloadRequest['user']\n}): Record<string, unknown> => {\n  const { collectionConfig, email, user } = args\n\n  const result: Record<string, unknown> = {\n    id: user.id,\n    collection: collectionConfig.slug,\n    email,\n  }\n\n  traverseFields({\n    data: user,\n    fields: collectionConfig.fields,\n    result,\n  })\n\n  return result\n}\n"],"names":["fieldAffectsData","tabHasName","traverseFields","data","fields","result","forEach","field","type","targetResult","saveToJWT","name","groupData","groupResult","tabs","map","tab","tabData","tabResult","getFieldsToSign","args","collectionConfig","email","user","id","collection","slug"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/auth/getFieldsToSign.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport type { CollectionConfig } from '../collections/config/types.js'\nimport type { Field, TabAsField } from '../fields/config/types.js'\nimport type { PayloadRequestWithData } from '../types/index.js'\n\nimport { fieldAffectsData, tabHasName } from '../fields/config/types.js'\n\ntype TraverseFieldsArgs = {\n  data: Record<string, unknown>\n  fields: (Field | TabAsField)[]\n  result: Record<string, unknown>\n}\nconst traverseFields = ({\n  data,\n  // parent,\n  fields,\n  result,\n}: TraverseFieldsArgs) => {\n  fields.forEach((field) => {\n    switch (field.type) {\n      case 'row':\n      case 'collapsible': {\n        traverseFields({\n          data,\n          fields: field.fields,\n          result,\n        })\n        break\n      }\n      case 'group': {\n        let targetResult\n        if (typeof field.saveToJWT === 'string') {\n          targetResult = field.saveToJWT\n          result[field.saveToJWT] = data[field.name]\n        } else if (field.saveToJWT) {\n          targetResult = field.name\n          result[field.name] = data[field.name]\n        }\n        const groupData: Record<string, unknown> = data[field.name] as Record<string, unknown>\n        const groupResult = (targetResult ? result[targetResult] : result) as Record<\n          string,\n          unknown\n        >\n        traverseFields({\n          data: groupData,\n          fields: field.fields,\n          result: groupResult,\n        })\n        break\n      }\n      case 'tabs': {\n        traverseFields({\n          data,\n          fields: field.tabs.map((tab) => ({ ...tab, type: 'tab' })),\n          result,\n        })\n        break\n      }\n      case 'tab': {\n        if (tabHasName(field)) {\n          let targetResult\n          if (typeof field.saveToJWT === 'string') {\n            targetResult = field.saveToJWT\n            result[field.saveToJWT] = data[field.name]\n          } else if (field.saveToJWT) {\n            targetResult = field.name\n            result[field.name] = data[field.name]\n          }\n          const tabData: Record<string, unknown> = data[field.name] as Record<string, unknown>\n          const tabResult = (targetResult ? result[targetResult] : result) as Record<\n            string,\n            unknown\n          >\n          traverseFields({\n            data: tabData,\n            fields: field.fields,\n            result: tabResult,\n          })\n        } else {\n          traverseFields({\n            data,\n            fields: field.fields,\n            result,\n          })\n        }\n        break\n      }\n      default:\n        if (fieldAffectsData(field)) {\n          if (field.saveToJWT) {\n            if (typeof field.saveToJWT === 'string') {\n              result[field.saveToJWT] = data[field.name]\n              delete result[field.name]\n            } else {\n              result[field.name] = data[field.name] as Record<string, unknown>\n            }\n          } else if (field.saveToJWT === false) {\n            delete result[field.name]\n          }\n        }\n    }\n  })\n  return result\n}\nexport const getFieldsToSign = (args: {\n  collectionConfig: CollectionConfig\n  email: string\n  user: PayloadRequestWithData['user']\n}): Record<string, unknown> => {\n  const { collectionConfig, email, user } = args\n\n  const result: Record<string, unknown> = {\n    id: user.id,\n    collection: collectionConfig.slug,\n    email,\n  }\n\n  traverseFields({\n    data: user,\n    fields: collectionConfig.fields,\n    result,\n  })\n\n  return result\n}\n"],"names":["fieldAffectsData","tabHasName","traverseFields","data","fields","result","forEach","field","type","targetResult","saveToJWT","name","groupData","groupResult","tabs","map","tab","tabData","tabResult","getFieldsToSign","args","collectionConfig","email","user","id","collection","slug"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,oCAAoC,GAKpC,SAASA,gBAAgB,EAAEC,UAAU,QAAQ,4BAA2B;AAOxE,MAAMC,iBAAiB,CAAC,EACtBC,IAAI,EACJ,UAAU;AACVC,MAAM,EACNC,MAAM,EACa;IACnBD,OAAOE,OAAO,CAAC,CAACC;QACd,OAAQA,MAAMC,IAAI;YAChB,KAAK;YACL,KAAK;gBAAe;oBAClBN,eAAe;wBACbC;wBACAC,QAAQG,MAAMH,MAAM;wBACpBC;oBACF;oBACA;gBACF;YACA,KAAK;gBAAS;oBACZ,IAAII;oBACJ,IAAI,OAAOF,MAAMG,SAAS,KAAK,UAAU;wBACvCD,eAAeF,MAAMG,SAAS;wBAC9BL,MAAM,CAACE,MAAMG,SAAS,CAAC,GAAGP,IAAI,CAACI,MAAMI,IAAI,CAAC;oBAC5C,OAAO,IAAIJ,MAAMG,SAAS,EAAE;wBAC1BD,eAAeF,MAAMI,IAAI;wBACzBN,MAAM,CAACE,MAAMI,IAAI,CAAC,GAAGR,IAAI,CAACI,MAAMI,IAAI,CAAC;oBACvC;oBACA,MAAMC,YAAqCT,IAAI,CAACI,MAAMI,IAAI,CAAC;oBAC3D,MAAME,cAAeJ,eAAeJ,MAAM,CAACI,aAAa,GAAGJ;oBAI3DH,eAAe;wBACbC,MAAMS;wBACNR,QAAQG,MAAMH,MAAM;wBACpBC,QAAQQ;oBACV;oBACA;gBACF;YACA,KAAK;gBAAQ;oBACXX,eAAe;wBACbC;wBACAC,QAAQG,MAAMO,IAAI,CAACC,GAAG,CAAC,CAACC,MAAS,CAAA;gCAAE,GAAGA,GAAG;gCAAER,MAAM;4BAAM,CAAA;wBACvDH;oBACF;oBACA;gBACF;YACA,KAAK;gBAAO;oBACV,IAAIJ,WAAWM,QAAQ;wBACrB,IAAIE;wBACJ,IAAI,OAAOF,MAAMG,SAAS,KAAK,UAAU;4BACvCD,eAAeF,MAAMG,SAAS;4BAC9BL,MAAM,CAACE,MAAMG,SAAS,CAAC,GAAGP,IAAI,CAACI,MAAMI,IAAI,CAAC;wBAC5C,OAAO,IAAIJ,MAAMG,SAAS,EAAE;4BAC1BD,eAAeF,MAAMI,IAAI;4BACzBN,MAAM,CAACE,MAAMI,IAAI,CAAC,GAAGR,IAAI,CAACI,MAAMI,IAAI,CAAC;wBACvC;wBACA,MAAMM,UAAmCd,IAAI,CAACI,MAAMI,IAAI,CAAC;wBACzD,MAAMO,YAAaT,eAAeJ,MAAM,CAACI,aAAa,GAAGJ;wBAIzDH,eAAe;4BACbC,MAAMc;4BACNb,QAAQG,MAAMH,MAAM;4BACpBC,QAAQa;wBACV;oBACF,OAAO;wBACLhB,eAAe;4BACbC;4BACAC,QAAQG,MAAMH,MAAM;4BACpBC;wBACF;oBACF;oBACA;gBACF;YACA;gBACE,IAAIL,iBAAiBO,QAAQ;oBAC3B,IAAIA,MAAMG,SAAS,EAAE;wBACnB,IAAI,OAAOH,MAAMG,SAAS,KAAK,UAAU;4BACvCL,MAAM,CAACE,MAAMG,SAAS,CAAC,GAAGP,IAAI,CAACI,MAAMI,IAAI,CAAC;4BAC1C,OAAON,MAAM,CAACE,MAAMI,IAAI,CAAC;wBAC3B,OAAO;4BACLN,MAAM,CAACE,MAAMI,IAAI,CAAC,GAAGR,IAAI,CAACI,MAAMI,IAAI,CAAC;wBACvC;oBACF,OAAO,IAAIJ,MAAMG,SAAS,KAAK,OAAO;wBACpC,OAAOL,MAAM,CAACE,MAAMI,IAAI,CAAC;oBAC3B;gBACF;QACJ;IACF;IACA,OAAON;AACT;AACA,OAAO,MAAMc,kBAAkB,CAACC;IAK9B,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAEC,IAAI,EAAE,GAAGH;IAE1C,MAAMf,SAAkC;QACtCmB,IAAID,KAAKC,EAAE;QACXC,YAAYJ,iBAAiBK,IAAI;QACjCJ;IACF;IAEApB,eAAe;QACbC,MAAMoB;QACNnB,QAAQiB,iBAAiBjB,MAAM;QAC/BC;IACF;IAEA,OAAOA;AACT,EAAC"}

package/dist/auth/operations/access.d.ts

@@ -1,7 +1,7 @@
-import type { PayloadRequest } from '../../types/index.js';
+import type { PayloadRequestWithData } from '../../types/index.js';
 import type { Permissions } from '../types.js';
 type Arguments = {
-    req: PayloadRequest;
+    req: PayloadRequestWithData;
 };
 export declare const accessOperation: (args: Arguments) => Promise<Permissions>;
 export {};

package/dist/auth/operations/access.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../../src/auth/operations/access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAQ9C,KAAK,SAAS,GAAG;IACf,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,eAAe,SAAgB,SAAS,KAAG,QAAQ,WAAW,CAc1E,CAAA"}
+{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../../src/auth/operations/access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAQ9C,KAAK,SAAS,GAAG;IACf,GAAG,EAAE,sBAAsB,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,eAAe,SAAgB,SAAS,KAAG,QAAQ,WAAW,CAc1E,CAAA"}

package/dist/auth/operations/access.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/auth/operations/access.ts"],"sourcesContent":["import type { PayloadRequest } from '../../types/index.js'\nimport type { Permissions } from '../types.js'\n\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport { adminInit as adminInitTelemetry } from '../../utilities/telemetry/events/adminInit.js'\nimport { getAccessResults } from '../getAccessResults.js'\n\ntype Arguments = {\n  req: PayloadRequest\n}\n\nexport const accessOperation = async (args: Arguments): Promise<Permissions> => {\n  const { req } = args\n\n  adminInitTelemetry(req)\n\n  try {\n    const shouldCommit = await initTransaction(req)\n    const results = getAccessResults({ req })\n    if (shouldCommit) await commitTransaction(req)\n    return results\n  } catch (e: unknown) {\n    await killTransaction(req)\n    throw e\n  }\n}\n"],"names":["commitTransaction","initTransaction","killTransaction","adminInit","adminInitTelemetry","getAccessResults","accessOperation","args","req","shouldCommit","results","e"],"rangeMappings":";;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,iBAAiB,QAAQ,uCAAsC;AACxE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,aAAaC,kBAAkB,QAAQ,gDAA+C;AAC/F,SAASC,gBAAgB,QAAQ,yBAAwB;AAMzD,OAAO,MAAMC,kBAAkB,OAAOC;IACpC,MAAM,EAAEC,GAAG,EAAE,GAAGD;IAEhBH,mBAAmBI;IAEnB,IAAI;QACF,MAAMC,eAAe,MAAMR,gBAAgBO;QAC3C,MAAME,UAAUL,iBAAiB;YAAEG;QAAI;QACvC,IAAIC,cAAc,MAAMT,kBAAkBQ;QAC1C,OAAOE;IACT,EAAE,OAAOC,GAAY;QACnB,MAAMT,gBAAgBM;QACtB,MAAMG;IACR;AACF,EAAC"}
+{"version":3,"sources":["../../../src/auth/operations/access.ts"],"sourcesContent":["import type { PayloadRequestWithData } from '../../types/index.js'\nimport type { Permissions } from '../types.js'\n\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport { adminInit as adminInitTelemetry } from '../../utilities/telemetry/events/adminInit.js'\nimport { getAccessResults } from '../getAccessResults.js'\n\ntype Arguments = {\n  req: PayloadRequestWithData\n}\n\nexport const accessOperation = async (args: Arguments): Promise<Permissions> => {\n  const { req } = args\n\n  adminInitTelemetry(req)\n\n  try {\n    const shouldCommit = await initTransaction(req)\n    const results = getAccessResults({ req })\n    if (shouldCommit) await commitTransaction(req)\n    return results\n  } catch (e: unknown) {\n    await killTransaction(req)\n    throw e\n  }\n}\n"],"names":["commitTransaction","initTransaction","killTransaction","adminInit","adminInitTelemetry","getAccessResults","accessOperation","args","req","shouldCommit","results","e"],"rangeMappings":";;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,iBAAiB,QAAQ,uCAAsC;AACxE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,aAAaC,kBAAkB,QAAQ,gDAA+C;AAC/F,SAASC,gBAAgB,QAAQ,yBAAwB;AAMzD,OAAO,MAAMC,kBAAkB,OAAOC;IACpC,MAAM,EAAEC,GAAG,EAAE,GAAGD;IAEhBH,mBAAmBI;IAEnB,IAAI;QACF,MAAMC,eAAe,MAAMR,gBAAgBO;QAC3C,MAAME,UAAUL,iBAAiB;YAAEG;QAAI;QACvC,IAAIC,cAAc,MAAMT,kBAAkBQ;QAC1C,OAAOE;IACT,EAAE,OAAOC,GAAY;QACnB,MAAMT,gBAAgBM;QACtB,MAAMG;IACR;AACF,EAAC"}

package/dist/auth/operations/auth.d.ts

@@ -1,9 +1,9 @@
 import type { GeneratedTypes } from '../../index.js';
-import type { PayloadRequest } from '../../types/index.js';
+import type { PayloadRequestWithData } from '../../types/index.js';
 import type { Permissions } from '../types.js';
 export type AuthArgs = {
     headers: Request['headers'];
-    req?: Omit<PayloadRequest, 'user'>;
+    req?: Omit<PayloadRequestWithData, 'user'>;
 };
 export type AuthResult = {
     cookies: Map<string, string>;

package/dist/auth/operations/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/auth/operations/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAQ,MAAM,aAAa,CAAA;AASpD,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IAC3B,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;CACnC,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,WAAW,EAAE,WAAW,CAAA;IACxB,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;CACpC,CAAA;AAED,eAAO,MAAM,IAAI,SAAgB,SAAS,QAAQ,CAAC,KAAG,QAAQ,UAAU,CAiCvE,CAAA"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/auth/operations/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,KAAK,EAAE,WAAW,EAAQ,MAAM,aAAa,CAAA;AASpD,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IAC3B,GAAG,CAAC,EAAE,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAA;CAC3C,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,WAAW,EAAE,WAAW,CAAA;IACxB,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;CACpC,CAAA;AAED,eAAO,MAAM,IAAI,SAAgB,SAAS,QAAQ,CAAC,KAAG,QAAQ,UAAU,CAiCvE,CAAA"}

package/dist/auth/operations/auth.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/auth/operations/auth.ts"],"sourcesContent":["import type { GeneratedTypes } from '../../index.js'\nimport type { PayloadRequest } from '../../types/index.js'\nimport type { Permissions, User } from '../types.js'\n\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport { parseCookies } from '../cookies.js'\nimport { executeAuthStrategies } from '../executeAuthStrategies.js'\nimport { getAccessResults } from '../getAccessResults.js'\n\nexport type AuthArgs = {\n  headers: Request['headers']\n  req?: Omit<PayloadRequest, 'user'>\n}\n\nexport type AuthResult = {\n  cookies: Map<string, string>\n  permissions: Permissions\n  user: GeneratedTypes['user'] | null\n}\n\nexport const auth = async (args: Required<AuthArgs>): Promise<AuthResult> => {\n  const { headers } = args\n  const req = args.req as PayloadRequest\n  const { payload } = req\n\n  const cookies = parseCookies(headers)\n\n  try {\n    const shouldCommit = await initTransaction(req)\n\n    const user = await executeAuthStrategies({\n      cookies,\n      headers,\n      payload,\n    })\n\n    req.user = user\n\n    const permissions = await getAccessResults({\n      req,\n    })\n\n    if (shouldCommit) await commitTransaction(req)\n\n    return {\n      cookies,\n      permissions,\n      user,\n    }\n  } catch (error: unknown) {\n    await killTransaction(req)\n    throw error\n  }\n}\n"],"names":["commitTransaction","initTransaction","killTransaction","parseCookies","executeAuthStrategies","getAccessResults","auth","args","headers","req","payload","cookies","shouldCommit","user","permissions","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,iBAAiB,QAAQ,uCAAsC;AACxE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,YAAY,QAAQ,gBAAe;AAC5C,SAASC,qBAAqB,QAAQ,8BAA6B;AACnE,SAASC,gBAAgB,QAAQ,yBAAwB;AAazD,OAAO,MAAMC,OAAO,OAAOC;IACzB,MAAM,EAAEC,OAAO,EAAE,GAAGD;IACpB,MAAME,MAAMF,KAAKE,GAAG;IACpB,MAAM,EAAEC,OAAO,EAAE,GAAGD;IAEpB,MAAME,UAAUR,aAAaK;IAE7B,IAAI;QACF,MAAMI,eAAe,MAAMX,gBAAgBQ;QAE3C,MAAMI,OAAO,MAAMT,sBAAsB;YACvCO;YACAH;YACAE;QACF;QAEAD,IAAII,IAAI,GAAGA;QAEX,MAAMC,cAAc,MAAMT,iBAAiB;YACzCI;QACF;QAEA,IAAIG,cAAc,MAAMZ,kBAAkBS;QAE1C,OAAO;YACLE;YACAG;YACAD;QACF;IACF,EAAE,OAAOE,OAAgB;QACvB,MAAMb,gBAAgBO;QACtB,MAAMM;IACR;AACF,EAAC"}
+{"version":3,"sources":["../../../src/auth/operations/auth.ts"],"sourcesContent":["import type { GeneratedTypes } from '../../index.js'\nimport type { PayloadRequestWithData } from '../../types/index.js'\nimport type { Permissions, User } from '../types.js'\n\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport { parseCookies } from '../cookies.js'\nimport { executeAuthStrategies } from '../executeAuthStrategies.js'\nimport { getAccessResults } from '../getAccessResults.js'\n\nexport type AuthArgs = {\n  headers: Request['headers']\n  req?: Omit<PayloadRequestWithData, 'user'>\n}\n\nexport type AuthResult = {\n  cookies: Map<string, string>\n  permissions: Permissions\n  user: GeneratedTypes['user'] | null\n}\n\nexport const auth = async (args: Required<AuthArgs>): Promise<AuthResult> => {\n  const { headers } = args\n  const req = args.req as PayloadRequestWithData\n  const { payload } = req\n\n  const cookies = parseCookies(headers)\n\n  try {\n    const shouldCommit = await initTransaction(req)\n\n    const user = await executeAuthStrategies({\n      cookies,\n      headers,\n      payload,\n    })\n\n    req.user = user\n\n    const permissions = await getAccessResults({\n      req,\n    })\n\n    if (shouldCommit) await commitTransaction(req)\n\n    return {\n      cookies,\n      permissions,\n      user,\n    }\n  } catch (error: unknown) {\n    await killTransaction(req)\n    throw error\n  }\n}\n"],"names":["commitTransaction","initTransaction","killTransaction","parseCookies","executeAuthStrategies","getAccessResults","auth","args","headers","req","payload","cookies","shouldCommit","user","permissions","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,iBAAiB,QAAQ,uCAAsC;AACxE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,YAAY,QAAQ,gBAAe;AAC5C,SAASC,qBAAqB,QAAQ,8BAA6B;AACnE,SAASC,gBAAgB,QAAQ,yBAAwB;AAazD,OAAO,MAAMC,OAAO,OAAOC;IACzB,MAAM,EAAEC,OAAO,EAAE,GAAGD;IACpB,MAAME,MAAMF,KAAKE,GAAG;IACpB,MAAM,EAAEC,OAAO,EAAE,GAAGD;IAEpB,MAAME,UAAUR,aAAaK;IAE7B,IAAI;QACF,MAAMI,eAAe,MAAMX,gBAAgBQ;QAE3C,MAAMI,OAAO,MAAMT,sBAAsB;YACvCO;YACAH;YACAE;QACF;QAEAD,IAAII,IAAI,GAAGA;QAEX,MAAMC,cAAc,MAAMT,iBAAiB;YACzCI;QACF;QAEA,IAAIG,cAAc,MAAMZ,kBAAkBS;QAE1C,OAAO;YACLE;YACAG;YACAD;QACF;IACF,EAAE,OAAOE,OAAgB;QACvB,MAAMb,gBAAgBO;QACtB,MAAMM;IACR;AACF,EAAC"}

package/dist/auth/operations/forgotPassword.d.ts

@@ -1,5 +1,5 @@
 import type { Collection } from '../../collections/config/types.js';
-import type { PayloadRequest } from '../../types/index.js';
+import type { PayloadRequestWithData } from '../../types/index.js';
 export type Arguments = {
     collection: Collection;
     data: {
@@ -8,7 +8,7 @@ export type Arguments = {
     };
     disableEmail?: boolean;
     expiration?: number;
-    req: PayloadRequest;
+    req: PayloadRequestWithData;
 };
 export type Result = string;
 export declare const forgotPasswordOperation: (incomingArgs: Arguments) => Promise<null | string>;

package/dist/auth/operations/forgotPassword.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"forgotPassword.d.ts","sourceRoot":"","sources":["../../../src/auth/operations/forgotPassword.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAQ1D,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE;QACJ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;QACtB,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;IACD,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,CAAA;AAE3B,eAAO,MAAM,uBAAuB,iBAAwB,SAAS,KAAG,QAAQ,IAAI,GAAG,MAAM,CA+I5F,CAAA"}
+{"version":3,"file":"forgotPassword.d.ts","sourceRoot":"","sources":["../../../src/auth/operations/forgotPassword.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAQlE,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE;QACJ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;QACtB,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;IACD,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,sBAAsB,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,CAAA;AAE3B,eAAO,MAAM,uBAAuB,iBAAwB,SAAS,KAAG,QAAQ,IAAI,GAAG,MAAM,CA6I5F,CAAA"}

package/dist/auth/operations/forgotPassword.js

@@ -26,7 +26,7 @@ export const forgotPasswordOperation = async (incomingArgs)=>{
                 req: args.req
             }) || args;
         }, Promise.resolve());
-        const { collection: { config: collectionConfig }, data, disableEmail, expiration, req: { payload: { config, emailOptions, sendEmail: email }, payload }, req } = args;
+        const { collection: { config: collectionConfig }, data, disableEmail, expiration, req: { payload: { config, email }, payload }, req } = args;
         // /////////////////////////////////////
         // Forget password
         // /////////////////////////////////////
@@ -57,12 +57,11 @@ export const forgotPasswordOperation = async (incomingArgs)=>{
             req
         });
         if (!disableEmail) {
-            const protocol = new URL(req.url).protocol;
-            const serverURL = config.serverURL !== null && config.serverURL !== '' ? config.serverURL : `${protocol}://${req.headers.get('host')}`;
+            const protocol = new URL(req.url).protocol // includes the final :
+            ;
+            const serverURL = config.serverURL !== null && config.serverURL !== '' ? config.serverURL : `${protocol}//${req.headers.get('host')}`;
             let html = `${req.t('authentication:youAreReceivingResetPassword')}
-    <a href="${serverURL}${config.routes.admin}/reset/${token}">
-     ${serverURL}${config.routes.admin}/reset/${token}
-    </a>
+    <a href="${serverURL}${config.routes.admin}/reset/${token}">${serverURL}${config.routes.admin}/reset/${token}</a>
     ${req.t('authentication:youDidNotRequestPassword')}`;
             if (typeof collectionConfig.auth.forgotPassword.generateEmailHTML === 'function') {
                 html = await collectionConfig.auth.forgotPassword.generateEmailHTML({
@@ -80,8 +79,8 @@ export const forgotPasswordOperation = async (incomingArgs)=>{
                 });
             }
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            email({
-                from: `"${emailOptions.fromName}" <${emailOptions.fromAddress}>`,
+            email.sendEmail({
+                from: `"${email.defaultFromName}" <${email.defaultFromAddress}>`,
                 html,
                 subject,
                 to: data.email