fix(core): add getter to event req & res object in default handler. (#…

…2381)
serverless-nextjs · Feb 23, 2022 · 31eff47 · 31eff47
1 parent 07b0685
commit 31eff47
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 0 deletions.
diff --git a/packages/libs/core/src/handle/default.ts b/packages/libs/core/src/handle/default.ts
@@ -118,6 +118,16 @@ export const handleDefault = async (
   if (route.isApi) {
     const { page } = route as ApiRoute;
     setCustomHeaders(event, routesManifest);
+    if (!event.req.hasOwnProperty("originalRequest")) {
+      Object.defineProperty(event.req, "originalRequest", {
+        get: () => event.req
+      });
+    }
+    if (!event.res.hasOwnProperty("originalResponse")) {
+      Object.defineProperty(event.res, "originalResponse", {
+        get: () => event.res
+      });
+    }
     getPage(page).default(event.req, event.res);
     return;
   }

diff --git a/packages/libs/core/tests/handle/default.test.ts b/packages/libs/core/tests/handle/default.test.ts
@@ -17,6 +17,7 @@ const previewModeCookies = {
 describe("Default handler", () => {
   let pagesManifest: { [key: string]: string };
   let manifest: PageManifest;
+  let v2HandlerManifest: PageManifest;
   let prerenderManifest: PrerenderManifest;
   let routesManifest: RoutesManifest;
   let getPage: any;
@@ -131,11 +132,25 @@ describe("Default handler", () => {
       publicFiles
     );
     manifest = manifests.pageManifest;
+    const v2HandlerManifests = await prepareBuildManifests(
+      {
+        buildId,
+        domainRedirects: { "www.example.com": "https://example.com" },
+        useV2Handler: true
+      },
+      {},
+      routesManifest,
+      pagesManifest,
+      prerenderManifest,
+      publicFiles
+    );
+    v2HandlerManifest = v2HandlerManifests.pageManifest;
   });
 
   beforeEach(() => {
     consoleError = jest.spyOn(console, "error").mockReturnValueOnce();
     getPage = jest.fn();
+    getPage.mockReturnValueOnce({ default: jest.fn() });
   });
 
   describe("Public file", () => {
@@ -427,4 +442,51 @@ describe("Default handler", () => {
       }
     });
   });
+
+  describe("API", () => {
+    it.each`
+      uri               | path
+      ${"/api/preview"} | ${"pages/api/preview.js"}
+    `(
+      "Routes api request $uri to page $page with NodeNextRequest & NodeNextResponse",
+      async ({ path, uri }) => {
+        const event = mockEvent(uri);
+        const route = await handleDefault(
+          event,
+          v2HandlerManifest,
+          prerenderManifest,
+          routesManifest,
+          getPage
+        );
+        expect(route).toBeFalsy();
+        expect(getPage).toHaveBeenCalledWith(path);
+        expect((event.req as any).originalRequest).toBe(event.req);
+        expect((event.res as any).originalResponse).toBe(event.res);
+      }
+    );
+
+    it.each`
+      uri               | path
+      ${"/api/preview"} | ${"pages/api/preview.js"}
+    `("Routes api request $uri to page $page", async ({ path, uri }) => {
+      const event: any = mockEvent(uri);
+      event.req.originalRequest = {};
+      event.res.originalResponse = {};
+      const route = await handleDefault(
+        event,
+        v2HandlerManifest,
+        prerenderManifest,
+        routesManifest,
+        getPage
+      );
+      expect(route).toBeFalsy();
+      expect(getPage).toHaveBeenCalledWith(path);
+      expect((event.req as any).originalRequest).toBe(
+        event.req.originalRequest
+      );
+      expect((event.res as any).originalResponse).toBe(
+        event.res.originalResponse
+      );
+    });
+  });
 });