@osano/osano-cmp-react-native 0.17.3 → 0.18.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] || [];
 	}

package/src/services/locale.ts

@@ -8,8 +8,9 @@ let locales: Record<string, LocalizedStrings> = {};
 
 // Require localizations from the `locale` folder
 try {
+	// eslint-disable-next-line @typescript-eslint/no-require-imports
 	locales = require('../locale');
-} catch (e) {
+} catch {
 	throw new Error(
 		'No localizations found. Did you run `npm run update:locale`?',
 	);
@@ -26,7 +27,7 @@ export function fetchGlobalLocalePhrases(
 	if (locales[languageCode]) {
 		return Promise.resolve(locales[languageCode] as LocalizedStrings);
 	}
-	return API.get(`${LOCALE_URI}/${localeCode}.json`).then(strings => {
+	return API.get(`${LOCALE_URI}/${localeCode}.json`).then((strings) => {
 		locales[languageCode] = strings as LocalizedStrings;
 		return strings;
 	}) as Promise<LocalizedStrings>;

package/src/styles.ts

@@ -30,7 +30,7 @@ const lookupColor = (color: string) => {
 
 export const createContrastColor = (
 	color: string,
-	amount = ARIA_CONTRAST_AMOUNT
+	amount = ARIA_CONTRAST_AMOUNT,
 ) => {
 	const [, contrast] = lookupColor(color);
 	return (amount < 0 ? !contrast : contrast)

package/src/types/consent-config.d.ts

@@ -41,7 +41,7 @@ type Palette = {
 
 export type Config = {
 	allowTimeout: boolean;
-	categories: ConsentCategory[];
+	categories: ConsentCategoryType[];
 	ccpaApplies: boolean;
 	ccpaRelaxed: boolean;
 	configId: string;

package/src/types/index.d.ts

@@ -27,7 +27,7 @@ export interface OsanoProps {
 	hideUI?: boolean;
 	hideDisclosures?: boolean;
 	onConfigLoadSuccess?: () => void;
-	onConfigLoadFailure?: () => void;
+	onConfigLoadFailure?: (error?: Error) => void;
 	onLangLoadSuccess?: () => void;
 	onLangLoadFailure?: () => void;
 	onGoogleConsentUpdate?: GoogleConsentModeCallback;

package/src/types/store.d.ts

@@ -1,5 +1,5 @@
 import { ConsentConfig } from '../ConsentManager';
-import { type ConsentCategory } from '../constants';
+import { type ConsentCategoryType } from '../constants';
 import { type AsyncAction } from '../hooks/useThunkReducer';
 
 export type OsanoAction<S extends string = any, T = any> = {
@@ -13,20 +13,20 @@ export type OsanoAction<S extends string = any, T = any> = {
 export type OsanoState = {
 	config?: ConsentConfig;
 	configId: string;
-	consent: Record<ConsentCategory, boolean | undefined>;
+	consent: Record<ConsentCategoryType, boolean | undefined>;
 	consentTimestamp: number;
 	customerId: string;
 	dialogOpen: boolean;
 	disclosures: {
-		fetched: ConsentCategory[];
+		fetched: ConsentCategoryType[];
 		loading: boolean;
-		results: Partial<Record<ConsentCategory, Disclosure[]>>;
+		results: Partial<Record<ConsentCategoryType, Disclosure[]>>;
 	};
 	locale: string;
 	ready: {
 		consent: boolean;
 	};
-	savedConsent: Record<ConsentCategory, boolean> | null;
+	savedConsent: Record<ConsentCategoryType, boolean> | null;
 	scrollToType: string;
 	scrollToId: number;
 	stack: string[];
@@ -44,7 +44,7 @@ export type DisclosureType =
 	| 'text';
 
 export type Disclosure = {
-	classification?: ConsentCategory;
+	classification?: ConsentCategoryType;
 	type?: DisclosureType;
 	expiry?: string | number;
 	name: string;

package/src/utils/API.ts

@@ -23,7 +23,7 @@ const makeFetch = (
 		mode: 'cors',
 		referrer: 'no-referrer',
 		body: method !== 'GET' ? JSON.stringify(params) : undefined,
-		...headers
+		...headers,
 	}).then((response) => {
 		if (response.status === 204 || response.type === 'opaque') {
 			return '';
@@ -46,5 +46,6 @@ export default {
 			typeof queryObj !== 'boolean' ? queryObj : undefined,
 			typeof queryObj === 'boolean',
 		),
-	post: (path: string, params?: object, headers?: object) => makeFetch('POST', path, params, false, headers),
+	post: (path: string, params?: object, headers?: object) =>
+		makeFetch('POST', path, params, false, headers),
 };

package/src/utils/Color.ts

@@ -7,7 +7,7 @@ export const parseColor = (
 			const colorArray = color
 				.replace(/[^\d,.]/g, '')
 				.split(',')
-				.map(value => {
+				.map((value) => {
 					const val = parseFloat(value);
 					if (isNaN(val)) {
 						throw new Error('Invalid color value');
@@ -15,7 +15,7 @@ export const parseColor = (
 					return val;
 				});
 			return colorArray as [r: number, g: number, b: number, a?: number];
-		} catch (error) {
+		} catch {
 			// Error parsing rgb color
 			return parseColor(defaultColor, 'rgba(0,0,0,1)');
 		}
@@ -26,7 +26,7 @@ export const parseColor = (
 		// HEX short code
 		hex = hex
 			.split('')
-			.map(c => `${c}${c}`)
+			.map((c) => `${c}${c}`)
 			.join('');
 	} else if (hex.length !== 6 && hex.length !== 8) {
 		return parseColor(defaultColor, 'rgba(0,0,0,1)');
@@ -36,7 +36,7 @@ export const parseColor = (
 	let pointer = 0;
 	while (pointer < hex.length && components.length < 3) {
 		const colorInt = parseInt(hex.slice(pointer, pointer + 2), 16);
-		// eslint-disable-next-line no-bitwise
+
 		components.push(colorInt & 255);
 		pointer += 2;
 	}
@@ -49,7 +49,7 @@ export const parseColor = (
 };
 
 export const intToHexInt = (...args: number[]) =>
-	args.map(i => ((i % 256) + 256) % 256);
+	args.map((i) => ((i % 256) + 256) % 256);
 export const intToHexString = (...args: number[]) =>
 	// Only RGB on hex strings
 	args
@@ -58,7 +58,6 @@ export const intToHexString = (...args: number[]) =>
 
 export const intToHue = (i: number) => ((i % 360) + 360) % 360;
 
-// eslint-disable-next-line no-bitwise
 export const floatToHexInt = (f: number) => ((~~(f * 255) % 256) + 256) % 256;
 export const floatToHexString = (...args: number[]) =>
 	args.reduce(

package/src/utils/EventEmitter.ts

@@ -1,10 +1,10 @@
-/* eslint-disable @typescript-eslint/ban-types */
+type Listener = (...args: any[]) => void;
 export class EventSubscription {
 	private _emitter: EventEmitter;
 	private _event: string;
-	private _listener: Function;
+	private _listener: Listener;
 
-	constructor(emitter: EventEmitter, event: string, listener: Function) {
+	constructor(emitter: EventEmitter, event: string, listener: Listener) {
 		this._emitter = emitter;
 		this._event = event;
 		this._listener = listener;
@@ -16,9 +16,9 @@ export class EventSubscription {
 }
 
 export class EventEmitter {
-	private _events: Record<string, Function[]> = {};
+	private _events: Record<string, Listener[]> = {};
 
-	on(event: string, listener: Function) {
+	on(event: string, listener: Listener) {
 		if (typeof this._events[event] !== 'object') {
 			this._events[event] = [];
 		}
@@ -27,7 +27,7 @@ export class EventEmitter {
 		return subscription;
 	}
 
-	off(event: string, listener: Function) {
+	off(event: string, listener: Listener) {
 		if (typeof this._events[event] === 'object') {
 			const idx = this._events[event]!.indexOf(listener);
 			if (idx > -1) {
@@ -42,7 +42,7 @@ export class EventEmitter {
 		}
 	}
 
-	once(event: string, listener: Function) {
+	once(event: string, listener: Listener) {
 		const g = (...args: unknown[]) => {
 			this.off(event, g);
 			listener.apply(this, args);

package/src/utils/ExpoDetector.ts

@@ -1,4 +1,3 @@
-import { Platform } from 'react-native';
 import { osanoLogger as OsanoLogger } from './OsanoLogger';
 
 interface ExpoDetectionResult {
@@ -8,7 +7,7 @@ interface ExpoDetectionResult {
 
 export class ExpoDetector {
 	private static _detectionResult: ExpoDetectionResult | null = null;
-	
+
 	/**
 	 * Detect Expo environment and cache result
 	 */
@@ -26,31 +25,33 @@ export class ExpoDetector {
 		// Check for Expo runtime via globals
 		try {
 			const hasExpoGlobalProp = !!(global as any).expo;
-			
+
 			if (hasExpoGlobalProp) {
 				result.isExpo = true;
-				
+
 				// Analyze global.expo to distinguish Expo Go from dev builds
 				const globalExpoContent = (global as any).expo;
-				
+
 				if (globalExpoContent && typeof globalExpoContent === 'object') {
 					const documentsDir = globalExpoContent.documentsDir || '';
 					const cacheDir = globalExpoContent.cacheDir || '';
-					
+
 					// Check execution environment
-					const exponentConstants = globalExpoContent.modules?.ExponentConstants;
+					const exponentConstants =
+						globalExpoContent.modules?.ExponentConstants;
 					const executionEnvironment = exponentConstants?.executionEnvironment;
-					
+
 					// Check for Expo Go app ID
 					const expoApplication = globalExpoContent.modules?.ExpoApplication;
 					const applicationId = expoApplication?.applicationId;
-					
+
 					// Expo Go indicators: package name, execution env, app ID
-					const hasExpoGoPackageName = documentsDir.includes('host.exp.exponent') || 
+					const hasExpoGoPackageName =
+						documentsDir.includes('host.exp.exponent') ||
 						cacheDir.includes('host.exp.exponent');
 					const isStoreClient = executionEnvironment === 'storeClient';
 					const hasExpoGoAppId = applicationId === 'host.exp.exponent';
-					
+
 					if (hasExpoGoPackageName || isStoreClient || hasExpoGoAppId) {
 						result.isExpoGo = true;
 					} else {
@@ -67,7 +68,7 @@ export class ExpoDetector {
 
 		// Cache the result
 		this._detectionResult = result;
-		
+
 		return result;
 	}
 
@@ -92,7 +93,7 @@ export class ExpoDetector {
 	 */
 	public static getEnvironmentDescription(): string {
 		const result = this.detect();
-		
+
 		if (!result.isExpo) {
 			return 'Bare React Native';
 		}
@@ -111,4 +112,3 @@ export class ExpoDetector {
 		this._detectionResult = null;
 	}
 }
-