@osano/osano-cmp-react-native 0.17.2 → 0.18.0

package/src/reducer.ts

@@ -7,7 +7,7 @@ import {
 	GO_BACK,
 	RELOAD,
 	REVERT_CONSENT,
-	SAVE_SUCCESS,
+	SAVE_BEGIN,
 	SET_ALL_CONSENT,
 	SET_CONFIG,
 	SET_LOCALE,
@@ -19,89 +19,57 @@ import {
 } from './actions';
 import {
 	ConsentCategory,
-	ConsentCategory as ConsentCategoryType,
+	initialState,
+	makeConsentFromCategories,
+	OsanoCategories,
+	type ConsentCategoryType,
 } from './constants';
-import { ConsentConfig, ConsentManager } from './ConsentManager';
 import type { Disclosure, OsanoAction, OsanoState } from './types/store';
-import { getFinalOptOutValue, getSavedConsent } from './iab/tcf/selectors';
-import { isAnalyticsAlwaysAllowed, shouldUseGPCOptOut } from './selectors';
-
-export const OsanoCategories = Object.values(ConsentCategory);
+import {
+	getFinalOptOutValue,
+	getPriorConsent,
+	isAnalyticsAlwaysAllowed,
+	shouldUseGPCOptOut,
+} from './selectors';
 
-export const initialState: OsanoState = {
-	config: undefined,
-	configId: '',
-	consent: {
-		[ConsentCategory.ESSENTIAL]: true,
-		[ConsentCategory.STORAGE]: false,
-		[ConsentCategory.MARKETING]: false,
-		[ConsentCategory.PERSONALIZATION]: false,
-		[ConsentCategory.ANALYTICS]: false,
-		[ConsentCategory.OPT_OUT]: false,
-	} as Record<ConsentCategoryType, boolean | undefined>,
-	consentTimestamp: 0,
-	customerId: '',
-	dialogOpen: false,
-	disclosures: {
-		fetched: [],
-		loading: false,
-		results: {},
-	},
-	locale: 'en',
-	ready: {
-		consent: false,
-	},
-	savedConsent: null,
-	scrollToType: '',
-	scrollToId: -1,
-	stack: [],
-};
+import { ConsentConfig } from './ConsentManager';
 
 export const init = (initialArgs: OsanoState & any): OsanoState => {
 	const { consent, ...reloadProps } = initialArgs;
+	const consentRecord = consent
+		? Array.isArray(consent)
+			? makeConsentFromCategories(consent)
+			: { ...consent }
+		: initialState.consent;
 	return {
 		...initialState,
 		...reloadProps,
-		consent: consent
-			? Array.isArray(consent)
-				? OsanoCategories.reduce(
-						(newConsent, category) => {
-							newConsent[`${category}`] = consent.includes(category);
-							return newConsent;
-						},
-						{} as Record<ConsentCategoryType, boolean | undefined>
-					)
-				: { ...consent }
-			: initialState.consent,
+		consent: consentRecord,
+		savedConsent: consent
+			? ({ ...consentRecord } as Record<ConsentCategoryType, boolean>)
+			: null,
 	};
 };
 
 const setAllConsent = (acceptOrDeny: boolean) => (state: OsanoState) => {
-	function formatStatus(category: ConsentCategoryType, status: boolean) {
-		const useGPC = shouldUseGPCOptOut(state, !status);
+	function isAccepted(category: ConsentCategoryType) {
+		const useGPC = shouldUseGPCOptOut(state, !acceptOrDeny);
 		switch (category) {
 			case 'ESSENTIAL': {
 				return true;
 			}
 			case 'OPT_OUT': {
 				// This is inverted because we would assume consent to all would be DENY for OPT_OUT
-				return useGPC || !status;
+				return useGPC || !acceptOrDeny;
 			}
 			case 'MARKETING': {
 				// Never set marketing to true if GPC is detected
-				return status && !useGPC;
+				return acceptOrDeny && !useGPC;
 			}
 		}
-		return status;
+		return acceptOrDeny;
 	}
-	const newConsent = OsanoCategories.reduce(
-		(consent, category) => {
-			const status = formatStatus(category, acceptOrDeny);
-			consent[`${category}`] = status;
-			return consent;
-		},
-		{} as Record<ConsentCategoryType, boolean | undefined>
-	);
+	const newConsent = makeConsentFromCategories(OsanoCategories, isAccepted);
 	return {
 		...state,
 		consent: newConsent as Record<ConsentCategoryType, boolean | undefined>,
@@ -134,31 +102,24 @@ export function reducer(state: OsanoState, action: OsanoAction): OsanoState {
 				...state,
 				locale: action.payload,
 			};
-		case SAVE_SUCCESS: {
+		/**
+		 * Why SAVE_BEGIN? Because we are going to save the consent regardless of SUCCESS OR FAILURE.
+		 * The only thing we do on FAILURE is we store an indicator that the record failed, and then
+		 * we will retry later. The consent state should reflect the user's choices immediately.
+		 */
+		case SAVE_BEGIN: {
 			const consentedCategories: ConsentCategoryType[] = action.payload;
-			const consent = OsanoCategories.reduce(
-				(consent, category) => {
-					consent[`${category}`] = consentedCategories.includes(category);
-					return consent;
-				},
-				{} as Record<ConsentCategoryType, boolean>
-			);
-
-			consent[ConsentCategory.ESSENTIAL] = true;
-			if (consent[ConsentCategory.OPT_OUT]) {
-				consent[ConsentCategory.MARKETING] = false;
-			}
+			const consent = makeConsentFromCategories(consentedCategories);
 			return {
 				...state,
 				consent,
 				savedConsent: { ...consent },
-				stack: [],
 			};
 		}
 		case CLEAR_CONSENT: {
 			const optOutStatus = getFinalOptOutValue(
 				state,
-				initialState.consent[ConsentCategory.OPT_OUT]
+				initialState.consent[ConsentCategory.OPT_OUT],
 			);
 
 			return {
@@ -175,20 +136,7 @@ export function reducer(state: OsanoState, action: OsanoAction): OsanoState {
 			};
 		}
 		case REVERT_CONSENT: {
-			const previousConsent = {
-				...(getSavedConsent(state) || initialState.consent),
-			};
-			if (!getSavedConsent(state)) {
-				previousConsent[ConsentCategory.OPT_OUT] = getFinalOptOutValue(
-					state,
-					previousConsent[ConsentCategory.OPT_OUT]
-				);
-				previousConsent[ConsentCategory.ANALYTICS] = isAnalyticsAlwaysAllowed(
-					state
-				)
-					? true
-					: false;
-			}
+			const previousConsent = getPriorConsent(state);
 			return {
 				...state,
 				consent: previousConsent,
@@ -293,26 +241,18 @@ export function reducer(state: OsanoState, action: OsanoAction): OsanoState {
 			};
 		}
 		case CLOSE: {
-			const cmp = action.payload as ConsentManager;
-			const consent = Object.keys(state.consent).reduce(
-				(newConsent, category) => {
-					newConsent[`${category as ConsentCategoryType}`] =
-						cmp.consent?.includes(category as ConsentCategoryType);
-					return newConsent;
-				},
-				{} as Record<ConsentCategoryType, boolean | undefined>
-			);
-			if (state.stack.length > 0) {
+			const previousConsent = getPriorConsent(state);
+			if (state.stack.length > 1) {
 				return {
 					...state,
-					consent,
+					consent: previousConsent,
 					stack: [],
 				};
 			}
 			return {
 				...state,
+				consent: previousConsent,
 				dialogOpen: false,
-				consent,
 				stack: [],
 			};
 		}
@@ -357,7 +297,7 @@ export function reducer(state: OsanoState, action: OsanoAction): OsanoState {
 			>(
 				(
 					categories: Partial<Record<ConsentCategoryType, Disclosure[]>>,
-					disclosure: Disclosure
+					disclosure: Disclosure,
 				) => {
 					const { classification: categoryName } = disclosure || {};
 					if (!disclosure || !categoryName) {
@@ -370,7 +310,7 @@ export function reducer(state: OsanoState, action: OsanoAction): OsanoState {
 					categoryDisclosures.push({ type: 'cookie', ...disclosure });
 					return categories;
 				},
-				{ ...results }
+				{ ...results },
 			);
 			const newResults = Object.entries(disclosuresByCategory)
 				.filter(([cat]) => fetched.push(cat as ConsentCategoryType))
@@ -390,11 +330,11 @@ export function reducer(state: OsanoState, action: OsanoAction): OsanoState {
 										: false;
 								})
 								.sort((a, b) =>
-									`${a.type}:${a.name}`.localeCompare(`${b.type}:${b.name}`)
+									`${a.type}:${a.name}`.localeCompare(`${b.type}:${b.name}`),
 								);
 						return validCategories;
 					},
-					{} as Record<ConsentCategoryType, Disclosure[]>
+					{} as Record<ConsentCategoryType, Disclosure[]>,
 				);
 			return {
 				...state,
@@ -402,7 +342,7 @@ export function reducer(state: OsanoState, action: OsanoAction): OsanoState {
 					...state.disclosures,
 					results: newResults,
 					fetched: fetched.filter(
-						(cat, index, list) => list.indexOf(cat) === index
+						(cat, index, list) => list.indexOf(cat) === index,
 					),
 					loading: false,
 				},

package/src/selectors.ts

@@ -1,7 +1,7 @@
-// @ts-nocheck
 import {
+	initialState,
 	ConsentCategory,
-	ConsentCategory as ConsentCategoryType,
+	type ConsentCategoryType,
 } from './constants';
 import type { Disclosure, OsanoState } from './types/store';
 
@@ -55,6 +55,41 @@ export function getConsent(state: OsanoState, category?: ConsentCategoryType) {
 		.filter(([_key, value]) => value)
 		.map(([key]) => key);
 }
+export function getFinalOptOutValue(
+	state?: OsanoState,
+	pendingNewValue?: boolean,
+) {
+	if (pendingNewValue === true) {
+		return true;
+	} else if (pendingNewValue === undefined) {
+		const existingOptOut =
+			get(state, ['consent', ConsentCategory.OPT_OUT]) ||
+			initialState.consent[ConsentCategory.OPT_OUT];
+		return existingOptOut;
+	}
+
+	return false;
+}
+export function getSavedConsent(state: OsanoState) {
+	return get(state, 'savedConsent', null);
+}
+export function getPriorConsent(
+	state: OsanoState,
+): Record<ConsentCategoryType, boolean | undefined> {
+	const previousConsent = {
+		...(getSavedConsent(state) || initialState.consent),
+	};
+	if (!getSavedConsent(state)) {
+		previousConsent[ConsentCategory.OPT_OUT] = getFinalOptOutValue(
+			state,
+			previousConsent[ConsentCategory.OPT_OUT],
+		);
+		previousConsent[ConsentCategory.ANALYTICS] = isAnalyticsAlwaysAllowed(state)
+			? true
+			: false;
+	}
+	return previousConsent;
+}
 export const getConsentTimestamp = (state: OsanoState): number =>
 	get(state, 'consentTimestamp') || 0;
 

package/src/services/consent.ts

@@ -4,8 +4,10 @@ import { TextEncoder } from 'text-encoding';
 import type { ConsentManager } from '../ConsentManager';
 import {
 	ConsentCategory,
-	ConsentCategory as ConsentCategoryType,
+	type ConsentCategoryType,
 	env,
+	formatConsentArray,
+	makeConsentFromCategories,
 } from '../constants';
 import { clearStorage, getStorage, setStorage } from '../native/OsanoCmp';
 import type { Config } from '../types/consent-config';
@@ -13,13 +15,17 @@ import { merge } from '../utils';
 import API from '../utils/API';
 import { osanoLogger } from '../utils/OsanoLogger';
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const Buffer = require('buffer').Buffer;
 
 const { CONSENT_URI, LOOKUPS_URI, OSANO_ORIGIN } = env;
 
-const IS_OFFICIAL_SAMPLE: boolean = (NativeModules as any)?.OsanoCmpSdk?.IS_OFFICIAL_SAMPLE;
+const IS_OFFICIAL_SAMPLE: boolean = (NativeModules as any)?.OsanoCmpSdk
+	?.IS_OFFICIAL_SAMPLE;
 
-const CONSENTING_PLATFORM_TAG = IS_OFFICIAL_SAMPLE ? `${Platform.OS}.sample-react-native` : `${Platform.OS}.react-native`;
+const CONSENTING_PLATFORM_TAG = IS_OFFICIAL_SAMPLE
+	? `${Platform.OS}.sample-react-native`
+	: `${Platform.OS}.react-native`;
 
 const overrideConfig: Partial<Config> = {
 	// Override config here
@@ -47,28 +53,11 @@ export type ConsentRecordPayload = {
 };
 
 export type ConsentLookupResponseType = {
-	consented: string[];
+	consented: ConsentCategoryType[];
 	lastConsentTimestamp: string;
 	userConsentId: string;
 };
 
-function createConsentPayload(
-	cmp: ConsentManager,
-	consent?: ConsentCategoryType[],
-): ConsentPayload {
-	return Object.fromEntries(
-		Object.entries({
-			customerId: cmp.customerId,
-			configId: cmp.configId,
-			consented: consent ?? cmp.consent,
-			consentingDomain: cmp.consentingDomain,
-			consentingPlatform: CONSENTING_PLATFORM_TAG,
-			deviceId: cmp.deviceId,
-			extUsrData: cmp.extUsrData,
-		}).filter(([, value]) => value !== undefined),
-	) as ConsentPayload;
-}
-
 function createConsentRecordPayload(
 	cmp: ConsentManager,
 	consent?: ConsentCategoryType[],
@@ -77,7 +66,7 @@ function createConsentRecordPayload(
 	const hashedExtUsrData = hashExtUsrData(
 		cmp.customerId,
 		cmp.configId,
-		cmp.extUsrData,
+		cmp.extUsrData || undefined,
 	);
 	return Object.fromEntries(
 		Object.entries({
@@ -87,28 +76,52 @@ function createConsentRecordPayload(
 			consentingDomain: cmp.consentingDomain,
 			consentingPlatform: CONSENTING_PLATFORM_TAG,
 			userConsentId: cmp.deviceId,
-			extUsrData: hashedExtUsrData,
+			extUsrData: hashedExtUsrData || undefined,
 		}).filter(([, value]) => value !== undefined),
 	) as ConsentRecordPayload;
 }
 
 const STORAGE_KEY = 'osano_consentmanager';
 
-const storeConsent = async (
+function consentRecordedRemotely(
+	configId: string,
+	success: boolean,
+	hashedExtUsrData?: string,
+) {
+	const userSuffix = hashedExtUsrData ? `_${hashedExtUsrData}` : '';
+	if (success) {
+		clearStorage(
+			`${STORAGE_KEY}_${configId}${userSuffix}_last_failed_remote_record`,
+		);
+	} else {
+		setStorage(
+			`${STORAGE_KEY}_${configId}${userSuffix}_last_failed_remote_record`,
+			JSON.stringify(new Date()),
+		);
+	}
+}
+
+export const storeConsent = async (
 	cmp: ConsentManager,
 	consent?: ConsentCategoryType[],
-) => {
+	recordedRemotely?: boolean,
+): Promise<ConsentCategoryType[]> => {
 	cmp.consent = consent ?? cmp.consent;
 	return new Promise<ConsentCategoryType[]>((resolve, reject) => {
 		const resConsent = () => {
 			resolve(cmp.consent ?? []);
 			return cmp.consent;
 		};
-		const hashedExtUsrData = hashExtUsrData(cmp.customerId, cmp.configId, cmp.extUsrData);
+		const hashedExtUsrData = hashExtUsrData(
+			cmp.customerId,
+			cmp.configId,
+			cmp.extUsrData,
+		);
 		const userSuffix = hashedExtUsrData ? `_${hashedExtUsrData}` : '';
 		switch (Platform.OS) {
 			case 'ios':
 			case 'android':
+			default: {
 				setStorage(
 					`${STORAGE_KEY}_last_recorded_consent_date${userSuffix}`,
 					JSON.stringify(new Date()),
@@ -122,7 +135,15 @@ const storeConsent = async (
 							.catch(reject);
 					})
 					.catch(reject);
+				if (recordedRemotely !== undefined) {
+					consentRecordedRemotely(
+						cmp.configId,
+						recordedRemotely,
+						hashedExtUsrData,
+					);
+				}
 				break;
+			}
 		}
 	});
 };
@@ -134,40 +155,55 @@ export const clearConsent = async (cmp: ConsentManager) => {
 			resolve([ConsentCategory.ESSENTIAL]);
 			return cmp.consent;
 		};
-		const hashedExtUsrData = hashExtUsrData(cmp.customerId, cmp.configId, cmp.extUsrData);
+		const hashedExtUsrData = hashExtUsrData(
+			cmp.customerId,
+			cmp.configId,
+			cmp.extUsrData,
+		);
 		const userSuffix = hashedExtUsrData ? `_${hashedExtUsrData}` : '';
 		switch (Platform.OS) {
 			case 'android':
 			case 'ios':
-				clearStorage(`${STORAGE_KEY}_${cmp.configId}${userSuffix}`).then(resConsent);
-				break;
-			default:
-				resConsent();
+			default: {
+				clearStorage(`${STORAGE_KEY}_${cmp.configId}${userSuffix}`).then(
+					resConsent,
+				);
+				consentRecordedRemotely(cmp.configId, false, hashedExtUsrData);
 				break;
+			}
 		}
 	});
 };
 
-export const migrateConsentStorage = async (cmp: ConsentManager): Promise<ConsentCategoryType[] | null> => {
-	const hashedExtUsrData = hashExtUsrData(cmp.customerId, cmp.configId, cmp.extUsrData);
-	
+export const migrateConsentStorage = async (
+	cmp: ConsentManager,
+): Promise<ConsentCategoryType[] | null> => {
+	const hashedExtUsrData = hashExtUsrData(
+		cmp.customerId,
+		cmp.configId,
+		cmp.extUsrData,
+	);
+
 	// Only migrate if we have extUsrData (user-specific storage needed)
 	if (!hashedExtUsrData) {
 		return null;
 	}
-	
+
 	return new Promise<ConsentCategoryType[] | null>((resolve) => {
 		const oldKey = `${STORAGE_KEY}_${cmp.configId}`; // Legacy key without user suffix
 		const oldTimestampKey = `${STORAGE_KEY}_last_recorded_consent_date`; // Legacy timestamp key
-		
+
 		switch (Platform.OS) {
 			case 'ios':
 			case 'android':
 				getStorage(oldKey)
 					.then((oldConsent) => {
 						if (oldConsent) {
-							const consent = JSON.parse(oldConsent) as ConsentCategoryType[];
+							let consent = JSON.parse(oldConsent) as ConsentCategoryType[];
 							if (consent.length > 0) {
+								consent = formatConsentArray(
+									makeConsentFromCategories(consent),
+								);
 								// Store with new user-specific key
 								storeConsent(cmp, consent).then(() => {
 									// Clean up old storage
@@ -206,11 +242,15 @@ const retrieveConsent = async (cmp: ConsentManager) => {
 			}
 			throw new Error('Consent not found');
 		};
-		
-		const hashedExtUsrData = hashExtUsrData(cmp.customerId, cmp.configId, cmp.extUsrData);
+
+		const hashedExtUsrData = hashExtUsrData(
+			cmp.customerId,
+			cmp.configId,
+			cmp.extUsrData,
+		);
 		const userSuffix = hashedExtUsrData ? `_${hashedExtUsrData}` : '';
 		const newKey = `${STORAGE_KEY}_${cmp.configId}${userSuffix}`;
-		
+
 		switch (Platform.OS) {
 			case 'ios':
 			case 'android':
@@ -228,6 +268,12 @@ const retrieveConsent = async (cmp: ConsentManager) => {
 					});
 				break;
 			default:
+				// Web and other platforms: use storage directly, no migration needed
+				getStorage(newKey)
+					.then(resConsent)
+					.catch(() => {
+						clearConsent(cmp).then(resolve);
+					});
 				break;
 		}
 	});
@@ -245,15 +291,19 @@ const retrieveLastConsentTimestamp = async (cmp: ConsentManager) => {
 				return '';
 			}
 		};
-		const hashedExtUsrData = hashExtUsrData(cmp.customerId, cmp.configId, cmp.extUsrData);
+		const hashedExtUsrData = hashExtUsrData(
+			cmp.customerId,
+			cmp.configId,
+			cmp.extUsrData,
+		);
 		const userSuffix = hashedExtUsrData ? `_${hashedExtUsrData}` : '';
 		switch (Platform.OS) {
 			case 'ios':
 			case 'android':
-				getStorage(`${STORAGE_KEY}_last_recorded_consent_date${userSuffix}`).then(resValue);
-				break;
 			default:
-				// nothing
+				getStorage(
+					`${STORAGE_KEY}_last_recorded_consent_date${userSuffix}`,
+				).then(resValue);
 				break;
 		}
 	});
@@ -267,10 +317,17 @@ export const recordConsent = (
 	return API.post(`${CONSENT_URI}/record`, payload, {
 		referrer: cmp.consentingDomain,
 	})
-		.then(() => consent ?? cmp.consent)
-		.then((consentCategories) => storeConsent(cmp, consentCategories))
+		.then(() => consent ?? cmp.consent ?? [ConsentCategory.ESSENTIAL])
+		.then((consentCategories) => {
+			consentCategories = formatConsentArray(
+				makeConsentFromCategories(consentCategories),
+			);
+			storeConsent(cmp, consentCategories, true);
+			return consentCategories;
+		})
 		.catch((error) => {
-			// Cannot record consent
+			// Cannot record consent (offline?), store locally and try again later
+			storeConsent(cmp, consent, false);
 			throw error;
 		});
 };
@@ -280,7 +337,12 @@ export function hashExtUsrData(
 	configId: string,
 	extUsrData: string | undefined,
 ): string {
-	if (!extUsrData || extUsrData === '' || customerId === '' || configId === '') {
+	if (
+		!extUsrData ||
+		extUsrData === '' ||
+		customerId === '' ||
+		configId === ''
+	) {
 		return '';
 	} else {
 		try {
@@ -290,7 +352,7 @@ export function hashExtUsrData(
 			const base64 = Buffer.from(hash).toString('base64');
 			const hashUrlSafe = base64.replace(/\+/g, '-').replace(/\//g, '_');
 			return hashUrlSafe;
-		} catch (error) {
+		} catch {
 			// something went wrong
 			return '';
 		}
@@ -326,10 +388,9 @@ export const fetchConsent = async (cmp: ConsentManager) => {
 		// If extUsrData is not null and not empty, always use remote consent (cross-device consent enabled)
 		if (extUsrData && extUsrData.trim() !== '') {
 			const remoteConsentCategories = consented.map(
-				(category) =>
-					ConsentCategoryType[category as keyof typeof ConsentCategoryType],
+				(category) => ConsentCategory[category as keyof typeof ConsentCategory],
 			);
-			await storeConsent(cmp, remoteConsentCategories);
+			await storeConsent(cmp, remoteConsentCategories, true);
 			return remoteConsentCategories;
 		}
 
@@ -341,15 +402,14 @@ export const fetchConsent = async (cmp: ConsentManager) => {
 				internalTimestamp === ''
 			) {
 				// Remote consent is newer or we haven't recorded any consent yet. Store remote consent.
-				const remoteConsentCategories = consented.map(
-					(category) =>
-						ConsentCategoryType[category as keyof typeof ConsentCategoryType],
+				const remoteConsentCategories = formatConsentArray(
+					makeConsentFromCategories(consented),
 				);
-				await storeConsent(cmp, remoteConsentCategories);
+				await storeConsent(cmp, remoteConsentCategories, true);
 
 				return remoteConsentCategories;
 			}
-		} catch (error) {
+		} catch {
 			// Error parsing timestamp
 		}
 
@@ -394,7 +454,7 @@ export const getStoredConfig = async (
 		if (config) {
 			return JSON.parse(config) as Config;
 		}
-	} catch (error) {
+	} catch {
 		// Failed to retrieve config
 	}
 	return null;
@@ -412,7 +472,7 @@ export const storeConfig = async (
 				JSON.stringify(new Date()),
 			),
 		]);
-	} catch (error) {
+	} catch {
 		throw new Error('Failed to store config');
 	}
 };
@@ -427,7 +487,7 @@ export const getConfigLastStoredAt = async (
 		if (lastStoredAt) {
 			return new Date(JSON.parse(lastStoredAt));
 		}
-	} catch (error) {
+	} catch {
 		// Failed to retrieve last stored at
 	}
 	return null;

package/src/services/google-consent-mode-mapper.ts

@@ -1,4 +1,4 @@
-import { ConsentCategory } from '../constants';
+import { ConsentCategory, type ConsentCategoryType } from '../constants';
 import type { GoogleConsentMap } from '../types/google-consent-mode';
 import {
 	GoogleConsentMapImpl,
@@ -51,7 +51,7 @@ export class GoogleConsentModeMapper {
 	 * ```
 	 */
 	static buildGoogleConsentMap(
-		categories: Set<ConsentCategory>,
+		categories: Set<ConsentCategoryType>,
 	): GoogleConsentMap {
 		// Initialize all parameters to DENIED by default
 		const consentMap: Record<GoogleConsentParameter, GoogleConsentStatus> = {
@@ -93,7 +93,7 @@ export class GoogleConsentModeMapper {
 	 * @param category - Osano consent category to check
 	 * @returns true if the category is mapped to Google Consent Mode parameters
 	 */
-	static isGoogleConsentCategory(category: ConsentCategory): boolean {
+	static isGoogleConsentCategory(category: ConsentCategoryType): boolean {
 		return category in this.GOOGLE_CATEGORIES_MAP;
 	}
 
@@ -104,7 +104,7 @@ export class GoogleConsentModeMapper {
 	 * @returns Array of Google Consent Mode parameters mapped to this category
 	 */
 	static getGoogleParametersForCategory(
-		category: ConsentCategory,
+		category: ConsentCategoryType,
 	): GoogleConsentParameter[] {
 		return this.GOOGLE_CATEGORIES_MAP[category] || [];
 	}