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

package/lib/module/native/OsanoCmp.js

@@ -1,62 +1,77 @@
+"use strict";
+
 import { NativeModules, Platform } from 'react-native';
-import OsanoCmpSdkTurboModule from './OsanoCmpSdkSpec';
 import { ExpoDetector } from '../utils/ExpoDetector';
 import { ExpoGoMemoryStorage } from '../utils/ExpoGoMemoryStorage';
+import { WebStorage } from '../utils/WebStorage';
+const isWeb = Platform.OS === 'web';
 const LINKING_ERROR = `The package 'osano-cmp-react-native' doesn't seem to be linked. Make sure: \n\n` + Platform.select({
   ios: "- You have run 'pod install'\n",
   default: ''
 }) + '- You rebuilt the app after installing the package\n' + '- You are not using Expo Go\n';
-const OsanoCmp = OsanoCmpSdkTurboModule || NativeModules.OsanoCmpSdk || new Proxy({}, {
-  get(_, prop) {
-    throw new Error(`${LINKING_ERROR}\nAttempted to call: ${String(prop)}`);
+
+// Lazy-load the TurboModule spec to avoid calling TurboModuleRegistry.get() on web
+// where it doesn't exist. The native module is only needed on iOS/Android.
+let _nativeModule;
+function getNativeModule() {
+  if (_nativeModule === undefined) {
+    if (isWeb) {
+      _nativeModule = null;
+    } else {
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
+      const OsanoCmpSdkTurboModule = require('./OsanoCmpSdkSpec').default;
+      _nativeModule = OsanoCmpSdkTurboModule || NativeModules.OsanoCmpSdk || new Proxy({}, {
+        get(_, prop) {
+          throw new Error(`${LINKING_ERROR}\nAttempted to call: ${String(prop)}`);
+        }
+      });
+    }
   }
-});
+  return _nativeModule;
+}
+function getFallback() {
+  if (isWeb) return WebStorage;
+  if (ExpoDetector.isExpoGo()) return ExpoGoMemoryStorage;
+  return null;
+}
 export function getDeviceId() {
-  if (ExpoDetector.isExpoGo()) {
-    return ExpoGoMemoryStorage.getDeviceId();
-  }
-  return OsanoCmp.getDeviceId();
+  const fallback = getFallback();
+  if (fallback) return fallback.getDeviceId();
+  return getNativeModule().getDeviceId();
 }
 export function setStorage(key, value) {
-  if (ExpoDetector.isExpoGo()) {
-    return ExpoGoMemoryStorage.setStorage(key, value);
-  }
-  return OsanoCmp.setStorage(key, value);
+  const fallback = getFallback();
+  if (fallback) return fallback.setStorage(key, value);
+  return getNativeModule().setStorage(key, value);
 }
 export function getStorage(key) {
-  if (ExpoDetector.isExpoGo()) {
-    return ExpoGoMemoryStorage.getStorage(key);
-  }
-  return OsanoCmp.getStorage(key);
+  const fallback = getFallback();
+  if (fallback) return fallback.getStorage(key);
+  return getNativeModule().getStorage(key);
 }
 export function clearStorage(key) {
-  if (ExpoDetector.isExpoGo()) {
-    return ExpoGoMemoryStorage.clearStorage(key);
-  }
-  return OsanoCmp.clearStorage(key);
+  const fallback = getFallback();
+  if (fallback) return fallback.clearStorage(key);
+  return getNativeModule().clearStorage(key);
 }
 export function setStorageToDefault(key, value) {
-  if (ExpoDetector.isExpoGo()) {
-    return ExpoGoMemoryStorage.setStorageToDefault(key, value);
-  }
-  return OsanoCmp.setStorageToDefault?.(key, value) ?? Promise.resolve(value);
+  const fallback = getFallback();
+  if (fallback) return fallback.setStorageToDefault(key, value);
+  return getNativeModule().setStorageToDefault?.(key, value) ?? Promise.resolve(value);
 }
 export function setIntStorageToDefault(key, value) {
-  if (ExpoDetector.isExpoGo()) {
-    return ExpoGoMemoryStorage.setIntStorageToDefault(key, value);
-  }
-  return OsanoCmp.setIntStorageToDefault?.(key, value) ?? Promise.resolve(value);
+  const fallback = getFallback();
+  if (fallback) return fallback.setIntStorageToDefault(key, value);
+  return getNativeModule().setIntStorageToDefault?.(key, value) ?? Promise.resolve(value);
 }
 export function setBoolStorageToDefault(key, value) {
-  if (ExpoDetector.isExpoGo()) {
-    return ExpoGoMemoryStorage.setBoolStorageToDefault(key, value);
-  }
-  return OsanoCmp.setBoolStorageToDefault?.(key, value) ?? Promise.resolve(value);
+  const fallback = getFallback();
+  if (fallback) return fallback.setBoolStorageToDefault(key, value);
+  return getNativeModule().setBoolStorageToDefault?.(key, value) ?? Promise.resolve(value);
 }
 export function clearStorageFromDefault(key) {
-  if (ExpoDetector.isExpoGo()) {
-    return ExpoGoMemoryStorage.clearStorageFromDefault(key);
-  }
-  return OsanoCmp.clearStorageFromDefault?.(key) ?? Promise.resolve();
+  const fallback = getFallback();
+  if (fallback) return fallback.clearStorageFromDefault(key);
+  return getNativeModule().clearStorageFromDefault?.(key) ?? Promise.resolve();
 }
 //# sourceMappingURL=OsanoCmp.js.map

package/lib/module/native/OsanoCmp.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","Platform","OsanoCmpSdkTurboModule","ExpoDetector","ExpoGoMemoryStorage","LINKING_ERROR","select","ios","default","OsanoCmp","OsanoCmpSdk","Proxy","get","_","prop","Error","String","getDeviceId","isExpoGo","setStorage","key","value","getStorage","clearStorage","setStorageToDefault","Promise","resolve","setIntStorageToDefault","setBoolStorageToDefault","clearStorageFromDefault"],"sourceRoot":"../../../src","sources":["native/OsanoCmp.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["NativeModules","Platform","ExpoDetector","ExpoGoMemoryStorage","WebStorage","isWeb","OS","LINKING_ERROR","select","ios","default","_nativeModule","getNativeModule","undefined","OsanoCmpSdkTurboModule","require","OsanoCmpSdk","Proxy","get","_","prop","Error","String","getFallback","isExpoGo","getDeviceId","fallback","setStorage","key","value","getStorage","clearStorage","setStorageToDefault","Promise","resolve","setIntStorageToDefault","setBoolStorageToDefault","clearStorageFromDefault"],"sourceRoot":"../../../src","sources":["native/OsanoCmp.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/native/OsanoCmpSdkSpec.js

@@ -1,3 +1,5 @@
+"use strict";
+
 import { TurboModuleRegistry } from 'react-native';
 export default TurboModuleRegistry.get('OsanoCmpSdk');
 //# sourceMappingURL=OsanoCmpSdkSpec.js.map

package/lib/module/native/OsanoCmpSdkSpec.js.map

@@ -1 +1 @@
-{"version":3,"names":["TurboModuleRegistry","get"],"sourceRoot":"../../../src","sources":["native/OsanoCmpSdkSpec.ts"],"mappings":"AACA,SAASA,mBAAmB,QAAQ,cAAc;AAuBlD,eAAeA,mBAAmB,CAACC,GAAG,CAAO,aAAa,CAAC","ignoreList":[]}
+{"version":3,"names":["TurboModuleRegistry","get"],"sourceRoot":"../../../src","sources":["native/OsanoCmpSdkSpec.ts"],"mappings":";;AACA,SAASA,mBAAmB,QAAQ,cAAc;AAuBlD,eAAeA,mBAAmB,CAACC,GAAG,CAAO,aAAa,CAAC","ignoreList":[]}

package/lib/module/reducer.js

@@ -1,55 +1,28 @@
-import { CLEAR_CONSENT, CLOSE, FETCH_DISCLOSURES_BEGIN, FETCH_DISCLOSURES_FAILURE, FETCH_DISCLOSURES_SUCCESS, GO_BACK, RELOAD, REVERT_CONSENT, SAVE_SUCCESS, SET_ALL_CONSENT, SET_CONFIG, SET_LOCALE, SHOW_DIALOG, SHOW_DRAWER, SHOW_IAB_DISCLOSURES, SHOW_IAB_VENDORS, TOGGLE_CATEGORY } from './actions';
-import { ConsentCategory } from './constants';
-import { getFinalOptOutValue, getSavedConsent } from './iab/tcf/selectors';
-import { isAnalyticsAlwaysAllowed, shouldUseGPCOptOut } from './selectors';
-export const OsanoCategories = Object.values(ConsentCategory);
-export const initialState = {
-  config: undefined,
-  configId: '',
-  consent: {
-    [ConsentCategory.ESSENTIAL]: true,
-    [ConsentCategory.STORAGE]: false,
-    [ConsentCategory.MARKETING]: false,
-    [ConsentCategory.PERSONALIZATION]: false,
-    [ConsentCategory.ANALYTICS]: false,
-    [ConsentCategory.OPT_OUT]: false
-  },
-  consentTimestamp: 0,
-  customerId: '',
-  dialogOpen: false,
-  disclosures: {
-    fetched: [],
-    loading: false,
-    results: {}
-  },
-  locale: 'en',
-  ready: {
-    consent: false
-  },
-  savedConsent: null,
-  scrollToType: '',
-  scrollToId: -1,
-  stack: []
-};
+"use strict";
+
+import { CLEAR_CONSENT, CLOSE, FETCH_DISCLOSURES_BEGIN, FETCH_DISCLOSURES_FAILURE, FETCH_DISCLOSURES_SUCCESS, GO_BACK, RELOAD, REVERT_CONSENT, SAVE_BEGIN, SET_ALL_CONSENT, SET_CONFIG, SET_LOCALE, SHOW_DIALOG, SHOW_DRAWER, SHOW_IAB_DISCLOSURES, SHOW_IAB_VENDORS, TOGGLE_CATEGORY } from './actions';
+import { ConsentCategory, initialState, makeConsentFromCategories, OsanoCategories } from './constants';
+import { getFinalOptOutValue, getPriorConsent, isAnalyticsAlwaysAllowed, shouldUseGPCOptOut } from './selectors';
 export const init = initialArgs => {
   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;
-    }, {}) : {
-      ...consent
-    } : initialState.consent
+    consent: consentRecord,
+    savedConsent: consent ? {
+      ...consentRecord
+    } : null
   };
 };
 const setAllConsent = acceptOrDeny => state => {
-  function formatStatus(category, status) {
-    const useGPC = shouldUseGPCOptOut(state, !status);
+  function isAccepted(category) {
+    const useGPC = shouldUseGPCOptOut(state, !acceptOrDeny);
     switch (category) {
       case 'ESSENTIAL':
         {
@@ -58,21 +31,17 @@ const setAllConsent = acceptOrDeny => state => {
       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;
-  }, {});
+  const newConsent = makeConsentFromCategories(OsanoCategories, isAccepted);
   return {
     ...state,
     consent: newConsent
@@ -106,24 +75,21 @@ export function reducer(state, action) {
         ...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 = action.payload;
-        const consent = OsanoCategories.reduce((consent, category) => {
-          consent[`${category}`] = consentedCategories.includes(category);
-          return consent;
-        }, {});
-        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:
@@ -142,13 +108,7 @@ export function reducer(state, action) {
       }
     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
@@ -251,22 +211,18 @@ export function reducer(state, action) {
       }
     case CLOSE:
       {
-        const cmp = action.payload;
-        const consent = Object.keys(state.consent).reduce((newConsent, category) => {
-          newConsent[`${category}`] = cmp.consent?.includes(category);
-          return newConsent;
-        }, {});
-        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: []
         };
       }

package/lib/module/reducer.js.map

@@ -1 +1 @@
-{"version":3,"names":["CLEAR_CONSENT","CLOSE","FETCH_DISCLOSURES_BEGIN","FETCH_DISCLOSURES_FAILURE","FETCH_DISCLOSURES_SUCCESS","GO_BACK","RELOAD","REVERT_CONSENT","SAVE_SUCCESS","SET_ALL_CONSENT","SET_CONFIG","SET_LOCALE","SHOW_DIALOG","SHOW_DRAWER","SHOW_IAB_DISCLOSURES","SHOW_IAB_VENDORS","TOGGLE_CATEGORY","ConsentCategory","getFinalOptOutValue","getSavedConsent","isAnalyticsAlwaysAllowed","shouldUseGPCOptOut","OsanoCategories","Object","values","initialState","config","undefined","configId","consent","ESSENTIAL","STORAGE","MARKETING","PERSONALIZATION","ANALYTICS","OPT_OUT","consentTimestamp","customerId","dialogOpen","disclosures","fetched","loading","results","locale","ready","savedConsent","scrollToType","scrollToId","stack","init","initialArgs","reloadProps","Array","isArray","reduce","newConsent","category","includes","setAllConsent","acceptOrDeny","state","formatStatus","status","useGPC","reducer","action","type","payload","consentConfig","consentedCategories","optOutStatus","previousConsent","value","id","length","slice","cmp","keys","indexOf","filter","cat","currentlyFetched","disclosuresByCategory","categories","disclosure","classification","categoryName","categoryDisclosures","push","newResults","entries","validCategories","lookup","name","uuid","sort","a","b","localeCompare","index","list"],"sourceRoot":"../../src","sources":["reducer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["CLEAR_CONSENT","CLOSE","FETCH_DISCLOSURES_BEGIN","FETCH_DISCLOSURES_FAILURE","FETCH_DISCLOSURES_SUCCESS","GO_BACK","RELOAD","REVERT_CONSENT","SAVE_BEGIN","SET_ALL_CONSENT","SET_CONFIG","SET_LOCALE","SHOW_DIALOG","SHOW_DRAWER","SHOW_IAB_DISCLOSURES","SHOW_IAB_VENDORS","TOGGLE_CATEGORY","ConsentCategory","initialState","makeConsentFromCategories","OsanoCategories","getFinalOptOutValue","getPriorConsent","isAnalyticsAlwaysAllowed","shouldUseGPCOptOut","init","initialArgs","consent","reloadProps","consentRecord","Array","isArray","savedConsent","setAllConsent","acceptOrDeny","state","isAccepted","category","useGPC","newConsent","reducer","action","type","payload","config","customerId","configId","consentConfig","locale","consentedCategories","optOutStatus","OPT_OUT","ANALYTICS","consentTimestamp","previousConsent","value","MARKETING","undefined","dialogOpen","stack","scrollToType","id","scrollToId","length","slice","disclosures","loading","fetched","indexOf","filter","cat","results","currentlyFetched","Object","values","disclosuresByCategory","reduce","categories","disclosure","classification","categoryName","categoryDisclosures","push","newResults","entries","validCategories","lookup","name","uuid","sort","a","b","localeCompare","index","list"],"sourceRoot":"../../src","sources":["reducer.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/selectors.js

@@ -1,5 +1,6 @@
-// @ts-nocheck
-import { ConsentCategory } from './constants';
+"use strict";
+
+import { initialState, ConsentCategory } from './constants';
 import { get } from './utils';
 export const isCategoryAccepted = (state, category) => getConsent(state).includes(category);
 export const isAnalyticsAlwaysAllowed = state => !!state.config?.type.analyticsAlways;
@@ -18,6 +19,28 @@ export function getConsent(state, category) {
   }
   return Object.entries(state.consent).filter(([_key, value]) => value).map(([key]) => key);
 }
+export function getFinalOptOutValue(state, pendingNewValue) {
+  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) {
+  return get(state, 'savedConsent', null);
+}
+export function getPriorConsent(state) {
+  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 => get(state, 'consentTimestamp') || 0;
 
 // Array Constants for common disclosures

package/lib/module/selectors.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConsentCategory","get","isCategoryAccepted","state","category","getConsent","includes","isAnalyticsAlwaysAllowed","config","type","analyticsAlways","isCategoryDisabled","ESSENTIAL","OPT_OUT","isGPCSupportEnabled","MARKETING","shouldRenderOptOut","isDrawerOpen","stack","length","isDialogOpen","dialogOpen","gpcSupport","navigator","Object","hasOwnProperty","call","window","shouldUseGPCOptOut","acceptOrDeny","hasOwn","consent","entries","filter","_key","value","map","key","getConsentTimestamp","loadingDisclosures","noDisclosures","name","isConsentReady","isLoadingDisclosures","disclosures","loading","hasFetchedDisclosuresForCategory","fetched","indexOf","getCategoryDisclosures","getStack","index","undefined"],"sourceRoot":"../../src","sources":["selectors.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["initialState","ConsentCategory","get","isCategoryAccepted","state","category","getConsent","includes","isAnalyticsAlwaysAllowed","config","type","analyticsAlways","isCategoryDisabled","ESSENTIAL","OPT_OUT","isGPCSupportEnabled","MARKETING","shouldRenderOptOut","isDrawerOpen","stack","length","isDialogOpen","dialogOpen","gpcSupport","navigator","Object","hasOwnProperty","call","window","shouldUseGPCOptOut","acceptOrDeny","hasOwn","consent","entries","filter","_key","value","map","key","getFinalOptOutValue","pendingNewValue","undefined","existingOptOut","getSavedConsent","getPriorConsent","previousConsent","ANALYTICS","getConsentTimestamp","loadingDisclosures","noDisclosures","name","isConsentReady","isLoadingDisclosures","disclosures","loading","hasFetchedDisclosuresForCategory","fetched","indexOf","getCategoryDisclosures","getStack","index"],"sourceRoot":"../../src","sources":["selectors.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/services/consent.js

@@ -1,11 +1,15 @@
+"use strict";
+
 import { sha512 } from 'js-sha512';
 import { Platform, NativeModules } from 'react-native';
 import { TextEncoder } from 'text-encoding';
-import { ConsentCategory, ConsentCategory as ConsentCategoryType, env } from '../constants';
+import { ConsentCategory, env, formatConsentArray, makeConsentFromCategories } from '../constants';
 import { clearStorage, getStorage, setStorage } from '../native/OsanoCmp';
 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,
@@ -18,20 +22,9 @@ const overrideConfig = {
   // Override config here
   variant: 'two'
 };
-function createConsentPayload(cmp, consent) {
-  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));
-}
 function createConsentRecordPayload(cmp, consent) {
   const consentedCategories = consent ?? cmp.consent ?? [];
-  const hashedExtUsrData = hashExtUsrData(cmp.customerId, cmp.configId, cmp.extUsrData);
+  const hashedExtUsrData = hashExtUsrData(cmp.customerId, cmp.configId, cmp.extUsrData || undefined);
   return Object.fromEntries(Object.entries({
     osnoCustomerId: cmp.customerId,
     osnoConfigId: cmp.configId,
@@ -39,11 +32,19 @@ function createConsentRecordPayload(cmp, consent) {
     consentingDomain: cmp.consentingDomain,
     consentingPlatform: CONSENTING_PLATFORM_TAG,
     userConsentId: cmp.deviceId,
-    extUsrData: hashedExtUsrData
+    extUsrData: hashedExtUsrData || undefined
   }).filter(([, value]) => value !== undefined));
 }
 const STORAGE_KEY = 'osano_consentmanager';
-const storeConsent = async (cmp, consent) => {
+function consentRecordedRemotely(configId, success, hashedExtUsrData) {
+  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, consent, recordedRemotely) => {
   cmp.consent = consent ?? cmp.consent;
   return new Promise((resolve, reject) => {
     const resConsent = () => {
@@ -55,10 +56,16 @@ const storeConsent = async (cmp, consent) => {
     switch (Platform.OS) {
       case 'ios':
       case 'android':
-        setStorage(`${STORAGE_KEY}_last_recorded_consent_date${userSuffix}`, JSON.stringify(new Date())).then(() => {
-          setStorage(`${STORAGE_KEY}_${cmp.configId}${userSuffix}`, JSON.stringify(cmp.consent)).then(resConsent).catch(reject);
-        }).catch(reject);
-        break;
+      default:
+        {
+          setStorage(`${STORAGE_KEY}_last_recorded_consent_date${userSuffix}`, JSON.stringify(new Date())).then(() => {
+            setStorage(`${STORAGE_KEY}_${cmp.configId}${userSuffix}`, JSON.stringify(cmp.consent)).then(resConsent).catch(reject);
+          }).catch(reject);
+          if (recordedRemotely !== undefined) {
+            consentRecordedRemotely(cmp.configId, recordedRemotely, hashedExtUsrData);
+          }
+          break;
+        }
     }
   });
 };
@@ -74,11 +81,12 @@ export const clearConsent = async cmp => {
     switch (Platform.OS) {
       case 'android':
       case 'ios':
-        clearStorage(`${STORAGE_KEY}_${cmp.configId}${userSuffix}`).then(resConsent);
-        break;
       default:
-        resConsent();
-        break;
+        {
+          clearStorage(`${STORAGE_KEY}_${cmp.configId}${userSuffix}`).then(resConsent);
+          consentRecordedRemotely(cmp.configId, false, hashedExtUsrData);
+          break;
+        }
     }
   });
 };
@@ -98,8 +106,9 @@ export const migrateConsentStorage = async cmp => {
       case 'android':
         getStorage(oldKey).then(oldConsent => {
           if (oldConsent) {
-            const consent = JSON.parse(oldConsent);
+            let consent = JSON.parse(oldConsent);
             if (consent.length > 0) {
+              consent = formatConsentArray(makeConsentFromCategories(consent));
               // Store with new user-specific key
               storeConsent(cmp, consent).then(() => {
                 // Clean up old storage
@@ -154,6 +163,10 @@ const retrieveConsent = async cmp => {
         });
         break;
       default:
+        // Web and other platforms: use storage directly, no migration needed
+        getStorage(newKey).then(resConsent).catch(() => {
+          clearConsent(cmp).then(resolve);
+        });
         break;
     }
   });
@@ -175,10 +188,8 @@ const retrieveLastConsentTimestamp = async cmp => {
     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;
     }
   });
@@ -187,8 +198,13 @@ export const recordConsent = (cmp, consent) => {
   const payload = createConsentRecordPayload(cmp, consent);
   return API.post(`${CONSENT_URI}/record`, payload, {
     referrer: cmp.consentingDomain
-  }).then(() => consent ?? cmp.consent).then(consentCategories => storeConsent(cmp, consentCategories)).catch(error => {
-    // Cannot record consent
+  }).then(() => consent ?? cmp.consent ?? [ConsentCategory.ESSENTIAL]).then(consentCategories => {
+    consentCategories = formatConsentArray(makeConsentFromCategories(consentCategories));
+    storeConsent(cmp, consentCategories, true);
+    return consentCategories;
+  }).catch(error => {
+    // Cannot record consent (offline?), store locally and try again later
+    storeConsent(cmp, consent, false);
     throw error;
   });
 };
@@ -203,7 +219,7 @@ export function hashExtUsrData(customerId, configId, extUsrData) {
       const base64 = Buffer.from(hash).toString('base64');
       const hashUrlSafe = base64.replace(/\+/g, '-').replace(/\//g, '_');
       return hashUrlSafe;
-    } catch (error) {
+    } catch {
       // something went wrong
       return '';
     }
@@ -236,8 +252,8 @@ export const fetchConsent = async cmp => {
 
     // 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]);
-      await storeConsent(cmp, remoteConsentCategories);
+      const remoteConsentCategories = consented.map(category => ConsentCategory[category]);
+      await storeConsent(cmp, remoteConsentCategories, true);
       return remoteConsentCategories;
     }
 
@@ -246,11 +262,11 @@ export const fetchConsent = async cmp => {
     try {
       if (new Date(lastConsentTimestamp) > new Date(internalTimestamp) || internalTimestamp === '') {
         // Remote consent is newer or we haven't recorded any consent yet. Store remote consent.
-        const remoteConsentCategories = consented.map(category => ConsentCategoryType[category]);
-        await storeConsent(cmp, remoteConsentCategories);
+        const remoteConsentCategories = formatConsentArray(makeConsentFromCategories(consented));
+        await storeConsent(cmp, remoteConsentCategories, true);
         return remoteConsentCategories;
       }
-    } catch (error) {
+    } catch {
       // Error parsing timestamp
     }
     return consent;
@@ -285,7 +301,7 @@ export const getStoredConfig = async configId => {
     if (config) {
       return JSON.parse(config);
     }
-  } catch (error) {
+  } catch {
     // Failed to retrieve config
   }
   return null;
@@ -293,7 +309,7 @@ export const getStoredConfig = async configId => {
 export const storeConfig = async (configId, config) => {
   try {
     await Promise.all([setStorage(`${STORAGE_KEY}_${configId}_config`, JSON.stringify(config)), setStorage(`${STORAGE_KEY}_${configId}_config_last_stored_at`, JSON.stringify(new Date()))]);
-  } catch (error) {
+  } catch {
     throw new Error('Failed to store config');
   }
 };
@@ -303,7 +319,7 @@ export const getConfigLastStoredAt = async configId => {
     if (lastStoredAt) {
       return new Date(JSON.parse(lastStoredAt));
     }
-  } catch (error) {
+  } catch {
     // Failed to retrieve last stored at
   }
   return null;