Merge pull request #279 from NHSDigital/feature/CCM-7467_add_protected_routes_and_unauthorised_data_test

CCM-7467: Add protected routes and unauthorised data test

Author: alexnuttall

frontend/src/__tests__/middleware.test.ts

@@ -27,7 +27,7 @@ describe('middleware function', () => {
 
     expect(response.status).toBe(307);
     expect(response.headers.get('location')).toBe(
-      'https://url.com/auth?redirect=%2Ftemplates%2F%2Fmanage-templates'
+      'https://url.com/auth?redirect=%2Ftemplates%2Fmanage-templates'
     );
     expect(response.headers.get('Content-Type')).toBe('text/html');
   });

frontend/src/middleware.ts

@@ -60,7 +60,7 @@ export async function middleware(request: NextRequest) {
     const redirectResponse = NextResponse.redirect(
       new URL(
         `/auth?redirect=${encodeURIComponent(
-          `${getBasePath()}/${request.nextUrl.pathname}`
+          `${getBasePath()}${request.nextUrl.pathname}`
         )}`,
         request.url
       )

package-lock.json

@@ -1,10 +1,15 @@
 import { Template, TemplateStatus, TemplateType } from '../types';
 
 export const TemplateFactory = {
-  createEmailTemplate: (id: string, owner: string): Template => {
+  createEmailTemplate: (
+    id: string,
+    owner: string,
+    name: string = ''
+  ): Template => {
     return TemplateFactory.create({
       id,
       owner,
+      name,
       templateType: TemplateType.EMAIL,
       subject: '',
     });
@@ -14,6 +19,7 @@ export const TemplateFactory = {
     return TemplateFactory.create({
       id,
       owner,
+      name: '',
       templateType: TemplateType.SMS,
     });
   },
@@ -22,6 +28,7 @@ export const TemplateFactory = {
     return TemplateFactory.create({
       id,
       owner,
+      name: '',
       templateType: TemplateType.NHS_APP,
     });
   },
@@ -30,6 +37,7 @@ export const TemplateFactory = {
     template: Partial<Template> & {
       id: string;
       owner: string;
+      name: string;
       templateType: string;
     }
   ): Template => {
@@ -38,7 +46,6 @@ export const TemplateFactory = {
       version: 1,
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
-      name: '',
       message: '',
       ...template,
     };

tests/test-team/helpers/factories/template-factory.ts

@@ -16,11 +16,12 @@
     "@aws-sdk/client-cognito-identity-provider": "^3.650.0",
     "@aws-sdk/client-dynamodb": "^3.654.0",
     "@aws-sdk/lib-dynamodb": "^3.654.0",
-    "@playwright/test": "^1.45.1",
     "@faker-js/faker": "^9.3.0",
+    "@playwright/test": "^1.45.1",
     "async-mutex": "^0.5.0",
     "aws-amplify": "^6.6.0",
     "generate-password": "^1.7.1",
+    "glob": "^11.0.1",
     "nhs-notify-backend-client": "*",
     "nhs-notify-web-template-management-util-backend-config": "*"
   }

tests/test-team/package.json

@@ -3,6 +3,8 @@ import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
 
 export class TemplateMgmtCreateEmailPage extends TemplateMgmtBasePage {
+  static readonly pageUrlSegment = 'create-email-template';
+
   public readonly nameInput: Locator;
 
   public readonly subjectLineInput: Locator;
@@ -37,8 +39,4 @@ export class TemplateMgmtCreateEmailPage extends TemplateMgmtBasePage {
 
     this.messageFormatting = new TemplateMgmtMessageFormatting(page);
   }
-
-  async loadPage() {
-    await this.navigateTo('/templates/create-email-template');
-  }
 }

tests/test-team/pages/email/template-mgmt-create-email-page.ts

@@ -3,6 +3,8 @@ import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
 
 export class TemplateMgmtEditEmailPage extends TemplateMgmtBasePage {
+  static readonly pageUrlSegment = 'edit-email-template';
+
   public readonly nameInput: Locator;
 
   public readonly subjectLineInput: Locator;
@@ -32,8 +34,4 @@ export class TemplateMgmtEditEmailPage extends TemplateMgmtBasePage {
 
     this.messageFormatting = new TemplateMgmtMessageFormatting(page);
   }
-
-  async loadPage(templateId: string) {
-    await this.navigateTo(`/templates/edit-email-template/${templateId}`);
-  }
 }