@payloadcms/next 3.0.0-beta.7 → 3.0.0-beta.70

package/dist/routes/rest/index.js

@@ -1,6 +1,10 @@
 import httpStatus from 'http-status';
 import { match } from 'path-to-regexp';
+import { addDataAndFileToRequest } from '../../utilities/addDataAndFileToRequest.js';
+import { addLocalesToRequestFromData } from '../../utilities/addLocalesToRequest.js';
 import { createPayloadRequest } from '../../utilities/createPayloadRequest.js';
+import { headersWithCors } from '../../utilities/headersWithCors.js';
+import { mergeHeaders } from '../../utilities/mergeHeaders.js';
 import { access } from './auth/access.js';
 import { forgotPassword } from './auth/forgotPassword.js';
 import { init } from './auth/init.js';
@@ -14,6 +18,7 @@ import { unlock } from './auth/unlock.js';
 import { verifyEmail } from './auth/verifyEmail.js';
 import { buildFormState } from './buildFormState.js';
 import { endpointsAreDisabled } from './checkEndpoints.js';
+import { count } from './collections/count.js';
 import { create } from './collections/create.js';
 import { deleteDoc } from './collections/delete.js';
 import { deleteByID } from './collections/deleteByID.js';
@@ -35,6 +40,7 @@ import { findVersions as findVersionsGlobal } from './globals/findVersions.js';
 import { preview as previewGlobal } from './globals/preview.js';
 import { restoreVersion as restoreVersionGlobal } from './globals/restoreVersion.js';
 import { update as updateGlobal } from './globals/update.js';
