payload 4.0.0-internal.e7d4ebc → 4.0.0-internal.ea6e8f8

package/dist/auth/operations/forgotPassword.js

@@ -1,23 +1,28 @@
 import crypto from 'crypto';
-import { status as httpStatus } from 'http-status';
 import { buildAfterOperation } from '../../collections/operations/utilities/buildAfterOperation.js';
 import { buildBeforeOperation } from '../../collections/operations/utilities/buildBeforeOperation.js';
 import { APIError } from '../../errors/index.js';
 import { Forbidden } from '../../index.js';
 import { appendNonTrashedFilter } from '../../utilities/appendNonTrashedFilter.js';
+import { assertNoValidationWrite } from '../../utilities/assertNoValidationWrite.js';
 import { commitTransaction } from '../../utilities/commitTransaction.js';
 import { formatAdminURL } from '../../utilities/formatAdminURL.js';
 import { getRequestOrigin } from '../../utilities/getRequestOrigin.js';
+import { httpStatus } from '../../utilities/httpStatus.js';
 import { initTransaction } from '../../utilities/initTransaction.js';
+import { isolateObjectProperty } from '../../utilities/isolateObjectProperty.js';
 import { killTransaction } from '../../utilities/killTransaction.js';
 import { getLoginOptions } from '../getLoginOptions.js';
 export const forgotPasswordOperation = async (incomingArgs)=>{
+    assertNoValidationWrite(incomingArgs.req);
     const loginWithUsername = incomingArgs.collection.config.auth.loginWithUsername;
     const { data, overrideAccess } = incomingArgs;
     const { canLoginWithEmail, canLoginWithUsername } = getLoginOptions(loginWithUsername);
     const sanitizedEmail = canLoginWithEmail && (incomingArgs.data.email || '').toLowerCase().trim() || null;
     const sanitizedUsername = 'username' in data && typeof data?.username === 'string' ? data.username.toLowerCase().trim() : null;
     let args = incomingArgs;
+    let hasSentEmail = false;
+    let releaseRequestInterval = null;
     if (incomingArgs.collection.config.auth.disableLocalStrategy) {
         throw new Forbidden(incomingArgs.req.t);
     }
@@ -36,13 +41,7 @@ export const forgotPasswordOperation = async (incomingArgs)=>{
             overrideAccess
         });
         const { collection: { config: collectionConfig }, disableEmail, expiration, req: { payload: { config, email }, payload }, req } = args;
-        // /////////////////////////////////////
-        // Forget password
-        // /////////////////////////////////////
-        let token = crypto.randomBytes(20).toString('hex');
-        if (!sanitizedEmail && !sanitizedUsername) {
-            throw new APIError(`Missing ${loginWithUsername ? 'username' : 'email'}.`, httpStatus.BAD_REQUEST);
-        }
+        const minRequestInterval = collectionConfig.auth.forgotPassword.minRequestInterval ?? 15000;
         let whereConstraint = {};
         if (canLoginWithEmail && sanitizedEmail) {
             whereConstraint = {
@@ -63,19 +62,93 @@ export const forgotPasswordOperation = async (incomingArgs)=>{
             trash: false,
             where: whereConstraint
         });
-        let user = await payload.db.findOne({
-            collection: collectionConfig.slug,
-            req,
-            where: whereConstraint
-        });
+        const now = Date.now();
+        let token = crypto.randomBytes(20).toString('hex');
+        const resetPasswordExpiration = new Date(now + (collectionConfig.auth?.forgotPassword?.expiration ?? expiration ?? 3600000)).toISOString();
+        let user;
+        if (!disableEmail && minRequestInterval > 0) {
+            const requestedAt = new Date(now).toISOString();
+            const reservationReq = isolateObjectProperty(req, 'transactionID');
+            reservationReq.transactionID = undefined;
+            user = await payload.db.updateOne({
+                collection: collectionConfig.slug,
+                data: {
+                    resetPasswordRequestedAt: requestedAt
+                },
+                options: {
+                    atomic: true
+                },
+                req: reservationReq,
+                where: {
+                    and: [
+                        whereConstraint,
+                        {
+                            or: [
+                                {
+                                    resetPasswordRequestedAt: {
+                                        exists: false
+                                    }
+                                },
+                                {
+                                    resetPasswordRequestedAt: {
+                                        equals: null
+                                    }
+                                },
+                                {
+                                    resetPasswordRequestedAt: {
+                                        less_than_equal: new Date(now - minRequestInterval).toISOString()
+                                    }
+                                }
+                            ]
+                        }
+                    ]
+                }
+            });
+            if (user) {
+                const userID = user.id;
+                releaseRequestInterval = async ()=>{
+                    await payload.db.updateOne({
+                        collection: collectionConfig.slug,
+                        data: {
+                            resetPasswordRequestedAt: null
+                        },
+                        options: {
+                            atomic: true
+                        },
+                        req: reservationReq,
+                        where: {
+                            and: [
+                                {
+                                    id: {
+                                        equals: userID
+                                    }
+                                },
+                                {
+                                    resetPasswordRequestedAt: {
+                                        equals: requestedAt
+                                    }
+                                }
+                            ]
+                        }
+                    });
+                };
+            }
+        } else {
+            user = await payload.db.findOne({
+                collection: collectionConfig.slug,
+                req,
+                where: whereConstraint
+            });
+        }
         // We don't want to indicate specifically that an email was not found,
         // as doing so could lead to the exposure of registered emails.
         // Therefore, we prefer to fail silently.
         if (!user) {
-            await commitTransaction(args.req);
+            if (shouldCommit) {
+                await commitTransaction(args.req);
+            }
             return null;
         }
-        const resetPasswordExpiration = new Date(Date.now() + (collectionConfig.auth?.forgotPassword?.expiration ?? expiration ?? 3600000)).toISOString();
         user = await payload.update({
             id: user.id,
             collection: collectionConfig.slug,
@@ -83,6 +156,7 @@ export const forgotPasswordOperation = async (incomingArgs)=>{
                 resetPasswordExpiration,
                 resetPasswordToken: token
             },
+            overrideAccess: true,
             req
         });
         if (!disableEmail && user.email) {
@@ -119,6 +193,7 @@ export const forgotPasswordOperation = async (incomingArgs)=>{
                 subject,
                 to: user.email
             });
+            hasSentEmail = true;
         }
         // /////////////////////////////////////
         // afterForgotPassword - Collection
