Bug Fix: Pass Next server to tokenHandler to fix build issues with ex…

…perimental-app-router (#1836) * Bug Fix: Fix wierd issue with import in experimental-app-router * Update Deps * Tests: Fix unit tests in app router * Update test in TokenHandler
wpengine · Mar 12, 2024 · 42ded80 · 42ded80
1 parent aee31a5
commit 42ded80
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 119 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/experimental-app-router/package.json b/packages/experimental-app-router/package.json
@@ -65,7 +65,7 @@
     "concurrently": "^8.2.0",
     "jest": "^29.6.2",
     "jest-environment-jsdom": "^29.6.2",
-    "next": "^14.0.1",
+    "next": "^14.1.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rimraf": "^5.0.1",

diff --git a/packages/experimental-app-router/src/server/routeHandler/index.ts b/packages/experimental-app-router/src/server/routeHandler/index.ts
@@ -1,4 +1,5 @@
 import { notFound } from 'next/navigation.js';
+import * as server from 'next/server.js';
 import { tokenHandler } from './tokenHandler.js';
 
 export async function GetFn(req: Request) {
@@ -7,7 +8,7 @@ export async function GetFn(req: Request) {
   switch (pathname) {
     case '/api/faust/token/':
     case '/api/faust/token': {
-      return tokenHandler(req);
+      return tokenHandler(req, server);
     }
     default: {
       return notFound();

diff --git a/packages/experimental-app-router/src/server/routeHandler/tokenHandler.ts b/packages/experimental-app-router/src/server/routeHandler/tokenHandler.ts
@@ -1,5 +1,5 @@
 import { cookies } from 'next/headers.js';
-import { NextResponse } from 'next/server.js';
+import * as server from 'next/server.js';
 import { getWpUrl, getWpSecret } from '../../faust-core-utils.js';
 
 export type AuthorizeResponse = {
@@ -9,7 +9,7 @@ export type AuthorizeResponse = {
   refreshTokenExpiration: number;
 };
 
-export async function tokenHandler(req: Request) {
+export async function tokenHandler(req: Request, s: typeof server) {
   try {
     const secretKey = getWpSecret();
 
@@ -79,7 +79,7 @@ export async function tokenHandler(req: Request) {
      * and expiration.
      */
 
-    const res = new NextResponse(JSON.stringify(data), {
+    const res = new s.NextResponse(JSON.stringify(data), {
       status: 200,
     });
 

diff --git a/packages/experimental-app-router/tests/server/routeHandler/tokenHandler.test.ts b/packages/experimental-app-router/tests/server/routeHandler/tokenHandler.test.ts
@@ -3,7 +3,7 @@ import * as tokenHandler from '../../../src/server/routeHandler/tokenHandler';
 jest.mock('next/headers.js');
 import { cookies } from 'next/headers.js';
 import fetchMock from 'fetch-mock';
-import { NextRequest } from 'next/server';
+import * as server from 'next/server';
 
 // // https://github.com/aelbore/esbuild-jest/issues/26#issuecomment-893763840
 const nextHeaders = { cookies };
@@ -27,7 +27,7 @@ describe('tokenHandler', () => {
   it('throws a 500 error if the secret key is not set', async () => {
     const req = new Request('http://localhost:3000/api/faust/token');
 
-    const response = await tokenHandler.tokenHandler(req);
+    const response = await tokenHandler.tokenHandler(req, server);
 
     expect(response.status).toBe(500);
     expect(await response.json()).toStrictEqual({
@@ -49,7 +49,7 @@ describe('tokenHandler', () => {
 
     const req = new Request('http://localhost:3000/api/faust/token');
 
-    const response = await tokenHandler.tokenHandler(req);
+    const response = await tokenHandler.tokenHandler(req, server);
 
     expect(response.status).toBe(401);
     expect(await response.json()).toStrictEqual({
@@ -74,11 +74,11 @@ describe('tokenHandler', () => {
       status: 401,
     });
 
-    const req = new NextRequest(
+    const req = new server.NextRequest(
       new Request('http://localhost:3000/api/faust/token'),
     );
 
-    const response = await tokenHandler.tokenHandler(req);
+    const response = await tokenHandler.tokenHandler(req, server);
 
     expect(response.status).toBe(401);
     expect(await response.json()).toStrictEqual({ error: 'Unauthorized' });
@@ -122,11 +122,11 @@ describe('tokenHandler', () => {
       },
     );
 
-    const req = new NextRequest(
+    const req = new server.NextRequest(
       new Request('http://localhost:3000/api/faust/token?code=my-code'),
     );
 
-    const response = await tokenHandler.tokenHandler(req);
+    const response = await tokenHandler.tokenHandler(req, server);
 
     expect(response.status).toBe(200);
     expect(await response.json()).toStrictEqual(validResponse);