From c549898a5147cdb0f298355d914e345d475b2beb Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 20 Jan 2025 11:37:58 +0000
Subject: [PATCH 01/31] Update types to include isCorp, isUserSignedIn,
 useNonAdvertisedList

---
 .../src/consent-management-platform/types/index.ts     | 10 +++++++++-
 .../src/consent-management-platform/types/window.d.ts  |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/types/index.ts b/libs/@guardian/libs/src/consent-management-platform/types/index.ts
index 0b5bbb11c..bf1e98269 100644
--- a/libs/@guardian/libs/src/consent-management-platform/types/index.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/types/index.ts
@@ -21,6 +21,8 @@ export type CMP = {
 export type InitCMP = (arg0: {
 	pubData?: PubData;
 	country?: CountryCode;
+	isUserSignedIn?: boolean;
+	useNonAdvertisedList?: boolean;
 }) => void;
 
 export type OnConsentChange = (
@@ -46,7 +48,13 @@ export interface PubData {
 	[propName: string]: unknown;
 }
 export interface SourcepointImplementation {
-	init: (framework: ConsentFramework, pubData?: PubData) => void;
+	init: (
+		framework: ConsentFramework,
+		countryCode: CountryCode,
+		isUserSignedIn: boolean,
+		useNonAdvertisedList: boolean,
+		pubData?: PubData,
+	) => void;
 	willShowPrivacyMessage: WillShowPrivacyMessage;
 	showPrivacyManager: () => void;
 }
diff --git a/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts b/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
index dd43b4b6a..802e23326 100644
--- a/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
@@ -34,6 +34,7 @@ declare global {
 				accountId: number;
 				propertyHref?: Property;
 				propertyId?: number;
+				campaignEnv: 'prod' | 'stage';
 				targetingParams: {
 					framework: ConsentFramework;
 					excludePage: boolean;
@@ -47,6 +48,8 @@ declare global {
 					targetingParams?: {
 						framework: ConsentFramework;
 						excludePage: boolean;
+						isCorP: boolean;
+						isUserSignedIn: boolean;
 					};
 				};
 				usnat?: {

From 1df95426f0f7aa75176b424fe2157569e97e1245 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 20 Jan 2025 13:09:11 +0000
Subject: [PATCH 02/31] Update Config for Property Id's and Href

---
 .../consent-management-platform/lib/sourcepointConfig.ts   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts b/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
index 6dbaab03e..bfe59281b 100644
--- a/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
@@ -2,8 +2,15 @@ import { isGuardianDomain } from './domain';
 
 export const ACCOUNT_ID = 1257;
 export const PRIVACY_MANAGER_USNAT = 1068329;
+
 export const PROPERTY_ID = 7417;
+export const PROPERTY_ID_MAIN = 9398; // TO BE CHANGED
+export const PROPERTY_ID_SUPPORT = 38161; // TO BE CHANGED
 export const PROPERTY_ID_AUSTRALIA = 13348;
+
+export const PROPERTY_HREF_SUPPORT = 'http://support-test';
+export const PROPERTY_HREF_MAIN = 'http://ui-dev';
+
 export const PRIVACY_MANAGER_TCFV2 = 106842;
 export const PRIVACY_MANAGER_AUSTRALIA = 1178486;
 

From 0067a059d76d20dee497fe0a1ea940d9a4cf21a5 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 20 Jan 2025 13:12:16 +0000
Subject: [PATCH 03/31] Use isUserSignedIn and useNonAdvertisedList in CMP.init

---
 .../libs/src/consent-management-platform/cmp.ts | 17 +++++++++++++++--
 .../src/consent-management-platform/index.ts    | 15 +++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/cmp.ts b/libs/@guardian/libs/src/consent-management-platform/cmp.ts
index 2b4faba55..5fdd5baf4 100644
--- a/libs/@guardian/libs/src/consent-management-platform/cmp.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/cmp.ts
@@ -1,3 +1,4 @@
+import { CountryCode } from '../index.test';
 import { getCurrentFramework } from './getCurrentFramework';
 import { mark } from './lib/mark';
 import {
@@ -16,9 +17,21 @@ import type {
 	WillShowPrivacyMessage,
 } from './types';
 
-const init = (framework: ConsentFramework, pubData?: PubData): void => {
+const init = (
+	framework: ConsentFramework,
+	countryCode: CountryCode,
+	isUserSignedIn: boolean,
+	useNonAdvertisedList: boolean,
+	pubData?: PubData,
+): void => {
 	mark('cmp-init');
-	initSourcepoint(framework, pubData);
+	initSourcepoint(
+		framework,
+		countryCode,
+		isUserSignedIn,
+		useNonAdvertisedList,
+		pubData,
+	);
 };
 
 const willShowPrivacyMessage: WillShowPrivacyMessage = () =>
diff --git a/libs/@guardian/libs/src/consent-management-platform/index.ts b/libs/@guardian/libs/src/consent-management-platform/index.ts
index 96c5eab68..4da6f1c6f 100644
--- a/libs/@guardian/libs/src/consent-management-platform/index.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/index.ts
@@ -33,7 +33,12 @@ const initialised = new Promise((resolve) => {
 	resolveInitialised = resolve;
 });
 
-const init: InitCMP = ({ pubData, country }) => {
+const init: InitCMP = ({
+	pubData,
+	country,
+	isUserSignedIn = false,
+	useNonAdvertisedList = false,
+}) => {
 	if (isDisabled() || isServerSide) {
 		return;
 	}
@@ -61,7 +66,13 @@ const init: InitCMP = ({ pubData, country }) => {
 
 	const framework = getFramework(country);
 
-	UnifiedCMP.init(framework, pubData ?? {});
+	UnifiedCMP.init(
+		framework,
+		country,
+		isUserSignedIn,
+		useNonAdvertisedList,
+		pubData ?? {},
+	);
 
 	void UnifiedCMP.willShowPrivacyMessage().then((willShowValue) => {
 		_willShowPrivacyMessage = willShowValue;

From 800c6a1ac9a5d2bb3f44768ba7e22d489e341106 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 20 Jan 2025 13:12:41 +0000
Subject: [PATCH 04/31] Create consent or pay function and test

---
 .../isConsentOrPay.test.js                            | 11 +++++++++++
 .../src/consent-management-platform/isConsentOrPay.ts |  7 +++++++
 2 files changed, 18 insertions(+)
 create mode 100644 libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.test.js
 create mode 100644 libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts

diff --git a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.test.js b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.test.js
new file mode 100644
index 000000000..fa8ffc685
--- /dev/null
+++ b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.test.js
@@ -0,0 +1,11 @@
+import { isConsentOrPay } from './isConsentOrPay.ts';
+
+describe('isConsentOrPay', () => {
+	test('should return false country code is FR', () => {
+		expect(isConsentOrPay('FR')).toBe(false);
+	});
+
+	test('should return true country code is GB', () => {
+		expect(isConsentOrPay('GB')).toBe(true);
+	});
+});
diff --git a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
new file mode 100644
index 000000000..30305e6a0
--- /dev/null
+++ b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
@@ -0,0 +1,7 @@
+import type { CountryCode } from '../index.test';
+
+export const isConsentOrPay = (countryCode: CountryCode) => {
+	const consentOrPayCountries = ['GB'];
+
+	return consentOrPayCountries.includes(countryCode);
+};

From 716039ffcc9e38612b590fa3604c6d64ad27e515 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 20 Jan 2025 13:33:56 +0000
Subject: [PATCH 05/31] Add type to import

---
 libs/@guardian/libs/src/consent-management-platform/cmp.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/cmp.ts b/libs/@guardian/libs/src/consent-management-platform/cmp.ts
index 5fdd5baf4..1b0b3d217 100644
--- a/libs/@guardian/libs/src/consent-management-platform/cmp.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/cmp.ts
@@ -1,4 +1,4 @@
-import { CountryCode } from '../index.test';
+import type { CountryCode } from '../index.test';
 import { getCurrentFramework } from './getCurrentFramework';
 import { mark } from './lib/mark';
 import {

From 86e864564c40a657986e1360eaa1c89df5664dd9 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 20 Jan 2025 13:37:20 +0000
Subject: [PATCH 06/31] Update to account for useNonAdvertisedList

---
 .../sourcepoint.test.js                       | 107 ++++++++++++------
 .../sourcepoint.ts                            |  62 ++++++++--
 2 files changed, 124 insertions(+), 45 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.test.js b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.test.js
index 0e50f1976..6cba16f53 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.test.js
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.test.js
@@ -1,7 +1,12 @@
 import { ACCOUNT_ID, ENDPOINT } from './lib/sourcepointConfig.ts';
 import { init } from './sourcepoint.ts';
 
-const frameworks = ['tcfv2', 'usnat', 'aus'];
+// const frameworks = ['tcfv2', 'usnat', 'aus'];
+const frameworksAndCountryCodes = [
+	{ framework: 'tcfv2', countryCode: 'FR' },
+	{ framework: 'usnat', countryCode: 'US' },
+	{ framework: 'aus', countryCode: 'AU' },
+];
 
 describe('Sourcepoint unified', () => {
 	beforeEach(() => {
@@ -18,10 +23,13 @@ describe('Sourcepoint unified', () => {
 		expect(init).toThrow();
 	});
 
-	it.each(frameworks)(
+	it.each(frameworksAndCountryCodes)(
 		"should initialize window._sp_ with the correct config if it doesn't exist",
-		(framework) => {
-			init(framework);
+		(frameworkAndCountryCode) => {
+			init(
+				frameworkAndCountryCode.framework,
+				frameworkAndCountryCode.countryCode,
+			);
 			expect(window._sp_).toBeDefined();
 			expect(window._sp_.config).toBeDefined();
 			expect(window._sp_.config.baseEndpoint).toEqual(ENDPOINT);
@@ -32,27 +40,27 @@ describe('Sourcepoint unified', () => {
 				'function',
 			);
 
-			if (framework == 'tcfv2') {
+			if (frameworkAndCountryCode.framework == 'tcfv2') {
 				expect(window._sp_.config.gdpr.targetingParams.framework).toEqual(
-					framework,
+					frameworkAndCountryCode.framework,
 				);
 				expect(window._sp_.config.usnat).toBeUndefined();
 				expect(window.__tcfapi).toBeDefined();
 				expect(window.__uspapi).toBeUndefined();
 				expect(window.__gpp).toBeUndefined();
-			} else if (framework == 'usnat') {
+			} else if (frameworkAndCountryCode.framework == 'usnat') {
 				expect(window._sp_.config.usnat.includeUspApi).toBeTruthy();
 				expect(window._sp_.config.usnat.transitionCCPAAuth).toBeTruthy();
 				expect(window._sp_.config.usnat.targetingParams.framework).toEqual(
-					framework,
+					frameworkAndCountryCode.framework,
 				);
 				expect(window._sp_.config.gdpr).toBeUndefined;
 				expect(window.__uspapi).toBeDefined();
 				expect(window.__tcfapi).toBeUndefined();
 				expect(window.__gpp).toBeDefined();
-			} else if (framework == 'aus') {
+			} else if (frameworkAndCountryCode.framework == 'aus') {
 				expect(window._sp_.config.ccpa.targetingParams.framework).toEqual(
-					framework,
+					frameworkAndCountryCode.framework,
 				);
 				expect(window._sp_.config.gdpr).toBeUndefined;
 				expect(window.__uspapi).toBeDefined();
@@ -62,34 +70,59 @@ describe('Sourcepoint unified', () => {
 		},
 	);
 
-	it.each(frameworks)('points at a real file', async (framework) => {
-		init(framework);
-		expect(document.getElementById('sourcepoint-lib')).toBeTruthy();
-		const src = document.getElementById('sourcepoint-lib')?.getAttribute('src');
+	it.each(frameworksAndCountryCodes)(
+		'points at a real file',
+		async (frameworkAndCountryCode) => {
+			init(
+				frameworkAndCountryCode.framework,
+				frameworkAndCountryCode.countryCode,
+			);
+			expect(document.getElementById('sourcepoint-lib')).toBeTruthy();
+			const src = document
+				.getElementById('sourcepoint-lib')
+				?.getAttribute('src');
 
-		const response = await fetch(src);
-		expect(response.ok).toBe(true);
-	});
+			const response = await fetch(src);
+			expect(response.ok).toBe(true);
+		},
+	);
 
-	it.each(frameworks)('should accept pubData', (framework) => {
-		const now = new Date().getTime();
-		init(framework, {
-			browserId: 'abc123',
-			pageViewId: 'abcdef',
-			cmpInitTimeUtc: 1601511014537,
-		});
-		expect(window._sp_.config.pubData.browserId).toEqual('abc123');
-		expect(window._sp_.config.pubData.pageViewId).toEqual('abcdef');
-		expect(window._sp_.config.pubData.cmpInitTimeUtc).toBeGreaterThanOrEqual(
-			now,
-		);
-	});
+	it.each(frameworksAndCountryCodes)(
+		'should accept pubData',
+		(frameworkAndCountryCode) => {
+			const now = new Date().getTime();
+			init(
+				frameworkAndCountryCode.framework,
+				frameworkAndCountryCode.countryCode,
+				true,
+				true,
+				{
+					browserId: 'abc123',
+					pageViewId: 'abcdef',
+					cmpInitTimeUtc: 1601511014537,
+				},
+			);
+			expect(window._sp_.config.pubData.browserId).toEqual('abc123');
+			expect(window._sp_.config.pubData.pageViewId).toEqual('abcdef');
+			expect(window._sp_.config.pubData.cmpInitTimeUtc).toBeGreaterThanOrEqual(
+				now,
+			);
+		},
+	);
 
-	it.each(frameworks)('should handle no pubData', (framework) => {
-		const now = new Date().getTime();
-		init(framework);
-		expect(window._sp_.config.pubData.cmpInitTimeUtc).toBeGreaterThanOrEqual(
-			now,
-		);
-	});
+	it.each(frameworksAndCountryCodes)(
+		'should handle no pubData',
+		(frameworkAndCountryCode) => {
+			const now = new Date().getTime();
+			init(
+				frameworkAndCountryCode.framework,
+				frameworkAndCountryCode.countryCode,
+				true,
+				true,
+			);
+			expect(window._sp_.config.pubData.cmpInitTimeUtc).toBeGreaterThanOrEqual(
+				now,
+			);
+		},
+	);
 });
diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index d249923cd..59c413af8 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -1,3 +1,4 @@
+import type { CountryCode } from '../index.test';
 import { log } from '../logger/logger';
 import { isExcludedFromCMP } from './exclusionList';
 import { setCurrentFramework } from './getCurrentFramework';
@@ -7,8 +8,12 @@ import type { Property } from './lib/property';
 import {
 	ACCOUNT_ID,
 	ENDPOINT,
-	PROPERTY_ID,
+	PROPERTY_HREF_MAIN,
+	PROPERTY_HREF_SUPPORT,
+	// PROPERTY_ID,
 	PROPERTY_ID_AUSTRALIA,
+	PROPERTY_ID_MAIN,
+	PROPERTY_ID_SUPPORT,
 	SourcePointChoiceTypes,
 } from './lib/sourcepointConfig';
 import { invokeCallbacks } from './onConsentChange';
@@ -27,21 +32,43 @@ export const willShowPrivacyMessage = new Promise<boolean>((resolve) => {
  * Australia has a single property while the rest of the world has a test and prod property.
  * TODO: incorporate au.theguardian into *.theguardian.com
  */
-const getPropertyHref = (framework: ConsentFramework): Property => {
+const getPropertyHref = (
+	framework: ConsentFramework,
+	useNonAdvertisedList: boolean,
+): Property => {
 	if (framework == 'aus') {
 		return 'https://au.theguardian.com';
 	}
-	return isGuardianDomain() ? null : 'https://test.theguardian.com';
+
+	return isGuardianDomain()
+		? null
+		: useNonAdvertisedList
+			? PROPERTY_HREF_SUPPORT
+			: PROPERTY_HREF_MAIN;
 };
 
-const getPropertyId = (framework: ConsentFramework): number => {
+const getPropertyId = (
+	framework: ConsentFramework,
+	useNonAdvertisedList: boolean,
+): number => {
 	if (framework == 'aus') {
 		return PROPERTY_ID_AUSTRALIA;
 	}
-	return PROPERTY_ID;
+
+	if (framework == 'usnat') {
+		return PROPERTY_ID_MAIN;
+	}
+
+	return useNonAdvertisedList ? PROPERTY_ID_SUPPORT : PROPERTY_ID_MAIN;
 };
 
-export const init = (framework: ConsentFramework, pubData = {}): void => {
+export const init = (
+	framework: ConsentFramework,
+	countryCode: CountryCode,
+	isUserSignedIn: boolean,
+	useNonAdvertisedList: boolean,
+	pubData = {},
+): void => {
 	stub(framework);
 
 	// make sure nothing else on the page has accidentally
@@ -84,7 +111,9 @@ export const init = (framework: ConsentFramework, pubData = {}): void => {
 		config: {
 			baseEndpoint: ENDPOINT,
 			accountId: ACCOUNT_ID,
-			propertyHref: getPropertyHref(framework),
+			propertyId: getPropertyId(framework, useNonAdvertisedList),
+			propertyHref: getPropertyHref(framework, useNonAdvertisedList),
+			campaignEnv: 'stage',
 			targetingParams: {
 				framework,
 				excludePage: isExcludedFromCMP(pageSection),
@@ -146,6 +175,18 @@ export const init = (framework: ConsentFramework, pubData = {}): void => {
 						)
 					) {
 						setTimeout(invokeCallbacks, 0);
+
+						if (
+							choiceTypeID === SourcePointChoiceTypes.RejectAll &&
+							message_type === 'gdpr' &&
+							// isConsentOrPay(countryCode) &&
+							!useNonAdvertisedList
+						) {
+							console.log('User has rejected all');
+							window.location.replace(
+								`https://support.theguardian.com/uk/contribute?redirectUrl=${window.location.href}`,
+							);
+						}
 					}
 				},
 				onPrivacyManagerAction: function (message_type, pmData) {
@@ -188,7 +229,10 @@ export const init = (framework: ConsentFramework, pubData = {}): void => {
 	};
 
 	if (isInPropertyIdABTest) {
-		window._sp_.config.propertyId = getPropertyId(framework);
+		window._sp_.config.propertyId = getPropertyId(
+			framework,
+			useNonAdvertisedList,
+		);
 	}
 
 	// NOTE - Contrary to the SourcePoint documentation, it's important that we add EITHER gdpr OR ccpa
@@ -203,6 +247,8 @@ export const init = (framework: ConsentFramework, pubData = {}): void => {
 				targetingParams: {
 					framework,
 					excludePage: isExcludedFromCMP(pageSection),
+					isCorP: false,
+					isUserSignedIn,
 				},
 			};
 			break;

From edd1fddb2efeefc5836b65bf1dcf6bcf98358a32 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 20 Jan 2025 13:54:37 +0000
Subject: [PATCH 07/31] Change to window.open and use isConsentOrPay

---
 .../libs/src/consent-management-platform/sourcepoint.ts     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index 59c413af8..09ad42502 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -2,6 +2,7 @@ import type { CountryCode } from '../index.test';
 import { log } from '../logger/logger';
 import { isExcludedFromCMP } from './exclusionList';
 import { setCurrentFramework } from './getCurrentFramework';
+import { isConsentOrPay } from './isConsentOrPay';
 import { isGuardianDomain } from './lib/domain';
 import { mark } from './lib/mark';
 import type { Property } from './lib/property';
@@ -183,8 +184,9 @@ export const init = (
 							!useNonAdvertisedList
 						) {
 							console.log('User has rejected all');
-							window.location.replace(
+							window.open(
 								`https://support.theguardian.com/uk/contribute?redirectUrl=${window.location.href}`,
+								'_blank',
 							);
 						}
 					}
@@ -247,7 +249,7 @@ export const init = (
 				targetingParams: {
 					framework,
 					excludePage: isExcludedFromCMP(pageSection),
-					isCorP: false,
+					isCorP: isConsentOrPay(countryCode),
 					isUserSignedIn,
 				},
 			};

From 2a9a39b8c1f74e270ddefd2fafa145d7a3ef2ef8 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 20 Jan 2025 14:08:29 +0000
Subject: [PATCH 08/31] Add isConsentOrPay to check

---
 .../libs/src/consent-management-platform/sourcepoint.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index 09ad42502..16335ecc1 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -180,7 +180,7 @@ export const init = (
 						if (
 							choiceTypeID === SourcePointChoiceTypes.RejectAll &&
 							message_type === 'gdpr' &&
-							// isConsentOrPay(countryCode) &&
+							isConsentOrPay(countryCode) &&
 							!useNonAdvertisedList
 						) {
 							console.log('User has rejected all');

From ae77c08fbe02f0d17aa2e8c6f7c0c66a2d81ef75 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 20 Jan 2025 14:08:43 +0000
Subject: [PATCH 09/31] Update test page

---
 .../src/components/CmpTest.svelte             | 51 +++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/apps/github-pages/src/components/CmpTest.svelte b/apps/github-pages/src/components/CmpTest.svelte
index 2186fce56..be43f919e 100644
--- a/apps/github-pages/src/components/CmpTest.svelte
+++ b/apps/github-pages/src/components/CmpTest.svelte
@@ -3,6 +3,9 @@
 	import { cmp, onConsentChange, log } from '@guardian/libs';
 	import { onMount } from 'svelte';
 
+	let useNonAdvertisedList = window.location.search.includes('CMP_MAIN');
+	let isUserSignedIn = window.location.search.includes('CMP_SIGNED_IN');
+
 	switch (window.location.hash) {
 		case '#tcfv2':
 			localStorage.setItem('framework', JSON.stringify('tcfv2'));
@@ -52,6 +55,29 @@
 		window.location.reload();
 	};
 
+	const toggleQueryParams = (param) => {
+		let queryParams = new URLSearchParams(window.location.search);
+		queryParams.has(param)
+			? queryParams.delete(param)
+			: queryParams.append(param, '');
+		window.location.search = queryParams.toString();
+	};
+
+	const toggleIsFeatureFlagEnabled = () => {
+		isFeatureFlagEnabled = !isFeatureFlagEnabled;
+		toggleQueryParams('CMP_COP');
+	};
+
+	const toggleIsUserSignedIn = () => {
+		isUserSignedIn = !isUserSignedIn;
+		toggleQueryParams('CMP_SIGNED_IN');
+	};
+
+	const toggleUseNonAdvertisedList = () => {
+		useNonAdvertisedList = !useNonAdvertisedList;
+		toggleQueryParams('CMP_MAIN');
+	};
+
 	let framework = JSON.parse(localStorage.getItem('framework'));
 
 	let setLocation = () => {
@@ -91,10 +117,11 @@
 		}
 
 		// do this loads to make sure that doesn't break things
-		cmp.init({ country });
-		cmp.init({ country });
-		cmp.init({ country });
-		cmp.init({ country });
+		cmp.init({
+			country,
+			isUserSignedIn: isUserSignedIn ?? false,
+			useNonAdvertisedList: useNonAdvertisedList ?? false,
+		});
 	});
 </script>
 
@@ -133,6 +160,22 @@
 			in Australia:
 			<strong>CCPA-like</strong>
 		</label>
+		<label class={useNonAdvertisedList ? 'selected' : 'none'}>
+			<input
+				type="checkbox"
+				on:change={toggleUseNonAdvertisedList}
+				checked={useNonAdvertisedList}
+			/>
+			<strong>useNonAdvertisedList?</strong>
+		</label>
+		<label class={isUserSignedIn ? 'selected' : 'none'}>
+			<input
+				type="checkbox"
+				on:change={toggleIsUserSignedIn}
+				checked={isUserSignedIn}
+			/>
+			<strong>isUserSignedIn?</strong>
+		</label>
 	</nav>
 
 	<div id="consent-state">

From c7b0f96697de82ae2aeb52d570652fbd96e11bf5 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 20 Jan 2025 14:31:37 +0000
Subject: [PATCH 10/31] Created function mergeUserConsent

---
 .../mergeUserConsent.ts                       | 27 +++++++++++++++++++
 .../sourcepoint.ts                            |  5 ++++
 .../types/tcfv2/index.ts                      |  6 +++++
 3 files changed, 38 insertions(+)
 create mode 100644 libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts

diff --git a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
new file mode 100644
index 000000000..921b70fb7
--- /dev/null
+++ b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
@@ -0,0 +1,27 @@
+import { getCookie } from '../cookies/getCookie';
+import { PROPERTY_ID_MAIN, PROPERTY_ID_SUPPORT } from './lib/sourcepointConfig';
+import type { SPUserConsent } from './types/tcfv2';
+
+// https://sourcepoint-public-api.readme.io/reference/post_consent-v3-siteid-tcstring
+
+export const mergeUserConsent = () => {
+	const consentUUID = getCookie({ name: 'consentUUID' });
+	const url = `https://cdn.privacy-mgmt.com/consent/tcfv2/consent/v3/${PROPERTY_ID_SUPPORT}/tcstring?consentUUID=${consentUUID}`;
+	const spUserConsentString = localStorage.getItem(
+		`_sp_user_consent_${PROPERTY_ID_MAIN}`,
+	);
+	const userConsent = JSON.parse(spUserConsentString ?? '{}') as SPUserConsent;
+
+	fetch(url, {
+		method: 'POST',
+		headers: {
+			Accept: 'application/json',
+			'Content-Type': 'application/json',
+		},
+		body: JSON.stringify({
+			euconsent: userConsent.gdpr?.euconsent,
+		}),
+	}).catch((error) => {
+		console.error('Error:', error);
+	});
+};
diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index 16335ecc1..7b302480c 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -17,6 +17,7 @@ import {
 	PROPERTY_ID_SUPPORT,
 	SourcePointChoiceTypes,
 } from './lib/sourcepointConfig';
+import { mergeUserConsent } from './mergeUserConsent';
 import { invokeCallbacks } from './onConsentChange';
 import { stub } from './stub';
 import type { ConsentFramework } from './types';
@@ -80,6 +81,10 @@ export const init = (
 
 	setCurrentFramework(framework);
 
+	if (useNonAdvertisedList) {
+		mergeUserConsent();
+	}
+
 	// invoke callbacks before we receive Sourcepoint events
 	invokeCallbacks();
 
diff --git a/libs/@guardian/libs/src/consent-management-platform/types/tcfv2/index.ts b/libs/@guardian/libs/src/consent-management-platform/types/tcfv2/index.ts
index efb8ed173..a1d94d45e 100644
--- a/libs/@guardian/libs/src/consent-management-platform/types/tcfv2/index.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/types/tcfv2/index.ts
@@ -26,3 +26,9 @@ export type TCPingStatusCode =
 	| 'visible'
 	| 'hidden'
 	| 'disabled';
+
+export interface SPUserConsent {
+	gdpr?: {
+		euconsent?: string;
+	};
+}

From b56c2b751d2771fab633acc1ca102626d5e34588 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Thu, 23 Jan 2025 07:58:59 +0000
Subject: [PATCH 11/31] Create breezy-drinks-live.md

---
 .changeset/breezy-drinks-live.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/breezy-drinks-live.md

diff --git a/.changeset/breezy-drinks-live.md b/.changeset/breezy-drinks-live.md
new file mode 100644
index 000000000..124a22131
--- /dev/null
+++ b/.changeset/breezy-drinks-live.md
@@ -0,0 +1,5 @@
+---
+'@guardian/libs': major
+---
+
+Add the ability for consent or pay by adding two new params to cmp.init

From 88aa90716c8fcc3e2843d922902920ee679b3522 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 27 Jan 2025 17:37:22 +0000
Subject: [PATCH 12/31] Check if user is a participant of ConsentOrPayBanner

---
 .../consent-management-platform/sourcepoint.ts   | 16 ++++++++++++++--
 .../consent-management-platform/types/index.ts   |  2 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index 7b302480c..a765f8417 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -1,5 +1,7 @@
 import type { CountryCode } from '../index.test';
+import { isObject } from '../isObject/isObject';
 import { log } from '../logger/logger';
+import { storage } from '../storage/storage';
 import { isExcludedFromCMP } from './exclusionList';
 import { setCurrentFramework } from './getCurrentFramework';
 import { isConsentOrPay } from './isConsentOrPay';
@@ -20,7 +22,7 @@ import {
 import { mergeUserConsent } from './mergeUserConsent';
 import { invokeCallbacks } from './onConsentChange';
 import { stub } from './stub';
-import type { ConsentFramework } from './types';
+import type { ConsentFramework, Participations } from './types';
 
 let resolveWillShowPrivacyMessage: typeof Promise.resolve;
 export const willShowPrivacyMessage = new Promise<boolean>((resolve) => {
@@ -81,11 +83,12 @@ export const init = (
 
 	setCurrentFramework(framework);
 
+	// invoke callbacks before we receive Sourcepoint events
+
 	if (useNonAdvertisedList) {
 		mergeUserConsent();
 	}
 
-	// invoke callbacks before we receive Sourcepoint events
 	invokeCallbacks();
 
 	let frameworkMessageType: string;
@@ -106,6 +109,15 @@ export const init = (
 		window.guardian?.config?.tests?.useSourcepointPropertyIdVariant ===
 		'variant';
 
+	const participations: Participations = storage.local.get(
+		'gu.ab.participations',
+	) as Participations;
+	const isInConsentOrPayABTest = isObject(participations)
+		? participations.ConsentOrPayBanner?.variant === 'activate'
+		: false;
+
+	console.log('participations', participations, isInConsentOrPayABTest);
+
 	log('cmp', `framework: ${framework}`);
 	log('cmp', `frameworkMessageType: ${frameworkMessageType}`);
 
diff --git a/libs/@guardian/libs/src/consent-management-platform/types/index.ts b/libs/@guardian/libs/src/consent-management-platform/types/index.ts
index bf1e98269..941f71c52 100644
--- a/libs/@guardian/libs/src/consent-management-platform/types/index.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/types/index.ts
@@ -78,3 +78,5 @@ export interface VendorConsents {
 }
 
 export type { VendorName };
+
+export type Participations = Record<string, { variant: string }>;

From 55f4b44693e546670df83f8ef9caaae8e73a5b56 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 3 Feb 2025 11:41:00 +0000
Subject: [PATCH 13/31] Add new api function to postCustomConsent

---
 .../consent-management-platform/tcfv2/api.ts  | 36 +++++++++++++++----
 .../types/window.d.ts                         |  4 ++-
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/tcfv2/api.ts b/libs/@guardian/libs/src/consent-management-platform/tcfv2/api.ts
index 0b8d8c996..fd2e306e9 100644
--- a/libs/@guardian/libs/src/consent-management-platform/tcfv2/api.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/tcfv2/api.ts
@@ -6,16 +6,28 @@ type Command =
 	| 'ping'
 	| 'addEventListener'
 	| 'removeEventListener'
+	| 'postCustomConsent'
 	| 'getCustomVendorConsents'; // Sourcepoint addition https://documentation.sourcepoint.com/web-implementation/sourcepoint-gdpr-and-tcf-v2-support/__tcfapi-getcustomvendorconsents-api
 
-const api = (command: Command) =>
+const api = (
+	command: Command,
+	vendorIds?: string[],
+	purposeIds?: string[],
+	legitimateInterestPurposeIds?: string[],
+) =>
 	new Promise((resolve, reject) => {
 		if (window.__tcfapi) {
-			window.__tcfapi(command, 2, (result, success) =>
-				success
-					? resolve(result)
-					: /* istanbul ignore next */
-						reject(new Error(`Unable to get ${command} data`)),
+			window.__tcfapi(
+				command,
+				2,
+				(result, success) =>
+					success
+						? resolve(result)
+						: /* istanbul ignore next */
+							reject(new Error(`Unable to get ${command} data`)),
+				vendorIds,
+				purposeIds,
+				legitimateInterestPurposeIds,
 			);
 		} else {
 			reject(new Error('No __tcfapi found on window'));
@@ -33,3 +45,15 @@ export const getTCData = (): Promise<TCData> =>
 
 export const getCustomVendorConsents = (): Promise<CustomVendorConsents> =>
 	api('getCustomVendorConsents') as Promise<CustomVendorConsents>;
+
+export const postCustomConsent = (
+	vendorIds: string[],
+	purposeIds: string[],
+	legitimateInterestPurposeIds: string[],
+): Promise<CustomVendorConsents> =>
+	api(
+		'postCustomConsent',
+		vendorIds,
+		purposeIds,
+		legitimateInterestPurposeIds,
+	) as Promise<CustomVendorConsents>;
diff --git a/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts b/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
index 802e23326..1d0ebd99f 100644
--- a/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
@@ -110,7 +110,9 @@ declare global {
 			command: string,
 			version: number,
 			callback: (tcData: TCData, success: boolean) => void,
-			vendorIDs?: number[],
+			vendorIDs?: string[],
+			purposeIds?: string[],
+			legitimateInterestPurposeIds?: string[],
 		) => void;
 		__gpp?: (
 			command: string,

From b8c7fe76eb32151531404b94cc678fe2af1c6c1d Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 3 Feb 2025 11:41:39 +0000
Subject: [PATCH 14/31] Create function to mergeVendorList

---
 .../mergeUserConsent.ts                       | 103 +++++++++++++++++-
 1 file changed, 101 insertions(+), 2 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
index 921b70fb7..f920ad215 100644
--- a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
@@ -1,10 +1,109 @@
 import { getCookie } from '../cookies/getCookie';
 import { PROPERTY_ID_MAIN, PROPERTY_ID_SUPPORT } from './lib/sourcepointConfig';
+import { postCustomConsent } from './tcfv2/api';
 import type { SPUserConsent } from './types/tcfv2';
 
-// https://sourcepoint-public-api.readme.io/reference/post_consent-v3-siteid-tcstring
+const purposeMap = new Map<number, string>([
+	[1, '677e3387b265dc07332909da'], // 1
+	[2, '677e3386b265dc073328f686'], //2
+	[3, '677e3386b265dc073328f96f'], // 3
+	[4, '677e3386b265dc073328fc01'], //4
+	[5, '677e3386b265dc073328fe72'], // 5
+	[6, '677e3386b265dc073328ff70'], //6
+	[7, '677e3386b265dc0733290050'], //7
+	[8, '677e3386b265dc07332903c8'], //8
+	[9, '677e3386b265dc0733290502'], //9
+	[10, '677e3386b265dc073329071a'], //10
+	[11, '677e3386b265dc07332909c2'], //11
+]);
 
-export const mergeUserConsent = () => {
+interface Vendors {
+	_id: string;
+	name: string;
+	vendorType: string;
+	googleId?: string;
+}
+
+interface LegIntCategories {
+	_id: string;
+	name: string;
+	iabPurposeRef: {
+		iabId: number;
+		name: string;
+	};
+}
+interface UserConsentStatus {
+	vendors: Vendors[];
+	legIntCategories: LegIntCategories[];
+	legIntVendors: Vendors[];
+	categories: LegIntCategories[];
+}
+
+/**
+ * THis function gets the user's consent for the larger gdpr vendor list
+ * then calls postUserConsent
+ * https://sourcepoint-public-api.readme.io/reference/get_consent-v3-history-siteid-1
+ */
+export const mergeVendorList = () => {
+	const consentUUID = getCookie({ name: 'consentUUID' });
+	const url = `https://cdn.privacy-mgmt.com/consent/tcfv2/consent/v3/history/${PROPERTY_ID_MAIN}?consentUUID=${consentUUID}`;
+	fetch(url, {
+		method: 'GET',
+		headers: {
+			Accept: 'application/json',
+			'Content-Type': 'application/json',
+		},
+	})
+		.then((response) => {
+			response
+				.json()
+				.then((data: UserConsentStatus[]) => {
+					postUserConsent(data);
+				})
+				.catch((error) => {
+					console.log('Error:', error);
+				});
+		})
+		.catch((error) => {
+			console.error('Error:', error);
+		});
+};
+
+/**
+ *
+ *
+ * @param {UserConsentStatus[]} data
+ */
+const postUserConsent = (data: UserConsentStatus[]) => {
+	const vendorIds = data[0]?.vendors.map((vendor) => vendor._id);
+	let purposeIds = data[0]?.categories.map(
+		(category) => purposeMap.get(category.iabPurposeRef.iabId) ?? '',
+	);
+	let legitimateInterestPurposeIds = data[0]?.legIntCategories.map(
+		(category) => purposeMap.get(category.iabPurposeRef.iabId) ?? '',
+	);
+
+	purposeIds = purposeIds?.filter((id) => id !== '');
+	legitimateInterestPurposeIds = legitimateInterestPurposeIds?.filter(
+		(id) => id !== '',
+	);
+
+	if (vendorIds && purposeIds && legitimateInterestPurposeIds) {
+		postCustomConsent(vendorIds, purposeIds, legitimateInterestPurposeIds)
+			.then(() => {
+				mergeUserConsent();
+			})
+			.catch((error) => {
+				console.log('Error:', error);
+			});
+	}
+};
+
+/**
+ * This function merges the main vendor list with the sub-domain user consent status
+ * https://sourcepoint-public-api.readme.io/reference/post_consent-v3-siteid-tcstring
+ */
+const mergeUserConsent = () => {
 	const consentUUID = getCookie({ name: 'consentUUID' });
 	const url = `https://cdn.privacy-mgmt.com/consent/tcfv2/consent/v3/${PROPERTY_ID_SUPPORT}/tcstring?consentUUID=${consentUUID}`;
 	const spUserConsentString = localStorage.getItem(

From cda7521f56fa02674b85629eaebfb4b52721cb22 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 3 Feb 2025 16:06:25 +0000
Subject: [PATCH 15/31] Use localstorage to log if a user has had their vendor
 list merged

---
 .../mergeUserConsent.ts                            | 14 +++++++++++---
 .../src/consent-management-platform/sourcepoint.ts | 12 ++++++++----
 .../consent-management-platform/types/window.d.ts  |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
index f920ad215..3c2315a76 100644
--- a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
@@ -1,4 +1,6 @@
 import { getCookie } from '../cookies/getCookie';
+import { setCookie } from '../cookies/setCookie';
+import { storage } from '../storage/storage';
 import { PROPERTY_ID_MAIN, PROPERTY_ID_SUPPORT } from './lib/sourcepointConfig';
 import { postCustomConsent } from './tcfv2/api';
 import type { SPUserConsent } from './types/tcfv2';
@@ -45,6 +47,7 @@ interface UserConsentStatus {
  * https://sourcepoint-public-api.readme.io/reference/get_consent-v3-history-siteid-1
  */
 export const mergeVendorList = () => {
+	console.log('Merging vendor list');
 	const consentUUID = getCookie({ name: 'consentUUID' });
 	const url = `https://cdn.privacy-mgmt.com/consent/tcfv2/consent/v3/history/${PROPERTY_ID_MAIN}?consentUUID=${consentUUID}`;
 	fetch(url, {
@@ -120,7 +123,12 @@ const mergeUserConsent = () => {
 		body: JSON.stringify({
 			euconsent: userConsent.gdpr?.euconsent,
 		}),
-	}).catch((error) => {
-		console.error('Error:', error);
-	});
+	})
+		.then(() => {
+			localStorage.setItem('mergedMinorList', 'true');
+			window.location.reload();
+		})
+		.catch((error) => {
+			console.error('Error:', error);
+		});
 };
diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index a765f8417..a8ecd697d 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -1,4 +1,5 @@
 import type { CountryCode } from '../index.test';
+import { isNonNullable } from '../isNonNullable/isNonNullable';
 import { isObject } from '../isObject/isObject';
 import { log } from '../logger/logger';
 import { storage } from '../storage/storage';
@@ -19,7 +20,7 @@ import {
 	PROPERTY_ID_SUPPORT,
 	SourcePointChoiceTypes,
 } from './lib/sourcepointConfig';
-import { mergeUserConsent } from './mergeUserConsent';
+import { mergeVendorList } from './mergeUserConsent';
 import { invokeCallbacks } from './onConsentChange';
 import { stub } from './stub';
 import type { ConsentFramework, Participations } from './types';
@@ -66,6 +67,10 @@ const getPropertyId = (
 	return useNonAdvertisedList ? PROPERTY_ID_SUPPORT : PROPERTY_ID_MAIN;
 };
 
+const hasNotConsentedToNonAdvertisedList = (): boolean => {
+	return !isNonNullable(localStorage.getItem('mergedMinorList'));
+};
+
 export const init = (
 	framework: ConsentFramework,
 	countryCode: CountryCode,
@@ -85,8 +90,8 @@ export const init = (
 
 	// invoke callbacks before we receive Sourcepoint events
 
-	if (useNonAdvertisedList) {
-		mergeUserConsent();
+	if (useNonAdvertisedList && hasNotConsentedToNonAdvertisedList()) {
+		mergeVendorList();
 	}
 
 	invokeCallbacks();
@@ -131,7 +136,6 @@ export const init = (
 			accountId: ACCOUNT_ID,
 			propertyId: getPropertyId(framework, useNonAdvertisedList),
 			propertyHref: getPropertyHref(framework, useNonAdvertisedList),
-			campaignEnv: 'stage',
 			targetingParams: {
 				framework,
 				excludePage: isExcludedFromCMP(pageSection),
diff --git a/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts b/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
index 1d0ebd99f..0aaca48ef 100644
--- a/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
@@ -34,7 +34,7 @@ declare global {
 				accountId: number;
 				propertyHref?: Property;
 				propertyId?: number;
-				campaignEnv: 'prod' | 'stage';
+				campaignEnv?: 'prod' | 'stage';
 				targetingParams: {
 					framework: ConsentFramework;
 					excludePage: boolean;

From 91395bd824093f9e6f252e95f3ee0a1f5b501475 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Tue, 4 Feb 2025 08:53:59 +0000
Subject: [PATCH 16/31] Fix tests

---
 .../mergeUserConsent.ts                       |  2 --
 .../tcfv2/api.test.js                         | 28 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
index 3c2315a76..f0de945a7 100644
--- a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
@@ -1,6 +1,4 @@
 import { getCookie } from '../cookies/getCookie';
-import { setCookie } from '../cookies/setCookie';
-import { storage } from '../storage/storage';
 import { PROPERTY_ID_MAIN, PROPERTY_ID_SUPPORT } from './lib/sourcepointConfig';
 import { postCustomConsent } from './tcfv2/api';
 import type { SPUserConsent } from './types/tcfv2';
diff --git a/libs/@guardian/libs/src/consent-management-platform/tcfv2/api.test.js b/libs/@guardian/libs/src/consent-management-platform/tcfv2/api.test.js
index f449d8fdb..2eb18f8b8 100644
--- a/libs/@guardian/libs/src/consent-management-platform/tcfv2/api.test.js
+++ b/libs/@guardian/libs/src/consent-management-platform/tcfv2/api.test.js
@@ -1,8 +1,13 @@
-import { getCustomVendorConsents, getTCData } from './api.ts';
+import {
+	getCustomVendorConsents,
+	getTCData,
+	postCustomConsent,
+} from './api.ts';
 
 it('calls the correct IAB api with the correct methods', async () => {
 	expect(getTCData()).rejects.toThrow();
 	expect(getCustomVendorConsents()).rejects.toThrow();
+	expect(postCustomConsent()).rejects.toThrow();
 
 	window.__tcfapi = jest.fn((a, b, cb) => {
 		cb({}, true);
@@ -10,12 +15,20 @@ it('calls the correct IAB api with the correct methods', async () => {
 
 	await getTCData();
 	await getCustomVendorConsents();
+	await postCustomConsent(
+		['vendor_id'],
+		['purpose_id'],
+		['leg_int_purpose_id'],
+	);
 
 	expect(window.__tcfapi).toHaveBeenNthCalledWith(
 		1,
 		'addEventListener',
 		expect.any(Number),
 		expect.any(Function),
+		undefined,
+		undefined,
+		undefined,
 	);
 
 	expect(window.__tcfapi).toHaveBeenNthCalledWith(
@@ -23,5 +36,18 @@ it('calls the correct IAB api with the correct methods', async () => {
 		'getCustomVendorConsents',
 		expect.any(Number),
 		expect.any(Function),
+		undefined,
+		undefined,
+		undefined,
+	);
+
+	expect(window.__tcfapi).toHaveBeenNthCalledWith(
+		3,
+		'postCustomConsent',
+		expect.any(Number),
+		expect.any(Function),
+		['vendor_id'],
+		['purpose_id'],
+		['leg_int_purpose_id'],
 	);
 });

From 4ecb9f93b3cba73d65d0d9eea19006f62f290cd5 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Tue, 4 Feb 2025 15:47:27 +0000
Subject: [PATCH 17/31] Update isInConsentOrPay

---
 .../isConsentOrPay.test.js                    |  6 ++--
 .../isConsentOrPay.ts                         | 15 ++++++++--
 .../sourcepoint.ts                            | 28 +++++++++----------
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.test.js b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.test.js
index fa8ffc685..7182611be 100644
--- a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.test.js
+++ b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.test.js
@@ -1,11 +1,11 @@
-import { isConsentOrPay } from './isConsentOrPay.ts';
+import { isConsentOrPayCountry } from './isConsentOrPay.ts';
 
 describe('isConsentOrPay', () => {
 	test('should return false country code is FR', () => {
-		expect(isConsentOrPay('FR')).toBe(false);
+		expect(isConsentOrPayCountry('FR')).toBe(false);
 	});
 
 	test('should return true country code is GB', () => {
-		expect(isConsentOrPay('GB')).toBe(true);
+		expect(isConsentOrPayCountry('GB')).toBe(true);
 	});
 });
diff --git a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
index 30305e6a0..18f05b1d4 100644
--- a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
@@ -1,7 +1,18 @@
 import type { CountryCode } from '../index.test';
+import { isObject } from '../isObject/isObject';
+import { storage } from '../storage/storage';
+import type { Participations } from './types';
 
-export const isConsentOrPay = (countryCode: CountryCode) => {
+export const isConsentOrPayCountry = (countryCode: CountryCode) => {
 	const consentOrPayCountries = ['GB'];
-
 	return consentOrPayCountries.includes(countryCode);
 };
+
+export const isInConsentOrPayABTest = (): boolean => {
+	const participations: Participations = storage.local.get(
+		'gu.ab.participations',
+	) as Participations;
+	return isObject(participations)
+		? participations.ConsentOrPayBanner?.variant === 'activate'
+		: false;
+};
diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index a8ecd697d..1a34a48b2 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -1,11 +1,12 @@
 import type { CountryCode } from '../index.test';
 import { isNonNullable } from '../isNonNullable/isNonNullable';
-import { isObject } from '../isObject/isObject';
 import { log } from '../logger/logger';
-import { storage } from '../storage/storage';
 import { isExcludedFromCMP } from './exclusionList';
 import { setCurrentFramework } from './getCurrentFramework';
-import { isConsentOrPay } from './isConsentOrPay';
+import {
+	isConsentOrPayCountry,
+	isInConsentOrPayABTest,
+} from './isConsentOrPay';
 import { isGuardianDomain } from './lib/domain';
 import { mark } from './lib/mark';
 import type { Property } from './lib/property';
@@ -23,7 +24,7 @@ import {
 import { mergeVendorList } from './mergeUserConsent';
 import { invokeCallbacks } from './onConsentChange';
 import { stub } from './stub';
-import type { ConsentFramework, Participations } from './types';
+import type { ConsentFramework } from './types';
 
 let resolveWillShowPrivacyMessage: typeof Promise.resolve;
 export const willShowPrivacyMessage = new Promise<boolean>((resolve) => {
@@ -90,7 +91,11 @@ export const init = (
 
 	// invoke callbacks before we receive Sourcepoint events
 
-	if (useNonAdvertisedList && hasNotConsentedToNonAdvertisedList()) {
+	if (
+		isConsentOrPayCountry(countryCode) &&
+		useNonAdvertisedList &&
+		hasNotConsentedToNonAdvertisedList()
+	) {
 		mergeVendorList();
 	}
 
@@ -114,14 +119,9 @@ export const init = (
 		window.guardian?.config?.tests?.useSourcepointPropertyIdVariant ===
 		'variant';
 
-	const participations: Participations = storage.local.get(
-		'gu.ab.participations',
-	) as Participations;
-	const isInConsentOrPayABTest = isObject(participations)
-		? participations.ConsentOrPayBanner?.variant === 'activate'
-		: false;
+	const isActiveABTest = isInConsentOrPayABTest();
 
-	console.log('participations', participations, isInConsentOrPayABTest);
+	console.log('participations', isActiveABTest);
 
 	log('cmp', `framework: ${framework}`);
 	log('cmp', `frameworkMessageType: ${frameworkMessageType}`);
@@ -201,7 +201,7 @@ export const init = (
 						if (
 							choiceTypeID === SourcePointChoiceTypes.RejectAll &&
 							message_type === 'gdpr' &&
-							isConsentOrPay(countryCode) &&
+							isConsentOrPayCountry(countryCode) &&
 							!useNonAdvertisedList
 						) {
 							console.log('User has rejected all');
@@ -270,7 +270,7 @@ export const init = (
 				targetingParams: {
 					framework,
 					excludePage: isExcludedFromCMP(pageSection),
-					isCorP: isConsentOrPay(countryCode),
+					isCorP: isConsentOrPayCountry(countryCode),
 					isUserSignedIn,
 				},
 			};

From 51e3da4e9f19426aa2a8743ba88b6cd91503e26d Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Wed, 5 Feb 2025 10:01:30 +0000
Subject: [PATCH 18/31] Update function to load privacy manager

---
 .../libs/src/consent-management-platform/cmp.ts        |  8 +++++++-
 .../src/consent-management-platform/isConsentOrPay.ts  | 10 ++++++++++
 .../lib/sourcepointConfig.ts                           |  1 +
 .../src/consent-management-platform/sourcepoint.ts     |  4 ++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/cmp.ts b/libs/@guardian/libs/src/consent-management-platform/cmp.ts
index 1b0b3d217..7f9cbb1f6 100644
--- a/libs/@guardian/libs/src/consent-management-platform/cmp.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/cmp.ts
@@ -1,9 +1,11 @@
 import type { CountryCode } from '../index.test';
 import { getCurrentFramework } from './getCurrentFramework';
+import { getIsConsentOrPay } from './isConsentOrPay';
 import { mark } from './lib/mark';
 import {
 	PRIVACY_MANAGER_AUSTRALIA,
 	PRIVACY_MANAGER_TCFV2,
+	PRIVACY_MANAGER_TCFV2_CONSENT_OR_PAY,
 	PRIVACY_MANAGER_USNAT,
 } from './lib/sourcepointConfig';
 import {
@@ -40,7 +42,11 @@ const willShowPrivacyMessage: WillShowPrivacyMessage = () =>
 function showPrivacyManager(): void {
 	switch (getCurrentFramework()) {
 		case 'tcfv2':
-			window._sp_?.gdpr?.loadPrivacyManagerModal?.(PRIVACY_MANAGER_TCFV2);
+			window._sp_?.gdpr?.loadPrivacyManagerModal?.(
+				getIsConsentOrPay()
+					? PRIVACY_MANAGER_TCFV2_CONSENT_OR_PAY
+					: PRIVACY_MANAGER_TCFV2,
+			);
 			break;
 		case 'usnat':
 			window._sp_?.usnat?.loadPrivacyManagerModal?.(PRIVACY_MANAGER_USNAT);
diff --git a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
index 18f05b1d4..199826b94 100644
--- a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
@@ -3,6 +3,16 @@ import { isObject } from '../isObject/isObject';
 import { storage } from '../storage/storage';
 import type { Participations } from './types';
 
+let isConsentOrPay = false;
+
+export const setIsConsentOrPay = (_isConsentOrPay: boolean) => {
+	isConsentOrPay = _isConsentOrPay;
+};
+
+export const getIsConsentOrPay = (): boolean => {
+	return isConsentOrPay;
+};
+
 export const isConsentOrPayCountry = (countryCode: CountryCode) => {
 	const consentOrPayCountries = ['GB'];
 	return consentOrPayCountries.includes(countryCode);
diff --git a/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts b/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
index bfe59281b..f9f6de6b7 100644
--- a/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
@@ -12,6 +12,7 @@ export const PROPERTY_HREF_SUPPORT = 'http://support-test';
 export const PROPERTY_HREF_MAIN = 'http://ui-dev';
 
 export const PRIVACY_MANAGER_TCFV2 = 106842;
+export const PRIVACY_MANAGER_TCFV2_CONSENT_OR_PAY = 1251121;
 export const PRIVACY_MANAGER_AUSTRALIA = 1178486;
 
 export const ENDPOINT = isGuardianDomain()
diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index 1a34a48b2..4a9992ef9 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -6,6 +6,7 @@ import { setCurrentFramework } from './getCurrentFramework';
 import {
 	isConsentOrPayCountry,
 	isInConsentOrPayABTest,
+	setIsConsentOrPay,
 } from './isConsentOrPay';
 import { isGuardianDomain } from './lib/domain';
 import { mark } from './lib/mark';
@@ -88,6 +89,9 @@ export const init = (
 	}
 
 	setCurrentFramework(framework);
+	setIsConsentOrPay(
+		isConsentOrPayCountry(countryCode) && !useNonAdvertisedList,
+	);
 
 	// invoke callbacks before we receive Sourcepoint events
 

From 2c7642b41ed95cb74df3fa33e32c900c1e436b4b Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Wed, 5 Feb 2025 11:34:44 +0000
Subject: [PATCH 19/31] Update ophan message to include Consent or Pay banner

---
 .../libs/src/consent-management-platform/lib/ophan.ts | 11 ++++++-----
 .../src/consent-management-platform/sourcepoint.ts    |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/lib/ophan.ts b/libs/@guardian/libs/src/consent-management-platform/lib/ophan.ts
index 214e30677..c118955a0 100644
--- a/libs/@guardian/libs/src/consent-management-platform/lib/ophan.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/lib/ophan.ts
@@ -2,6 +2,7 @@ import type {
 	OphanComponentEvent,
 	OphanRecordFunction,
 } from '../../ophan/@types';
+import { getIsConsentOrPay } from '../isConsentOrPay';
 import { SourcePointChoiceTypes } from './sourcepointConfig';
 
 export type SourcepointButtonActions =
@@ -11,7 +12,7 @@ export type SourcepointButtonActions =
 	| 'dismiss'
 	| undefined;
 
-export type SourcepointMessageType = 'ACCEPT_REJECT';
+export type SourcepointMessageType = 'ACCEPT_REJECT' | 'CONSENT_OR_PAY_BANNER';
 const getOphanRecordFunction = (): OphanRecordFunction => {
 	const record = window.guardian?.ophan?.record;
 
@@ -22,10 +23,10 @@ const getOphanRecordFunction = (): OphanRecordFunction => {
 	return () => {};
 };
 
-export const constructBannerMessageId = (
-	messageType: SourcepointMessageType,
-	messageId: string,
-): string => {
+export const constructBannerMessageId = (messageId: string): string => {
+	const messageType: SourcepointMessageType = getIsConsentOrPay()
+		? 'CONSENT_OR_PAY_BANNER'
+		: 'ACCEPT_REJECT';
 	return `${messageType}-${messageId}`;
 };
 
diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index ef3d21acf..c75fe6511 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -192,7 +192,7 @@ export const init = (
 					if (data.messageId !== 0) {
 						messageId = data.messageId;
 						sendMessageReadyToOphan(
-							constructBannerMessageId('ACCEPT_REJECT', messageId.toString()),
+							constructBannerMessageId(messageId.toString()),
 						);
 					}
 
@@ -212,7 +212,7 @@ export const init = (
 
 					sendConsentChoicesToOphan(
 						choiceTypeID,
-						constructBannerMessageId('ACCEPT_REJECT', messageId.toString()),
+						constructBannerMessageId(messageId.toString()),
 					);
 
 					// https://documentation.sourcepoint.com/web-implementation/web-implementation/multi-campaign-web-implementation/event-callbacks#choice-type-id-descriptions

From 86df823b078b596f0d024ae624ffe63951b450bf Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Fri, 7 Feb 2025 15:01:53 +0000
Subject: [PATCH 20/31] Update property name

---
 .../lib/sourcepointConfig.ts                        |  4 ++--
 .../consent-management-platform/mergeUserConsent.ts |  7 +++++--
 .../src/consent-management-platform/sourcepoint.ts  | 13 +++++++------
 .../consent-management-platform/types/window.d.ts   |  1 +
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts b/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
index 0221dab2c..dd47f4e65 100644
--- a/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
@@ -5,10 +5,10 @@ export const PRIVACY_MANAGER_USNAT = 1068329;
 
 export const PROPERTY_ID = 7417;
 export const PROPERTY_ID_MAIN = 9398; // TO BE CHANGED
-export const PROPERTY_ID_SUPPORT = 38161; // TO BE CHANGED
+export const PROPERTY_ID_SUBDOMAIN = 38161;
 export const PROPERTY_ID_AUSTRALIA = 13348;
 
-export const PROPERTY_HREF_SUPPORT = 'http://support-test';
+export const PROPERTY_HREF_SUBDOMAIN = 'http://subdomain.theguardian.com';
 export const PROPERTY_HREF_MAIN = 'http://ui-dev';
 
 export const PRIVACY_MANAGER_TCFV2 = 106842;
diff --git a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
index f0de945a7..ff09cb93e 100644
--- a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
@@ -1,5 +1,8 @@
 import { getCookie } from '../cookies/getCookie';
-import { PROPERTY_ID_MAIN, PROPERTY_ID_SUPPORT } from './lib/sourcepointConfig';
+import {
+	PROPERTY_ID_MAIN,
+	PROPERTY_ID_SUBDOMAIN,
+} from './lib/sourcepointConfig';
 import { postCustomConsent } from './tcfv2/api';
 import type { SPUserConsent } from './types/tcfv2';
 
@@ -106,7 +109,7 @@ const postUserConsent = (data: UserConsentStatus[]) => {
  */
 const mergeUserConsent = () => {
 	const consentUUID = getCookie({ name: 'consentUUID' });
-	const url = `https://cdn.privacy-mgmt.com/consent/tcfv2/consent/v3/${PROPERTY_ID_SUPPORT}/tcstring?consentUUID=${consentUUID}`;
+	const url = `https://cdn.privacy-mgmt.com/consent/tcfv2/consent/v3/${PROPERTY_ID_SUBDOMAIN}/tcstring?consentUUID=${consentUUID}`;
 	const spUserConsentString = localStorage.getItem(
 		`_sp_user_consent_${PROPERTY_ID_MAIN}`,
 	);
diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index c75fe6511..d1ddbec69 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -20,11 +20,11 @@ import {
 	ACCOUNT_ID,
 	ENDPOINT,
 	PROPERTY_HREF_MAIN,
-	PROPERTY_HREF_SUPPORT,
+	PROPERTY_HREF_SUBDOMAIN,
 	// PROPERTY_ID,
 	PROPERTY_ID_AUSTRALIA,
 	PROPERTY_ID_MAIN,
-	PROPERTY_ID_SUPPORT,
+	PROPERTY_ID_SUBDOMAIN,
 	SourcePointChoiceTypes,
 } from './lib/sourcepointConfig';
 import { mergeVendorList } from './mergeUserConsent';
@@ -55,7 +55,7 @@ const getPropertyHref = (
 	return isGuardianDomain()
 		? null
 		: useNonAdvertisedList
-			? PROPERTY_HREF_SUPPORT
+			? PROPERTY_HREF_SUBDOMAIN
 			: PROPERTY_HREF_MAIN;
 };
 
@@ -71,7 +71,7 @@ const getPropertyId = (
 		return PROPERTY_ID_MAIN;
 	}
 
-	return useNonAdvertisedList ? PROPERTY_ID_SUPPORT : PROPERTY_ID_MAIN;
+	return useNonAdvertisedList ? PROPERTY_ID_SUBDOMAIN : PROPERTY_ID_MAIN;
 };
 
 const hasNotConsentedToNonAdvertisedList = (): boolean => {
@@ -130,9 +130,9 @@ export const init = (
 		window.guardian?.config?.tests?.useSourcepointPropertyIdVariant ===
 		'variant';
 
-	const isActiveABTest = isInConsentOrPayABTest();
+	const isCorpABTest = isInConsentOrPayABTest();
 
-	console.log('participations', isActiveABTest);
+	console.log('participations', isCorpABTest);
 
 	log('cmp', `framework: ${framework}`);
 	log('cmp', `frameworkMessageType: ${frameworkMessageType}`);
@@ -297,6 +297,7 @@ export const init = (
 					excludePage: isExcludedFromCMP(pageSection),
 					isCorP: isConsentOrPayCountry(countryCode),
 					isUserSignedIn,
+					isCorpABTest,
 				},
 			};
 			break;
diff --git a/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts b/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
index 0aaca48ef..178908812 100644
--- a/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/types/window.d.ts
@@ -50,6 +50,7 @@ declare global {
 						excludePage: boolean;
 						isCorP: boolean;
 						isUserSignedIn: boolean;
+						isCorpABTest: boolean;
 					};
 				};
 				usnat?: {

From 3dd58c66b86bcc13a1d7b888b3bec9b1fed4bbad Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 10:07:25 +0000
Subject: [PATCH 21/31] Only redirect users for users in Consent or Pay AB test

---
 .../libs/src/consent-management-platform/sourcepoint.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index d1ddbec69..31963ad9f 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -227,9 +227,9 @@ export const init = (
 							choiceTypeID === SourcePointChoiceTypes.RejectAll &&
 							message_type === 'gdpr' &&
 							isConsentOrPayCountry(countryCode) &&
-							!useNonAdvertisedList
+							!useNonAdvertisedList &&
+							isCorpABTest
 						) {
-							console.log('User has rejected all');
 							window.open(
 								`https://support.theguardian.com/uk/contribute?redirectUrl=${window.location.href}`,
 								'_blank',

From 2ee4ec4f1d8995c88b99380309738eb5919825ce Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:43:23 +0000
Subject: [PATCH 22/31] Update to use consentStatus from localStorage

---
 .../sourcepoint.ts                            | 40 ++++++++++++++-----
 .../types/tcfv2/index.ts                      |  3 ++
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index 31963ad9f..6e36c39f4 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -27,10 +27,11 @@ import {
 	PROPERTY_ID_SUBDOMAIN,
 	SourcePointChoiceTypes,
 } from './lib/sourcepointConfig';
-import { mergeVendorList } from './mergeUserConsent';
+import { mergedListKey, mergeVendorList } from './mergeUserConsent';
 import { invokeCallbacks } from './onConsentChange';
 import { stub } from './stub';
 import type { ConsentFramework } from './types';
+import { SPUserConsent } from './types/tcfv2';
 
 let resolveWillShowPrivacyMessage: typeof Promise.resolve;
 export const willShowPrivacyMessage = new Promise<boolean>((resolve) => {
@@ -74,8 +75,18 @@ const getPropertyId = (
 	return useNonAdvertisedList ? PROPERTY_ID_SUBDOMAIN : PROPERTY_ID_MAIN;
 };
 
-const hasNotConsentedToNonAdvertisedList = (): boolean => {
-	return !isNonNullable(localStorage.getItem('mergedMinorList'));
+/**
+ * This function checks the hasConsentData in the localStorage
+ * It returns false if it can't find the key to ensure it doesn't get stuck in a loop
+ *
+ * @return {*}  {boolean}
+ */
+const hasConsentedToNonAdvertisedList = (): boolean => {
+	const spUserConsentString = localStorage.getItem(
+		`_sp_user_consent_${PROPERTY_ID_SUBDOMAIN}`,
+	);
+	const userConsent = JSON.parse(spUserConsentString ?? '{}') as SPUserConsent;
+	return userConsent.gdpr?.consentStatus.hasConsentData ?? true;
 };
 
 export const init = (
@@ -94,20 +105,31 @@ export const init = (
 	}
 
 	setCurrentFramework(framework);
+
+	const isCorpABTest = isInConsentOrPayABTest();
+
+	// To esnure users who are not part
+	if (!isCorpABTest) {
+		useNonAdvertisedList = false;
+	}
+
+	console.log('participations', isCorpABTest);
+
 	setIsConsentOrPay(
 		isConsentOrPayCountry(countryCode) && !useNonAdvertisedList,
 	);
 
-	// invoke callbacks before we receive Sourcepoint events
-
 	if (
 		isConsentOrPayCountry(countryCode) &&
 		useNonAdvertisedList &&
-		hasNotConsentedToNonAdvertisedList()
+		!hasConsentedToNonAdvertisedList()
 	) {
-		mergeVendorList();
+		mergeVendorList().catch((error) => {
+			console.log('Failed to merge vendor list', error);
+		});
 	}
 
+	// invoke callbacks before we receive Sourcepoint
 	invokeCallbacks();
 
 	let frameworkMessageType: string;
@@ -130,10 +152,6 @@ export const init = (
 		window.guardian?.config?.tests?.useSourcepointPropertyIdVariant ===
 		'variant';
 
-	const isCorpABTest = isInConsentOrPayABTest();
-
-	console.log('participations', isCorpABTest);
-
 	log('cmp', `framework: ${framework}`);
 	log('cmp', `frameworkMessageType: ${frameworkMessageType}`);
 
diff --git a/libs/@guardian/libs/src/consent-management-platform/types/tcfv2/index.ts b/libs/@guardian/libs/src/consent-management-platform/types/tcfv2/index.ts
index a1d94d45e..7b3692f77 100644
--- a/libs/@guardian/libs/src/consent-management-platform/types/tcfv2/index.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/types/tcfv2/index.ts
@@ -30,5 +30,8 @@ export type TCPingStatusCode =
 export interface SPUserConsent {
 	gdpr?: {
 		euconsent?: string;
+		consentStatus: {
+			hasConsentData: boolean;
+		};
 	};
 }

From f059211f6b8162b5d3390a54a7c7743e2bb8ee6b Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:44:03 +0000
Subject: [PATCH 23/31] Move consentOrPayCountries to config file

---
 .../libs/src/consent-management-platform/isConsentOrPay.ts   | 2 +-
 .../src/consent-management-platform/lib/sourcepointConfig.ts | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
index 199826b94..e94d2653e 100644
--- a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
@@ -1,6 +1,7 @@
 import type { CountryCode } from '../index.test';
 import { isObject } from '../isObject/isObject';
 import { storage } from '../storage/storage';
+import { consentOrPayCountries } from './lib/sourcepointConfig';
 import type { Participations } from './types';
 
 let isConsentOrPay = false;
@@ -14,7 +15,6 @@ export const getIsConsentOrPay = (): boolean => {
 };
 
 export const isConsentOrPayCountry = (countryCode: CountryCode) => {
-	const consentOrPayCountries = ['GB'];
 	return consentOrPayCountries.includes(countryCode);
 };
 
diff --git a/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts b/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
index dd47f4e65..9926e6de0 100644
--- a/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/lib/sourcepointConfig.ts
@@ -3,8 +3,7 @@ import { isGuardianDomain } from './domain';
 export const ACCOUNT_ID = 1257;
 export const PRIVACY_MANAGER_USNAT = 1068329;
 
-export const PROPERTY_ID = 7417;
-export const PROPERTY_ID_MAIN = 9398; // TO BE CHANGED
+export const PROPERTY_ID_MAIN = 9398; // TO BE CHANGED to 7417
 export const PROPERTY_ID_SUBDOMAIN = 38161;
 export const PROPERTY_ID_AUSTRALIA = 13348;
 
@@ -27,3 +26,5 @@ export const SourcePointChoiceTypes = {
 	RejectAll: 13,
 	Dismiss: 15,
 } as const;
+
+export const consentOrPayCountries = ['GB'];

From fe632be6349b5d2f3e0e102d094b647b33763dc0 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:44:22 +0000
Subject: [PATCH 24/31] Refactor to use await/async

---
 .../mergeUserConsent.ts                       | 79 +++++++++----------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
index ff09cb93e..e0e07b2df 100644
--- a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
@@ -6,7 +6,7 @@ import {
 import { postCustomConsent } from './tcfv2/api';
 import type { SPUserConsent } from './types/tcfv2';
 
-const purposeMap = new Map<number, string>([
+const purposeIdToNonAdvertisingPurposesMap = new Map<number, string>([
 	[1, '677e3387b265dc07332909da'], // 1
 	[2, '677e3386b265dc073328f686'], //2
 	[3, '677e3386b265dc073328f96f'], // 3
@@ -20,6 +20,7 @@ const purposeMap = new Map<number, string>([
 	[11, '677e3386b265dc07332909c2'], //11
 ]);
 
+const spBaseUrl = 'https://cdn.privacy-mgmt.com/consent/tcfv2/consent/v3';
 interface Vendors {
 	_id: string;
 	name: string;
@@ -47,30 +48,33 @@ interface UserConsentStatus {
  * then calls postUserConsent
  * https://sourcepoint-public-api.readme.io/reference/get_consent-v3-history-siteid-1
  */
-export const mergeVendorList = () => {
-	console.log('Merging vendor list');
+export const mergeVendorList = async (): Promise<void> => {
+	const userConsent = await getUserConsentOnAdvertisingList();
+	await postUserConsent(userConsent);
+	await mergeUserConsent();
+	window.location.reload();
+};
+
+/**
+ *
+ *
+ * @return {*}  {Promise<UserConsentStatus[]>}
+ */
+const getUserConsentOnAdvertisingList = async (): Promise<
+	UserConsentStatus[]
+> => {
 	const consentUUID = getCookie({ name: 'consentUUID' });
-	const url = `https://cdn.privacy-mgmt.com/consent/tcfv2/consent/v3/history/${PROPERTY_ID_MAIN}?consentUUID=${consentUUID}`;
-	fetch(url, {
+	const url = `${spBaseUrl}/history/${PROPERTY_ID_MAIN}?consentUUID=${consentUUID}`;
+
+	const getUserConsentOnAdvertisingListResponse = await fetch(url, {
 		method: 'GET',
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
 		},
-	})
-		.then((response) => {
-			response
-				.json()
-				.then((data: UserConsentStatus[]) => {
-					postUserConsent(data);
-				})
-				.catch((error) => {
-					console.log('Error:', error);
-				});
-		})
-		.catch((error) => {
-			console.error('Error:', error);
-		});
+	});
+
+	return (await getUserConsentOnAdvertisingListResponse.json()) as UserConsentStatus[];
 };
 
 /**
@@ -78,13 +82,17 @@ export const mergeVendorList = () => {
  *
  * @param {UserConsentStatus[]} data
  */
-const postUserConsent = (data: UserConsentStatus[]) => {
+const postUserConsent = async (data: UserConsentStatus[]): Promise<void> => {
 	const vendorIds = data[0]?.vendors.map((vendor) => vendor._id);
 	let purposeIds = data[0]?.categories.map(
-		(category) => purposeMap.get(category.iabPurposeRef.iabId) ?? '',
+		(category) =>
+			purposeIdToNonAdvertisingPurposesMap.get(category.iabPurposeRef.iabId) ??
+			'',
 	);
 	let legitimateInterestPurposeIds = data[0]?.legIntCategories.map(
-		(category) => purposeMap.get(category.iabPurposeRef.iabId) ?? '',
+		(category) =>
+			purposeIdToNonAdvertisingPurposesMap.get(category.iabPurposeRef.iabId) ??
+			'',
 	);
 
 	purposeIds = purposeIds?.filter((id) => id !== '');
@@ -93,13 +101,11 @@ const postUserConsent = (data: UserConsentStatus[]) => {
 	);
 
 	if (vendorIds && purposeIds && legitimateInterestPurposeIds) {
-		postCustomConsent(vendorIds, purposeIds, legitimateInterestPurposeIds)
-			.then(() => {
-				mergeUserConsent();
-			})
-			.catch((error) => {
-				console.log('Error:', error);
-			});
+		await postCustomConsent(
+			vendorIds,
+			purposeIds,
+			legitimateInterestPurposeIds,
+		);
 	}
 };
 
@@ -107,15 +113,15 @@ const postUserConsent = (data: UserConsentStatus[]) => {
  * This function merges the main vendor list with the sub-domain user consent status
  * https://sourcepoint-public-api.readme.io/reference/post_consent-v3-siteid-tcstring
  */
-const mergeUserConsent = () => {
+const mergeUserConsent = async (): Promise<void> => {
 	const consentUUID = getCookie({ name: 'consentUUID' });
-	const url = `https://cdn.privacy-mgmt.com/consent/tcfv2/consent/v3/${PROPERTY_ID_SUBDOMAIN}/tcstring?consentUUID=${consentUUID}`;
+	const url = `${spBaseUrl}/${PROPERTY_ID_SUBDOMAIN}/tcstring?consentUUID=${consentUUID}`;
 	const spUserConsentString = localStorage.getItem(
 		`_sp_user_consent_${PROPERTY_ID_MAIN}`,
 	);
 	const userConsent = JSON.parse(spUserConsentString ?? '{}') as SPUserConsent;
 
-	fetch(url, {
+	await fetch(url, {
 		method: 'POST',
 		headers: {
 			Accept: 'application/json',
@@ -124,12 +130,5 @@ const mergeUserConsent = () => {
 		body: JSON.stringify({
 			euconsent: userConsent.gdpr?.euconsent,
 		}),
-	})
-		.then(() => {
-			localStorage.setItem('mergedMinorList', 'true');
-			window.location.reload();
-		})
-		.catch((error) => {
-			console.error('Error:', error);
-		});
+	});
 };

From 26aa123f6792f7d4fe6b3a46826b292ec3d5a528 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:55:40 +0000
Subject: [PATCH 25/31] fix lint

---
 .../libs/src/consent-management-platform/sourcepoint.ts      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index 6e36c39f4..1543ef39d 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -1,5 +1,4 @@
 import type { CountryCode } from '../index.test';
-import { isNonNullable } from '../isNonNullable/isNonNullable';
 import { log } from '../logger/logger';
 import { isExcludedFromCMP } from './exclusionList';
 import { setCurrentFramework } from './getCurrentFramework';
@@ -27,11 +26,11 @@ import {
 	PROPERTY_ID_SUBDOMAIN,
 	SourcePointChoiceTypes,
 } from './lib/sourcepointConfig';
-import { mergedListKey, mergeVendorList } from './mergeUserConsent';
+import { mergeVendorList } from './mergeUserConsent';
 import { invokeCallbacks } from './onConsentChange';
 import { stub } from './stub';
 import type { ConsentFramework } from './types';
-import { SPUserConsent } from './types/tcfv2';
+import type { SPUserConsent } from './types/tcfv2';
 
 let resolveWillShowPrivacyMessage: typeof Promise.resolve;
 export const willShowPrivacyMessage = new Promise<boolean>((resolve) => {

From ae44ca4e4a4702909866ee944c515243ac4ecee2 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:05:50 +0000
Subject: [PATCH 26/31] Update text

---
 .changeset/breezy-drinks-live.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.changeset/breezy-drinks-live.md b/.changeset/breezy-drinks-live.md
index 124a22131..cdd8d06f3 100644
--- a/.changeset/breezy-drinks-live.md
+++ b/.changeset/breezy-drinks-live.md
@@ -2,4 +2,8 @@
 '@guardian/libs': major
 ---
 
-Add the ability for consent or pay by adding two new params to cmp.init
+- Add the ability for consent or pay by adding two new params, useNonAdvertisingList and isUsedSignedIn to cmp.init
+- Using Sourcepoint Subdomain property if useNonAdvertisedList is true
+- Merging user consent from Advertising to Non-Advertising vendor list
+- Redirecting user to Support when clicking Reject for Consent or Pay users
+- Extending \_\_tcfapi to postCustomConsent as part of merging user consent process.

From 61b823da1a70e339ce91c6ca0aad0c63da614110 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:09:09 +0000
Subject: [PATCH 27/31] Flipped variable and parameter name

---
 .../src/consent-management-platform/isConsentOrPay.ts     | 8 ++++----
 .../libs/src/consent-management-platform/sourcepoint.ts   | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
index e94d2653e..4d8974d14 100644
--- a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
@@ -4,14 +4,14 @@ import { storage } from '../storage/storage';
 import { consentOrPayCountries } from './lib/sourcepointConfig';
 import type { Participations } from './types';
 
-let isConsentOrPay = false;
+let _isConsentOrPay = false;
 
-export const setIsConsentOrPay = (_isConsentOrPay: boolean) => {
-	isConsentOrPay = _isConsentOrPay;
+export const setIsConsentOrPay = (isConsentOrPay: boolean) => {
+	_isConsentOrPay = isConsentOrPay;
 };
 
 export const getIsConsentOrPay = (): boolean => {
-	return isConsentOrPay;
+	return _isConsentOrPay;
 };
 
 export const isConsentOrPayCountry = (countryCode: CountryCode) => {
diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index 1543ef39d..8197a3132 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -20,7 +20,6 @@ import {
 	ENDPOINT,
 	PROPERTY_HREF_MAIN,
 	PROPERTY_HREF_SUBDOMAIN,
-	// PROPERTY_ID,
 	PROPERTY_ID_AUSTRALIA,
 	PROPERTY_ID_MAIN,
 	PROPERTY_ID_SUBDOMAIN,

From 1b2823b9e9c4eb7e7e24e9cf0c5f7abca517572f Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:14:38 +0000
Subject: [PATCH 28/31] Update E2e test

---
 .../src/components/CmpTest.svelte             |  25 +-
 .../e2e/sourcepoint-tcfv2.spec.js.disabled    | 277 ++++++++++++------
 2 files changed, 200 insertions(+), 102 deletions(-)

diff --git a/apps/github-pages/src/components/CmpTest.svelte b/apps/github-pages/src/components/CmpTest.svelte
index be43f919e..d8a065b7c 100644
--- a/apps/github-pages/src/components/CmpTest.svelte
+++ b/apps/github-pages/src/components/CmpTest.svelte
@@ -3,8 +3,8 @@
 	import { cmp, onConsentChange, log } from '@guardian/libs';
 	import { onMount } from 'svelte';
 
-	let useNonAdvertisedList = window.location.search.includes('CMP_MAIN');
-	let isUserSignedIn = window.location.search.includes('CMP_SIGNED_IN');
+	let useNonAdvertisedList = window.location.search.includes('NON_ADV');
+	let isUserSignedIn = window.location.search.includes('SIGNED_IN');
 
 	switch (window.location.hash) {
 		case '#tcfv2':
@@ -40,11 +40,22 @@
 		log('cmp', event);
 	}
 
+	let setABTest = () => {
+		localStorage.setItem('gu.ab.participations', JSON.stringify({
+			value: {
+				ConsentOrPayBanner: {
+					variant: 'activate',
+				},
+			}
+		}));
+	}
+
 	let clearPreferences = () => {
 		// clear local storage
 		// https://documentation.sourcepoint.com/web-implementation/general/cookies-and-local-storage#cmp-local-storage
 		localStorage.clear();
 
+		setABTest();
 		// clear cookies
 		// https://documentation.sourcepoint.com/web-implementation/general/cookies-and-local-storage#cmp-cookies
 		document.cookie.split(';').forEach((cookie) => {
@@ -70,12 +81,12 @@
 
 	const toggleIsUserSignedIn = () => {
 		isUserSignedIn = !isUserSignedIn;
-		toggleQueryParams('CMP_SIGNED_IN');
+		toggleQueryParams('SIGNED_IN');
 	};
 
 	const toggleUseNonAdvertisedList = () => {
 		useNonAdvertisedList = !useNonAdvertisedList;
-		toggleQueryParams('CMP_MAIN');
+		toggleQueryParams('NON_ADV');
 	};
 
 	let framework = JSON.parse(localStorage.getItem('framework'));
@@ -116,11 +127,10 @@
 				break;
 		}
 
-		// do this loads to make sure that doesn't break things
 		cmp.init({
 			country,
-			isUserSignedIn: isUserSignedIn ?? false,
-			useNonAdvertisedList: useNonAdvertisedList ?? false,
+			isUserSignedIn: isUserSignedIn,
+			useNonAdvertisedList: useNonAdvertisedList,
 		});
 	});
 </script>
@@ -131,6 +141,7 @@
 			>open privacy manager</button
 		>
 		<button on:click={clearPreferences}>clear preferences</button>
+		<button on:click={setABTest}>set ab test</button>
 		<label class={framework == 'tcfv2' ? 'selected' : 'none'}>
 			<input
 				type="radio"
diff --git a/libs/@guardian/libs/playwright/e2e/sourcepoint-tcfv2.spec.js.disabled b/libs/@guardian/libs/playwright/e2e/sourcepoint-tcfv2.spec.js.disabled
index 90008aad0..41048f942 100644
--- a/libs/@guardian/libs/playwright/e2e/sourcepoint-tcfv2.spec.js.disabled
+++ b/libs/@guardian/libs/playwright/e2e/sourcepoint-tcfv2.spec.js.disabled
@@ -3,9 +3,15 @@ import { expect, test } from '@playwright/test';
 import { ACCOUNT_ID, ENDPOINT } from '../fixtures/sourcepointConfig';
 
 const iframeMessage = `[id^="sp_message_iframe_"]`;
-const iframePrivacyManager = '#sp_message_iframe_106842';
+// const iframePrivacyManager = '#sp_message_iframe_106842';
+const iframePrivacyManager = '#sp_message_iframe_1251121';
+
+const acceptAllButton = 'sp_choice_type_11';
+const rejectAllButton = 'sp_choice_type_13';
 
 const url = `http://localhost:4321/csnx/cmp-test-page#tcfv2`;
+const nonAdvertisingBannerUrl = `http://localhost:4321/csnx/cmp-test-page?CMP_MAIN#tcfv2`
+
 
 async function getIframeBody(page, selector) {
 	const iframeElement = await page.locator(`iframe${selector}`).elementHandle();
@@ -59,120 +65,201 @@ test.describe('Document', () => {
 	});
 });
 test.describe('Interaction', () => {
-	const buttonTitle = 'Yes, I accept';
 
-	test(`should give all consents when clicking "${buttonTitle}"`, async ({
-		page,
-	}) => {
-		await page.goto(url);
-		await page.context().addCookies([
-			{ name: 'ccpaApplies', value: 'false', url },
-			{ name: 'gdprApplies', value: 'true', url },
-		]);
+	test.describe('Consent or Pay banner', () => {
+		test(`should give all consents when clicking accept all`, async ({
+			page,
+		}) => {
+			await page.goto(url);
+			await page.context().addCookies([
+				{ name: 'ccpaApplies', value: 'false', url },
+				{ name: 'gdprApplies', value: 'true', url },
+			]);
+
+			const iframe = await getIframeBody(page, iframeMessage);
+			await iframe.click(`button.${acceptAllButton}`);
+
+			await page.waitForTimeout(2000);
+
+			for (const purpose of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]) {
+				const consent = await page.getAttribute(
+					`[data-purpose="${purpose}"]`,
+					'data-consent',
+				);
+				expect(consent).toBe('true');
+			}
+		});
+
+		test(`should have no consents when clicking reject all`, async ({
+			page,
+		}) => {
+			await page.goto(url);
+			await page.context().addCookies([
+				{ name: 'ccpaApplies', value: 'false', url },
+				{ name: 'gdprApplies', value: 'true', url },
+			]);
+
+			const iframe = await getIframeBody(page, iframeMessage);
+			await iframe.click(`button.${rejectAllButton}`);
+
+			await page.waitForTimeout(2000);
+
+			for (const purpose of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]) {
+				const consent = await page.getAttribute(
+					`[data-purpose="${purpose}"]`,
+					'data-consent',
+				);
+				expect(consent).toBe('false');
+			}
+		});
+
+		test(`should deactivate purpose 5, 6, 8, 11 if rejecting 'Personalised content and content measurement' in privacy manager`, async ({ page }) => {
+			await page.goto(url);
+			await page.context().addCookies([
+				{ name: 'ccpaApplies', value: 'false', url },
+				{ name: 'gdprApplies', value: 'true', url },
+			]);
 
-		const iframe = await getIframeBody(page, iframeMessage);
-		await iframe.click(`button[title="${buttonTitle}"]`);
+			const iframe = await getIframeBody(page, iframeMessage);
+			await iframe.click(`button.${acceptAllButton}`);
 
-		await page.waitForTimeout(2000);
+			await page.waitForTimeout(2000);
 
-		for (const purpose of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]) {
-			const consent = await page.getAttribute(
-				`[data-purpose="${purpose}"]`,
-				'data-consent',
+			await page.click('[data-cy=pm]');
+
+			const privacyManagerIframe = await getIframeBody(
+				page,
+				iframePrivacyManager,
 			);
-			expect(consent).toBe('true');
-		}
-	});
+			await privacyManagerIframe.locator('div.pur-buttons-container').nth(2).locator('button').nth(1).click();
+			await privacyManagerIframe.click('button[title="Save and close"]');
 
-	test(`should deactivate purpose 1 only`, async ({ page }) => {
-		await page.goto(url);
-		await page.context().addCookies([
-			{ name: 'ccpaApplies', value: 'false', url },
-			{ name: 'gdprApplies', value: 'true', url },
-		]);
+			await page.waitForTimeout(2000);
 
-		const iframe = await getIframeBody(page, iframeMessage);
-		await iframe.click(`button[title="${buttonTitle}"]`);
+			for (const purpose of [1, 2, 3, 4, 7,  9, 10]) {
+				const consent = await page.getAttribute(
+					`[data-purpose="${purpose}"]`,
+					'data-consent',
+				);
+				expect(consent).toBe('true');
+			}
 
-		await page.waitForTimeout(2000);
+			for (const purpose of [5, 6, 8, 11]) {
+				const consent = await page.getAttribute(
+					`[data-purpose="${purpose}"]`,
+					'data-consent',
+				);
+				expect(consent).toBe('false');
+			}
+		});
 
-		await page.click('[data-cy=pm]');
+	})
 
-		const privacyManagerIframe = await getIframeBody(
+	test.describe('Non Advertising Banner', () => {
+		test(`should give all consents when clicking accept all`, async ({
 			page,
-			iframePrivacyManager,
-		);
-		await privacyManagerIframe.click(
-			'div[title="Store and/or access information on a device"] span.off',
-		);
-		await privacyManagerIframe.click('button[title="Save and close"]');
+		}) => {
+			await page.goto(nonAdvertisingBannerUrl);
+			await page.context().addCookies([
+				{ name: 'ccpaApplies', value: 'false', url: nonAdvertisingBannerUrl },
+				{ name: 'gdprApplies', value: 'true', url: nonAdvertisingBannerUrl },
+			]);
 
-		await page.waitForFunction(
-			() =>
-				document
-					.querySelector(`[data-purpose="1"]`)
-					.getAttribute('data-consent') === 'false',
-		);
+			const iframe = await getIframeBody(page, iframeMessage);
+			await iframe.click(`button.${acceptAllButton}`);
 
-		const consent = await page.getAttribute(
-			`[data-purpose="1"]`,
-			'data-consent',
-		);
-		expect(consent).toBe('false');
+			await page.waitForTimeout(2000);
 
-		for (const purpose of [2, 3, 4, 5, 6, 7, 8, 9, 10, 11]) {
-			const consent = await page.getAttribute(
-				`[data-purpose="${purpose}"]`,
-				'data-consent',
-			);
-			expect(consent).toBe('true');
-		}
-	});
+			for (const purpose of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) {
+				const consent = await page.getAttribute(
+					`[data-purpose="${purpose}"]`,
+					'data-consent',
+				);
+				expect(consent).toBe('true');
+			}
+		});
 
-	test(`should deactivate all purposes except purpose 1`, async ({ page }) => {
-		await page.goto(url);
-		await page.context().addCookies([
-			{ name: 'ccpaApplies', value: 'false', url },
-			{ name: 'gdprApplies', value: 'true', url },
-		]);
+		test(`should have no consents when clicking reject all`, async ({
+			page,
+		}) => {
+			await page.goto(nonAdvertisingBannerUrl);
+			await page.context().addCookies([
+				{ name: 'ccpaApplies', value: 'false', url: nonAdvertisingBannerUrl },
+				{ name: 'gdprApplies', value: 'true', url: nonAdvertisingBannerUrl },
+			]);
 
-		const iframe = await getIframeBody(page, iframeMessage);
-		await iframe.click(`button[title="${buttonTitle}"]`);
+			const iframe = await getIframeBody(page, iframeMessage);
+			await iframe.click(`button.${rejectAllButton}`);
 
-		await page.click('[data-cy=pm]');
+			await page.waitForTimeout(2000);
+
+			for (const purpose of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]) {
+				const consent = await page.getAttribute(
+					`[data-purpose="${purpose}"]`,
+					'data-consent',
+				);
+				expect(consent).toBe('false');
+			}
+		});
+	})
 
-		const privacyManagerIframe = await getIframeBody(
+	test.describe('Moving from Consent or Pay to Non Advertising Banner', () => {
+		test(`should give all consents in non advertised banner when clicking accept all in Consent or Pay`, async ({
 			page,
-			iframePrivacyManager,
-		);
-		await privacyManagerIframe.click(
-			'div[title="Store and/or access information on a device"] span.on',
-		);
-		await page
-			.frameLocator('iframe[title="SP Consent Message"]')
-			.getByRole('button', { name: 'Off' })
-			.click();
-		await privacyManagerIframe.click('button[title="Save and close"]');
-
-		await page.waitForFunction(
-			() =>
-				document
-					.querySelector(`[data-purpose="2"]`)
-					.getAttribute('data-consent') === 'false',
-		);
+		}) => {
+			await page.goto(url);
+			await page.context().addCookies([
+				{ name: 'ccpaApplies', value: 'false', url },
+				{ name: 'gdprApplies', value: 'true', url },
+			]);
 
-		const consent = await page.getAttribute(
-			`[data-purpose="1"]`,
-			'data-consent',
-		);
-		expect(consent).toBe('true');
+			const iframe = await getIframeBody(page, iframeMessage);
+			await iframe.click(`button.${acceptAllButton}`);
 
-		for (const purpose of [2, 3, 4, 5, 6, 7, 8, 9, 10, 11]) {
-			const consent = await page.getAttribute(
-				`[data-purpose="${purpose}"]`,
-				'data-consent',
-			);
-			expect(consent).toBe('false');
-		}
+			await page.waitForTimeout(2000);
+
+			await page.goto(nonAdvertisingBannerUrl);
+
+			await page.waitForTimeout(2000);
+
+			for (const purpose of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]) {
+				const consent = await page.getAttribute(
+					`[data-purpose="${purpose}"]`,
+					'data-consent',
+				);
+				expect(consent).toBe('true');
+			}
+
+		});
+
+		test(`should give no consents in non advertised banner when clicking reject all in Consent or Pay`, async ({
+			page,
+		}) => {
+			await page.goto(url);
+			await page.context().addCookies([
+				{ name: 'ccpaApplies', value: 'false', url },
+				{ name: 'gdprApplies', value: 'true', url },
+			]);
+
+			const iframe = await getIframeBody(page, iframeMessage);
+			await iframe.click(`button.${rejectAllButton}`);
+
+			await page.waitForTimeout(2000);
+
+			await page.goto(nonAdvertisingBannerUrl);
+
+			await page.waitForTimeout(2000);
+
+			for (const purpose of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]) {
+				const consent = await page.getAttribute(
+					`[data-purpose="${purpose}"]`,
+					'data-consent',
+				);
+				expect(consent).toBe('false');
+			}
+
+		});
 	});
+
+
 });

From 4a8efab764df0b9e2a0a8a7dd6cfe85bb52ab854 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:44:43 +0000
Subject: [PATCH 29/31] Create function to get support sign up page depending
 on domain

---
 .../libs/src/consent-management-platform/isConsentOrPay.ts | 7 +++++++
 .../libs/src/consent-management-platform/sourcepoint.ts    | 6 ++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
index 4d8974d14..6006cd471 100644
--- a/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/isConsentOrPay.ts
@@ -1,6 +1,7 @@
 import type { CountryCode } from '../index.test';
 import { isObject } from '../isObject/isObject';
 import { storage } from '../storage/storage';
+import { isGuardianDomain } from './lib/domain';
 import { consentOrPayCountries } from './lib/sourcepointConfig';
 import type { Participations } from './types';
 
@@ -26,3 +27,9 @@ export const isInConsentOrPayABTest = (): boolean => {
 		? participations.ConsentOrPayBanner?.variant === 'activate'
 		: false;
 };
+
+export const getSupportSignUpPage = (): string => {
+	return isGuardianDomain()
+		? `https://support.theguardian.com/guardian-ad-lite?returnAddress=${window.location.href}`
+		: `https://support.code.dev-theguardian.com/guardian-ad-lite?returnAddress=${window.location.href}`;
+};
diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index 8197a3132..ece1f4e0a 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -3,6 +3,7 @@ import { log } from '../logger/logger';
 import { isExcludedFromCMP } from './exclusionList';
 import { setCurrentFramework } from './getCurrentFramework';
 import {
+	getSupportSignUpPage,
 	isConsentOrPayCountry,
 	isInConsentOrPayABTest,
 	setIsConsentOrPay,
@@ -246,10 +247,7 @@ export const init = (
 							!useNonAdvertisedList &&
 							isCorpABTest
 						) {
-							window.open(
-								`https://support.theguardian.com/uk/contribute?redirectUrl=${window.location.href}`,
-								'_blank',
-							);
+							window.open(getSupportSignUpPage(), '_blank');
 						}
 					}
 				},

From eb7944b7f00b5078bb2c0910b1dc0979cdd08fb3 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:45:52 +0000
Subject: [PATCH 30/31] Refactor the mergeVendorList

---
 .../mergeUserConsent.ts                       | 80 ++++++++++++-------
 1 file changed, 50 insertions(+), 30 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
index e0e07b2df..56279a356 100644
--- a/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/mergeUserConsent.ts
@@ -1,4 +1,6 @@
 import { getCookie } from '../cookies/getCookie';
+import { isString } from '../isString/isString';
+import { isUndefined } from '../isUndefined/isUndefined';
 import {
 	PROPERTY_ID_MAIN,
 	PROPERTY_ID_SUBDOMAIN,
@@ -42,6 +44,11 @@ interface UserConsentStatus {
 	legIntVendors: Vendors[];
 	categories: LegIntCategories[];
 }
+interface PostUserConsentResponse {
+	vendors: string[];
+	purposes: string[];
+	legitimateInterestPurposeIds: string[];
+}
 
 /**
  * THis function gets the user's consent for the larger gdpr vendor list
@@ -49,18 +56,27 @@ interface UserConsentStatus {
  * https://sourcepoint-public-api.readme.io/reference/get_consent-v3-history-siteid-1
  */
 export const mergeVendorList = async (): Promise<void> => {
-	const userConsent = await getUserConsentOnAdvertisingList();
-	await postUserConsent(userConsent);
-	await mergeUserConsent();
-	window.location.reload();
+	const userConsent = await getUserConsentForAdvertisingVendorList();
+	const purposesAndVendors = getConsentedPurposesandVendorsStrings(userConsent);
+
+	if (!isUndefined(purposesAndVendors)) {
+		await postCustomConsent(
+			purposesAndVendors.vendors,
+			purposesAndVendors.purposes,
+			purposesAndVendors.legitimateInterestPurposeIds,
+		);
+		await mergeUserConsent();
+
+		window.location.reload();
+	}
 };
 
 /**
+ * Fetches the users consent to the main GDPR vendor list from the sourcepoint API
  *
- *
- * @return {*}  {Promise<UserConsentStatus[]>}
+ * @return {*}  {Promise<UserConsentStatus[]>}  user consent status
  */
-const getUserConsentOnAdvertisingList = async (): Promise<
+const getUserConsentForAdvertisingVendorList = async (): Promise<
 	UserConsentStatus[]
 > => {
 	const consentUUID = getCookie({ name: 'consentUUID' });
@@ -79,33 +95,37 @@ const getUserConsentOnAdvertisingList = async (): Promise<
 
 /**
  *
- *
- * @param {UserConsentStatus[]} data
+ * Extract user consent data from main vendor list and posts them to Sourcepoint for non advertising vendor list.
  */
-const postUserConsent = async (data: UserConsentStatus[]): Promise<void> => {
+const getConsentedPurposesandVendorsStrings = (
+	data: UserConsentStatus[],
+): PostUserConsentResponse | undefined => {
 	const vendorIds = data[0]?.vendors.map((vendor) => vendor._id);
-	let purposeIds = data[0]?.categories.map(
-		(category) =>
-			purposeIdToNonAdvertisingPurposesMap.get(category.iabPurposeRef.iabId) ??
-			'',
-	);
-	let legitimateInterestPurposeIds = data[0]?.legIntCategories.map(
-		(category) =>
-			purposeIdToNonAdvertisingPurposesMap.get(category.iabPurposeRef.iabId) ??
-			'',
-	);
-
-	purposeIds = purposeIds?.filter((id) => id !== '');
-	legitimateInterestPurposeIds = legitimateInterestPurposeIds?.filter(
-		(id) => id !== '',
-	);
+	const purposeIds = data[0]?.categories
+		.map(
+			(category) =>
+				purposeIdToNonAdvertisingPurposesMap.get(
+					category.iabPurposeRef.iabId,
+				) ?? '',
+		)
+		.filter(isString);
+	const legitimateInterestPurposeIds = data[0]?.legIntCategories
+		.map(
+			(category) =>
+				purposeIdToNonAdvertisingPurposesMap.get(
+					category.iabPurposeRef.iabId,
+				) ?? '',
+		)
+		.filter(isString);
 
 	if (vendorIds && purposeIds && legitimateInterestPurposeIds) {
-		await postCustomConsent(
-			vendorIds,
-			purposeIds,
-			legitimateInterestPurposeIds,
-		);
+		return {
+			vendors: vendorIds,
+			purposes: purposeIds,
+			legitimateInterestPurposeIds: legitimateInterestPurposeIds,
+		};
+	} else {
+		return undefined;
 	}
 };
 

From af6eccd6f334c61e251d4d20c68c3c74709954c9 Mon Sep 17 00:00:00 2001
From: Akinsola Lawanson <106528085+akinsola-guardian@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:46:07 +0000
Subject: [PATCH 31/31] Using serverside ab test

---
 .../libs/src/consent-management-platform/sourcepoint.ts     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
index ece1f4e0a..7734371be 100644
--- a/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
+++ b/libs/@guardian/libs/src/consent-management-platform/sourcepoint.ts
@@ -1,3 +1,4 @@
+import { getCookie } from '../cookies/getCookie';
 import type { CountryCode } from '../index.test';
 import { log } from '../logger/logger';
 import { isExcludedFromCMP } from './exclusionList';
@@ -5,7 +6,6 @@ import { setCurrentFramework } from './getCurrentFramework';
 import {
 	getSupportSignUpPage,
 	isConsentOrPayCountry,
-	isInConsentOrPayABTest,
 	setIsConsentOrPay,
 } from './isConsentOrPay';
 import { isGuardianDomain } from './lib/domain';
@@ -105,7 +105,9 @@ export const init = (
 
 	setCurrentFramework(framework);
 
-	const isCorpABTest = isInConsentOrPayABTest();
+	const isCorpABTest = getCookie({
+		name: 'X-GU-Experiment-0perc-E',
+	})?.includes('true');
 
 	// To esnure users who are not part
 	if (!isCorpABTest) {