@payloadcms/next 3.0.0-alpha.64 → 3.0.0-alpha.66

package/dist/routes/rest/index.js

@@ -1,5 +1,7 @@
 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 { access } from './auth/access.js';
@@ -117,7 +119,10 @@ const handleCustomEndpoints = ({ endpoints, entitySlug, payloadRequest })=>{
             }
         });
         if (customEndpoint) {
-            payloadRequest.routeParams = handlerParams;
+            payloadRequest.routeParams = {
+                ...payloadRequest.routeParams,
+                ...handlerParams
+            };
             return customEndpoint.handler(payloadRequest);
         }
     }
@@ -150,7 +155,7 @@ export const OPTIONS = (config)=>async (request)=>{
             return routeError({
                 config,
                 err: error,
-                req
+                req: req || request
             });
         }
     };
@@ -162,9 +167,6 @@ export const GET = (config)=>async (request, { params: { slug } })=>{
         try {
             req = await createPayloadRequest({
                 config,
-                params: {
-                    collection: slug1
-                },
                 request
             });
             const disableEndpoints = endpointsAreDisabled({
@@ -174,6 +176,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
@@ -184,62 +187,72 @@ export const GET = (config)=>async (request, { params: { slug } })=>{
                     entitySlug: slug1,
                     payloadRequest: 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
-                            // /: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,
+                if (customEndpointResponse) {
+                    return customEndpointResponse;
+                } else {
+                    const reqWithData = await addDataAndFileToRequest({
+                        request: req
+                    });
+                    const payloadRequest = addLocalesToRequestFromData({
+                        request: reqWithData
+                    });
+                    switch(slug.length){
+                        case 1:
+                            // /:collection
+                            res = await endpoints.collection.GET.find({
                                 collection,
-                                req
+                                req: payloadRequest
                             });
-                        }
-                        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: payloadRequest
+                                });
+                            } else {
+                                // /:collection/:id
+                                res = await endpoints.collection.GET.findByID({
+                                    id: slug2,
+                                    collection,
+                                    req: payloadRequest
+                                });
+                            }
+                            break;
+                        case 3:
+                            if (slug2 === 'file') {
+                                // /:collection/file/:filename
+                                res = await endpoints.collection.GET.getFile({
+                                    collection,
+                                    filename: slug3,
+                                    req: payloadRequest
+                                });
+                            } else if (slug3 in endpoints.collection.GET) {
+                                // /:collection/:id/preview
+                                res = await endpoints.collection.GET[slug3]({
+                                    id: slug2,
+                                    collection,
+                                    req: payloadRequest
+                                });
+                            } 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: payloadRequest
+                                });
+                            }
+                            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
@@ -250,46 +263,61 @@ export const GET = (config)=>async (request, { params: { slug } })=>{
                     entitySlug: `${slug1}/${slug2}`,
                     payloadRequest: 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}`])({
+                if (customEndpointResponse) {
+                    return customEndpointResponse;
+                } else {
+                    const reqWithData = await addDataAndFileToRequest({
+                        request: req
+                    });
+                    const payloadRequest = addLocalesToRequestFromData({
+                        request: reqWithData
+                    });
+                    switch(slug.length){
+                        case 2:
+                            // /globals/:slug
+                            res = await endpoints.global.GET.findOne({
                                 globalConfig,
-                                req
+                                req: payloadRequest
                             });
-                        }
-                        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;
+                            break;
+                        case 3:
+                            if (slug3 in endpoints.global.GET) {
+                                // /globals/:slug/preview
+                                res = await endpoints.global.GET[slug3]({
+                                    globalConfig,
+                                    req: payloadRequest
+                                });
+                            } 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: payloadRequest
+                                });
+                            }
+                            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: payloadRequest
+                                });
+                            }
+                            break;
+                    }
                 }
             } else if (slug.length === 1 && slug1 in endpoints.root.GET) {
+                const reqWithData = await addDataAndFileToRequest({
+                    request: req
+                });
+                const payloadRequest = addLocalesToRequestFromData({
+                    request: reqWithData
+                });
                 res = await endpoints.root.GET[slug1]({
-                    req
+                    req: payloadRequest
                 });
             }
             if (res instanceof Response) return res;
@@ -308,7 +336,7 @@ export const GET = (config)=>async (request, { params: { slug } })=>{
                 collection,
                 config,
                 err: error,
-                req
+                req: req || request
             });
         }
     };
@@ -320,9 +348,6 @@ export const POST = (config)=>async (request, { params: { slug } })=>{
         try {
             req = await createPayloadRequest({
                 config,
-                params: {
-                    collection: slug1
-                },
                 request
             });
             collection = req.payload.collections?.[slug1];
@@ -332,6 +357,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
@@ -342,53 +368,63 @@ export const POST = (config)=>async (request, { params: { slug } })=>{
                     entitySlug: slug1,
                     payloadRequest: 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,
+                if (customEndpointResponse) {
+                    return customEndpointResponse;
+                } else {
+                    const reqWithData = await addDataAndFileToRequest({
+                        request: req
+                    });
+                    const payloadRequest = addLocalesToRequestFromData({
+                        request: reqWithData
+                    });
+                    switch(slug.length){
+                        case 1:
+                            // /:collection
+                            res = await endpoints.collection.POST.create({
                                 collection,
-                                req
+                                req: payloadRequest
                             });
-                        } else if (slug3 === 'duplicate' && collection.config.disableDuplicate !== true) {
-                            // /:collection/:id/duplicate
-                            res = await endpoints.collection.POST.duplicate({
-                                id: slug2,
-                                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: payloadRequest
+                                });
+                            }
+                            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: payloadRequest
+                                });
+                            } else if (slug3 === 'duplicate' && collection.config.disableDuplicate !== true) {
+                                // /:collection/:id/duplicate
+                                res = await endpoints.collection.POST.duplicate({
+                                    id: slug2,
+                                    collection,
+                                    req: payloadRequest
+                                });
+                            }
+                            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
@@ -399,42 +435,57 @@ export const POST = (config)=>async (request, { params: { slug } })=>{
                     entitySlug: `${slug1}/${slug2}`,
                     payloadRequest: 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 {
+                    const reqWithData = await addDataAndFileToRequest({
+                        request: req
+                    });
+                    const payloadRequest = addLocalesToRequestFromData({
+                        request: reqWithData
+                    });
+                    switch(slug.length){
+                        case 2:
+                            // /globals/:slug
+                            res = await endpoints.global.POST.update({
                                 globalConfig,
-                                req
+                                req: payloadRequest
                             });
-                        }
-                        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: payloadRequest
+                                });
+                            }
+                            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: payloadRequest
+                                });
+                            }
+                            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) {
+                const reqWithData = await addDataAndFileToRequest({
+                    request: req
+                });
+                const payloadRequest = addLocalesToRequestFromData({
+                    request: reqWithData
+                });
                 res = await endpoints.root.POST[slug1]({
-                    req
+                    req: payloadRequest
                 });
             }
             if (res instanceof Response) return res;
@@ -453,7 +504,7 @@ export const POST = (config)=>async (request, { params: { slug } })=>{
                 collection,
                 config,
                 err: error,
-                req
+                req: req || request
             });
         }
     };
@@ -465,9 +516,6 @@ export const DELETE = (config)=>async (request, { params: { slug } })=>{
         try {
             req = await createPayloadRequest({
                 config,
-                params: {
-                    collection: slug1
-                },
                 request
             });
             collection = req.payload.collections?.[slug1];
@@ -477,6 +525,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
@@ -487,23 +536,32 @@ export const DELETE = (config)=>async (request, { params: { slug } })=>{
                     entitySlug: slug1,
                     payloadRequest: 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 {
+                    const reqWithData = await addDataAndFileToRequest({
+                        request: req
+                    });
+                    const payloadRequest = addLocalesToRequestFromData({
+                        request: reqWithData
+                    });
+                    switch(slug.length){
+                        case 1:
+                            // /:collection
+                            res = await endpoints.collection.DELETE.delete({
+                                collection,
+                                req: payloadRequest
+                            });
+                            break;
+                        case 2:
+                            // /:collection/:id
+                            res = await endpoints.collection.DELETE.deleteByID({
+                                id: slug2,
+                                collection,
+                                req: payloadRequest
+                            });
+                            break;
+                    }
                 }
             }
             if (res instanceof Response) return res;
@@ -522,7 +580,7 @@ export const DELETE = (config)=>async (request, { params: { slug } })=>{
                 collection,
                 config,
                 err: error,
-                req
+                req: req || request
             });
         }
     };
@@ -534,9 +592,6 @@ export const PATCH = (config)=>async (request, { params: { slug } })=>{
         try {
             req = await createPayloadRequest({
                 config,
-                params: {
-                    collection: slug1
-                },
                 request
             });
             collection = req.payload.collections?.[slug1];
@@ -546,6 +601,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
@@ -556,23 +612,32 @@ export const PATCH = (config)=>async (request, { params: { slug } })=>{
                     entitySlug: slug1,
                     payloadRequest: 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 {
+                    const reqWithData = await addDataAndFileToRequest({
+                        request: req
+                    });
+                    const payloadRequest = addLocalesToRequestFromData({
+                        request: reqWithData
+                    });
+                    switch(slug.length){
+                        case 1:
+                            // /:collection
+                            res = await endpoints.collection.PATCH.update({
+                                collection,
+                                req: payloadRequest
+                            });
+                            break;
+                        case 2:
+                            // /:collection/:id
+                            res = await endpoints.collection.PATCH.updateByID({
+                                id: slug2,
+                                collection,
+                                req: payloadRequest
+                            });
+                            break;
+                    }
                 }
             }
             if (res instanceof Response) return res;
@@ -591,7 +656,7 @@ export const PATCH = (config)=>async (request, { params: { slug } })=>{
                 collection,
                 config,
                 err: error,
-                req
+                req: req || request
             });
         }
     };