CCM-5340: use NextRequest and add content type

Author: alexnuttall

frontend/src/__tests__/middleware.test.ts

@@ -25,10 +25,11 @@ describe('middleware function', () => {
     const request = new NextRequest(url);
     const response = await middleware(request);
 
-    expect(response.status).toBe(302);
+    expect(response.status).toBe(307);
     expect(response.headers.get('location')).toBe(
       'https://url.com/auth?redirect=%2Ftemplates%2F%2Fmanage-templates'
     );
+    expect(response.headers.get('Content-Type')).toBe('text/html');
   });
 
   it('if request path is protected, and access token is obtained, respond with CSP', async () => {

frontend/src/middleware.ts

@@ -57,14 +57,18 @@ export async function middleware(request: NextRequest) {
   const token = await getAccessTokenServer();
 
   if (!token) {
-    return Response.redirect(
+    const redirectResponse = NextResponse.redirect(
       new URL(
         `/auth?redirect=${encodeURIComponent(
           `${getBasePath()}/${request.nextUrl.pathname}`
         )}`,
         request.url
       )
     );
+
+    redirectResponse.headers.set('Content-Type', 'text/html');
+
+    return redirectResponse;
   }
 
   const response = NextResponse.next({