From 18488bb3be37b02446e8ad58fcfb31c1b6bedd1a Mon Sep 17 00:00:00 2001
From: Ashleigh Carr <ashcorr20@gmail.com>
Date: Thu, 21 Nov 2024 15:58:10 +0000
Subject: [PATCH] feat: Add more information to errors if we think cookies are
 missing

---
 src/client/components/GatewayErrorSummary.tsx | 21 +++++++++++++++----
 src/server/lib/renderer.tsx                   |  5 ++++-
 src/shared/model/Errors.ts                    |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/client/components/GatewayErrorSummary.tsx b/src/client/components/GatewayErrorSummary.tsx
index f82497a94e..d912f344ef 100644
--- a/src/client/components/GatewayErrorSummary.tsx
+++ b/src/client/components/GatewayErrorSummary.tsx
@@ -18,10 +18,22 @@ interface GateWayErrorSummaryProps
 
 export const GatewayErrorSummary = (props: GateWayErrorSummaryProps) => {
 	const structuredError = asStructuredError(props.gatewayError);
-	const fullContext =
-		props.shortRequestId && structuredError?.severity !== 'BAU'
+	const fullContext = [
+		props.context,
+		...(structuredError?.severity === 'CSRF'
+			? [
+					<p>
+						If the problem persists, please check if you have cookies enabled.
+						You can find details on how to enable cookies in our{' '}
+						<a href="https://www.theguardian.com/info/cookies#how-to-manage-cookies-at-the-guardian">
+							Cookies FAQ
+						</a>
+						.
+					</p>,
+				]
+			: []),
+		...(props.shortRequestId && structuredError?.severity !== 'BAU'
 			? [
-					props.context,
 					<p
 						css={[errorContextSpacing, errorContextLastTypeSpacing]}
 						key={'requestId'}
@@ -29,7 +41,8 @@ export const GatewayErrorSummary = (props: GateWayErrorSummaryProps) => {
 						Request ID: {props.shortRequestId}
 					</p>,
 				]
-			: props.context;
+			: []),
+	];
 
 	return (
 		<ErrorSummary
diff --git a/src/server/lib/renderer.tsx b/src/server/lib/renderer.tsx
index b1af9d9dfa..b772a2b5f6 100644
--- a/src/server/lib/renderer.tsx
+++ b/src/server/lib/renderer.tsx
@@ -86,7 +86,10 @@ const clientStateFromRequestStateLocals = ({
 			...clientState,
 			pageData: {
 				...clientState.pageData,
-				formError: CsrfErrors.CSRF_ERROR,
+				formError: {
+					message: CsrfErrors.CSRF_ERROR,
+					severity: 'CSRF',
+				},
 			},
 		};
 	}
diff --git a/src/shared/model/Errors.ts b/src/shared/model/Errors.ts
index 5855b5cf31..ba9fd555d2 100644
--- a/src/shared/model/Errors.ts
+++ b/src/shared/model/Errors.ts
@@ -92,7 +92,7 @@ export enum SubscribeErrors {
 
 export interface StructuredGatewayError {
 	message: string;
-	severity: 'BAU' | 'UNEXPECTED';
+	severity: 'BAU' | 'CSRF' | 'UNEXPECTED';
 }
 
 export type GatewayError = StructuredGatewayError | string;