@osano/osano-cmp-react-native 0.12.0 → 0.14.0

package/src/iab/tcf/middleware.ts

@@ -9,6 +9,7 @@ import {
 	setConsent,
 } from './actions';
 import { SET_CONSENT_DATA, setConsentData } from '../actions';
+import { clearAllIABKeys, setAllIABKeys } from './iab-storage-utils';
 import { clearStorage, getStorage, setStorage } from '../../native/OsanoCmp';
 import { getConsentString, getPurposeIds } from './selectors';
 import {
@@ -24,6 +25,7 @@ import type { IabInitOptions } from './types';
 import type { IabState } from '../types';
 import { Platform } from 'react-native';
 import type { Store } from '../../hooks/useThunkReducer';
+import { osanoLogger } from '../../utils/OsanoLogger';
 
 export const makeMiddleware: IabMiddlewareFactory = (
 	initOptions: IabInitOptions,
@@ -64,40 +66,17 @@ export const makeMiddleware: IabMiddlewareFactory = (
 						}
 						store.dispatch(setConsent(payload));
 					};
-					switch (Platform.OS) {
-						case 'ios':
-						case 'android':
-							getStorage(`${gppSection}_${configId}`)
-								.then(resConsent)
-								.catch(() => {
-									// Consent not found
-									clearStorage(`${gppSection}_${configId}`);
-								});
-							break;
-						default:
-							try {
-								resConsent(
-									window.localStorage.getItem(`${gppSection}_${configId}`),
-								);
-							} catch (e) {
-								window.localStorage.removeItem(`${gppSection}_${configId}`);
-							}
-							break;
-					}
+					getStorage(`${gppSection}_${configId}`)
+						.then(resConsent)
+						.catch(() => {
+							// Consent not found
+							clearStorage(`${gppSection}_${configId}`);
+						});
 					break;
 				}
 				case CLEAR_CONSENT: {
-					switch (Platform.OS) {
-						case 'ios':
-						case 'android':
-							clearStorage(`${gppSection}_${configId}`);
-							break;
-						default:
-							try {
-								window.localStorage.removeItem(`${gppSection}_${configId}`);
-							} catch {}
-							break;
-					}
+					clearStorage(`${gppSection}_${configId}`);
+					clearAllIABKeys();
 					store.dispatch(setConsentData(gppSection, ''));
 					break;
 				}
@@ -160,52 +139,40 @@ export const makeMiddleware: IabMiddlewareFactory = (
 							// no change
 							break;
 						}
-						console.log(`\nSetting new consent string\n -> ${value}`);
+						osanoLogger.info(`Setting new consent string -> ${value}`);
 						const consent = parseConsentString(value);
+
 						setStorage(storageKey, value);
-						setStorage('IABTCF_CmpSdkID', cmpId.toString());
-						setStorage('IABTCF_CmpSdkVersion', cmpVersion.toString());
-						setStorage('IABTCF_PolicyVersion', version);
-						setStorage('IABTCF_PublisherCC', consent.publisherCC);
-						setStorage('IABTCF_gdprApplies', consent.gdprApplies ? '1' : '0');
-						setStorage(
-							'IABTCF_PurposeOneTreatment',
-							consent.purposeOneTreatment ? '1' : '0',
-						);
-						setStorage(
-							'IABTCF_UseNonStandardTexts',
-							consent.useNonStandardStacks ? '1' : '0',
-						);
 
-						// The following all have to be binary strings
-						setStorage(
-							'IABTCF_VendorConsents',
-							idRecordToBinaryString(consent.vendor.consents),
-						);
-						setStorage(
-							'IABTCF_VendorLegitimateInterests',
-							idRecordToBinaryString(consent.vendor.legitimateInterests),
-						);
-						setStorage(
-							'IABTCF_PurposeConsents',
-							idRecordToBinaryString(consent.purpose.consents),
-						);
-						setStorage(
-							'IABTCF_PurposeLegitimateInterests',
-							idRecordToBinaryString(consent.purpose.legitimateInterests),
-						);
-						setStorage(
-							'IABTCF_SpecialFeaturesOptIns',
-							idRecordToBinaryString(consent.specialFeatureOptins),
-						);
-						// Publisher restrictions are not yet supported
-						/*
-							'IABTCF_PublisherRestrictions',
-							'IABTCF_PublisherConsent'
-							'IABTCF_PublisherLegitimateInterests'
-							'IABTCF_PublisherCustomPurposesConsents'
-							'IABTCF_PublisherCustomPurposesLegitimateInterests'
-						*/
+						const consentData = {
+							tcString: value,
+							cmpId,
+							cmpVersion,
+							policyVersion: version,
+							publisherCC: consent.publisherCC,
+							gdprApplies: consent.gdprApplies,
+							purposeOneTreatment: consent.purposeOneTreatment,
+							useNonStandardStacks: consent.useNonStandardStacks,
+							vendorConsentsString: idRecordToBinaryString(
+								consent.vendor.consents,
+							),
+							vendorLegitimateInterestsString: idRecordToBinaryString(
+								consent.vendor.legitimateInterests,
+							),
+							purposeConsentsString: idRecordToBinaryString(
+								consent.purpose.consents,
+							),
+							purposeLegitimateInterestsString: idRecordToBinaryString(
+								consent.purpose.legitimateInterests,
+							),
+							specialFeatureOptinsString: idRecordToBinaryString(
+								consent.specialFeatureOptins,
+							),
+							enableAdvertiserConsentMode:
+								config?.googleConsent && config?.tcfIsApplicable,
+						};
+
+						setAllIABKeys(consentData);
 					}
 				}
 			}