@@ -148,6 +223,16 @@ export const forgotPasswordOperation = async (incomingArgs)=>{
         return token;
     } catch (error) {
         await killTransaction(args.req);
+        if (!hasSentEmail && releaseRequestInterval) {
+            try {
+                await releaseRequestInterval();
+            } catch (err) {
+                args.req.payload.logger.error({
+                    err,
+                    msg: 'Failed to release forgot-password interval'
+                });
+            }
+        }
         throw error;
     }
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/auth/operations/forgotPassword.ts"],"sourcesContent":["import crypto from 'crypto'\nimport { status as httpStatus } from 'http-status'\n\nimport type {\n  AuthOperationsFromCollectionSlug,\n  Collection,\n} from '../../collections/config/types.js'\nimport type { AuthCollectionSlug } from '../../index.js'\nimport type { PayloadRequest, Where } from '../../types/index.js'\n\nimport { buildAfterOperation } from '../../collections/operations/utilities/buildAfterOperation.js'\nimport { buildBeforeOperation } from '../../collections/operations/utilities/buildBeforeOperation.js'\nimport { APIError } from '../../errors/index.js'\nimport { Forbidden } from '../../index.js'\nimport { appendNonTrashedFilter } from '../../utilities/appendNonTrashedFilter.js'\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { formatAdminURL } from '../../utilities/formatAdminURL.js'\nimport { getRequestOrigin } from '../../utilities/getRequestOrigin.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport { getLoginOptions } from '../getLoginOptions.js'\n\nexport type Arguments<TSlug extends AuthCollectionSlug> = {\n  collection: Collection\n  data: {\n    [key: string]: unknown\n  } & AuthOperationsFromCollectionSlug<TSlug>['forgotPassword']\n  disableEmail?: boolean\n  expiration?: number\n  overrideAccess?: boolean\n  req: PayloadRequest\n}\n\nexport type Result = string\n\nexport const forgotPasswordOperation = async <TSlug extends AuthCollectionSlug>(\n  incomingArgs: Arguments<TSlug>,\n): Promise<null | string> => {\n  const loginWithUsername = incomingArgs.collection.config.auth.loginWithUsername\n  const { data, overrideAccess } = incomingArgs\n\n  const { canLoginWithEmail, canLoginWithUsername } = getLoginOptions(loginWithUsername)\n\n  const sanitizedEmail =\n    (canLoginWithEmail && (incomingArgs.data.email || '').toLowerCase().trim()) || null\n  const sanitizedUsername =\n    'username' in data && typeof data?.username === 'string'\n      ? data.username.toLowerCase().trim()\n      : null\n\n  let args = incomingArgs\n\n  if (incomingArgs.collection.config.auth.disableLocalStrategy) {\n    throw new Forbidden(incomingArgs.req.t)\n  }\n  if (!sanitizedEmail && !sanitizedUsername) {\n    throw new APIError(\n      `Missing ${loginWithUsername ? 'username' : 'email'}.`,\n      httpStatus.BAD_REQUEST,\n    )\n  }\n\n  try {\n    const shouldCommit = await initTransaction(args.req)\n\n    // /////////////////////////////////////\n    // beforeOperation - Collection\n    // /////////////////////////////////////\n    args = await buildBeforeOperation({\n      args,\n      collection: args.collection.config,\n      operation: 'forgotPassword',\n      overrideAccess,\n    })\n\n    const {\n      collection: { config: collectionConfig },\n      disableEmail,\n      expiration,\n      req: {\n        payload: { config, email },\n        payload,\n      },\n      req,\n    } = args\n\n    // /////////////////////////////////////\n    // Forget password\n    // /////////////////////////////////////\n\n    let token: string = crypto.randomBytes(20).toString('hex')\n    type UserDoc = {\n      email?: string\n      id: number | string\n      resetPasswordExpiration?: string\n      resetPasswordToken?: string\n    }\n\n    if (!sanitizedEmail && !sanitizedUsername) {\n      throw new APIError(\n        `Missing ${loginWithUsername ? 'username' : 'email'}.`,\n        httpStatus.BAD_REQUEST,\n      )\n    }\n\n    let whereConstraint: Where = {}\n\n    if (canLoginWithEmail && sanitizedEmail) {\n      whereConstraint = {\n        email: {\n          equals: sanitizedEmail,\n        },\n      }\n    } else if (canLoginWithUsername && sanitizedUsername) {\n      whereConstraint = {\n        username: {\n          equals: sanitizedUsername,\n        },\n      }\n    }\n\n    // Exclude trashed users unless `trash: true`\n    whereConstraint = appendNonTrashedFilter({\n      enableTrash: collectionConfig.trash,\n      trash: false,\n      where: whereConstraint,\n    })\n\n    let user = await payload.db.findOne<UserDoc>({\n      collection: collectionConfig.slug,\n      req,\n      where: whereConstraint,\n    })\n\n    // We don't want to indicate specifically that an email was not found,\n    // as doing so could lead to the exposure of registered emails.\n    // Therefore, we prefer to fail silently.\n    if (!user) {\n      await commitTransaction(args.req)\n      return null\n    }\n\n    const resetPasswordExpiration = new Date(\n      Date.now() + (collectionConfig.auth?.forgotPassword?.expiration ?? expiration ?? 3600000),\n    ).toISOString()\n\n    user = await payload.update({\n      id: user.id,\n      collection: collectionConfig.slug,\n      data: {\n        resetPasswordExpiration,\n        resetPasswordToken: token,\n      },\n      req,\n    })\n\n    if (!disableEmail && user.email) {\n      const serverURL = getRequestOrigin({ config, req })\n      const forgotURL = formatAdminURL({\n        adminRoute: config.routes.admin,\n        path: `${config.admin.routes.reset}/${token}`,\n        serverURL,\n      })\n      let html = `${req.t('authentication:youAreReceivingResetPassword')}\n    <a href=\"${forgotURL}\">${forgotURL}</a>\n    ${req.t('authentication:youDidNotRequestPassword')}`\n\n      if (typeof collectionConfig.auth.forgotPassword?.generateEmailHTML === 'function') {\n        html = await collectionConfig.auth.forgotPassword.generateEmailHTML({\n          req,\n          token,\n          user,\n        })\n      }\n\n      let subject = req.t('authentication:resetYourPassword')\n\n      if (typeof collectionConfig.auth.forgotPassword?.generateEmailSubject === 'function') {\n        subject = await collectionConfig.auth.forgotPassword.generateEmailSubject({\n          req,\n          token,\n          user,\n        })\n      }\n\n      await email.sendEmail({\n        from: `\"${email.defaultFromName}\" <${email.defaultFromAddress}>`,\n        html,\n        subject,\n        to: user.email,\n      })\n    }\n\n    // /////////////////////////////////////\n    // afterForgotPassword - Collection\n    // /////////////////////////////////////\n\n    if (collectionConfig.hooks?.afterForgotPassword?.length) {\n      for (const hook of collectionConfig.hooks.afterForgotPassword) {\n        await hook({ args, collection: args.collection?.config, context: req.context })\n      }\n    }\n\n    // /////////////////////////////////////\n    // afterOperation - Collection\n    // /////////////////////////////////////\n\n    token = await buildAfterOperation({\n      args,\n      collection: args.collection?.config,\n      operation: 'forgotPassword',\n      overrideAccess,\n      result: token,\n    })\n\n    if (shouldCommit) {\n      await commitTransaction(req)\n    }\n\n    return token\n  } catch (error: unknown) {\n    await killTransaction(args.req)\n    throw error\n  }\n}\n"],"names":["crypto","status","httpStatus","buildAfterOperation","buildBeforeOperation","APIError","Forbidden","appendNonTrashedFilter","commitTransaction","formatAdminURL","getRequestOrigin","initTransaction","killTransaction","getLoginOptions","forgotPasswordOperation","incomingArgs","loginWithUsername","collection","config","auth","data","overrideAccess","canLoginWithEmail","canLoginWithUsername","sanitizedEmail","email","toLowerCase","trim","sanitizedUsername","username","args","disableLocalStrategy","req","t","BAD_REQUEST","shouldCommit","operation","collectionConfig","disableEmail","expiration","payload","token","randomBytes","toString","whereConstraint","equals","enableTrash","trash","where","user","db","findOne","slug","resetPasswordExpiration","Date","now","forgotPassword","toISOString","update","id","resetPasswordToken","serverURL","forgotURL","adminRoute","routes","admin","path","reset","html","generateEmailHTML","subject","generateEmailSubject","sendEmail","from","defaultFromName","defaultFromAddress","to","hooks","afterForgotPassword","length","hook","context","result","error"],"mappings":"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"}
+{"version":3,"sources":["../../../src/auth/operations/forgotPassword.ts"],"sourcesContent":["import crypto from 'crypto'\n\nimport type {\n  AuthOperationsFromCollectionSlug,\n  Collection,\n} from '../../collections/config/types.js'\nimport type { AuthCollectionSlug } from '../../index.js'\nimport type { PayloadRequest, Where } from '../../types/index.js'\n\nimport { buildAfterOperation } from '../../collections/operations/utilities/buildAfterOperation.js'\nimport { buildBeforeOperation } from '../../collections/operations/utilities/buildBeforeOperation.js'\nimport { APIError } from '../../errors/index.js'\nimport { Forbidden } from '../../index.js'\nimport { appendNonTrashedFilter } from '../../utilities/appendNonTrashedFilter.js'\nimport { assertNoValidationWrite } from '../../utilities/assertNoValidationWrite.js'\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { formatAdminURL } from '../../utilities/formatAdminURL.js'\nimport { getRequestOrigin } from '../../utilities/getRequestOrigin.js'\nimport { httpStatus } from '../../utilities/httpStatus.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { isolateObjectProperty } from '../../utilities/isolateObjectProperty.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport { getLoginOptions } from '../getLoginOptions.js'\n\nexport type Arguments<TSlug extends AuthCollectionSlug> = {\n  collection: Collection\n  data: {\n    [key: string]: unknown\n  } & AuthOperationsFromCollectionSlug<TSlug>['forgotPassword']\n  disableEmail?: boolean\n  expiration?: number\n  overrideAccess?: boolean\n  req: PayloadRequest\n}\n\nexport type Result = string\n\nexport const forgotPasswordOperation = async <TSlug extends AuthCollectionSlug>(\n  incomingArgs: Arguments<TSlug>,\n): Promise<null | string> => {\n  assertNoValidationWrite(incomingArgs.req)\n\n  const loginWithUsername = incomingArgs.collection.config.auth.loginWithUsername\n  const { data, overrideAccess } = incomingArgs\n\n  const { canLoginWithEmail, canLoginWithUsername } = getLoginOptions(loginWithUsername)\n\n  const sanitizedEmail =\n    (canLoginWithEmail && (incomingArgs.data.email || '').toLowerCase().trim()) || null\n  const sanitizedUsername =\n    'username' in data && typeof data?.username === 'string'\n      ? data.username.toLowerCase().trim()\n      : null\n  let args = incomingArgs\n  let hasSentEmail = false\n  let releaseRequestInterval: (() => Promise<void>) | null = null\n\n  if (incomingArgs.collection.config.auth.disableLocalStrategy) {\n    throw new Forbidden(incomingArgs.req.t)\n  }\n  if (!sanitizedEmail && !sanitizedUsername) {\n    throw new APIError(\n      `Missing ${loginWithUsername ? 'username' : 'email'}.`,\n      httpStatus.BAD_REQUEST,\n    )\n  }\n\n  try {\n    const shouldCommit = await initTransaction(args.req)\n\n    // /////////////////////////////////////\n    // beforeOperation - Collection\n    // /////////////////////////////////////\n    args = await buildBeforeOperation({\n      args,\n      collection: args.collection.config,\n      operation: 'forgotPassword',\n      overrideAccess,\n    })\n\n    const {\n      collection: { config: collectionConfig },\n      disableEmail,\n      expiration,\n      req: {\n        payload: { config, email },\n        payload,\n      },\n      req,\n    } = args\n    const minRequestInterval = collectionConfig.auth.forgotPassword.minRequestInterval ?? 15000\n\n    // /////////////////////////////////////\n    // Forget password\n    // /////////////////////////////////////\n\n    type UserDoc = {\n      email?: string\n      id: number | string\n      resetPasswordExpiration?: string\n      resetPasswordRequestedAt?: string\n      resetPasswordToken?: string\n    }\n\n    let whereConstraint: Where = {}\n\n    if (canLoginWithEmail && sanitizedEmail) {\n      whereConstraint = {\n        email: {\n          equals: sanitizedEmail,\n        },\n      }\n    } else if (canLoginWithUsername && sanitizedUsername) {\n      whereConstraint = {\n        username: {\n          equals: sanitizedUsername,\n        },\n      }\n    }\n\n    // Exclude trashed users unless `trash: true`\n    whereConstraint = appendNonTrashedFilter({\n      enableTrash: collectionConfig.trash,\n      trash: false,\n      where: whereConstraint,\n    })\n\n    const now = Date.now()\n    let token: string = crypto.randomBytes(20).toString('hex')\n    const resetPasswordExpiration = new Date(\n      now + (collectionConfig.auth?.forgotPassword?.expiration ?? expiration ?? 3600000),\n    ).toISOString()\n    let user: null | UserDoc\n\n    if (!disableEmail && minRequestInterval > 0) {\n      const requestedAt = new Date(now).toISOString()\n      const reservationReq = isolateObjectProperty(req, 'transactionID')\n      reservationReq.transactionID = undefined\n\n      user = (await payload.db.updateOne({\n        collection: collectionConfig.slug,\n        data: {\n          resetPasswordRequestedAt: requestedAt,\n        },\n        options: { atomic: true },\n        req: reservationReq,\n        where: {\n          and: [\n            whereConstraint,\n            {\n              or: [\n                { resetPasswordRequestedAt: { exists: false } },\n                { resetPasswordRequestedAt: { equals: null } },\n                {\n                  resetPasswordRequestedAt: {\n                    less_than_equal: new Date(now - minRequestInterval).toISOString(),\n                  },\n                },\n              ],\n            },\n          ],\n        },\n      })) as null | UserDoc\n\n      if (user) {\n        const userID = user.id\n        releaseRequestInterval = async () => {\n          await payload.db.updateOne({\n            collection: collectionConfig.slug,\n            data: { resetPasswordRequestedAt: null },\n            options: { atomic: true },\n            req: reservationReq,\n            where: {\n              and: [\n                { id: { equals: userID } },\n                { resetPasswordRequestedAt: { equals: requestedAt } },\n              ],\n            },\n          })\n        }\n      }\n    } else {\n      user = await payload.db.findOne<UserDoc>({\n        collection: collectionConfig.slug,\n        req,\n        where: whereConstraint,\n      })\n    }\n\n    // We don't want to indicate specifically that an email was not found,\n    // as doing so could lead to the exposure of registered emails.\n    // Therefore, we prefer to fail silently.\n    if (!user) {\n      if (shouldCommit) {\n        await commitTransaction(args.req)\n      }\n      return null\n    }\n\n    user = await payload.update({\n      id: user.id,\n      collection: collectionConfig.slug,\n      data: {\n        resetPasswordExpiration,\n        resetPasswordToken: token,\n      },\n      overrideAccess: true,\n      req,\n    })\n\n    if (!disableEmail && user.email) {\n      const serverURL = getRequestOrigin({ config, req })\n      const forgotURL = formatAdminURL({\n        adminRoute: config.routes.admin,\n        path: `${config.admin.routes.reset}/${token}`,\n        serverURL,\n      })\n      let html = `${req.t('authentication:youAreReceivingResetPassword')}\n    <a href=\"${forgotURL}\">${forgotURL}</a>\n    ${req.t('authentication:youDidNotRequestPassword')}`\n\n      if (typeof collectionConfig.auth.forgotPassword?.generateEmailHTML === 'function') {\n        html = await collectionConfig.auth.forgotPassword.generateEmailHTML({\n          req,\n          token,\n          user,\n        })\n      }\n\n      let subject = req.t('authentication:resetYourPassword')\n\n      if (typeof collectionConfig.auth.forgotPassword?.generateEmailSubject === 'function') {\n        subject = await collectionConfig.auth.forgotPassword.generateEmailSubject({\n          req,\n          token,\n          user,\n        })\n      }\n\n      await email.sendEmail({\n        from: `\"${email.defaultFromName}\" <${email.defaultFromAddress}>`,\n        html,\n        subject,\n        to: user.email,\n      })\n      hasSentEmail = true\n    }\n\n    // /////////////////////////////////////\n    // afterForgotPassword - Collection\n    // /////////////////////////////////////\n\n    if (collectionConfig.hooks?.afterForgotPassword?.length) {\n      for (const hook of collectionConfig.hooks.afterForgotPassword) {\n        await hook({ args, collection: args.collection?.config, context: req.context })\n      }\n    }\n\n    // /////////////////////////////////////\n    // afterOperation - Collection\n    // /////////////////////////////////////\n\n    token = await buildAfterOperation({\n      args,\n      collection: args.collection?.config,\n      operation: 'forgotPassword',\n      overrideAccess,\n      result: token,\n    })\n\n    if (shouldCommit) {\n      await commitTransaction(req)\n    }\n\n    return token\n  } catch (error: unknown) {\n    await killTransaction(args.req)\n\n    if (!hasSentEmail && releaseRequestInterval) {\n      try {\n        await releaseRequestInterval()\n      } catch (err) {\n        args.req.payload.logger.error({ err, msg: 'Failed to release forgot-password interval' })\n      }\n    }\n\n    throw error\n  }\n}\n"],"names":["crypto","buildAfterOperation","buildBeforeOperation","APIError","Forbidden","appendNonTrashedFilter","assertNoValidationWrite","commitTransaction","formatAdminURL","getRequestOrigin","httpStatus","initTransaction","isolateObjectProperty","killTransaction","getLoginOptions","forgotPasswordOperation","incomingArgs","req","loginWithUsername","collection","config","auth","data","overrideAccess","canLoginWithEmail","canLoginWithUsername","sanitizedEmail","email","toLowerCase","trim","sanitizedUsername","username","args","hasSentEmail","releaseRequestInterval","disableLocalStrategy","t","BAD_REQUEST","shouldCommit","operation","collectionConfig","disableEmail","expiration","payload","minRequestInterval","forgotPassword","whereConstraint","equals","enableTrash","trash","where","now","Date","token","randomBytes","toString","resetPasswordExpiration","toISOString","user","requestedAt","reservationReq","transactionID","undefined","db","updateOne","slug","resetPasswordRequestedAt","options","atomic","and","or","exists","less_than_equal","userID","id","findOne","update","resetPasswordToken","serverURL","forgotURL","adminRoute","routes","admin","path","reset","html","generateEmailHTML","subject","generateEmailSubject","sendEmail","from","defaultFromName","defaultFromAddress","to","hooks","afterForgotPassword","length","hook","context","result","error","err","logger","msg"],"mappings":"AAAA,OAAOA,YAAY,SAAQ;AAS3B,SAASC,mBAAmB,QAAQ,gEAA+D;AACnG,SAASC,oBAAoB,QAAQ,iEAAgE;AACrG,SAASC,QAAQ,QAAQ,wBAAuB;AAChD,SAASC,SAAS,QAAQ,iBAAgB;AAC1C,SAASC,sBAAsB,QAAQ,4CAA2C;AAClF,SAASC,uBAAuB,QAAQ,6CAA4C;AACpF,SAASC,iBAAiB,QAAQ,uCAAsC;AACxE,SAASC,cAAc,QAAQ,oCAAmC;AAClE,SAASC,gBAAgB,QAAQ,sCAAqC;AACtE,SAASC,UAAU,QAAQ,gCAA+B;AAC1D,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,qBAAqB,QAAQ,2CAA0C;AAChF,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,eAAe,QAAQ,wBAAuB;AAevD,OAAO,MAAMC,0BAA0B,OACrCC;IAEAV,wBAAwBU,aAAaC,GAAG;IAExC,MAAMC,oBAAoBF,aAAaG,UAAU,CAACC,MAAM,CAACC,IAAI,CAACH,iBAAiB;IAC/E,MAAM,EAAEI,IAAI,EAAEC,cAAc,EAAE,GAAGP;IAEjC,MAAM,EAAEQ,iBAAiB,EAAEC,oBAAoB,EAAE,GAAGX,gBAAgBI;IAEpE,MAAMQ,iBACJ,AAACF,qBAAqB,AAACR,CAAAA,aAAaM,IAAI,CAACK,KAAK,IAAI,EAAC,EAAGC,WAAW,GAAGC,IAAI,MAAO;IACjF,MAAMC,oBACJ,cAAcR,QAAQ,OAAOA,MAAMS,aAAa,WAC5CT,KAAKS,QAAQ,CAACH,WAAW,GAAGC,IAAI,KAChC;IACN,IAAIG,OAAOhB;IACX,IAAIiB,eAAe;IACnB,IAAIC,yBAAuD;IAE3D,IAAIlB,aAAaG,UAAU,CAACC,MAAM,CAACC,IAAI,CAACc,oBAAoB,EAAE;QAC5D,MAAM,IAAI/B,UAAUY,aAAaC,GAAG,CAACmB,CAAC;IACxC;IACA,IAAI,CAACV,kBAAkB,CAACI,mBAAmB;QACzC,MAAM,IAAI3B,SACR,CAAC,QAAQ,EAAEe,oBAAoB,aAAa,QAAQ,CAAC,CAAC,EACtDR,WAAW2B,WAAW;IAE1B;IAEA,IAAI;QACF,MAAMC,eAAe,MAAM3B,gBAAgBqB,KAAKf,GAAG;QAEnD,wCAAwC;QACxC,+BAA+B;QAC/B,wCAAwC;QACxCe,OAAO,MAAM9B,qBAAqB;YAChC8B;YACAb,YAAYa,KAAKb,UAAU,CAACC,MAAM;YAClCmB,WAAW;YACXhB;QACF;QAEA,MAAM,EACJJ,YAAY,EAAEC,QAAQoB,gBAAgB,EAAE,EACxCC,YAAY,EACZC,UAAU,EACVzB,KAAK,EACH0B,SAAS,EAAEvB,MAAM,EAAEO,KAAK,EAAE,EAC1BgB,OAAO,EACR,EACD1B,GAAG,EACJ,GAAGe;QACJ,MAAMY,qBAAqBJ,iBAAiBnB,IAAI,CAACwB,cAAc,CAACD,kBAAkB,IAAI;QActF,IAAIE,kBAAyB,CAAC;QAE9B,IAAItB,qBAAqBE,gBAAgB;YACvCoB,kBAAkB;gBAChBnB,OAAO;oBACLoB,QAAQrB;gBACV;YACF;QACF,OAAO,IAAID,wBAAwBK,mBAAmB;YACpDgB,kBAAkB;gBAChBf,UAAU;oBACRgB,QAAQjB;gBACV;YACF;QACF;QAEA,6CAA6C;QAC7CgB,kBAAkBzC,uBAAuB;YACvC2C,aAAaR,iBAAiBS,KAAK;YACnCA,OAAO;YACPC,OAAOJ;QACT;QAEA,MAAMK,MAAMC,KAAKD,GAAG;QACpB,IAAIE,QAAgBrD,OAAOsD,WAAW,CAAC,IAAIC,QAAQ,CAAC;QACpD,MAAMC,0BAA0B,IAAIJ,KAClCD,MAAOX,CAAAA,iBAAiBnB,IAAI,EAAEwB,gBAAgBH,cAAcA,cAAc,OAAM,GAChFe,WAAW;QACb,IAAIC;QAEJ,IAAI,CAACjB,gBAAgBG,qBAAqB,GAAG;YAC3C,MAAMe,cAAc,IAAIP,KAAKD,KAAKM,WAAW;YAC7C,MAAMG,iBAAiBhD,sBAAsBK,KAAK;YAClD2C,eAAeC,aAAa,GAAGC;YAE/BJ,OAAQ,MAAMf,QAAQoB,EAAE,CAACC,SAAS,CAAC;gBACjC7C,YAAYqB,iBAAiByB,IAAI;gBACjC3C,MAAM;oBACJ4C,0BAA0BP;gBAC5B;gBACAQ,SAAS;oBAAEC,QAAQ;gBAAK;gBACxBnD,KAAK2C;gBACLV,OAAO;oBACLmB,KAAK;wBACHvB;wBACA;4BACEwB,IAAI;gCACF;oCAAEJ,0BAA0B;wCAAEK,QAAQ;oCAAM;gCAAE;gCAC9C;oCAAEL,0BAA0B;wCAAEnB,QAAQ;oCAAK;gCAAE;gCAC7C;oCACEmB,0BAA0B;wCACxBM,iBAAiB,IAAIpB,KAAKD,MAAMP,oBAAoBa,WAAW;oCACjE;gCACF;6BACD;wBACH;qBACD;gBACH;YACF;YAEA,IAAIC,MAAM;gBACR,MAAMe,SAASf,KAAKgB,EAAE;gBACtBxC,yBAAyB;oBACvB,MAAMS,QAAQoB,EAAE,CAACC,SAAS,CAAC;wBACzB7C,YAAYqB,iBAAiByB,IAAI;wBACjC3C,MAAM;4BAAE4C,0BAA0B;wBAAK;wBACvCC,SAAS;4BAAEC,QAAQ;wBAAK;wBACxBnD,KAAK2C;wBACLV,OAAO;4BACLmB,KAAK;gCACH;oCAAEK,IAAI;wCAAE3B,QAAQ0B;oCAAO;gCAAE;gCACzB;oCAAEP,0BAA0B;wCAAEnB,QAAQY;oCAAY;gCAAE;6BACrD;wBACH;oBACF;gBACF;YACF;QACF,OAAO;YACLD,OAAO,MAAMf,QAAQoB,EAAE,CAACY,OAAO,CAAU;gBACvCxD,YAAYqB,iBAAiByB,IAAI;gBACjChD;gBACAiC,OAAOJ;YACT;QACF;QAEA,sEAAsE;QACtE,+DAA+D;QAC/D,yCAAyC;QACzC,IAAI,CAACY,MAAM;YACT,IAAIpB,cAAc;gBAChB,MAAM/B,kBAAkByB,KAAKf,GAAG;YAClC;YACA,OAAO;QACT;QAEAyC,OAAO,MAAMf,QAAQiC,MAAM,CAAC;YAC1BF,IAAIhB,KAAKgB,EAAE;YACXvD,YAAYqB,iBAAiByB,IAAI;YACjC3C,MAAM;gBACJkC;gBACAqB,oBAAoBxB;YACtB;YACA9B,gBAAgB;YAChBN;QACF;QAEA,IAAI,CAACwB,gBAAgBiB,KAAK/B,KAAK,EAAE;YAC/B,MAAMmD,YAAYrE,iBAAiB;gBAAEW;gBAAQH;YAAI;YACjD,MAAM8D,YAAYvE,eAAe;gBAC/BwE,YAAY5D,OAAO6D,MAAM,CAACC,KAAK;gBAC/BC,MAAM,GAAG/D,OAAO8D,KAAK,CAACD,MAAM,CAACG,KAAK,CAAC,CAAC,EAAE/B,OAAO;gBAC7CyB;YACF;YACA,IAAIO,OAAO,GAAGpE,IAAImB,CAAC,CAAC,+CAA+C;aAC5D,EAAE2C,UAAU,EAAE,EAAEA,UAAU;IACnC,EAAE9D,IAAImB,CAAC,CAAC,4CAA4C;YAElD,IAAI,OAAOI,iBAAiBnB,IAAI,CAACwB,cAAc,EAAEyC,sBAAsB,YAAY;gBACjFD,OAAO,MAAM7C,iBAAiBnB,IAAI,CAACwB,cAAc,CAACyC,iBAAiB,CAAC;oBAClErE;oBACAoC;oBACAK;gBACF;YACF;YAEA,IAAI6B,UAAUtE,IAAImB,CAAC,CAAC;YAEpB,IAAI,OAAOI,iBAAiBnB,IAAI,CAACwB,cAAc,EAAE2C,yBAAyB,YAAY;gBACpFD,UAAU,MAAM/C,iBAAiBnB,IAAI,CAACwB,cAAc,CAAC2C,oBAAoB,CAAC;oBACxEvE;oBACAoC;oBACAK;gBACF;YACF;YAEA,MAAM/B,MAAM8D,SAAS,CAAC;gBACpBC,MAAM,CAAC,CAAC,EAAE/D,MAAMgE,eAAe,CAAC,GAAG,EAAEhE,MAAMiE,kBAAkB,CAAC,CAAC,CAAC;gBAChEP;gBACAE;gBACAM,IAAInC,KAAK/B,KAAK;YAChB;YACAM,eAAe;QACjB;QAEA,wCAAwC;QACxC,mCAAmC;QACnC,wCAAwC;QAExC,IAAIO,iBAAiBsD,KAAK,EAAEC,qBAAqBC,QAAQ;YACvD,KAAK,MAAMC,QAAQzD,iBAAiBsD,KAAK,CAACC,mBAAmB,CAAE;gBAC7D,MAAME,KAAK;oBAAEjE;oBAAMb,YAAYa,KAAKb,UAAU,EAAEC;oBAAQ8E,SAASjF,IAAIiF,OAAO;gBAAC;YAC/E;QACF;QAEA,wCAAwC;QACxC,8BAA8B;QAC9B,wCAAwC;QAExC7C,QAAQ,MAAMpD,oBAAoB;YAChC+B;YACAb,YAAYa,KAAKb,UAAU,EAAEC;YAC7BmB,WAAW;YACXhB;YACA4E,QAAQ9C;QACV;QAEA,IAAIf,cAAc;YAChB,MAAM/B,kBAAkBU;QAC1B;QAEA,OAAOoC;IACT,EAAE,OAAO+C,OAAgB;QACvB,MAAMvF,gBAAgBmB,KAAKf,GAAG;QAE9B,IAAI,CAACgB,gBAAgBC,wBAAwB;YAC3C,IAAI;gBACF,MAAMA;YACR,EAAE,OAAOmE,KAAK;gBACZrE,KAAKf,GAAG,CAAC0B,OAAO,CAAC2D,MAAM,CAACF,KAAK,CAAC;oBAAEC;oBAAKE,KAAK;gBAA6C;YACzF;QACF;QAEA,MAAMH;IACR;AACF,EAAC"}

