feat: Hide First Edition newsletter when reader is signing in to Guardian Jobs with an existing account

Author: AshCorr

src/client/components/RegistrationConsents.tsx

@@ -9,19 +9,22 @@ interface RegistrationConsentsProps {
 	geolocation?: GeoLocation;
 	appName?: AppName;
 	isJobs?: boolean;
+	hideRegistrationNewsletter?: boolean;
 	onChange?: (id: string, checked: boolean) => void;
 }
 
 export const RegistrationConsents = ({
 	geolocation,
 	appName,
 	isJobs,
+	hideRegistrationNewsletter,
 }: RegistrationConsentsProps) => {
-	const consentList = getRegistrationConsentsList(
-		isJobs ?? false,
+	const consentList = getRegistrationConsentsList({
+		isJobs: isJobs ?? false,
 		geolocation,
 		appName,
-	);
+		hideRegistrationNewsletter,
+	});
 	return (
 		<ToggleSwitchList>
 			{consentList.map((consentItem) => (

src/client/pages/NewAccountConsents.tsx

@@ -20,6 +20,7 @@ type NewAccountConsentsProps = RegistrationProps & {
 	appName?: AppName;
 	shortRequestId?: string;
 	pageError?: string;
+	hideRegistrationNewsletter?: boolean;
 };
 
 const getErrorContext = (pageError?: string) => {
@@ -52,6 +53,7 @@ export const NewAccountConsents = ({
 	appName,
 	shortRequestId,
 	pageError,
+	hideRegistrationNewsletter,
 }: NewAccountConsentsProps) => {
 	const formTrackingName = 'register';
 
@@ -96,6 +98,7 @@ export const NewAccountConsents = ({
 					geolocation={geolocation}
 					appName={appName}
 					isJobs={isJobs}
+					hideRegistrationNewsletter={hideRegistrationNewsletter}
 				/>
 			</MainForm>
 		</MinimalLayout>

src/client/pages/NewAccountConsentsPage.tsx

@@ -11,7 +11,7 @@ export const NewAccountConsentsPage = () => {
 		shortRequestId,
 		globalMessage = {},
 	} = clientState;
-	const { email, formError } = pageData;
+	const { email, formError, signInOrRegister } = pageData;
 	const { recaptchaSiteKey } = recaptchaConfig;
 	const { error: pageError } = globalMessage;
 
@@ -25,6 +25,7 @@ export const NewAccountConsentsPage = () => {
 			appName={pageData.appName}
 			shortRequestId={shortRequestId}
 			pageError={pageError}
+			hideRegistrationNewsletter={signInOrRegister === 'REGISTER'}
 		/>
 	);
 };

src/server/routes/agree.ts

@@ -12,6 +12,7 @@ import { loginMiddlewareOAuth } from '@/server/lib/middleware/login';
 import { deleteOAuthTokenCookie } from '@/server/lib/okta/tokens';
 import { requestStateHasOAuthTokens } from '../lib/middleware/requestState';
 import { JOBS_TOS_URI } from '@/shared/model/Configuration';
+import { buildUrlWithQueryParams } from '@/shared/lib/routeUtils';
 
 const { defaultReturnUri, signInPageUrl } = getConfiguration();
 
@@ -92,16 +93,16 @@ router.post(
 	loginMiddlewareOAuth,
 	async (req: Request, res: ResponseWithRequestState) => {
 		const state = res.locals;
+		const { queryParams } = state;
+		const { firstName, secondName } = req.body;
+
 		if (!requestStateHasOAuthTokens(state)) {
 			return res.redirect(
 				303,
-				addQueryParamsToUntypedPath(signInPageUrl, state.queryParams),
+				addQueryParamsToUntypedPath(signInPageUrl, queryParams),
 			);
 		}
 
-		const { returnUrl, fromURI } = state.queryParams;
-		const { firstName, secondName } = req.body;
-
 		try {
 			await setupJobsUserInOkta(
 				firstName,
@@ -121,17 +122,12 @@ router.post(
 				error,
 			);
 			trackMetric('JobsGRSGroupAgree::Failure');
-		} finally {
-			// complete the oauth flow if coming from the okta sign in page
-			// through the oauth flow initiated by the jobs site
-			if (fromURI) {
-				// eslint-disable-next-line no-unsafe-finally -- we want to redirect and return regardless of any throws
-				return res.redirect(303, fromURI);
-			}
-			// otherwise try going to the return url
-			// eslint-disable-next-line no-unsafe-finally -- we want to redirect and return regardless of any throws
-			return res.redirect(303, returnUrl);
 		}
+
+		return res.redirect(
+			303,
+			buildUrlWithQueryParams('/welcome/complete-account', {}, queryParams),
+		);
 	},
 );
 

src/server/routes/welcome.ts

@@ -233,6 +233,7 @@ router.get(
 			requestState: mergeRequestState(state, {
 				pageData: {
 					email: encrypedCookieState?.email,
+					signInOrRegister: encrypedCookieState?.signInOrRegister,
 				},
 			}),
 		});

src/shared/model/ClientState.ts

@@ -55,6 +55,7 @@ export interface PageData {
 	consents?: Consent[];
 	page?: ConsentPath;
 	previousPage?: ConsentPath;
+	signInOrRegister?: 'SIGNIN' | 'REGISTER';
 
 	// reset password token specific
 	timeUntilTokenExpiry?: number;

src/shared/model/Consent.ts

@@ -44,15 +44,22 @@ interface RegistrationConsentsList {
 	consentOrNewsletter: 'CONSENT' | 'NEWSLETTER';
 }
 
-export const getRegistrationConsentsList = (
-	isJobs: boolean,
-	geolocation?: GeoLocation,
-	appName?: AppName,
-): Array<RegistrationConsentsList> => {
+export const getRegistrationConsentsList = ({
+	isJobs,
+	geolocation,
+	appName,
+	hideRegistrationNewsletter,
+}: {
+	isJobs: boolean;
+	geolocation?: GeoLocation;
+	appName?: AppName;
+	hideRegistrationNewsletter?: boolean;
+}): Array<RegistrationConsentsList> => {
 	const registrationNewsletter = chooseNewsletter({
 		geolocation,
 		appName,
 		isJobs,
+		hideRegistrationNewsletter,
 	});
 	const showMarketingConsent = !isJobs;
 

src/shared/model/Newsletter.ts

@@ -136,13 +136,19 @@ export const chooseNewsletter = ({
 	geolocation,
 	appName,
 	isJobs,
+	hideRegistrationNewsletter,
 }: {
 	geolocation: GeoLocation | undefined;
 	appName: AppName | undefined;
 	isJobs?: boolean;
+	hideRegistrationNewsletter?: boolean;
 }): RegistrationNewsletterFormFields | undefined => {
 	const isFeast = appName === 'Feast';
 
+	if (hideRegistrationNewsletter && isJobs) {
+		return undefined;
+	}
+
 	if (isFeast) {
 		return RegistrationNewslettersFormFieldsMap.feast;
 	}