@osano/osano-cmp-react-native 0.18.1 → 0.18.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@osano/osano-cmp-react-native",
-	"version": "0.18.1",
+	"version": "0.18.3",
 	"description": "Package and example for the react-native Osano CMP SDK",
 	"main": "lib/commonjs/index",
 	"module": "lib/module/index",
@@ -31,9 +31,9 @@
 	],
 	"scripts": {
 		"example": "yarn workspace osano-cmp-sdk-example",
-		"test": "jest src/services/__tests__/consent.test.ts src/__tests__/index.test.tsx src/services/__tests__/google-consent-mode.test.ts src/__tests__/OsanoLogger.test.ts src/__tests__/constants.test.ts src/__tests__/reducer.test.ts src/__tests__/selectors.test.ts src/__tests__/ConsentManager.test.ts src/__tests__/ConsentUiBuilder.test.tsx src/utils/__tests__/WebStorage.test.ts src/native/__tests__/OsanoCmp.test.ts",
-		"test:legacy": "REACT_NATIVE_NEW_ARCH_ENABLED=false jest src/services/__tests__/consent.test.ts src/__tests__/index.test.tsx src/services/__tests__/google-consent-mode.test.ts src/__tests__/OsanoLogger.test.ts src/__tests__/constants.test.ts src/__tests__/reducer.test.ts src/__tests__/selectors.test.ts src/__tests__/ConsentManager.test.ts src/__tests__/ConsentUiBuilder.test.tsx src/utils/__tests__/WebStorage.test.ts src/native/__tests__/OsanoCmp.test.ts",
-		"test:newarch": "REACT_NATIVE_NEW_ARCH_ENABLED=true jest src/services/__tests__/consent.test.ts src/__tests__/index.test.tsx src/services/__tests__/google-consent-mode.test.ts src/__tests__/OsanoLogger.test.ts src/__tests__/constants.test.ts src/__tests__/reducer.test.ts src/__tests__/selectors.test.ts src/__tests__/ConsentManager.test.ts src/__tests__/ConsentUiBuilder.test.tsx src/utils/__tests__/WebStorage.test.ts src/native/__tests__/OsanoCmp.test.ts",
+		"test": "jest src/services/__tests__/consent.test.ts src/services/__tests__/fetchConfig.test.ts src/__tests__/index.test.tsx src/services/__tests__/google-consent-mode.test.ts src/__tests__/OsanoLogger.test.ts src/__tests__/constants.test.ts src/__tests__/reducer.test.ts src/__tests__/selectors.test.ts src/__tests__/ConsentManager.test.ts src/__tests__/ConsentUiBuilder.test.tsx src/utils/__tests__/WebStorage.test.ts src/native/__tests__/OsanoCmp.test.ts",
+		"test:legacy": "REACT_NATIVE_NEW_ARCH_ENABLED=false jest src/services/__tests__/consent.test.ts src/services/__tests__/fetchConfig.test.ts src/__tests__/index.test.tsx src/services/__tests__/google-consent-mode.test.ts src/__tests__/OsanoLogger.test.ts src/__tests__/constants.test.ts src/__tests__/reducer.test.ts src/__tests__/selectors.test.ts src/__tests__/ConsentManager.test.ts src/__tests__/ConsentUiBuilder.test.tsx src/utils/__tests__/WebStorage.test.ts src/native/__tests__/OsanoCmp.test.ts",
+		"test:newarch": "REACT_NATIVE_NEW_ARCH_ENABLED=true jest src/services/__tests__/consent.test.ts src/services/__tests__/fetchConfig.test.ts src/__tests__/index.test.tsx src/services/__tests__/google-consent-mode.test.ts src/__tests__/OsanoLogger.test.ts src/__tests__/constants.test.ts src/__tests__/reducer.test.ts src/__tests__/selectors.test.ts src/__tests__/ConsentManager.test.ts src/__tests__/ConsentUiBuilder.test.tsx src/utils/__tests__/WebStorage.test.ts src/native/__tests__/OsanoCmp.test.ts",
 		"test:google-consent-mode": "jest src/services/__tests__/google-consent-mode.test.ts",
 		"typecheck": "tsc --noEmit",
 		"lint": "eslint",

package/src/ConsentManager.ts

@@ -28,9 +28,6 @@ import {
 	clearConsent as clearStoredConsent,
 	fetchConfig,
 	fetchConsent,
-	getStoredConfig,
-	hasStaleConfig,
-	storeConfig,
 } from './services/consent';
 import { GoogleConsentModeMapper } from './services/google-consent-mode-mapper';
 import type { OsanoOverrides } from './types';
@@ -153,17 +150,6 @@ async function fetchConfigWithRetries(
 	retries: number = 3,
 	delay: number = 500,
 ): Promise<Config | null> {
-	const isStale = await hasStaleConfig(configId);
-
-	if (!isStale) {
-		// If the config is not stale, we can return the cached config
-		const cachedConfig = await getStoredConfig(configId);
-
-		if (cachedConfig) {
-			return cachedConfig;
-		}
-	}
-
 	for (let attempt = 1; attempt <= retries; attempt++) {
 		try {
 			const config = await fetchConfig(customerId, configId);
@@ -221,7 +207,6 @@ export class ConsentConfig extends EventEmitter {
 					config.palette,
 				) as Palette;
 				this._config = merge(this._config, config) as Config;
-				storeConfig(this._configId, this._config);
 				this.emit('loadSuccess', this._config);
 			})
 			.catch((err) => {
@@ -256,10 +241,11 @@ export class ConsentConfig extends EventEmitter {
 		return [...new Set(categories)];
 	}
 	get jurisdiction(): string {
+		// Lowercased to match the web SDK (Osano.cm.jurisdiction), e.g. "us" / "us-ca".
+		const composite = `${this.country}${this.region ? `-${this.region}` : ''}`;
 		return (
-			mappedJurisdictions[`${this.country}`.toLowerCase()] ||
-			`${this.country}${this.region ? `-${this.region}` : ''}`
-		);
+			mappedJurisdictions[`${this.country}`.toLowerCase()] || composite
+		).toLowerCase();
 	}
 	get ccpaRelaxed(): boolean {
 		return this._config.ccpaRelaxed;
@@ -663,6 +649,15 @@ export class ConsentManager {
 		return this._config;
 	}
 
+	/**
+	 * The visitor's jurisdiction as a lowercase composite of country and region,
+	 * e.g. "us" or "us-ca". Mirrors the web SDK's `Osano.cm.jurisdiction` and the
+	 * Android SDK's `getJurisdiction()`.
+	 */
+	public get jurisdiction(): string {
+		return this._config.jurisdiction;
+	}
+
 	constructor(options?: OsanoOverrides, extUsrData?: string) {
 		const { locale, flavor, iabEnabled, iabFrameworks, iabVersions, palette } =
 			options || {};

package/src/context.ts

@@ -24,6 +24,7 @@ type OsanoPublicContextType = {
 		category?: ConsentCategoryType,
 	) => boolean | ConsentCategoryType[];
 	getDeviceId: () => string;
+	getJurisdiction: () => string;
 	clearConsent: () => void;
 	consent: (
 		consent?: ConsentCategoryType | ConsentCategoryType[],
@@ -63,6 +64,7 @@ export const OsanoPublicContext = React.createContext<OsanoPublicContextType>({
 		return false;
 	},
 	getDeviceId: () => '',
+	getJurisdiction: () => '',
 	consent: () => Promise.resolve([ConsentCategory.ESSENTIAL]),
 	clearConsent: noop,
 	setLocale: noop,

package/src/index.tsx

@@ -157,11 +157,16 @@ export const Osano: React.FunctionComponent<
 			return consentManager.current.deviceId;
 		}, []);
 
+		const handleGetJurisdiction = useCallback(() => {
+			return consentManager.current.jurisdiction;
+		}, []);
+
 		const context = useMemo(() => {
 			return {
 				locale: consentManager.current.translator.locale,
 				getConsent: handleGetConsent,
 				getDeviceId: handleGetDeviceId,
+				getJurisdiction: handleGetJurisdiction,
 				consent: handleRecordConsent,
 				clearConsent: handleClearConsent,
 				setLocale: handleSetLocale,

package/src/services/consent.ts

@@ -422,35 +422,17 @@ export const fetchConsent = async (cmp: ConsentManager) => {
 	}
 };
 
-export const fetchConfig = (customerId: string, configId: string) => {
-	return API.get(`${OSANO_ORIGIN}/${customerId}/${configId}/config.json`, true)
-		.then((response) => {
-			const { headers, json } = response as {
-				json: Config;
-				headers: Headers;
-			};
-			return merge(
-				{
-					...json,
-					country: headers.get('x-osano-country'),
-					region: headers.get('x-osano-region'),
-					variant: headers.get('x-osano-variant'),
-					gdprApplies: headers.get('x-osano-gdpr-applies') === 'true',
-				},
-				overrideConfig,
-			) as Config;
-		})
-		.catch(() => {
-			// Consent not found or network/server error
-			throw new Error('Error fetching config');
-		});
-};
+const configCacheKey = (customerId: string, configId: string, suffix: string) =>
+	`${STORAGE_KEY}_${customerId}_${configId}_${suffix}`;
 
 export const getStoredConfig = async (
+	customerId: string,
 	configId: string,
 ): Promise<Config | null> => {
 	try {
-		const config = await getStorage(`${STORAGE_KEY}_${configId}_config`);
+		const config = await getStorage(
+			configCacheKey(customerId, configId, 'config'),
+		);
 		if (config) {
 			return JSON.parse(config) as Config;
 		}
@@ -461,14 +443,18 @@ export const getStoredConfig = async (
 };
 
 export const storeConfig = async (
+	customerId: string,
 	configId: string,
 	config: Config,
 ): Promise<void> => {
 	try {
 		await Promise.all([
-			setStorage(`${STORAGE_KEY}_${configId}_config`, JSON.stringify(config)),
 			setStorage(
-				`${STORAGE_KEY}_${configId}_config_last_stored_at`,
+				configCacheKey(customerId, configId, 'config'),
+				JSON.stringify(config),
+			),
+			setStorage(
+				configCacheKey(customerId, configId, 'config_last_stored_at'),
 				JSON.stringify(new Date()),
 			),
 		]);
@@ -478,11 +464,12 @@ export const storeConfig = async (
 };
 
 export const getConfigLastStoredAt = async (
+	customerId: string,
 	configId: string,
 ): Promise<Date | null> => {
 	try {
 		const lastStoredAt = await getStorage(
-			`${STORAGE_KEY}_${configId}_config_last_stored_at`,
+			configCacheKey(customerId, configId, 'config_last_stored_at'),
 		);
 		if (lastStoredAt) {
 			return new Date(JSON.parse(lastStoredAt));
@@ -493,20 +480,170 @@ export const getConfigLastStoredAt = async (
 	return null;
 };
 
-/**
- * Determine if a cached config is stale
- *
- * @async
- * @param {string} configId
- * @returns {Promise<boolean>}
- */
-export const hasStaleConfig = async (configId: string): Promise<boolean> => {
-	const lastStoredAt = await getConfigLastStoredAt(configId);
+export const hasStaleConfig = async (
+	customerId: string,
+	configId: string,
+): Promise<boolean> => {
+	const lastStoredAt = await getConfigLastStoredAt(customerId, configId);
 	if (!lastStoredAt) {
 		return true;
 	}
 	const now = new Date();
-	const diff = now.getTime() - lastStoredAt.getTime();
-	const diffInMinutes = Math.floor(diff / 60000);
-	return diffInMinutes > 1440; // 24 hours = 1440 minutes
+	// Treat clock skew (future timestamp) as expired so we force a full refetch
+	if (lastStoredAt.getTime() > now.getTime()) {
+		return true;
+	}
+	return (
+		lastStoredAt.getFullYear() !== now.getFullYear() ||
+		lastStoredAt.getMonth() !== now.getMonth() ||
+		lastStoredAt.getDate() !== now.getDate()
+	);
+};
+
+export const getStoredEtag = async (
+	customerId: string,
+	configId: string,
+): Promise<string | null> => {
+	try {
+		return (
+			(await getStorage(configCacheKey(customerId, configId, 'config_etag'))) ??
+			null
+		);
+	} catch {
+		return null;
+	}
+};
+
+export const getStoredLastModified = async (
+	customerId: string,
+	configId: string,
+): Promise<string | null> => {
+	try {
+		return (
+			(await getStorage(
+				configCacheKey(customerId, configId, 'config_last_modified'),
+			)) ?? null
+		);
+	} catch {
+		return null;
+	}
+};
+
+export const fetchConfig = async (
+	customerId: string,
+	configId: string,
+): Promise<Config> => {
+	const [cachedConfig, stale, storedEtag, storedLastModified] =
+		await Promise.all([
+			getStoredConfig(customerId, configId),
+			hasStaleConfig(customerId, configId),
+			getStoredEtag(customerId, configId),
+			getStoredLastModified(customerId, configId),
+		]);
+
+	const conditionalHeaders: Record<string, string> = {};
+	if (cachedConfig && !stale) {
+		if (storedEtag) conditionalHeaders['If-None-Match'] = storedEtag;
+		if (storedLastModified)
+			conditionalHeaders['If-Modified-Since'] = storedLastModified;
+	}
+
+	try {
+		const response = await fetch(
+			`${OSANO_ORIGIN}/${customerId}/${configId}/config.json`,
+			{
+				method: 'GET',
+				headers: {
+					Accept: 'application/json',
+					'Content-Type': 'application/json',
+					'Cache-Control': 'no-cache',
+					...conditionalHeaders,
+				},
+				mode: 'cors',
+				referrer: 'no-referrer',
+			},
+		);
+
+		if (response.status === 304) {
+			if (!cachedConfig) {
+				throw new Error('304 with no cached config');
+			}
+
+			// 304 may still carry updated geo/jurisdiction headers (e.g. user
+			// moved between regions). Apply them on top of the cached body, but
+			// fall back to the previously-cached values when a header is absent
+			// rather than the first-fetch defaults.
+			const variant =
+				response.headers.get('x-osano-variant') ?? cachedConfig.variant;
+			const country =
+				response.headers.get('x-osano-country') ?? cachedConfig.country;
+			const region =
+				response.headers.get('x-osano-region') ?? cachedConfig.region;
+			const gdprAppliesHeader = response.headers.get('x-osano-gdpr-applies');
+			const gdprApplies =
+				gdprAppliesHeader != null
+					? gdprAppliesHeader === 'true'
+					: cachedConfig.gdprApplies;
+
+			const updated = merge(
+				{ ...cachedConfig, country, region, variant, gdprApplies },
+				overrideConfig,
+			) as Config;
+
+			// Persist the body update without bumping lastUsage — TTL stays
+			// anchored to the last 200 response.
+			await setStorage(
+				configCacheKey(customerId, configId, 'config'),
+				JSON.stringify(updated),
+			);
+
+			return updated;
+		}
+
+		if (!response.ok) {
+			throw response;
+		}
+
+		const json = (await response.json()) as Config;
+
+		const variant = response.headers.get('x-osano-variant') ?? 'two';
+		const country = response.headers.get('x-osano-country') ?? 'us';
+		const region = response.headers.get('x-osano-region') ?? '';
+		const gdprApplies = response.headers.get('x-osano-gdpr-applies') === 'true';
+		const newEtag = response.headers.get('etag');
+		const newLastModified = response.headers.get('last-modified');
+
+		const config = merge(
+			{ ...json, country, region, variant, gdprApplies },
+			overrideConfig,
+		) as Config;
+
+		const writes: Promise<unknown>[] = [
+			storeConfig(customerId, configId, config),
+		];
+		if (newEtag) {
+			writes.push(
+				setStorage(
+					configCacheKey(customerId, configId, 'config_etag'),
+					newEtag,
+				),
+			);
+		}
+		if (newLastModified) {
+			writes.push(
+				setStorage(
+					configCacheKey(customerId, configId, 'config_last_modified'),
+					newLastModified,
+				),
+			);
+		}
+		await Promise.all(writes);
+
+		return config;
+	} catch {
+		if (cachedConfig) {
+			return cachedConfig;
+		}
+		throw new Error('Error fetching config');
+	}
 };