CCM-8744: revert force refresh, csrf refactor, sync

Author: harrim91

frontend/src/__tests__/components/forms/PreviewLetterTemplate/PreviewLetterTemplate.test.tsx

@@ -53,6 +53,7 @@ describe('Preview letter form renders', () => {
               currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
               virusScanStatus: VirusScanStatus.PENDING,
             },
+            testDataCsv: undefined,
           },
         })}
       />

frontend/src/__tests__/components/forms/PreviewLetterTemplate/__snapshots__/PreviewLetterTemplate.test.tsx.snap

@@ -756,43 +756,6 @@ exports[`Preview letter form renders matches snapshot when navigating from manag
                 </div>
               </div>
             </div>
-            <div
-              class="nhsuk-grid-row preview__row"
-            >
-              <div
-                class="nhsuk-grid-column-one-third preview__col"
-              >
-                <div
-                  class="preview__col_heading"
-                >
-                  Test personalisation file
-                </div>
-              </div>
-              <div
-                class="nhsuk-grid-column-two-thirds col"
-              >
-                <div
-                  class="container"
-                >
-                  <svg
-                    class="icon"
-                    fill="none"
-                    height="26"
-                    viewBox="0 0 20 26"
-                    width="20"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
-                      fill="#4C6272"
-                    />
-                  </svg>
-                  <p
-                    class="text"
-                  />
-                </div>
-              </div>
-            </div>
           </div>
         </div>
         <form

frontend/src/__tests__/components/molecules/NHSNotifyFormWrapper.test.tsx

@@ -4,10 +4,13 @@ import {
   csrfServerAction,
 } from '@molecules/NHSNotifyFormWrapper/NHSNotifyFormWrapper';
 import { render } from '@testing-library/react';
-import { verifyCsrfTokenFull } from '@utils/csrf-utils';
+import { redirect } from 'next/navigation';
+import { verifyFormCsrfToken } from '@utils/csrf-utils';
+
+jest.mock('next/navigation');
 
 jest.mock('@utils/csrf-utils', () => ({
-  verifyCsrfTokenFull: jest.fn(),
+  verifyFormCsrfToken: jest.fn(),
 }));
 
 test('Renders back button', () => {
@@ -27,8 +30,9 @@ describe('csrfServerAction', () => {
     expect(action).toEqual('/action');
   });
 
-  test('server action', async () => {
-    const mockAction = jest.fn(() => 'response');
+  test('server action with valid csrf check', async () => {
+    jest.mocked(verifyFormCsrfToken).mockResolvedValueOnce(true);
+    const mockAction = jest.fn();
     const action = csrfServerAction(mockAction);
 
     if (typeof action === 'string') {
@@ -38,7 +42,25 @@ describe('csrfServerAction', () => {
     const mockFormData = mockDeep<FormData>();
     await action(mockFormData);
 
-    expect(verifyCsrfTokenFull).toHaveBeenCalledWith(mockFormData);
+    expect(verifyFormCsrfToken).toHaveBeenCalledWith(mockFormData);
     expect(mockAction).toHaveBeenCalledWith(mockFormData);
   });
+
+  test('server action with failed csrf check', async () => {
+    jest.mocked(verifyFormCsrfToken).mockResolvedValueOnce(false);
+
+    const mockAction = jest.fn();
+    const action = csrfServerAction(mockAction);
+
+    if (typeof action === 'string') {
+      throw new TypeError('Expected server action');
+    }
+
+    const mockFormData = mockDeep<FormData>();
+    await action(mockFormData);
+
+    expect(verifyFormCsrfToken).toHaveBeenCalledWith(mockFormData);
+    expect(redirect).toHaveBeenCalledWith('/auth/signout');
+    expect(mockAction).not.toHaveBeenCalled();
+  });
 });

frontend/src/__tests__/middleware.test.ts

@@ -35,7 +35,7 @@ describe('middleware function', () => {
 
     const response = await middleware(request);
 
-    expect(getTokenMock).toHaveBeenCalledWith({ forceRefresh: true });
+    expect(getTokenMock).toHaveBeenCalled();
 
     expect(response.status).toBe(307);
     expect(response.headers.get('location')).toBe(

frontend/src/__tests__/utils/amplify-utils.test.ts

@@ -1,8 +1,9 @@
 /**
  * @jest-environment node
  */
-import { getAccessTokenServer } from '@utils/amplify-utils';
+import { sign } from 'jsonwebtoken';
 import { fetchAuthSession } from 'aws-amplify/auth/server';
+import { getAccessTokenServer, getSessionId } from '../../utils/amplify-utils';
 
 jest.mock('aws-amplify/auth/server');
 jest.mock('@aws-amplify/adapter-nextjs/api');
@@ -19,24 +20,22 @@ const fetchAuthSessionMock = jest.mocked(fetchAuthSession);
 
 describe('amplify-utils', () => {
   test('getAccessTokenServer - should return the auth token', async () => {
-    fetchAuthSessionMock.mockResolvedValue({
+    fetchAuthSessionMock.mockResolvedValueOnce({
       tokens: {
         accessToken: {
-          toString: () => 'mockSub',
-          payload: {
-            sub: 'mockSub',
-          },
+          toString: () => 'mockToken',
+          payload: {},
         },
       },
     });
 
     const result = await getAccessTokenServer();
 
-    expect(result).toEqual('mockSub');
+    expect(result).toEqual('mockToken');
   });
 
   test('getAccessTokenServer - should return undefined when no auth session', async () => {
-    fetchAuthSessionMock.mockResolvedValue({});
+    fetchAuthSessionMock.mockResolvedValueOnce({});
 
     const result = await getAccessTokenServer();
 
@@ -52,4 +51,46 @@ describe('amplify-utils', () => {
 
     expect(result).toBeUndefined();
   });
+
+  describe('getSessionId', () => {
+    test('returns void when access token not found', async () => {
+      fetchAuthSessionMock.mockResolvedValueOnce({});
+
+      await expect(getSessionId()).resolves.toBeUndefined();
+    });
+
+    test('errors when session ID not found', async () => {
+      fetchAuthSessionMock.mockResolvedValueOnce({
+        tokens: {
+          accessToken: {
+            toString: () => sign({}, 'key'),
+            payload: {},
+          },
+        },
+      });
+
+      await expect(getSessionId()).resolves.toBeUndefined();
+    });
+
+    test('returns session id', async () => {
+      fetchAuthSessionMock.mockResolvedValueOnce({
+        tokens: {
+          accessToken: {
+            toString: () =>
+              sign(
+                {
+                  origin_jti: 'jti',
+                },
+                'key'
+              ),
+            payload: {},
+          },
+        },
+      });
+
+      const sessionId = await getSessionId();
+
+      expect(sessionId).toEqual('jti');
+    });
+  });
 });