package/dist/auth/operations/local/auth.js

@@ -1,13 +1,16 @@
-import { createLocalReq } from '../../../utilities/createLocalReq.js';
+import { createPayloadRequest } from '../../../utilities/createPayloadRequest.js';
 import { auth as authOperation } from '../auth.js';
 export const authLocal = async (payload, options)=>{
     const { headers, req } = options;
     return await authOperation({
         canSetHeaders: Boolean(options.canSetHeaders),
         headers,
-        req: await createLocalReq({
-            req
-        }, payload)
+        req: await createPayloadRequest({
+            payload,
+            req: req ?? {
+                headers
+            }
+        })
     });
 };
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/auth/operations/local/auth.ts"],"sourcesContent":["import type { Payload } from '../../../index.js'\nimport type { AuthArgs, AuthResult } from '../auth.js'\n\nimport { createLocalReq } from '../../../utilities/createLocalReq.js'\nimport { auth as authOperation } from '../auth.js'\n\nexport const authLocal = async (payload: Payload, options: AuthArgs): Promise<AuthResult> => {\n  const { headers, req } = options\n\n  return await authOperation({\n    canSetHeaders: Boolean(options.canSetHeaders),\n    headers,\n    req: await createLocalReq({ req }, payload),\n  })\n}\n"],"names":["createLocalReq","auth","authOperation","authLocal","payload","options","headers","req","canSetHeaders","Boolean"],"mappings":"AAGA,SAASA,cAAc,QAAQ,uCAAsC;AACrE,SAASC,QAAQC,aAAa,QAAQ,aAAY;AAElD,OAAO,MAAMC,YAAY,OAAOC,SAAkBC;IAChD,MAAM,EAAEC,OAAO,EAAEC,GAAG,EAAE,GAAGF;IAEzB,OAAO,MAAMH,cAAc;QACzBM,eAAeC,QAAQJ,QAAQG,aAAa;QAC5CF;QACAC,KAAK,MAAMP,eAAe;YAAEO;QAAI,GAAGH;IACrC;AACF,EAAC"}
+{"version":3,"sources":["../../../../src/auth/operations/local/auth.ts"],"sourcesContent":["import type { Payload } from '../../../index.js'\nimport type { AuthArgs, AuthResult } from '../auth.js'\n\nimport { createPayloadRequest } from '../../../utilities/createPayloadRequest.js'\nimport { auth as authOperation } from '../auth.js'\n\nexport const authLocal = async (payload: Payload, options: AuthArgs): Promise<AuthResult> => {\n  const { headers, req } = options\n\n  return await authOperation({\n    canSetHeaders: Boolean(options.canSetHeaders),\n    headers,\n    req: await createPayloadRequest({ payload, req: req ?? { headers } }),\n  })\n}\n"],"names":["createPayloadRequest","auth","authOperation","authLocal","payload","options","headers","req","canSetHeaders","Boolean"],"mappings":"AAGA,SAASA,oBAAoB,QAAQ,6CAA4C;AACjF,SAASC,QAAQC,aAAa,QAAQ,aAAY;AAElD,OAAO,MAAMC,YAAY,OAAOC,SAAkBC;IAChD,MAAM,EAAEC,OAAO,EAAEC,GAAG,EAAE,GAAGF;IAEzB,OAAO,MAAMH,cAAc;QACzBM,eAAeC,QAAQJ,QAAQG,aAAa;QAC5CF;QACAC,KAAK,MAAMP,qBAAqB;YAAEI;YAASG,KAAKA,OAAO;gBAAED;YAAQ;QAAE;IACrE;AACF,EAAC"}

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

