Move rejectAll to cmp object

guardian · Dec 9, 2024 · 334c67d · 334c67d
1 parent eb85496
commit 334c67d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/apps/github-pages/src/components/CmpTest.svelte b/apps/github-pages/src/components/CmpTest.svelte
@@ -1,6 +1,6 @@
 <script>
 	// this maps to the version in libs/@guardian/libs
-	import { cmp, onConsentChange, log, rejectAll } from '@guardian/libs';
+	import { cmp, onConsentChange, log } from '@guardian/libs';
 	import { onMount } from 'svelte';
 
 
@@ -42,7 +42,7 @@
 	}
 
 	let rejectAllFunc = () => {
-		rejectAll().then(() => {
+		cmp.rejectAll().then(() => {
 			logEvent({ title: 'rejectAll'});
 			// window.location.reload();
 		});

diff --git a/libs/@guardian/libs/src/consent-management-platform/index.test.ts b/libs/@guardian/libs/src/consent-management-platform/index.test.ts
@@ -106,6 +106,7 @@ describe('hotfix cmp.init', () => {
 			willShowPrivacyMessage: () => new Promise(() => true),
 			willShowPrivacyMessageSync: () => true,
 			hasInitialised: () => true,
+			rejectAll: () => new Promise(() => undefined),
 			showPrivacyManager: () => {
 				console.warn('This is a dummy for showPrivacyManager');
 			},

diff --git a/libs/@guardian/libs/src/consent-management-platform/index.ts b/libs/@guardian/libs/src/consent-management-platform/index.ts
@@ -93,6 +93,10 @@ const showPrivacyManager = () => {
 	void initialised.then(UnifiedCMP.showPrivacyManager);
 };
 
+const rejectAll = isServerSide
+	? clientRejectAll
+	: (window.guCmpHotFix.rejectAll ??= clientRejectAll);
+
 export const cmp: CMP = isServerSide
 	? serverCmp
 	: (window.guCmpHotFix.cmp ||= {
@@ -101,6 +105,7 @@ export const cmp: CMP = isServerSide
 			willShowPrivacyMessageSync,
 			hasInitialised,
 			showPrivacyManager,
+			rejectAll,
 			version: version,
 
 			// special helper methods for disabling CMP
@@ -109,10 +114,6 @@ export const cmp: CMP = isServerSide
 			__disable: disable,
 		});
 
-export const rejectAll = isServerSide
-	? clientRejectAll
-	: (window.guCmpHotFix.rejectAll ??= clientRejectAll);
-
 export const onConsent = isServerSide
 	? serverOnConsent
 	: (window.guCmpHotFix.onConsent ||= clientOnConsent);

diff --git a/libs/@guardian/libs/src/consent-management-platform/server.ts b/libs/@guardian/libs/src/consent-management-platform/server.ts
@@ -34,6 +34,7 @@ export const cmp: CMP = {
 	version: 'n/a',
 	willShowPrivacyMessage: serverSideWarnAndReturn(Promise.resolve(false)),
 	willShowPrivacyMessageSync: serverSideWarnAndReturn(false),
+	rejectAll: serverSideWarnAndReturn(Promise.resolve()),
 };
 
 export const onConsent = (): ReturnType<typeof OnConsent> => {

diff --git a/libs/@guardian/libs/src/consent-management-platform/types/index.ts b/libs/@guardian/libs/src/consent-management-platform/types/index.ts
@@ -12,6 +12,7 @@ export type CMP = {
 	willShowPrivacyMessageSync: () => boolean;
 	hasInitialised: () => boolean;
 	showPrivacyManager: () => void;
+	rejectAll: () => Promise<void>;
 	version: string;
 	__isDisabled: () => boolean;
 	__disable: () => void;

diff --git a/libs/@guardian/libs/src/index.test.ts b/libs/@guardian/libs/src/index.test.ts
@@ -29,7 +29,6 @@ describe('The package', () => {
 			'log',
 			'onConsent',
 			'onConsentChange',
-			'rejectAll',
 			'removeCookie',
 			'setCookie',
 			'setSessionCookie',

diff --git a/libs/@guardian/libs/src/index.ts b/libs/@guardian/libs/src/index.ts
@@ -21,7 +21,6 @@ export {
 	getConsentFor,
 	onConsentChange,
 	onConsent,
-	rejectAll,
 } from './consent-management-platform';
 
 export { getCookie } from './cookies/getCookie';