fix e3e proofing test

Author: alexnuttall

frontend/src/app/preview-letter-template/[templateId]/page.tsx

@@ -9,7 +9,7 @@ import { redirect, RedirectType } from 'next/navigation';
 import { PreviewLetterTemplate } from '@organisms/PreviewLetterTemplate/PreviewLetterTemplate';
 import content from '@content/content';
 import type { Metadata } from 'next';
-import { getSubServer } from '@utils/amplify-utils';
+import { getSessionServer } from '@utils/amplify-utils';
 
 const { pageTitle } = content.components.previewLetterTemplate;
 
@@ -24,15 +24,15 @@ const PreviewLetterTemplatePage = async (props: PageProps) => {
 
   const template = await getTemplate(templateId);
 
-  const user = await getSubServer();
+  const { sub } = await getSessionServer();
 
   const validatedTemplate = validateLetterTemplate(template);
 
   if (!validatedTemplate) {
     return redirect('/invalid-template', RedirectType.replace);
   }
 
-  return <PreviewLetterTemplate template={validatedTemplate} user={user} />;
+  return <PreviewLetterTemplate template={validatedTemplate} user={sub} />;
 };
 
 export default PreviewLetterTemplatePage;

frontend/src/app/preview-submitted-letter-template/[templateId]/page.tsx

@@ -9,7 +9,7 @@ import { redirect, RedirectType } from 'next/navigation';
 import { Metadata } from 'next';
 import content from '@content/content';
 import { ViewLetterTemplate } from '@molecules/ViewLetterTemplate/ViewLetterTemplate';
-import { getSubServer } from '@utils/amplify-utils';
+import { getSessionServer } from '@utils/amplify-utils';
 
 const { pageTitle } = content.components.previewLetterTemplate;
 
@@ -24,15 +24,15 @@ const PreviewSubmittedLetterTemplatePage = async (props: PageProps) => {
 
   const template = await getTemplate(templateId);
 
-  const user = await getSubServer();
+  const { sub } = await getSessionServer();
 
   const validatedTemplate = validateSubmittedLetterTemplate(template);
 
   if (!validatedTemplate) {
     redirect('/invalid-template', RedirectType.replace);
   }
 
-  return <ViewLetterTemplate initialState={validatedTemplate} user={user} />;
+  return <ViewLetterTemplate initialState={validatedTemplate} user={sub} />;
 };
 
 export default PreviewSubmittedLetterTemplatePage;

tests/test-team/template-mgmt-e2e-tests/template-mgmt-proofing.e2e.spec.ts

@@ -75,16 +75,16 @@ test.describe('Letter Proofing', () => {
       });
 
       expect(template.files?.proofs).toEqual({
-        'proof-1': {
-          fileName: `proofs/${user.userId}/${templateId}/proof-1.pdf`,
+        'proof-1.pdf': {
+          fileName: 'proof-1.pdf',
           virusScanStatus: 'PASSED',
         },
-        'proof-2': {
-          fileName: `proofs/${user.userId}/${templateId}/proof-2.pdf`,
+        'proof-2.pdf': {
+          fileName: 'proof-2.pdf',
           virusScanStatus: 'PASSED',
         },
-        'proof-3': {
-          fileName: `proofs/${user.userId}/${templateId}/proof-3.pdf`,
+        'proof-3.pdf': {
+          fileName: 'proof-3.pdf',
           virusScanStatus: 'PASSED',
         },
       });
@@ -172,8 +172,8 @@ test.describe('Letter Proofing', () => {
       });
 
       expect(template.files?.proofs).toEqual({
-        proof: {
-          fileName: `proofs/${user.userId}/${templateId}/proof.pdf`,
+        'proof.pdf': {
+          fileName: `proof.pdf`,
           virusScanStatus: 'FAILED',
         },
       });