From bb3bd9c39543bb77e929ca4f819b4d54ccedf58d Mon Sep 17 00:00:00 2001
From: Elliot DeNolf <denolfe@gmail.com>
Date: Mon, 22 Apr 2024 15:42:21 -0400
Subject: [PATCH 1/2] chore: adjust email adapter messaging

---
 .../src/email/{stdoutAdapter.ts => consoleEmailAdapter.ts}  | 4 ++--
 packages/payload/src/index.ts                               | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename packages/payload/src/email/{stdoutAdapter.ts => consoleEmailAdapter.ts} (69%)

diff --git a/packages/payload/src/email/stdoutAdapter.ts b/packages/payload/src/email/consoleEmailAdapter.ts
similarity index 69%
rename from packages/payload/src/email/stdoutAdapter.ts
rename to packages/payload/src/email/consoleEmailAdapter.ts
index 122e0b9ab2..ef667fdfd2 100644
--- a/packages/payload/src/email/stdoutAdapter.ts
+++ b/packages/payload/src/email/consoleEmailAdapter.ts
@@ -3,12 +3,12 @@ import type { EmailAdapter } from './types.js'
 import { emailDefaults } from './defaults.js'
 import { getStringifiedToAddress } from './getStringifiedToAddress.js'
 
-export const stdoutAdapter: EmailAdapter<void> = ({ payload }) => ({
+export const consoleEmailAdapter: EmailAdapter<void> = ({ payload }) => ({
   defaultFromAddress: emailDefaults.defaultFromAddress,
   defaultFromName: emailDefaults.defaultFromName,
   sendEmail: async (message) => {
     const stringifiedTo = getStringifiedToAddress(message)
-    const res = `EMAIL NON-DELIVERY. To: '${stringifiedTo}', Subject: '${message.subject}'`
+    const res = `Email attempted without being configured. To: '${stringifiedTo}', Subject: '${message.subject}'`
     payload.logger.info({ msg: res })
     return Promise.resolve()
   },
diff --git a/packages/payload/src/index.ts b/packages/payload/src/index.ts
index 412f4eb861..cf411ea2f5 100644
--- a/packages/payload/src/index.ts
+++ b/packages/payload/src/index.ts
@@ -49,7 +49,7 @@ import { APIKeyAuthentication } from './auth/strategies/apiKey.js'
 import { JWTAuthentication } from './auth/strategies/jwt.js'
 import localOperations from './collections/operations/local/index.js'
 import { validateSchema } from './config/validate.js'
-import { stdoutAdapter } from './email/stdoutAdapter.js'
+import { consoleEmailAdapter } from './email/consoleEmailAdapter.js'
 import { fieldAffectsData } from './exports/types.js'
 import localGlobalOperations from './globals/operations/local/index.js'
 import flattenFields from './utilities/flattenTopLevelFields.js'
@@ -382,10 +382,10 @@ export class BasePayload<TGeneratedTypes extends GeneratedTypes> {
       this.email = this.config.email({ payload: this })
     } else {
       this.logger.warn(
-        `No email adapter provided. Email will be written to stdout. More info at https://payloadcms.com/docs/email/overview.`,
+        `No email adapter provided. Email will be written to console. More info at https://payloadcms.com/docs/email/overview.`,
       )
 
-      this.email = stdoutAdapter({ payload: this })
+      this.email = consoleEmailAdapter({ payload: this })
     }
 
     this.sendEmail = this.email['sendEmail']

From 43089fd13cba7616b9abb9463f5495643cefa8d4 Mon Sep 17 00:00:00 2001
From: Jarrod Flesch <30633324+JarrodMFlesch@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:48:42 -0400
Subject: [PATCH 2/2] chore: adds cors headers to routeErrors (#5957)

---
 packages/next/src/routes/rest/routeError.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/next/src/routes/rest/routeError.ts b/packages/next/src/routes/rest/routeError.ts
index d362fc4e84..99e10cd488 100644
--- a/packages/next/src/routes/rest/routeError.ts
+++ b/packages/next/src/routes/rest/routeError.ts
@@ -4,6 +4,7 @@ import httpStatus from 'http-status'
 import { APIError } from 'payload/errors'
 
 import { getPayloadHMR } from '../../utilities/getPayloadHMR.js'
+import { headersWithCors } from '../../utilities/headersWithCors.js'
 
 export type ErrorResponse = { data?: any; errors: unknown[]; stack?: string }
 
@@ -81,6 +82,11 @@ export const routeError = async ({
 }) => {
   let payload = req?.payload
 
+  const headers = headersWithCors({
+    headers: new Headers(),
+    req,
+  })
+
   if (!payload) {
     try {
       payload = await getPayloadHMR({ config: configArg })
@@ -89,7 +95,7 @@ export const routeError = async ({
         {
           message: 'There was an error initializing Payload',
         },
-        { status: httpStatus.INTERNAL_SERVER_ERROR },
+        { headers, status: httpStatus.INTERNAL_SERVER_ERROR },
       )
     }
   }
@@ -133,5 +139,5 @@ export const routeError = async ({
     })
   }
 
-  return Response.json(response, { status })
+  return Response.json(response, { headers, status })
 }