+import { generateOGImage } from './og/index.js';
 import { routeError } from './routeError.js';
 const endpoints = {
     collection: {
@@ -43,6 +49,7 @@ const endpoints = {
             deleteByID
         },
         GET: {
+            count,
             'doc-access-by-id': docAccess,
             'doc-versions-by-id': findVersionByID,
             find,
@@ -89,24 +96,35 @@ const endpoints = {
     },
     root: {
         GET: {
-            access
+            access,
+            og: generateOGImage
         },
         POST: {
             'form-state': buildFormState
         }
     }
 };
-const handleCustomEndpoints = ({ endpoints, entitySlug, payloadRequest })=>{
+const handleCustomEndpoints = async ({ endpoints, entitySlug, req })=>{
     if (endpoints && endpoints.length > 0) {
         let handlerParams = {};
-        const { pathname } = payloadRequest;
-        const pathPrefix = payloadRequest.payload.config.routes.api + (entitySlug ? `/${entitySlug}` : '');
+        const { pathname } = req;
+        /*
+     * This makes sure the next.js basePath property is supported. If basePath is used, payload config.routes.api should include it. This makes all outgoing frontend request
+     * target the correct API endpoint starting with basePath, which is good!
+     *
+     * The incoming request (here) will not include the basePath though, as it's automatically stripped by Next.js. Since we are adding the basePath to the pathPrefix below though
+     * (from req.payload.config.routes.api) we need to add it to pathname, which does not contain the basePath. Otherwise, no endpoint will be matched if basePath is set.
+     */ let adjustedPathname = pathname;
+        if (process.env.NEXT_BASE_PATH) {
+            adjustedPathname = process.env.NEXT_BASE_PATH + pathname;
+        }
+        const pathPrefix = req.payload.config.routes.api + (entitySlug ? `/${entitySlug}` : '');
         const customEndpoint = endpoints.find((endpoint)=>{
-            if (endpoint.method === payloadRequest.method.toLowerCase()) {
+            if (endpoint.method === req.method.toLowerCase()) {
                 const pathMatchFn = match(`${pathPrefix}${endpoint.path}`, {
                     decode: decodeURIComponent
                 });
-                const tempParams = pathMatchFn(pathname);
+                const tempParams = pathMatchFn(adjustedPathname);
                 if (tempParams) {
                     handlerParams = tempParams.params;
                     return true;
@@ -114,17 +132,52 @@ const handleCustomEndpoints = ({ endpoints, entitySlug, payloadRequest })=>{
             }
         });
         if (customEndpoint) {
-            payloadRequest.routeParams = handlerParams;
-            return customEndpoint.handler(payloadRequest);
+            req.routeParams = {
+                ...req.routeParams,
+                ...handlerParams
+            };
+            const res = await customEndpoint.handler(req);
+            if (res instanceof Response) {
+                if (req.responseHeaders) {
+                    mergeHeaders(req.responseHeaders, res.headers);
+                }
+                return res;
+            }
         }
     }
     return null;
 };
-const RouteNotFoundResponse = (slug)=>Response.json({
+const RouteNotFoundResponse = ({ slug, req })=>Response.json({
         message: `Route Not Found: "${slug.join('/')}"`
     }, {
+        headers: headersWithCors({
+            headers: new Headers(),
+            req
+        }),
         status: httpStatus.NOT_FOUND
     });
+export const OPTIONS = (config)=>async (request)=>{
+        let req;
+        try {
+            req = await createPayloadRequest({
+                config,
+                request
+            });
+            return Response.json({}, {
+                headers: headersWithCors({
+                    headers: new Headers(),
+                    req
+                }),
+                status: 200
+            });
+        } catch (error) {
+            return routeError({
+                config,
+                err: error,
+                req: req || request
+            });
+        }
+    };
 export const GET = (config)=>async (request, { params: { slug } })=>{
         const [slug1, slug2, slug3, slug4] = slug;
         let req;
@@ -133,9 +186,6 @@ export const GET = (config)=>async (request, { params: { slug } })=>{
         try {
             req = await createPayloadRequest({
                 config,
-                params: {
-                    collection: slug1
-                },
                 request
             });
             const disableEndpoints = endpointsAreDisabled({
@@ -145,6 +195,7 @@ export const GET = (config)=>async (request, { params: { slug } })=>{
             if (disableEndpoints) return disableEndpoints;
             collection = req.payload.collections?.[slug1];
             if (collection) {
+                req.routeParams.collection = slug1;
                 const disableEndpoints = endpointsAreDisabled({
                     endpoints: collection.config.endpoints,
                     request
@@ -153,63 +204,70 @@ export const GET = (config)=>async (request, { params: { slug } })=>{
                 const customEndpointResponse = await handleCustomEndpoints({
                     endpoints: collection.config.endpoints,
                     entitySlug: slug1,
-                    payloadRequest: req
+                    req
                 });
-                if (customEndpointResponse) return customEndpointResponse;
-                switch(slug.length){
-                    case 1:
-                        // /:collection
-                        res = await endpoints.collection.GET.find({
-                            collection,
-                            req
-                        });
-                        break;
-                    case 2:
-                        if (slug2 in endpoints.collection.GET) {
-                            // /:collection/init
-                            // /:collection/me
-                            // /:collection/versions
-                            res = await endpoints.collection.GET[slug2]({
+                if (customEndpointResponse) {
+                    return customEndpointResponse;
+                } else {
+                    await addDataAndFileToRequest(req);
+                    addLocalesToRequestFromData(req);
+                    switch(slug.length){
+                        case 1:
+                            // /:collection
+                            res = await endpoints.collection.GET.find({
                                 collection,
                                 req
                             });
-                        } else {
-                            // /:collection/:id
-                            res = await endpoints.collection.GET.findByID({
-                                id: slug2,
-                                collection,
-                                req
-                            });
-                        }
-                        break;
-                    case 3:
-                        if (slug2 === 'file') {
-                            // /:collection/file/:filename
-                            res = await endpoints.collection.GET.getFile({
-                                collection,
-                                filename: slug3,
-                                req
-                            });
-                        } else if (slug3 in endpoints.collection.GET) {
-                            // /:collection/:id/preview
-                            res = await endpoints.collection.GET[slug3]({
-                                id: slug2,
-                                collection,
-                                req
-                            });
-                        } else if (`doc-${slug2}-by-id` in endpoints.collection.GET) {
-                            // /:collection/access/:id
-                            // /:collection/versions/:id
-                            res = await endpoints.collection.GET[`doc-${slug2}-by-id`]({
-                                id: slug3,
-                                collection,
-                                req
-                            });
-                        }
-                        break;
+                            break;
+                        case 2:
+                            if (slug2 in endpoints.collection.GET) {
+                                // /:collection/init
+                                // /:collection/me
+                                // /:collection/versions
+                                // /:collection/count
+                                res = await endpoints.collection.GET[slug2]({
+                                    collection,
+                                    req
+                                });
+                            } else {
+                                // /:collection/:id
+                                res = await endpoints.collection.GET.findByID({
+                                    id: slug2,
+                                    collection,
+                                    req
+                                });
+                            }
+                            break;
+                        case 3:
+                            if (slug2 === 'file') {
+                                // /:collection/file/:filename
+                                res = await endpoints.collection.GET.getFile({
+                                    collection,
+                                    filename: slug3,
+                                    req
+                                });
+                            } else if (slug3 in endpoints.collection.GET) {
+                                // /:collection/:id/preview
+                                res = await endpoints.collection.GET[slug3]({
+                                    id: slug2,
+                                    collection,
+                                    req
+                                });
+                            } else if (`doc-${slug2}-by-id` in endpoints.collection.GET) {
+                                // /:collection/access/:id
+                                // /:collection/versions/:id
+                                res = await endpoints.collection.GET[`doc-${slug2}-by-id`]({
+                                    id: slug3,
+                                    collection,
+                                    req
+                                });
+                            }
+                            break;
+                    }
                 }
             } else if (slug1 === 'globals') {
                 const globalConfig = req.payload.config.globals.find((global)=>global.slug === slug2);
+                req.routeParams.global = globalConfig.slug;
                 const disableEndpoints = endpointsAreDisabled({
                     endpoints: globalConfig.endpoints,
                     request
@@ -218,63 +276,79 @@ export const GET = (config)=>async (request, { params: { slug } })=>{
                 const customEndpointResponse = await handleCustomEndpoints({
                     endpoints: globalConfig.endpoints,
                     entitySlug: `${slug1}/${slug2}`,
-                    payloadRequest: req
+                    req
                 });
-                if (customEndpointResponse) return customEndpointResponse;
-                switch(slug.length){
-                    case 2:
-                        // /globals/:slug
-                        res = await endpoints.global.GET.findOne({
-                            globalConfig,
-                            req
-                        });
-                        break;
-                    case 3:
-                        if (slug3 in endpoints.global.GET) {
-                            // /globals/:slug/preview
-                            res = await endpoints.global.GET[slug3]({
-                                globalConfig,
-                                req
-                            });
-                        } else if (`doc-${slug3}` in endpoints.global.GET) {
-                            // /globals/:slug/access
-                            // /globals/:slug/versions
-                            // /globals/:slug/preview
-                            res = await (endpoints.global.GET?.[`doc-${slug3}`])({
-                                globalConfig,
-                                req
-                            });
-                        }
-                        break;
-                    case 4:
-                        if (`doc-${slug3}-by-id` in endpoints.global.GET) {
-                            // /globals/:slug/versions/:id
-                            res = await (endpoints.global.GET?.[`doc-${slug3}-by-id`])({
-                                id: slug4,
+                if (customEndpointResponse) {
+                    return customEndpointResponse;
+                } else {
+                    await addDataAndFileToRequest(req);
+                    addLocalesToRequestFromData(req);
+                    switch(slug.length){
+                        case 2:
+                            // /globals/:slug
+                            res = await endpoints.global.GET.findOne({
                                 globalConfig,
                                 req
                             });
-                        }
-                        break;
+                            break;
+                        case 3:
+                            if (slug3 in endpoints.global.GET) {
+                                // /globals/:slug/preview
+                                res = await endpoints.global.GET[slug3]({
+                                    globalConfig,
+                                    req
+                                });
+                            } else if (`doc-${slug3}` in endpoints.global.GET) {
+                                // /globals/:slug/access
+                                // /globals/:slug/versions
+                                // /globals/:slug/preview
+                                res = await (endpoints.global.GET?.[`doc-${slug3}`])({
+                                    globalConfig,
+                                    req
+                                });
+                            }
+                            break;
+                        case 4:
+                            if (`doc-${slug3}-by-id` in endpoints.global.GET) {
+                                // /globals/:slug/versions/:id
+                                res = await (endpoints.global.GET?.[`doc-${slug3}-by-id`])({
+                                    id: slug4,
+                                    globalConfig,
+                                    req
+                                });
+                            }
+                            break;
+                    }
                 }
             } else if (slug.length === 1 && slug1 in endpoints.root.GET) {
+                await addDataAndFileToRequest(req);
+                addLocalesToRequestFromData(req);
                 res = await endpoints.root.GET[slug1]({
                     req
                 });
             }
-            if (res instanceof Response) return res;
+            if (res instanceof Response) {
+                if (req.responseHeaders) {
+                    mergeHeaders(req.responseHeaders, res.headers);
+                }
+                return res;
+            }
             // root routes
             const customEndpointResponse = await handleCustomEndpoints({
                 endpoints: req.payload.config.endpoints,
-                payloadRequest: req
+                req
             });
             if (customEndpointResponse) return customEndpointResponse;
-            return RouteNotFoundResponse(slug);
+            return RouteNotFoundResponse({
+                slug,
+                req
+            });
         } catch (error) {
             return routeError({
                 collection,
+                config,
                 err: error,
-                req
+                req: req || request
             });
         }
     };
@@ -283,12 +357,17 @@ export const POST = (config)=>async (request, { params: { slug } })=>{
         let req;
         let res;
         let collection;
+        const overrideHttpMethod = request.headers.get('X-HTTP-Method-Override');
+        if (overrideHttpMethod === 'GET') {
+            return await GET(config)(request, {
+                params: {
+                    slug
+                }
+            });
+        }
         try {
             req = await createPayloadRequest({
                 config,
-                params: {
-                    collection: slug1
-                },
                 request
             });
             collection = req.payload.collections?.[slug1];
@@ -298,6 +377,7 @@ export const POST = (config)=>async (request, { params: { slug } })=>{
             });
             if (disableEndpoints) return disableEndpoints;
             if (collection) {
+                req.routeParams.collection = slug1;
                 const disableEndpoints = endpointsAreDisabled({
                     endpoints: collection.config.endpoints,
                     request
@@ -306,55 +386,61 @@ export const POST = (config)=>async (request, { params: { slug } })=>{
                 const customEndpointResponse = await handleCustomEndpoints({
                     endpoints: collection.config.endpoints,
                     entitySlug: slug1,
-                    payloadRequest: req
+                    req
                 });
-                if (customEndpointResponse) return customEndpointResponse;
-                switch(slug.length){
-                    case 1:
-                        // /:collection
-                        res = await endpoints.collection.POST.create({
-                            collection,
-                            req
-                        });
-                        break;
-                    case 2:
-                        if (slug2 in endpoints.collection.POST) {
-                            // /:collection/login
-                            // /:collection/logout
-                            // /:collection/unlock
-                            // /:collection/access
-                            // /:collection/first-register
-                            // /:collection/forgot-password
-                            // /:collection/reset-password
-                            // /:collection/refresh-token
-                            res = await (endpoints.collection.POST?.[slug2])({
-                                collection,
-                                req
-                            });
-                        }
-                        break;
-                    case 3:
-                        if (`doc-${slug2}-by-id` in endpoints.collection.POST) {
-                            // /:collection/access/:id
-                            // /:collection/versions/:id
-                            // /:collection/verify/:token ("doc-verify-by-id" uses id as token internally)
-                            res = await endpoints.collection.POST[`doc-${slug2}-by-id`]({
-                                id: slug3,
-                                collection,
-                                req
-                            });
-                        } else if (slug3 === 'duplicate' && collection.config.disableDuplicate !== true) {
-                            // /:collection/:id/duplicate
-                            res = await endpoints.collection.POST.duplicate({
-                                id: slug2,
+                if (customEndpointResponse) {
+                    return customEndpointResponse;
+                } else {
+                    await addDataAndFileToRequest(req);
+                    addLocalesToRequestFromData(req);
+                    switch(slug.length){
+                        case 1:
+                            // /:collection
+                            res = await endpoints.collection.POST.create({
                                 collection,
                                 req
                             });
-                        }
-                        break;
+                            break;
+                        case 2:
+                            if (slug2 in endpoints.collection.POST) {
+                                // /:collection/login
+                                // /:collection/logout
+                                // /:collection/unlock
+                                // /:collection/access
+                                // /:collection/first-register
+                                // /:collection/forgot-password
+                                // /:collection/reset-password
+                                // /:collection/refresh-token
+                                res = await (endpoints.collection.POST?.[slug2])({
+                                    collection,
+                                    req
+                                });
+                            }
+                            break;
+                        case 3:
+                            if (`doc-${slug2}-by-id` in endpoints.collection.POST) {
+                                // /:collection/access/:id
+                                // /:collection/versions/:id
+                                // /:collection/verify/:token ("doc-verify-by-id" uses id as token internally)
+                                res = await endpoints.collection.POST[`doc-${slug2}-by-id`]({
+                                    id: slug3,
+                                    collection,
+                                    req
+                                });
+                            } else if (slug3 === 'duplicate' && collection.config.disableDuplicate !== true) {
+                                // /:collection/:id/duplicate
+                                res = await endpoints.collection.POST.duplicate({
+                                    id: slug2,
+                                    collection,
+                                    req
+                                });
+                            }
+                            break;
+                    }
                 }
             } else if (slug1 === 'globals' && slug2) {
                 const globalConfig = req.payload.config.globals.find((global)=>global.slug === slug2);
+                req.routeParams.global = globalConfig.slug;
                 const disableEndpoints = endpointsAreDisabled({
                     endpoints: globalConfig.endpoints,
                     request
@@ -363,59 +449,75 @@ export const POST = (config)=>async (request, { params: { slug } })=>{
                 const customEndpointResponse = await handleCustomEndpoints({
                     endpoints: globalConfig.endpoints,
                     entitySlug: `${slug1}/${slug2}`,
-                    payloadRequest: req
+                    req
                 });
-                if (customEndpointResponse) return customEndpointResponse;
-                switch(slug.length){
-                    case 2:
-                        // /globals/:slug
-                        res = await endpoints.global.POST.update({
-                            globalConfig,
-                            req
-                        });
-                        break;
-                    case 3:
-                        if (`doc-${slug3}` in endpoints.global.POST) {
-                            // /globals/:slug/access
-                            res = await (endpoints.global.POST?.[`doc-${slug3}`])({
+                if (customEndpointResponse) {
+                    return customEndpointResponse;
+                } else {
+                    await addDataAndFileToRequest(req);
+                    addLocalesToRequestFromData(req);
+                    switch(slug.length){
+                        case 2:
+                            // /globals/:slug
+                            res = await endpoints.global.POST.update({
                                 globalConfig,
                                 req
                             });
-                        }
-                        break;
-                    case 4:
-                        if (`doc-${slug3}-by-id` in endpoints.global.POST) {
-                            // /globals/:slug/versions/:id
-                            res = await (endpoints.global.POST?.[`doc-${slug3}-by-id`])({
-                                id: slug4,
-                                globalConfig,
-                                req
+                            break;
+                        case 3:
+                            if (`doc-${slug3}` in endpoints.global.POST) {
+                                // /globals/:slug/access
+                                res = await (endpoints.global.POST?.[`doc-${slug3}`])({
+                                    globalConfig,
+                                    req
+                                });
+                            }
+                            break;
+                        case 4:
+                            if (`doc-${slug3}-by-id` in endpoints.global.POST) {
+                                // /globals/:slug/versions/:id
+                                res = await (endpoints.global.POST?.[`doc-${slug3}-by-id`])({
+                                    id: slug4,
+                                    globalConfig,
+                                    req
+                                });
+                            }
+                            break;
+                        default:
+                            res = new Response('Route Not Found', {
+                                status: 404
                             });
-                        }
-                        break;
-                    default:
-                        res = new Response('Route Not Found', {
-                            status: 404
-                        });
+                    }
                 }
             } else if (slug.length === 1 && slug1 in endpoints.root.POST) {
+                await addDataAndFileToRequest(req);
+                addLocalesToRequestFromData(req);
                 res = await endpoints.root.POST[slug1]({
                     req
                 });
             }
-            if (res instanceof Response) return res;
+            if (res instanceof Response) {
+                if (req.responseHeaders) {
+                    mergeHeaders(req.responseHeaders, res.headers);
+                }
+                return res;
+            }
             // root routes
             const customEndpointResponse = await handleCustomEndpoints({
                 endpoints: req.payload.config.endpoints,
-                payloadRequest: req
+                req
             });
             if (customEndpointResponse) return customEndpointResponse;
-            return RouteNotFoundResponse(slug);
+            return RouteNotFoundResponse({
+                slug,
+                req
+            });
         } catch (error) {
             return routeError({
                 collection,
+                config,
                 err: error,
-                req
+                req: req || request
             });
         }
     };
@@ -427,9 +529,6 @@ export const DELETE = (config)=>async (request, { params: { slug } })=>{
         try {
             req = await createPayloadRequest({
                 config,
-                params: {
-                    collection: slug1
-                },
                 request
             });
             collection = req.payload.collections?.[slug1];
@@ -439,6 +538,7 @@ export const DELETE = (config)=>async (request, { params: { slug } })=>{
             });
             if (disableEndpoints) return disableEndpoints;
             if (collection) {
+                req.routeParams.collection = slug1;
                 const disableEndpoints = endpointsAreDisabled({
                     endpoints: collection.config.endpoints,
                     request
@@ -447,40 +547,54 @@ export const DELETE = (config)=>async (request, { params: { slug } })=>{
                 const customEndpointResponse = await handleCustomEndpoints({
                     endpoints: collection.config.endpoints,
                     entitySlug: slug1,
-                    payloadRequest: req
+                    req
                 });
-                if (customEndpointResponse) return customEndpointResponse;
-                switch(slug.length){
-                    case 1:
-                        // /:collection
-                        res = await endpoints.collection.DELETE.delete({
-                            collection,
-                            req
-                        });
-                        break;
-                    case 2:
-                        // /:collection/:id
-                        res = await endpoints.collection.DELETE.deleteByID({
-                            id: slug2,
-                            collection,
-                            req
-                        });
-                        break;
+                if (customEndpointResponse) {
+                    return customEndpointResponse;
+                } else {
+                    await addDataAndFileToRequest(req);
+                    addLocalesToRequestFromData(req);
+                    switch(slug.length){
+                        case 1:
+                            // /:collection
+                            res = await endpoints.collection.DELETE.delete({
+                                collection,
+                                req
+                            });
+                            break;
+                        case 2:
+                            // /:collection/:id
+                            res = await endpoints.collection.DELETE.deleteByID({
+                                id: slug2,
+                                collection,
+                                req
+                            });
+                            break;
+                    }
+                }
+            }
+            if (res instanceof Response) {
+                if (req.responseHeaders) {
+                    mergeHeaders(req.responseHeaders, res.headers);
                 }
+                return res;
             }
-            if (res instanceof Response) return res;
             // root routes
             const customEndpointResponse = await handleCustomEndpoints({
                 endpoints: req.payload.config.endpoints,
-                payloadRequest: req
+                req
             });
             if (customEndpointResponse) return customEndpointResponse;
-            return RouteNotFoundResponse(slug);
+            return RouteNotFoundResponse({
+                slug,
+                req
+            });
         } catch (error) {
             return routeError({
                 collection,
+                config,
                 err: error,
-                req
+                req: req || request
             });
         }
     };
@@ -492,9 +606,6 @@ export const PATCH = (config)=>async (request, { params: { slug } })=>{
         try {
             req = await createPayloadRequest({
                 config,
-                params: {
-                    collection: slug1
-                },
                 request
             });
             collection = req.payload.collections?.[slug1];
@@ -504,6 +615,7 @@ export const PATCH = (config)=>async (request, { params: { slug } })=>{
             });
             if (disableEndpoints) return disableEndpoints;
             if (collection) {
+                req.routeParams.collection = slug1;
                 const disableEndpoints = endpointsAreDisabled({
                     endpoints: collection.config.endpoints,
                     request
@@ -512,40 +624,54 @@ export const PATCH = (config)=>async (request, { params: { slug } })=>{
                 const customEndpointResponse = await handleCustomEndpoints({
                     endpoints: collection.config.endpoints,
                     entitySlug: slug1,
-                    payloadRequest: req
+                    req
                 });
-                if (customEndpointResponse) return customEndpointResponse;
-                switch(slug.length){
-                    case 1:
-                        // /:collection
-                        res = await endpoints.collection.PATCH.update({
-                            collection,
-                            req
-                        });
-                        break;
-                    case 2:
-                        // /:collection/:id
-                        res = await endpoints.collection.PATCH.updateByID({
-                            id: slug2,
-                            collection,
-                            req
-                        });
-                        break;
+                if (customEndpointResponse) {
+                    return customEndpointResponse;
+                } else {
+                    await addDataAndFileToRequest(req);
+                    addLocalesToRequestFromData(req);
+                    switch(slug.length){
+                        case 1:
+                            // /:collection
+                            res = await endpoints.collection.PATCH.update({
+                                collection,
+                                req
+                            });
+                            break;
+                        case 2:
+                            // /:collection/:id
+                            res = await endpoints.collection.PATCH.updateByID({
+                                id: slug2,
+                                collection,
+                                req
+                            });
+                            break;
+                    }
                 }
             }
-            if (res instanceof Response) return res;
+            if (res instanceof Response) {
+                if (req.responseHeaders) {
+                    mergeHeaders(req.responseHeaders, res.headers);
+                }
+                return res;
+            }
             // root routes
             const customEndpointResponse = await handleCustomEndpoints({
                 endpoints: req.payload.config.endpoints,
-                payloadRequest: req
+                req
             });
             if (customEndpointResponse) return customEndpointResponse;
-            return RouteNotFoundResponse(slug);
+            return RouteNotFoundResponse({
+                slug,
+                req
+            });
         } catch (error) {
             return routeError({
                 collection,
+                config,
                 err: error,
-                req
+                req: req || request
             });
         }
     };