CCM-7465: re-add protected routes

Author: bhansell1

frontend/src/middleware.ts

@@ -1,6 +1,6 @@
-import { cookies } from 'next/headers';
 import { NextResponse, type NextRequest } from 'next/server';
-// import { getAccessTokenServer } from '@utils/amplify-utils';
+import { getAccessTokenServer } from '@utils/amplify-utils';
+import { getBasePath } from '@utils/get-base-path';
 
 function isExcludedPath(path: string, excludedPaths: string[]): boolean {
   return excludedPaths.some((excludedPath) => path.startsWith(excludedPath));
@@ -9,26 +9,23 @@ function isExcludedPath(path: string, excludedPaths: string[]): boolean {
 export async function middleware(request: NextRequest) {
   const excludedPaths = ['/create-and-submit-templates', '/auth'];
 
-  console.log('middleware', cookies().getAll());
-
   if (isExcludedPath(request.nextUrl.pathname, excludedPaths)) {
     return NextResponse.next();
   }
 
-  // const token = await getAccessTokenServer();
+  const token = await getAccessTokenServer();
 
-  // console.log('token', token);
-  // if (!token) {
-  //   return Response.redirect(
-  //     new URL(
-  //       `/auth?redirect=${encodeURIComponent(
-  //         // Replace create-and-submit-templates with ${request.nextUrl.pathname} once auth login is fixed otherwise we end up in a redirect loop
-  //         `${getBasePath()}/create-and-submit-templates`
-  //       )}`,
-  //       request.url
-  //     )
-  //   );
-  // }
+  if (!token) {
+    return Response.redirect(
+      new URL(
+        `/auth?redirect=${encodeURIComponent(
+          // Replace create-and-submit-templates with ${request.nextUrl.pathname} once auth login is fixed otherwise we end up in a redirect loop
+          `${getBasePath()}/create-and-submit-templates`
+        )}`,
+        request.url
+      )
+    );
+  }
 }
 
 export const config = {

frontend/src/utils/amplify-utils.ts

@@ -7,7 +7,6 @@ import { generateServerClientUsingCookies } from '@aws-amplify/adapter-nextjs/da
 import { Schema } from 'nhs-notify-web-template-management-amplify';
 import { createServerRunner } from '@aws-amplify/adapter-nextjs';
 import { fetchAuthSession } from 'aws-amplify/auth/server';
-import { logger } from 'nhs-notify-web-template-management-utils/logger';
 
 const config = require('@/amplify_outputs.json');
 
@@ -23,19 +22,14 @@ export const getAmplifyBackendClient = () =>
   });
 
 export async function getAccessTokenServer(): Promise<string | undefined> {
-  logger.info('cookies', await cookies().getAll());
-  logger.info('cookies 2', await cookies().toString());
   try {
     const { tokens } = await runWithAmplifyServerContext({
       nextServerContext: { cookies },
       operation: fetchAuthSession,
     });
 
-    console.log('tokens', tokens);
-
     return tokens?.accessToken?.toString();
-  } catch (error) {
+  } catch {
     // no-op
-    logger.error('issue with auth', error);
   }
 }

tests/test-team/template-mgmt-component-tests/template-mgmt-start-page.component.ts

@@ -1,9 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { TemplateMgmtStartPage } from '../pages/template-mgmt-start-page';
-import { assertLoginLink } from './template-mgmt-common.steps';
-
-// Reset storage state for this file to avoid being authenticated
-test.use({ storageState: { cookies: [], origins: [] } });
+import { assertLogoutLink } from './template-mgmt-common.steps';
 
 test.describe('Start Page', () => {
   test('should land on start page when navigating to "/templates/create-and-submit-templates"', async ({
@@ -49,10 +46,10 @@ test.describe('Start Page', () => {
     );
   });
 
-  test('should display login link', async ({ page }) => {
+  test('should display logout link', async ({ page }) => {
     const startPage = new TemplateMgmtStartPage(page);
 
-    await assertLoginLink({
+    await assertLogoutLink({
       page: startPage,
       id: '/templates/create-and-submit-templates',
     });