Merge remote-tracking branch 'origin/development' into feat/sdke-132-disable-identity-cache-when-no-functional-is-true

Author: jaissica12

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [2.46.0](https://github.com/mParticle/mparticle-web-sdk/compare/v2.45.0...v2.46.0) (2025-09-17)
+
+
+### Features
+
+* added only rokt, all, none click ids when collectClickIdV2Enabl… ([#1062](https://github.com/mParticle/mparticle-web-sdk/issues/1062)) ([99982ac](https://github.com/mParticle/mparticle-web-sdk/commit/99982ac8d648a138d161caf507e0be256b55e488))
+
 # [2.45.0](https://github.com/mParticle/mparticle-web-sdk/compare/v2.44.0...v2.45.0) (2025-09-15)
 
 

dist/mparticle.common.js

@@ -1,6 +1,6 @@
 {
     "name": "@mparticle/web-sdk",
-    "version": "2.45.0",
+    "version": "2.46.0",
     "description": "mParticle core SDK for web applications",
     "license": "Apache-2.0",
     "keywords": [

dist/mparticle.esm.js

@@ -72,7 +72,9 @@ export class BatchUploader {
 
         // Cache Offline Storage Availability boolean
         // so that we don't have to check it every time
-        this.offlineStorageEnabled = this.isOfflineStorageAvailable();
+        this.offlineStorageEnabled =
+            this.isOfflineStorageAvailable() &&
+            !mpInstance._Store.getPrivacyFlag('OfflineEvents');
 
         if (this.offlineStorageEnabled) {
             this.eventVault = new SessionStorageVault<SDKEvent[]>(

dist/mparticle.js

@@ -229,3 +229,15 @@ export const HTTP_UNAUTHORIZED = 401 as const;
 export const HTTP_FORBIDDEN = 403 as const;
 export const HTTP_NOT_FOUND = 404 as const;
 export const HTTP_SERVER_ERROR = 500 as const;
+
+export type PrivacyControl = 'functional' | 'targeting';
+
+export type StorageTypes = 'SDKState' | 'Products' | 'OfflineEvents' | 'IdentityCache' | 'TimeOnSite';
+
+export const StoragePrivacyMap: Record<StorageTypes, PrivacyControl> = {
+    SDKState: 'functional',
+    Products: 'targeting',
+    OfflineEvents: 'functional',
+    IdentityCache: 'functional',
+    TimeOnSite: 'targeting',
+};

package-lock.json

@@ -8,7 +8,7 @@ import {
     UserIdentities,
 } from '@mparticle/web-sdk';
 import { IKitConfigs } from './configAPIClient';
-import Constants from './constants';
+import Constants, { PrivacyControl, StoragePrivacyMap, StorageTypes } from './constants';
 import {
     DataPlanResult,
     KitBlockerOptions,
@@ -216,6 +216,7 @@ export interface IStore {
     setNoFunctional?(noFunctional: boolean): void;
     getNoTargeting?(): boolean;
     setNoTargeting?(noTargeting: boolean): void;
+    getPrivacyFlag?(storageType: StorageTypes): boolean;
 
     getDeviceId?(): string;
     setDeviceId?(deviceId: string): void;
@@ -608,6 +609,17 @@ export default function Store(
         this.noTargeting = noTargeting;
     };
 
+    this.getPrivacyFlag = (storageType: StorageTypes): boolean => {
+        const privacyControl: PrivacyControl = StoragePrivacyMap[storageType];
+        if (privacyControl === 'functional') {
+            return this.getNoFunctional();
+        }
+        if (privacyControl === 'targeting') {
+            return this.getNoTargeting();
+        }
+        return false;
+    };
+
     this.getDeviceId = () => this.deviceId;
     this.setDeviceId = (deviceId: string) => {
         this.deviceId = deviceId;

package.json

@@ -1,32 +1,59 @@
 import { BatchUploader } from '../../src/batchUploader';
 import { IMParticleWebSDKInstance } from '../../src/mp-instance';
+import { IStore } from '../../src/store';
+import { StoragePrivacyMap, StorageTypes } from '../../src/constants';
+import { SDKEvent } from '../../src/sdkRuntimeModels';
 
 describe('BatchUploader', () => {
     let batchUploader: BatchUploader;
     let mockMPInstance: IMParticleWebSDKInstance;
+    let originalFetch: typeof global.fetch;
 
     beforeEach(() => {
         const now = Date.now();
         jest.useFakeTimers({
             now: now,
             advanceTimers: true // This improves the performance of nested timers, equivalent to Sinon's shouldAdvanceTime
         });
-        
+        originalFetch = global.fetch;
+        global.fetch = jest.fn().mockResolvedValue({ ok: true, status: 200 });
+
         // Create a mock mParticle instance with mocked methods for instantiating a BatchUploader
         mockMPInstance = {
             _Store: {
+                storageName: 'mprtcl-v4_abcdef',
+                getNoFunctional: function(this: IStore) { return this.noFunctional; },
+                getNoTargeting: function(this: IStore) { return this.noTargeting; },
+                getPrivacyFlag: function(this: IStore, storageType: StorageTypes) {
+                    const privacyControl = StoragePrivacyMap[storageType];
+                    if (privacyControl === 'functional') {
+                        return this.getNoFunctional();
+                    }
+                    if (privacyControl === 'targeting') {
+                        return this.getNoTargeting();
+                    }
+                    return false;
+                },
+                deviceId: 'device-1',
                 SDKConfig: {
                     flags: {}
                 }
             },
             _Helpers: {
-                getFeatureFlag: jest.fn().mockReturnValue(false),
-                createServiceUrl: jest.fn().mockReturnValue('https://mock-url.com')
+                getFeatureFlag: jest.fn().mockReturnValue('100'),
+                createServiceUrl: jest.fn().mockReturnValue('https://mock-url.com'),
+                generateUniqueId: jest.fn().mockReturnValue('req-1'),
             },
             Identity: {
                 getCurrentUser: jest.fn().mockReturnValue({
-                    getMPID: () => 'test-mpid'
+                    getMPID: () => 'test-mpid',
+                    getConsentState: jest.fn().mockReturnValue(null),
                 })
+            },
+            Logger: {
+                verbose: jest.fn(),
+                error: jest.fn(),
+                warning: jest.fn(),
             }
         } as unknown as IMParticleWebSDKInstance;
 
@@ -35,6 +62,7 @@ describe('BatchUploader', () => {
 
     afterEach(() => {
         jest.useRealTimers();
+        global.fetch = originalFetch;
     });
 
     describe('shouldDebounceAST', () => {
@@ -104,4 +132,50 @@ describe('BatchUploader', () => {
             expect(secondCallTime).toBe(firstCallTime);
         });
     });
+
+    describe('noFunctional', () => {
+        beforeEach(() => {
+            localStorage.clear();
+            sessionStorage.clear();
+        });
+
+        it('should disable offline storage when noFunctional is true', () => {
+            mockMPInstance._Store.noFunctional = true;
+
+            const uploader = new BatchUploader(mockMPInstance, 1000);
+            expect(uploader['offlineStorageEnabled']).toBe(false);
+
+            uploader.queueEvent({ EventDataType: 4 } as SDKEvent);
+            expect(sessionStorage.getItem('mprtcl-v4_abcdef-events')).toBeNull();
+            expect(localStorage.getItem('mprtcl-v4_abcdef-batches')).toBeNull();
+        });
+
+        it('should enable offline storage when noFunctional is false by default', async () => {
+            const uploader = new BatchUploader(mockMPInstance, 1000);
+
+            expect(uploader['offlineStorageEnabled']).toBe(true);
+
+            uploader.queueEvent({ EventDataType: 4 } as SDKEvent);
+            expect(sessionStorage.getItem('mprtcl-v4_abcdef-events')).not.toBeNull();
+
+            jest.advanceTimersByTime(1000);
+            await Promise.resolve();
+
+            expect(localStorage.getItem('mprtcl-v4_abcdef-batches')).not.toBeNull();
+        });
+
+        it('should enable offline storage when noFunctional is false', async () => {
+            mockMPInstance._Store.noFunctional = false;
+
+            const uploader = new BatchUploader(mockMPInstance, 1000);
+
+            uploader.queueEvent({ EventDataType: 4 } as SDKEvent);
+            expect(sessionStorage.getItem('mprtcl-v4_abcdef-events')).not.toBeNull();
+
+            jest.advanceTimersByTime(1000);
+            await Promise.resolve();
+
+            expect(localStorage.getItem('mprtcl-v4_abcdef-batches')).not.toBeNull();
+        });
+    });
 });