chore: temporarily revert 10597 (#10718)

Temporarily reverts 10597 to fix plugin-oauth

Author: AlessioGr

packages/next/src/exports/utilities.ts

@@ -23,7 +23,9 @@ export const mergeHeaders = _mergeHeaders
 
 /**
  * @deprecated
- * This function is not needed anymore for public usage. CORS headers are applied by default to response.
+ * Use:
+ * ```ts
+ * import { headersWithCors } from 'payload'
  * ```
  */
 export const headersWithCors = _headersWithCors

packages/payload/src/auth/endpoints/access.ts

@@ -2,15 +2,22 @@ import { status as httpStatus } from 'http-status'
 
 import type { PayloadHandler } from '../../config/types.js'
 
+import { headersWithCors } from '../../utilities/headersWithCors.js'
 import { accessOperation } from '../operations/access.js'
 
 export const accessHandler: PayloadHandler = async (req) => {
+  const headers = headersWithCors({
+    headers: new Headers(),
+    req,
+  })
+
   try {
     const results = await accessOperation({
       req,
     })
 
     return Response.json(results, {
+      headers,
       status: httpStatus.OK,
     })
   } catch (e: unknown) {
@@ -19,6 +26,7 @@ export const accessHandler: PayloadHandler = async (req) => {
         error: e,
       },
       {
+        headers,
         status: httpStatus.INTERNAL_SERVER_ERROR,
       },
     )

packages/payload/src/auth/endpoints/forgotPassword.ts

@@ -3,6 +3,7 @@ import { status as httpStatus } from 'http-status'
 import type { PayloadHandler } from '../../config/types.js'
 
 import { getRequestCollection } from '../../utilities/getRequestEntity.js'
+import { headersWithCors } from '../../utilities/headersWithCors.js'
 import { forgotPasswordOperation } from '../operations/forgotPassword.js'
 
 export const forgotPasswordHandler: PayloadHandler = async (req) => {
@@ -32,6 +33,10 @@ export const forgotPasswordHandler: PayloadHandler = async (req) => {
       message: t('general:success'),
     },
     {
+      headers: headersWithCors({
+        headers: new Headers(),
+        req,
+      }),
       status: httpStatus.OK,
     },
   )

packages/payload/src/auth/endpoints/init.ts

@@ -1,6 +1,7 @@
 import type { PayloadHandler } from '../../config/types.js'
 
 import { getRequestCollection } from '../../utilities/getRequestEntity.js'
+import { headersWithCors } from '../../utilities/headersWithCors.js'
 import { initOperation } from '../operations/init.js'
 
 export const initHandler: PayloadHandler = async (req) => {
@@ -9,5 +10,13 @@ export const initHandler: PayloadHandler = async (req) => {
     req,
   })
 
-  return Response.json({ initialized })
+  return Response.json(
+    { initialized },
+    {
+      headers: headersWithCors({
+        headers: new Headers(),
+        req,
+      }),
+    },
+  )
 }

packages/payload/src/auth/endpoints/login.ts

@@ -3,6 +3,7 @@ import { status as httpStatus } from 'http-status'
 import type { PayloadHandler } from '../../config/types.js'
 
 import { getRequestCollection } from '../../utilities/getRequestEntity.js'
+import { headersWithCors } from '../../utilities/headersWithCors.js'
 import { isNumber } from '../../utilities/isNumber.js'
 import { generatePayloadCookie } from '../cookies.js'
 import { loginOperation } from '../operations/login.js'
@@ -46,8 +47,11 @@ export const loginHandler: PayloadHandler = async (req) => {
       ...result,
     },
     {
-      headers: new Headers({
-        'Set-Cookie': cookie,
+      headers: headersWithCors({
+        headers: new Headers({
+          'Set-Cookie': cookie,
+        }),
+        req,
       }),
       status: httpStatus.OK,
     },

packages/payload/src/auth/endpoints/logout.ts

@@ -3,6 +3,7 @@ import { status as httpStatus } from 'http-status'
 import type { PayloadHandler } from '../../config/types.js'
 
 import { getRequestCollection } from '../../utilities/getRequestEntity.js'
+import { headersWithCors } from '../../utilities/headersWithCors.js'
 import { generateExpiredPayloadCookie } from '../cookies.js'
 import { logoutOperation } from '../operations/logout.js'
 
@@ -14,12 +15,18 @@ export const logoutHandler: PayloadHandler = async (req) => {
     req,
   })
 
+  const headers = headersWithCors({
+    headers: new Headers(),
+    req,
+  })
+
   if (!result) {
     return Response.json(
       {
         message: t('error:logoutFailed'),
       },
       {
+        headers,
         status: httpStatus.BAD_REQUEST,
       },
     )
@@ -31,9 +38,7 @@ export const logoutHandler: PayloadHandler = async (req) => {
     cookiePrefix: req.payload.config.cookiePrefix,
   })
 
-  const headers = new Headers({
-    'Set-Cookie': expiredCookie,
-  })
+  headers.set('Set-Cookie', expiredCookie)
 
   return Response.json(
     {

packages/payload/src/auth/endpoints/me.ts

@@ -3,6 +3,7 @@ import { status as httpStatus } from 'http-status'
 import type { PayloadHandler } from '../../config/types.js'
 
 import { getRequestCollection } from '../../utilities/getRequestEntity.js'
+import { headersWithCors } from '../../utilities/headersWithCors.js'
 import { extractJWT } from '../extractJWT.js'
 import { meOperation } from '../operations/me.js'
 
@@ -26,6 +27,10 @@ export const meHandler: PayloadHandler = async (req) => {
       message: req.t('authentication:account'),
     },
     {
+      headers: headersWithCors({
+        headers: new Headers(),
+        req,
+      }),
       status: httpStatus.OK,
     },
   )

packages/payload/src/auth/endpoints/refresh.ts

@@ -3,14 +3,18 @@ import { status as httpStatus } from 'http-status'
 import type { PayloadHandler } from '../../config/types.js'
 
 import { getRequestCollection } from '../../utilities/getRequestEntity.js'
+import { headersWithCors } from '../../utilities/headersWithCors.js'
 import { generatePayloadCookie } from '../cookies.js'
 import { refreshOperation } from '../operations/refresh.js'
 
 export const refreshHandler: PayloadHandler = async (req) => {
   const collection = getRequestCollection(req)
   const { t } = req
 
-  const headers = new Headers()
+  const headers = headersWithCors({
+    headers: new Headers(),
+    req,
+  })
 
   const result = await refreshOperation({
     collection,

packages/payload/src/auth/endpoints/registerFirstUser.ts

@@ -3,6 +3,7 @@ import { status as httpStatus } from 'http-status'
 import type { PayloadHandler } from '../../config/types.js'
 
 import { getRequestCollection } from '../../utilities/getRequestEntity.js'
+import { headersWithCors } from '../../utilities/headersWithCors.js'
 import { generatePayloadCookie } from '../cookies.js'
 import { registerFirstUserOperation } from '../operations/registerFirstUser.js'
 
@@ -43,8 +44,11 @@ export const registerFirstUserHandler: PayloadHandler = async (req) => {
       user: result.user,
     },
     {
-      headers: new Headers({
-        'Set-Cookie': cookie,
+      headers: headersWithCors({
+        headers: new Headers({
+          'Set-Cookie': cookie,
+        }),
+        req,
       }),
       status: httpStatus.OK,
     },

packages/payload/src/auth/endpoints/resetPassword.ts

@@ -3,6 +3,7 @@ import { status as httpStatus } from 'http-status'
 import type { PayloadHandler } from '../../config/types.js'
 
 import { getRequestCollection } from '../../utilities/getRequestEntity.js'
+import { headersWithCors } from '../../utilities/headersWithCors.js'
 import { generatePayloadCookie } from '../cookies.js'
 import { resetPasswordOperation } from '../operations/resetPassword.js'
 
@@ -37,8 +38,11 @@ export const resetPasswordHandler: PayloadHandler = async (req) => {
       ...result,
     },
     {
-      headers: new Headers({
-        'Set-Cookie': cookie,
+      headers: headersWithCors({
+        headers: new Headers({
+          'Set-Cookie': cookie,
+        }),
+        req,
       }),
       status: httpStatus.OK,
     },