@@ -1,5 +1,6 @@
 import type { AuthCollectionSlug, Payload, RequestContext } from '../../../index.js';
 import type { PayloadRequest } from '../../../types/index.js';
+import type { SharedLocalAPIOptions } from '../../../types/operations.js';
 import type { Result } from '../forgotPassword.js';
 export type Options<TSlug extends AuthCollectionSlug> = {
     collection: TSlug;
@@ -9,8 +10,7 @@ export type Options<TSlug extends AuthCollectionSlug> = {
     };
     disableEmail?: boolean;
     expiration?: number;
-    overrideAccess?: boolean;
     req?: Partial<PayloadRequest>;
-};
+} & Pick<SharedLocalAPIOptions, 'overrideAccess'>;
 export declare function forgotPasswordLocal<T extends AuthCollectionSlug>(payload: Payload, options: Options<T>): Promise<Result>;
 //# sourceMappingURL=forgotPassword.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"forgotPassword.d.ts","sourceRoot":"","sources":["../../../../src/auth/operations/local/forgotPassword.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAMlD,MAAM,MAAM,OAAO,CAAC,KAAK,SAAS,kBAAkB,IAAI;IACtD,UAAU,EAAE,KAAK,CAAA;IACjB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;IACD,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAC9B,CAAA;AAED,wBAAsB,mBAAmB,CAAC,CAAC,SAAS,kBAAkB,EACpE,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAClB,OAAO,CAAC,MAAM,CAAC,CA2BjB"}