package/src/iab/tcf/reducer.ts

@@ -134,23 +134,10 @@ export default function makeReducer(initOptions: IabInitOptions) {
 				const { config } = payload as ConsentManager;
 				if (config.configId && config.iabEnabled) {
 					const payload = createConsentPayload(state);
-					switch (Platform.OS) {
-						case 'ios':
-						case 'android':
-							setStorage(
-								`${gppSection}_${config.configId}`,
-								JSON.stringify(payload),
-							);
-							break;
-						default:
-							try {
-								window.localStorage.setItem(
-									`${gppSection}_${config.configId}`,
-									JSON.stringify(payload),
-								);
-							} catch (e) {}
-							break;
-					}
+					setStorage(
+						`${gppSection}_${config.configId}`,
+						JSON.stringify(payload),
+					);
 				}
 				return state;
 			}

package/src/index.tsx

@@ -1,7 +1,5 @@
-import type { OsanoAction, OsanoState } from './types/store';
-import { OsanoCategories, init, reducer } from './reducer';
-import { Platform, UIManager } from 'react-native';
 import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react';
+import { Platform, UIManager } from 'react-native';
 import {
 	CLEAR_CONSENT,
 	reload,
@@ -10,20 +8,30 @@ import {
 	showDialog,
 	showDrawer,
 } from './actions';
+import { OsanoCategories, init, reducer } from './reducer';
+import type { OsanoAction, OsanoState } from './types/store';
 
-import { ConsentCategory } from './constants';
 import { ConsentManager } from './ConsentManager';
 import { ConsentUiBuilder } from './ConsentUiBuilder';
-import type { OsanoProps } from './types';
+import { ConsentCategory } from './constants';
 import { OsanoPublicContext } from './context';
+import { usePrevious } from './hooks/usePrevious';
+import useThunkReducer, { type Store } from './hooks/useThunkReducer';
 import { addIabReducers } from './iab';
+import type { IabFramework, IabState } from './iab/types';
 import { getConsent } from './selectors';
 import { recordConsent } from './services/consent';
-import useThunkReducer, { type Store } from './hooks/useThunkReducer';
-import type { IabFramework, IabState } from './iab/types';
-import { usePrevious } from './hooks/usePrevious';
+import type { OsanoProps } from './types';
+import { osanoLogger as OsanoLogger } from './utils/OsanoLogger';
 
 export { OsanoPublicContext as OsanoContext } from './context';
+export { GoogleConsentModeMapper } from './services/google-consent-mode-mapper';
+export type {
+	GoogleConsentMap,
+	GoogleConsentModeCallback,
+	GoogleConsentParameter,
+	GoogleConsentStatus,
+} from './types/google-consent-mode';
 
 if (Platform.OS === 'android') {
 	if (UIManager.setLayoutAnimationEnabledExperimental) {
@@ -44,14 +52,20 @@ export const Osano: React.FunctionComponent<
 			onConfigLoadSuccess,
 			onLangLoadFailure,
 			onLangLoadSuccess,
+			onGoogleConsentUpdate,
 			overrides,
 			extUsrData,
+			setLoggingEnabled = true,
 		} = props;
 		const { flavor, iabEnabled } = overrides || {};
 		const consentManager = useRef<ConsentManager>(
 			new ConsentManager(overrides, extUsrData),
 		);
 
+		useEffect(() => {
+			OsanoLogger.setEnabled(setLoggingEnabled);
+		}, [setLoggingEnabled]);
+
 		const [_state, store] = useThunkReducer<OsanoState, OsanoAction>(
 			reducer,
 			{ configId, customerId },
@@ -91,6 +105,9 @@ export const Osano: React.FunctionComponent<
 
 		const handleClearConsent = useCallback(() => {
 			dispatch({ type: CLEAR_CONSENT });
+			consentManager.current.triggerGoogleConsentUpdate([
+				ConsentCategory.ESSENTIAL,
+			]);
 		}, []);
 
 		const retryWithBackoff = async (
@@ -177,6 +194,15 @@ export const Osano: React.FunctionComponent<
 			consentManager.current.config.type = flavor;
 		}, [flavor]);
 
+		// Set up Google Consent Mode callback if provided
+		useEffect(() => {
+			if (onGoogleConsentUpdate) {
+				consentManager.current.setGoogleConsentModeCallback(
+					onGoogleConsentUpdate,
+				);
+			}
+		}, [onGoogleConsentUpdate]);
+
 		const iabLoaded = useRef(false);
 		const iabChanged = usePrevious(iabEnabled) !== iabEnabled;
 		useEffect(() => {
@@ -235,6 +261,7 @@ export const Osano: React.FunctionComponent<
 			prev.hideUI === next.hideUI &&
 			prev.hideDisclosures === next.hideDisclosures &&
 			prev.children === next.children &&
+			prev.setLoggingEnabled === next.setLoggingEnabled &&
 			flavor === nextFlavor &&
 			iabEnabled === nextIabEnabled
 		);