+{"version":3,"file":"forgotPassword.d.ts","sourceRoot":"","sources":["../../../../src/auth/operations/local/forgotPassword.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAMlD,MAAM,MAAM,OAAO,CAAC,KAAK,SAAS,kBAAkB,IAAI;IACtD,UAAU,EAAE,KAAK,CAAA;IACjB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;IACD,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAC9B,GAAG,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAA;AAEjD,wBAAsB,mBAAmB,CAAC,CAAC,SAAS,kBAAkB,EACpE,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAClB,OAAO,CAAC,MAAM,CAAC,CA2BjB"}

package/dist/auth/operations/local/forgotPassword.js

@@ -1,8 +1,8 @@
 import { APIError } from '../../../errors/index.js';
-import { createLocalReq } from '../../../utilities/createLocalReq.js';
+import { createPayloadRequest } from '../../../utilities/createPayloadRequest.js';
 import { forgotPasswordOperation } from '../forgotPassword.js';
 export async function forgotPasswordLocal(payload, options) {
-    const { collection: collectionSlug, data, disableEmail, expiration, overrideAccess = true } = options;
+    const { collection: collectionSlug, data, disableEmail, expiration, overrideAccess = false } = options;
     const collection = payload.collections[collectionSlug];
     if (!collection) {
         throw new APIError(`The collection with slug ${String(collectionSlug)} can't be found. Forgot Password Operation.`);
@@ -13,7 +13,10 @@ export async function forgotPasswordLocal(payload, options) {
         disableEmail,
         expiration,
         overrideAccess,
-        req: await createLocalReq(options, payload)
+        req: await createPayloadRequest({
+            ...options,
+            payload
+        })
     });
 }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/auth/operations/local/forgotPassword.ts"],"sourcesContent":["import type { AuthCollectionSlug, Payload, RequestContext } from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { Result } from '../forgotPassword.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createLocalReq } from '../../../utilities/createLocalReq.js'\nimport { forgotPasswordOperation } from '../forgotPassword.js'\n\nexport type Options<TSlug extends AuthCollectionSlug> = {\n  collection: TSlug\n  context?: RequestContext\n  data: {\n    email: string\n  }\n  disableEmail?: boolean\n  expiration?: number\n  overrideAccess?: boolean\n  req?: Partial<PayloadRequest>\n}\n\nexport async function forgotPasswordLocal<T extends AuthCollectionSlug>(\n  payload: Payload,\n  options: Options<T>,\n): Promise<Result> {\n  const {\n    collection: collectionSlug,\n    data,\n    disableEmail,\n    expiration,\n    overrideAccess = true,\n  } = options\n\n  const collection = payload.collections[collectionSlug]\n\n  if (!collection) {\n    throw new APIError(\n      `The collection with slug ${String(\n        collectionSlug,\n      )} can't be found. Forgot Password Operation.`,\n    )\n  }\n\n  return forgotPasswordOperation({\n    collection,\n    data,\n    disableEmail,\n    expiration,\n    overrideAccess,\n    req: await createLocalReq(options, payload),\n  }) as Promise<Result>\n}\n"],"names":["APIError","createLocalReq","forgotPasswordOperation","forgotPasswordLocal","payload","options","collection","collectionSlug","data","disableEmail","expiration","overrideAccess","collections","String","req"],"mappings":"AAIA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,uBAAuB,QAAQ,uBAAsB;AAc9D,OAAO,eAAeC,oBACpBC,OAAgB,EAChBC,OAAmB;IAEnB,MAAM,EACJC,YAAYC,cAAc,EAC1BC,IAAI,EACJC,YAAY,EACZC,UAAU,EACVC,iBAAiB,IAAI,EACtB,GAAGN;IAEJ,MAAMC,aAAaF,QAAQQ,WAAW,CAACL,eAAe;IAEtD,IAAI,CAACD,YAAY;QACf,MAAM,IAAIN,SACR,CAAC,yBAAyB,EAAEa,OAC1BN,gBACA,2CAA2C,CAAC;IAElD;IAEA,OAAOL,wBAAwB;QAC7BI;QACAE;QACAC;QACAC;QACAC;QACAG,KAAK,MAAMb,eAAeI,SAASD;IACrC;AACF"}
+{"version":3,"sources":["../../../../src/auth/operations/local/forgotPassword.ts"],"sourcesContent":["import type { AuthCollectionSlug, Payload, RequestContext } from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { SharedLocalAPIOptions } from '../../../types/operations.js'\nimport type { Result } from '../forgotPassword.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createPayloadRequest } from '../../../utilities/createPayloadRequest.js'\nimport { forgotPasswordOperation } from '../forgotPassword.js'\n\nexport type Options<TSlug extends AuthCollectionSlug> = {\n  collection: TSlug\n  context?: RequestContext\n  data: {\n    email: string\n  }\n  disableEmail?: boolean\n  expiration?: number\n  req?: Partial<PayloadRequest>\n} & Pick<SharedLocalAPIOptions, 'overrideAccess'>\n\nexport async function forgotPasswordLocal<T extends AuthCollectionSlug>(\n  payload: Payload,\n  options: Options<T>,\n): Promise<Result> {\n  const {\n    collection: collectionSlug,\n    data,\n    disableEmail,\n    expiration,\n    overrideAccess = false,\n  } = options\n\n  const collection = payload.collections[collectionSlug]\n\n  if (!collection) {\n    throw new APIError(\n      `The collection with slug ${String(\n        collectionSlug,\n      )} can't be found. Forgot Password Operation.`,\n    )\n  }\n\n  return forgotPasswordOperation({\n    collection,\n    data,\n    disableEmail,\n    expiration,\n    overrideAccess,\n    req: await createPayloadRequest({ ...options, payload }),\n  }) as Promise<Result>\n}\n"],"names":["APIError","createPayloadRequest","forgotPasswordOperation","forgotPasswordLocal","payload","options","collection","collectionSlug","data","disableEmail","expiration","overrideAccess","collections","String","req"],"mappings":"AAKA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,oBAAoB,QAAQ,6CAA4C;AACjF,SAASC,uBAAuB,QAAQ,uBAAsB;AAa9D,OAAO,eAAeC,oBACpBC,OAAgB,EAChBC,OAAmB;IAEnB,MAAM,EACJC,YAAYC,cAAc,EAC1BC,IAAI,EACJC,YAAY,EACZC,UAAU,EACVC,iBAAiB,KAAK,EACvB,GAAGN;IAEJ,MAAMC,aAAaF,QAAQQ,WAAW,CAACL,eAAe;IAEtD,IAAI,CAACD,YAAY;QACf,MAAM,IAAIN,SACR,CAAC,yBAAyB,EAAEa,OAC1BN,gBACA,2CAA2C,CAAC;IAElD;IAEA,OAAOL,wBAAwB;QAC7BI;QACAE;QACAC;QACAC;QACAC;QACAG,KAAK,MAAMb,qBAAqB;YAAE,GAAGI,OAAO;YAAED;QAAQ;IACxD;AACF"}

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

@@ -1,5 +1,6 @@
 import type { AuthCollectionSlug, AuthOperationsFromCollectionSlug, Payload, RequestContext } from '../../../index.js';
 import type { PayloadRequest } from '../../../types/index.js';
+import type { SharedLocalAPIOptions } from '../../../types/operations.js';
 import type { LoginResult } from '../login.js';
 export type Options<TSlug extends AuthCollectionSlug> = {
     collection: TSlug;
@@ -8,10 +9,9 @@ export type Options<TSlug extends AuthCollectionSlug> = {
     depth?: number;
     fallbackLocale?: string;
     locale?: string;
-    overrideAccess?: boolean;
     req?: Partial<PayloadRequest>;
     showHiddenFields?: boolean;
     trash?: boolean;
-};
+} & Pick<SharedLocalAPIOptions, 'overrideAccess'>;
 export declare function loginLocal<TSlug extends AuthCollectionSlug>(payload: Payload, options: Options<TSlug>): Promise<LoginResult<TSlug>>;
 //# sourceMappingURL=login.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../src/auth/operations/local/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,gCAAgC,EAChC,OAAO,EACP,cAAc,EACf,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAM9C,MAAM,MAAM,OAAO,CAAC,KAAK,SAAS,kBAAkB,IAAI;IACtD,UAAU,EAAE,KAAK,CAAA;IACjB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,IAAI,EAAE,gCAAgC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAA;IACtD,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,wBAAsB,UAAU,CAAC,KAAK,SAAS,kBAAkB,EAC/D,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GACtB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAiC7B"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../src/auth/operations/local/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,gCAAgC,EAChC,OAAO,EACP,cAAc,EACf,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAM9C,MAAM,MAAM,OAAO,CAAC,KAAK,SAAS,kBAAkB,IAAI;IACtD,UAAU,EAAE,KAAK,CAAA;IACjB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,IAAI,EAAE,gCAAgC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAA;IACtD,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,GAAG,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAA;AAEjD,wBAAsB,UAAU,CAAC,KAAK,SAAS,kBAAkB,EAC/D,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GACtB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAiC7B"}

package/dist/auth/operations/local/login.js

@@ -1,8 +1,8 @@
 import { APIError } from '../../../errors/index.js';
-import { createLocalReq } from '../../../utilities/createLocalReq.js';
+import { createPayloadRequest } from '../../../utilities/createPayloadRequest.js';
 import { loginOperation } from '../login.js';
 export async function loginLocal(payload, options) {
-    const { collection: collectionSlug, data, depth, overrideAccess = true, showHiddenFields } = options;
+    const { collection: collectionSlug, data, depth, overrideAccess = false, showHiddenFields } = options;
     const collection = payload.collections[collectionSlug];
     if (!collection) {
         throw new APIError(`The collection with slug ${String(collectionSlug)} can't be found. Login Operation.`);
@@ -12,7 +12,10 @@ export async function loginLocal(payload, options) {
         data,
         depth,
         overrideAccess,
-        req: await createLocalReq(options, payload),
+        req: await createPayloadRequest({
+            ...options,
+            payload
+        }),
         showHiddenFields
     };
     const result = await loginOperation(args);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/auth/operations/local/login.ts"],"sourcesContent":["import type {\n  AuthCollectionSlug,\n  AuthOperationsFromCollectionSlug,\n  Payload,\n  RequestContext,\n} from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { LoginResult } from '../login.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createLocalReq } from '../../../utilities/createLocalReq.js'\nimport { loginOperation } from '../login.js'\n\nexport type Options<TSlug extends AuthCollectionSlug> = {\n  collection: TSlug\n  context?: RequestContext\n  data: AuthOperationsFromCollectionSlug<TSlug>['login']\n  depth?: number\n  fallbackLocale?: string\n  locale?: string\n  overrideAccess?: boolean\n  req?: Partial<PayloadRequest>\n  showHiddenFields?: boolean\n  trash?: boolean\n}\n\nexport async function loginLocal<TSlug extends AuthCollectionSlug>(\n  payload: Payload,\n  options: Options<TSlug>,\n): Promise<LoginResult<TSlug>> {\n  const {\n    collection: collectionSlug,\n    data,\n    depth,\n    overrideAccess = true,\n    showHiddenFields,\n  } = options\n\n  const collection = payload.collections[collectionSlug]\n\n  if (!collection) {\n    throw new APIError(\n      `The collection with slug ${String(collectionSlug)} can't be found. Login Operation.`,\n    )\n  }\n\n  const args = {\n    collection,\n    data,\n    depth,\n    overrideAccess,\n    req: await createLocalReq(options, payload),\n    showHiddenFields,\n  }\n\n  const result = await loginOperation<TSlug>(args)\n\n  if (collection.config.auth.removeTokenFromResponses) {\n    delete result.token\n  }\n\n  return result\n}\n"],"names":["APIError","createLocalReq","loginOperation","loginLocal","payload","options","collection","collectionSlug","data","depth","overrideAccess","showHiddenFields","collections","String","args","req","result","config","auth","removeTokenFromResponses","token"],"mappings":"AASA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,cAAc,QAAQ,cAAa;AAe5C,OAAO,eAAeC,WACpBC,OAAgB,EAChBC,OAAuB;IAEvB,MAAM,EACJC,YAAYC,cAAc,EAC1BC,IAAI,EACJC,KAAK,EACLC,iBAAiB,IAAI,EACrBC,gBAAgB,EACjB,GAAGN;IAEJ,MAAMC,aAAaF,QAAQQ,WAAW,CAACL,eAAe;IAEtD,IAAI,CAACD,YAAY;QACf,MAAM,IAAIN,SACR,CAAC,yBAAyB,EAAEa,OAAON,gBAAgB,iCAAiC,CAAC;IAEzF;IAEA,MAAMO,OAAO;QACXR;QACAE;QACAC;QACAC;QACAK,KAAK,MAAMd,eAAeI,SAASD;QACnCO;IACF;IAEA,MAAMK,SAAS,MAAMd,eAAsBY;IAE3C,IAAIR,WAAWW,MAAM,CAACC,IAAI,CAACC,wBAAwB,EAAE;QACnD,OAAOH,OAAOI,KAAK;IACrB;IAEA,OAAOJ;AACT"}
+{"version":3,"sources":["../../../../src/auth/operations/local/login.ts"],"sourcesContent":["import type {\n  AuthCollectionSlug,\n  AuthOperationsFromCollectionSlug,\n  Payload,\n  RequestContext,\n} from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { SharedLocalAPIOptions } from '../../../types/operations.js'\nimport type { LoginResult } from '../login.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createPayloadRequest } from '../../../utilities/createPayloadRequest.js'\nimport { loginOperation } from '../login.js'\n\nexport type Options<TSlug extends AuthCollectionSlug> = {\n  collection: TSlug\n  context?: RequestContext\n  data: AuthOperationsFromCollectionSlug<TSlug>['login']\n  depth?: number\n  fallbackLocale?: string\n  locale?: string\n  req?: Partial<PayloadRequest>\n  showHiddenFields?: boolean\n  trash?: boolean\n} & Pick<SharedLocalAPIOptions, 'overrideAccess'>\n\nexport async function loginLocal<TSlug extends AuthCollectionSlug>(\n  payload: Payload,\n  options: Options<TSlug>,\n): Promise<LoginResult<TSlug>> {\n  const {\n    collection: collectionSlug,\n    data,\n    depth,\n    overrideAccess = false,\n    showHiddenFields,\n  } = options\n\n  const collection = payload.collections[collectionSlug]\n\n  if (!collection) {\n    throw new APIError(\n      `The collection with slug ${String(collectionSlug)} can't be found. Login Operation.`,\n    )\n  }\n\n  const args = {\n    collection,\n    data,\n    depth,\n    overrideAccess,\n    req: await createPayloadRequest({ ...options, payload }),\n    showHiddenFields,\n  }\n\n  const result = await loginOperation<TSlug>(args)\n\n  if (collection.config.auth.removeTokenFromResponses) {\n    delete result.token\n  }\n\n  return result\n}\n"],"names":["APIError","createPayloadRequest","loginOperation","loginLocal","payload","options","collection","collectionSlug","data","depth","overrideAccess","showHiddenFields","collections","String","args","req","result","config","auth","removeTokenFromResponses","token"],"mappings":"AAUA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,oBAAoB,QAAQ,6CAA4C;AACjF,SAASC,cAAc,QAAQ,cAAa;AAc5C,OAAO,eAAeC,WACpBC,OAAgB,EAChBC,OAAuB;IAEvB,MAAM,EACJC,YAAYC,cAAc,EAC1BC,IAAI,EACJC,KAAK,EACLC,iBAAiB,KAAK,EACtBC,gBAAgB,EACjB,GAAGN;IAEJ,MAAMC,aAAaF,QAAQQ,WAAW,CAACL,eAAe;IAEtD,IAAI,CAACD,YAAY;QACf,MAAM,IAAIN,SACR,CAAC,yBAAyB,EAAEa,OAAON,gBAAgB,iCAAiC,CAAC;IAEzF;IAEA,MAAMO,OAAO;QACXR;QACAE;QACAC;QACAC;QACAK,KAAK,MAAMd,qBAAqB;YAAE,GAAGI,OAAO;YAAED;QAAQ;QACtDO;IACF;IAEA,MAAMK,SAAS,MAAMd,eAAsBY;IAE3C,IAAIR,WAAWW,MAAM,CAACC,IAAI,CAACC,wBAAwB,EAAE;QACnD,OAAOH,OAAOI,KAAK;IACrB;IAEA,OAAOJ;AACT"}

package/dist/auth/operations/local/resetPassword.js

@@ -1,5 +1,5 @@
 import { APIError } from '../../../errors/index.js';
-import { createLocalReq } from '../../../utilities/createLocalReq.js';
+import { createPayloadRequest } from '../../../utilities/createPayloadRequest.js';
 import { resetPasswordOperation } from '../resetPassword.js';
 export async function resetPasswordLocal(payload, options) {
     const { collection: collectionSlug, data, overrideAccess } = options;
@@ -11,7 +11,10 @@ export async function resetPasswordLocal(payload, options) {
         collection,
         data,
         overrideAccess,
-        req: await createLocalReq(options, payload)
+        req: await createPayloadRequest({
+            ...options,
+            payload
+        })
     });
     if (collection.config.auth.removeTokenFromResponses) {
         delete result.token;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/auth/operations/local/resetPassword.ts"],"sourcesContent":["import type { AuthCollectionSlug, Payload, RequestContext } from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { Result } from '../resetPassword.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createLocalReq } from '../../../utilities/createLocalReq.js'\nimport { resetPasswordOperation } from '../resetPassword.js'\n\nexport type Options<TSlug extends AuthCollectionSlug> = {\n  collection: TSlug\n  context?: RequestContext\n  data: {\n    password: string\n    token: string\n  }\n  overrideAccess: boolean\n  req?: Partial<PayloadRequest>\n}\n\nexport async function resetPasswordLocal<TSlug extends AuthCollectionSlug>(\n  payload: Payload,\n  options: Options<TSlug>,\n): Promise<Result> {\n  const { collection: collectionSlug, data, overrideAccess } = options\n\n  const collection = payload.collections[collectionSlug]\n\n  if (!collection) {\n    throw new APIError(\n      `The collection with slug ${String(\n        collectionSlug,\n      )} can't be found. Reset Password Operation.`,\n    )\n  }\n\n  const result = await resetPasswordOperation<TSlug>({\n    collection,\n    data,\n    overrideAccess,\n    req: await createLocalReq(options, payload),\n  })\n\n  if (collection.config.auth.removeTokenFromResponses) {\n    delete result.token\n  }\n\n  return result\n}\n"],"names":["APIError","createLocalReq","resetPasswordOperation","resetPasswordLocal","payload","options","collection","collectionSlug","data","overrideAccess","collections","String","result","req","config","auth","removeTokenFromResponses","token"],"mappings":"AAIA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,sBAAsB,QAAQ,sBAAqB;AAa5D,OAAO,eAAeC,mBACpBC,OAAgB,EAChBC,OAAuB;IAEvB,MAAM,EAAEC,YAAYC,cAAc,EAAEC,IAAI,EAAEC,cAAc,EAAE,GAAGJ;IAE7D,MAAMC,aAAaF,QAAQM,WAAW,CAACH,eAAe;IAEtD,IAAI,CAACD,YAAY;QACf,MAAM,IAAIN,SACR,CAAC,yBAAyB,EAAEW,OAC1BJ,gBACA,0CAA0C,CAAC;IAEjD;IAEA,MAAMK,SAAS,MAAMV,uBAA8B;QACjDI;QACAE;QACAC;QACAI,KAAK,MAAMZ,eAAeI,SAASD;IACrC;IAEA,IAAIE,WAAWQ,MAAM,CAACC,IAAI,CAACC,wBAAwB,EAAE;QACnD,OAAOJ,OAAOK,KAAK;IACrB;IAEA,OAAOL;AACT"}
+{"version":3,"sources":["../../../../src/auth/operations/local/resetPassword.ts"],"sourcesContent":["import type { AuthCollectionSlug, Payload, RequestContext } from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { Result } from '../resetPassword.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createPayloadRequest } from '../../../utilities/createPayloadRequest.js'\nimport { resetPasswordOperation } from '../resetPassword.js'\n\nexport type Options<TSlug extends AuthCollectionSlug> = {\n  collection: TSlug\n  context?: RequestContext\n  data: {\n    password: string\n    token: string\n  }\n  overrideAccess: boolean\n  req?: Partial<PayloadRequest>\n}\n\nexport async function resetPasswordLocal<TSlug extends AuthCollectionSlug>(\n  payload: Payload,\n  options: Options<TSlug>,\n): Promise<Result> {\n  const { collection: collectionSlug, data, overrideAccess } = options\n\n  const collection = payload.collections[collectionSlug]\n\n  if (!collection) {\n    throw new APIError(\n      `The collection with slug ${String(\n        collectionSlug,\n      )} can't be found. Reset Password Operation.`,\n    )\n  }\n\n  const result = await resetPasswordOperation<TSlug>({\n    collection,\n    data,\n    overrideAccess,\n    req: await createPayloadRequest({ ...options, payload }),\n  })\n\n  if (collection.config.auth.removeTokenFromResponses) {\n    delete result.token\n  }\n\n  return result\n}\n"],"names":["APIError","createPayloadRequest","resetPasswordOperation","resetPasswordLocal","payload","options","collection","collectionSlug","data","overrideAccess","collections","String","result","req","config","auth","removeTokenFromResponses","token"],"mappings":"AAIA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,oBAAoB,QAAQ,6CAA4C;AACjF,SAASC,sBAAsB,QAAQ,sBAAqB;AAa5D,OAAO,eAAeC,mBACpBC,OAAgB,EAChBC,OAAuB;IAEvB,MAAM,EAAEC,YAAYC,cAAc,EAAEC,IAAI,EAAEC,cAAc,EAAE,GAAGJ;IAE7D,MAAMC,aAAaF,QAAQM,WAAW,CAACH,eAAe;IAEtD,IAAI,CAACD,YAAY;QACf,MAAM,IAAIN,SACR,CAAC,yBAAyB,EAAEW,OAC1BJ,gBACA,0CAA0C,CAAC;IAEjD;IAEA,MAAMK,SAAS,MAAMV,uBAA8B;QACjDI;QACAE;QACAC;QACAI,KAAK,MAAMZ,qBAAqB;YAAE,GAAGI,OAAO;YAAED;QAAQ;IACxD;IAEA,IAAIE,WAAWQ,MAAM,CAACC,IAAI,CAACC,wBAAwB,EAAE;QACnD,OAAOJ,OAAOK,KAAK;IACrB;IAEA,OAAOL;AACT"}

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

@@ -1,11 +1,11 @@
 import type { AuthCollectionSlug, AuthOperationsFromCollectionSlug, Payload, RequestContext } from '../../../index.js';
 import type { PayloadRequest } from '../../../types/index.js';
+import type { SharedLocalAPIOptions } from '../../../types/operations.js';
 export type Options<TSlug extends AuthCollectionSlug> = {
     collection: TSlug;
     context?: RequestContext;
     data: AuthOperationsFromCollectionSlug<TSlug>['unlock'];
-    overrideAccess: boolean;
     req?: Partial<PayloadRequest>;
-};
+} & Pick<SharedLocalAPIOptions, 'overrideAccess'>;
 export declare function unlockLocal<TSlug extends AuthCollectionSlug>(payload: Payload, options: Options<TSlug>): Promise<boolean>;
 //# sourceMappingURL=unlock.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"unlock.d.ts","sourceRoot":"","sources":["../../../../src/auth/operations/local/unlock.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,gCAAgC,EAChC,OAAO,EACP,cAAc,EACf,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAM7D,MAAM,MAAM,OAAO,CAAC,KAAK,SAAS,kBAAkB,IAAI;IACtD,UAAU,EAAE,KAAK,CAAA;IACjB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,IAAI,EAAE,gCAAgC,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAA;IACvD,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAC9B,CAAA;AAED,wBAAsB,WAAW,CAAC,KAAK,SAAS,kBAAkB,EAChE,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GACtB,OAAO,CAAC,OAAO,CAAC,CAiBlB"}
+{"version":3,"file":"unlock.d.ts","sourceRoot":"","sources":["../../../../src/auth/operations/local/unlock.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,gCAAgC,EAChC,OAAO,EACP,cAAc,EACf,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAMzE,MAAM,MAAM,OAAO,CAAC,KAAK,SAAS,kBAAkB,IAAI;IACtD,UAAU,EAAE,KAAK,CAAA;IACjB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,IAAI,EAAE,gCAAgC,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAA;IACvD,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAC9B,GAAG,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAA;AAEjD,wBAAsB,WAAW,CAAC,KAAK,SAAS,kBAAkB,EAChE,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GACtB,OAAO,CAAC,OAAO,CAAC,CAiBlB"}

package/dist/auth/operations/local/unlock.js

@@ -1,8 +1,8 @@
 import { APIError } from '../../../errors/index.js';
-import { createLocalReq } from '../../../utilities/createLocalReq.js';
+import { createPayloadRequest } from '../../../utilities/createPayloadRequest.js';
 import { unlockOperation } from '../unlock.js';
 export async function unlockLocal(payload, options) {
-    const { collection: collectionSlug, data, overrideAccess = true } = options;
+    const { collection: collectionSlug, data, overrideAccess = false } = options;
     const collection = payload.collections[collectionSlug];
     if (!collection) {
         throw new APIError(`The collection with slug ${String(collectionSlug)} can't be found. Unlock Operation.`);
@@ -11,7 +11,10 @@ export async function unlockLocal(payload, options) {
         collection,
         data,
         overrideAccess,
-        req: await createLocalReq(options, payload)
+        req: await createPayloadRequest({
+            ...options,
+            payload
+        })
     });
 }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/auth/operations/local/unlock.ts"],"sourcesContent":["import type {\n  AuthCollectionSlug,\n  AuthOperationsFromCollectionSlug,\n  Payload,\n  RequestContext,\n} from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createLocalReq } from '../../../utilities/createLocalReq.js'\nimport { unlockOperation } from '../unlock.js'\n\nexport type Options<TSlug extends AuthCollectionSlug> = {\n  collection: TSlug\n  context?: RequestContext\n  data: AuthOperationsFromCollectionSlug<TSlug>['unlock']\n  overrideAccess: boolean\n  req?: Partial<PayloadRequest>\n}\n\nexport async function unlockLocal<TSlug extends AuthCollectionSlug>(\n  payload: Payload,\n  options: Options<TSlug>,\n): Promise<boolean> {\n  const { collection: collectionSlug, data, overrideAccess = true } = options\n\n  const collection = payload.collections[collectionSlug]\n\n  if (!collection) {\n    throw new APIError(\n      `The collection with slug ${String(collectionSlug)} can't be found. Unlock Operation.`,\n    )\n  }\n\n  return unlockOperation<TSlug>({\n    collection,\n    data,\n    overrideAccess,\n    req: await createLocalReq(options, payload),\n  })\n}\n"],"names":["APIError","createLocalReq","unlockOperation","unlockLocal","payload","options","collection","collectionSlug","data","overrideAccess","collections","String","req"],"mappings":"AAQA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,eAAe,QAAQ,eAAc;AAU9C,OAAO,eAAeC,YACpBC,OAAgB,EAChBC,OAAuB;IAEvB,MAAM,EAAEC,YAAYC,cAAc,EAAEC,IAAI,EAAEC,iBAAiB,IAAI,EAAE,GAAGJ;IAEpE,MAAMC,aAAaF,QAAQM,WAAW,CAACH,eAAe;IAEtD,IAAI,CAACD,YAAY;QACf,MAAM,IAAIN,SACR,CAAC,yBAAyB,EAAEW,OAAOJ,gBAAgB,kCAAkC,CAAC;IAE1F;IAEA,OAAOL,gBAAuB;QAC5BI;QACAE;QACAC;QACAG,KAAK,MAAMX,eAAeI,SAASD;IACrC;AACF"}
+{"version":3,"sources":["../../../../src/auth/operations/local/unlock.ts"],"sourcesContent":["import type {\n  AuthCollectionSlug,\n  AuthOperationsFromCollectionSlug,\n  Payload,\n  RequestContext,\n} from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { SharedLocalAPIOptions } from '../../../types/operations.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createPayloadRequest } from '../../../utilities/createPayloadRequest.js'\nimport { unlockOperation } from '../unlock.js'\n\nexport type Options<TSlug extends AuthCollectionSlug> = {\n  collection: TSlug\n  context?: RequestContext\n  data: AuthOperationsFromCollectionSlug<TSlug>['unlock']\n  req?: Partial<PayloadRequest>\n} & Pick<SharedLocalAPIOptions, 'overrideAccess'>\n\nexport async function unlockLocal<TSlug extends AuthCollectionSlug>(\n  payload: Payload,\n  options: Options<TSlug>,\n): Promise<boolean> {\n  const { collection: collectionSlug, data, overrideAccess = false } = options\n\n  const collection = payload.collections[collectionSlug]\n\n  if (!collection) {\n    throw new APIError(\n      `The collection with slug ${String(collectionSlug)} can't be found. Unlock Operation.`,\n    )\n  }\n\n  return unlockOperation<TSlug>({\n    collection,\n    data,\n    overrideAccess,\n    req: await createPayloadRequest({ ...options, payload }),\n  })\n}\n"],"names":["APIError","createPayloadRequest","unlockOperation","unlockLocal","payload","options","collection","collectionSlug","data","overrideAccess","collections","String","req"],"mappings":"AASA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,oBAAoB,QAAQ,6CAA4C;AACjF,SAASC,eAAe,QAAQ,eAAc;AAS9C,OAAO,eAAeC,YACpBC,OAAgB,EAChBC,OAAuB;IAEvB,MAAM,EAAEC,YAAYC,cAAc,EAAEC,IAAI,EAAEC,iBAAiB,KAAK,EAAE,GAAGJ;IAErE,MAAMC,aAAaF,QAAQM,WAAW,CAACH,eAAe;IAEtD,IAAI,CAACD,YAAY;QACf,MAAM,IAAIN,SACR,CAAC,yBAAyB,EAAEW,OAAOJ,gBAAgB,kCAAkC,CAAC;IAE1F;IAEA,OAAOL,gBAAuB;QAC5BI;QACAE;QACAC;QACAG,KAAK,MAAMX,qBAAqB;YAAE,GAAGI,OAAO;YAAED;QAAQ;IACxD;AACF"}

package/dist/auth/operations/local/verifyEmail.js

@@ -1,5 +1,5 @@
 import { APIError } from '../../../errors/index.js';
-import { createLocalReq } from '../../../utilities/createLocalReq.js';
+import { createPayloadRequest } from '../../../utilities/createPayloadRequest.js';
 import { verifyEmailOperation } from '../verifyEmail.js';
 export async function verifyEmailLocal(payload, options) {
     const { collection: collectionSlug, token } = options;
@@ -9,7 +9,10 @@ export async function verifyEmailLocal(payload, options) {
     }
     return verifyEmailOperation({
         collection,
-        req: await createLocalReq(options, payload),
+        req: await createPayloadRequest({
+            ...options,
+            payload
+        }),
         token
     });
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/auth/operations/local/verifyEmail.ts"],"sourcesContent":["import type { AuthCollectionSlug, Payload, RequestContext } from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createLocalReq } from '../../../utilities/createLocalReq.js'\nimport { verifyEmailOperation } from '../verifyEmail.js'\n\nexport type Options<TSlug extends AuthCollectionSlug> = {\n  collection: TSlug\n  context?: RequestContext\n  req?: Partial<PayloadRequest>\n  token: string\n}\n\nexport async function verifyEmailLocal<T extends AuthCollectionSlug>(\n  payload: Payload,\n  options: Options<T>,\n): Promise<boolean> {\n  const { collection: collectionSlug, token } = options\n\n  const collection = payload.collections[collectionSlug]\n\n  if (!collection) {\n    throw new APIError(\n      `The collection with slug ${String(collectionSlug)} can't be found. Verify Email Operation.`,\n    )\n  }\n\n  return verifyEmailOperation({\n    collection,\n    req: await createLocalReq(options, payload),\n    token,\n  })\n}\n"],"names":["APIError","createLocalReq","verifyEmailOperation","verifyEmailLocal","payload","options","collection","collectionSlug","token","collections","String","req"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,oBAAoB,QAAQ,oBAAmB;AASxD,OAAO,eAAeC,iBACpBC,OAAgB,EAChBC,OAAmB;IAEnB,MAAM,EAAEC,YAAYC,cAAc,EAAEC,KAAK,EAAE,GAAGH;IAE9C,MAAMC,aAAaF,QAAQK,WAAW,CAACF,eAAe;IAEtD,IAAI,CAACD,YAAY;QACf,MAAM,IAAIN,SACR,CAAC,yBAAyB,EAAEU,OAAOH,gBAAgB,wCAAwC,CAAC;IAEhG;IAEA,OAAOL,qBAAqB;QAC1BI;QACAK,KAAK,MAAMV,eAAeI,SAASD;QACnCI;IACF;AACF"}
+{"version":3,"sources":["../../../../src/auth/operations/local/verifyEmail.ts"],"sourcesContent":["import type { AuthCollectionSlug, Payload, RequestContext } from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createPayloadRequest } from '../../../utilities/createPayloadRequest.js'\nimport { verifyEmailOperation } from '../verifyEmail.js'\n\nexport type Options<TSlug extends AuthCollectionSlug> = {\n  collection: TSlug\n  context?: RequestContext\n  req?: Partial<PayloadRequest>\n  token: string\n}\n\nexport async function verifyEmailLocal<T extends AuthCollectionSlug>(\n  payload: Payload,\n  options: Options<T>,\n): Promise<boolean> {\n  const { collection: collectionSlug, token } = options\n\n  const collection = payload.collections[collectionSlug]\n\n  if (!collection) {\n    throw new APIError(\n      `The collection with slug ${String(collectionSlug)} can't be found. Verify Email Operation.`,\n    )\n  }\n\n  return verifyEmailOperation({\n    collection,\n    req: await createPayloadRequest({ ...options, payload }),\n    token,\n  })\n}\n"],"names":["APIError","createPayloadRequest","verifyEmailOperation","verifyEmailLocal","payload","options","collection","collectionSlug","token","collections","String","req"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,oBAAoB,QAAQ,6CAA4C;AACjF,SAASC,oBAAoB,QAAQ,oBAAmB;AASxD,OAAO,eAAeC,iBACpBC,OAAgB,EAChBC,OAAmB;IAEnB,MAAM,EAAEC,YAAYC,cAAc,EAAEC,KAAK,EAAE,GAAGH;IAE9C,MAAMC,aAAaF,QAAQK,WAAW,CAACF,eAAe;IAEtD,IAAI,CAACD,YAAY;QACf,MAAM,IAAIN,SACR,CAAC,yBAAyB,EAAEU,OAAOH,gBAAgB,wCAAwC,CAAC;IAEhG;IAEA,OAAOL,qBAAqB;QAC1BI;QACAK,KAAK,MAAMV,qBAAqB;YAAE,GAAGI,OAAO;YAAED;QAAQ;QACtDI;IACF;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/auth/operations/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gCAAgC,EAChC,UAAU,EACV,sBAAsB,EACvB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,KAAK,EAAE,kBAAkB,EAA2B,MAAM,gBAAgB,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,sBAAsB,CAAA;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAwBpD,MAAM,MAAM,WAAW,CAAC,KAAK,SAAS,kBAAkB,IAAI;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,iBAAiB,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAA;CACzD,CAAA;AAED,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,kBAAkB,IAAI;IACxD,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE,gCAAgC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAA;IACtD,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,KAAK,wBAAwB,CAAC,KAAK,SAAS,kBAAkB,IAAI;IAChE,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,GAAG,EAAE,cAAc,CAAA;IACnB,IAAI,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAA;CACpC,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,kBAAkB,yCAIlE,wBAAwB,CAAC,KAAK,CAAC,SAQjC,CAAA;AAED,eAAO,MAAM,cAAc,GAAU,KAAK,SAAS,kBAAkB,gBACrD,SAAS,CAAC,KAAK,CAAC,KAC7B,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CA+V5B,CAAA"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/auth/operations/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gCAAgC,EAChC,UAAU,EACV,sBAAsB,EACvB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,KAAK,EAAE,kBAAkB,EAA2B,MAAM,gBAAgB,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,sBAAsB,CAAA;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AA0BpD,MAAM,MAAM,WAAW,CAAC,KAAK,SAAS,kBAAkB,IAAI;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,iBAAiB,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAA;CACzD,CAAA;AAED,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,kBAAkB,IAAI;IACxD,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE,gCAAgC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAA;IACtD,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,KAAK,wBAAwB,CAAC,KAAK,SAAS,kBAAkB,IAAI;IAChE,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,GAAG,EAAE,cAAc,CAAA;IACnB,IAAI,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAA;CACpC,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,kBAAkB,yCAIlE,wBAAwB,CAAC,KAAK,CAAC,SAQjC,CAAA;AAED,eAAO,MAAM,cAAc,GAAU,KAAK,SAAS,kBAAkB,gBACrD,SAAS,CAAC,KAAK,CAAC,KAC7B,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAyW5B,CAAA"}