@mparticle/web-sdk 2.23.7 → 2.23.9

package/dist/mparticle.js

@@ -608,7 +608,7 @@ var mParticle = (function () {
       Environment: Environment
     };
 
-    var version = "2.23.7";
+    var version = "2.23.9";
 
     var Constants = {
       sdkVersion: version,
@@ -742,6 +742,7 @@ var mParticle = (function () {
         ia: 1,
         con: 1
       },
+      // https://go.mparticle.com/work/SQDSDKS-6039
       SDKv2NonMPIDCookieKeys: {
         gs: 1,
         cu: 1,
@@ -764,7 +765,13 @@ var mParticle = (function () {
         OfflineStorage: 'offlineStorage'
       },
       DefaultInstance: 'default_instance',
-      CCPAPurpose: 'data_sale_opt_out'
+      CCPAPurpose: 'data_sale_opt_out',
+      IdentityMethods: {
+        Modify: 'modify',
+        Logout: 'logout',
+        Login: 'login',
+        Identify: 'identify'
+      }
     };
 
     /******************************************************************************
@@ -1282,9 +1289,15 @@ var mParticle = (function () {
     var isNumber = function isNumber(value) {
       return typeof value === 'number';
     };
+    var isBoolean = function isBoolean(value) {
+      return typeof value === 'boolean';
+    };
     var isFunction = function isFunction(fn) {
       return typeof fn === 'function';
     };
+    var isValidCustomFlagProperty = function isValidCustomFlagProperty(value) {
+      return isNumber(value) || isString(value) || isBoolean(value);
+    };
     var toDataPlanSlug = function toDataPlanSlug(value) {
       // Make sure we are only acting on strings or numbers
       return isStringOrNumber(value) ? value.toString().toLowerCase().replace(/[^0-9a-zA-Z]+/g, '_') : '';
@@ -2364,6 +2377,7 @@ var mParticle = (function () {
           this.uploader = new BatchUploader(mpInstance, millis);
         }
         this.uploader.queueEvent(event);
+        // https://go.mparticle.com/work/SQDSDKS-6038
         mpInstance._Persistence.update();
       };
       this.processQueuedEvents = function () {
@@ -2414,6 +2428,7 @@ var mParticle = (function () {
         if (isEmpty(event)) {
           return;
         }
+        // https://go.mparticle.com/work/SQDSDKS-6038
         if (options.shouldUploadEvent) {
           this.queueEventForBatchUpload(event);
         }
@@ -2494,6 +2509,7 @@ var mParticle = (function () {
       };
     }
 
+    var Modify$3 = Constants.IdentityMethods.Modify;
     var Validators = {
       // From ./utils
       // Utility Functions for backwards compatability
@@ -2516,7 +2532,7 @@ var mParticle = (function () {
           copyUserAttributes: 1
         };
         if (identityApiData) {
-          if (method === 'modify') {
+          if (method === Modify$3) {
             if (isObject(identityApiData.userIdentities) && !Object.keys(identityApiData.userIdentities).length || !isObject(identityApiData.userIdentities)) {
               return {
                 valid: false,
@@ -2690,6 +2706,7 @@ var mParticle = (function () {
         }
       };
 
+      // https://go.mparticle.com/work/SQDSDKS-6047
       // Standalone version of jQuery.extend, from https://github.com/dansdom/extend
       this.extend = function () {
         var options,
@@ -3191,6 +3208,7 @@ var mParticle = (function () {
             self.endSession();
             self.startNewSession();
           } else {
+            // https://go.mparticle.com/work/SQDSDKS-6045
             var persistence = mpInstance._Persistence.getPersistence();
             if (persistence && !persistence.cu) {
               mpInstance.Identity.identify(mpInstance._Store.SDKConfig.identifyRequest, mpInstance._Store.SDKConfig.identityCallback);
@@ -4008,6 +4026,8 @@ var mParticle = (function () {
       StorageNames = Constants.StorageNames;
     function _Persistence(mpInstance) {
       var self = this;
+
+      // https://go.mparticle.com/work/SQDSDKS-5022
       this.useLocalStorage = function () {
         return !mpInstance._Store.SDKConfig.useCookieStorage && mpInstance._Store.isLocalStorageAvailable;
       };
@@ -4018,6 +4038,7 @@ var mParticle = (function () {
             cookies = self.getCookie(),
             allData;
 
+          // https://go.mparticle.com/work/SQDSDKS-6045
           // Determine if there is any data in cookies or localStorage to figure out if it is the first time the browser is loading mParticle
           if (!localStorageData && !cookies) {
             mpInstance._Store.isFirstRun = true;
@@ -4025,9 +4046,13 @@ var mParticle = (function () {
           } else {
             mpInstance._Store.isFirstRun = false;
           }
+
+          // https://go.mparticle.com/work/SQDSDKS-6045
           if (!mpInstance._Store.isLocalStorageAvailable) {
             mpInstance._Store.SDKConfig.useCookieStorage = true;
           }
+
+          // https://go.mparticle.com/work/SQDSDKS-6046
           if (mpInstance._Store.isLocalStorageAvailable) {
             storage = window.localStorage;
             if (mpInstance._Store.SDKConfig.useCookieStorage) {
@@ -4035,6 +4060,7 @@ var mParticle = (function () {
               // no mParticle cookie exists yet and there is localStorage. Get the localStorage, set them to cookies, then delete the localStorage item.
               if (localStorageData) {
                 if (cookies) {
+                  // https://go.mparticle.com/work/SQDSDKS-6047
                   allData = mpInstance._Helpers.extend(false, localStorageData, cookies);
                 } else {
                   allData = localStorageData;
@@ -4049,6 +4075,7 @@ var mParticle = (function () {
               // no mParticle localStorage exists yet and there are cookies. Get the cookies, set them to localStorage, then delete the cookies.
               if (cookies) {
                 if (localStorageData) {
+                  // https://go.mparticle.com/work/SQDSDKS-6047
                   allData = mpInstance._Helpers.extend(false, localStorageData, cookies);
                 } else {
                   allData = cookies;
@@ -4062,6 +4089,8 @@ var mParticle = (function () {
           } else {
             self.storeDataInMemory(cookies);
           }
+
+          // https://go.mparticle.com/work/SQDSDKS-6048
           try {
             if (mpInstance._Store.isLocalStorageAvailable) {
               var encodedProducts = localStorage.getItem(mpInstance._Store.prodStorageName);
@@ -4079,6 +4108,9 @@ var mParticle = (function () {
             mpInstance._Store.cartProducts = [];
             mpInstance.Logger.error('Error loading products in initialization: ' + e);
           }
+
+          // https://go.mparticle.com/work/SQDSDKS-6046
+          // Stores all non-current user MPID information into the store
           for (var key in allData) {
             if (allData.hasOwnProperty(key)) {
               if (!SDKv2NonMPIDCookieKeys[key]) {
@@ -4088,6 +4120,8 @@ var mParticle = (function () {
           }
           self.update();
         } catch (e) {
+          // If cookies or local storage is corrupt, we want to remove it
+          // so that in the future, initializeStorage will work
           if (self.useLocalStorage() && mpInstance._Store.isLocalStorageAvailable) {
             localStorage.removeItem(mpInstance._Store.storageName);
           } else {
@@ -4113,6 +4147,8 @@ var mParticle = (function () {
           }
         }
       };
+
+      // https://go.mparticle.com/work/SQDSDKS-6045
       this.storeDataInMemory = function (obj, currentMPID) {
         try {
           if (!obj) {
@@ -4164,6 +4200,8 @@ var mParticle = (function () {
           mpInstance.Logger.error(Messages$4.ErrorMessages.CookieParseError);
         }
       };
+
+      // https://go.mparticle.com/work/SQDSDKS-5022
       this.determineLocalStorageAvailability = function (storage) {
         var result;
         if (window.mParticle && window.mParticle._forceNoLocalStorage) {
@@ -4223,6 +4261,8 @@ var mParticle = (function () {
         }
         return parsedDecodedProducts;
       };
+
+      // https://go.mparticle.com/work/SQDSDKS-6021
       this.setLocalStorage = function () {
         if (!mpInstance._Store.isLocalStorageAvailable) {
           return;
@@ -4355,7 +4395,8 @@ var mParticle = (function () {
         }
       };
 
-      // only used in persistence
+      // https://go.mparticle.com/work/SQDSDKS-5022
+      // https://go.mparticle.com/work/SQDSDKS-6021
       this.setCookie = function () {
         var mpid,
           currentUser = mpInstance.Identity.getCurrentUser();
@@ -4706,6 +4747,8 @@ var mParticle = (function () {
           }
         }
       };
+
+      // https://go.mparticle.com/work/SQDSDKS-6021
       this.savePersistence = function (persistence) {
         var encodedPersistence = self.encodePersistence(JSON.stringify(persistence)),
           date = new Date(),
@@ -4835,6 +4878,7 @@ var mParticle = (function () {
         }
       };
 
+      // https://go.mparticle.com/work/SQDSDKS-6045
       // Forwarder Batching Code
       this.forwardingStatsBatches = {
         uploadsTable: {},
@@ -5044,6 +5088,8 @@ var mParticle = (function () {
             commerceEvent.EventAttributes = attrs;
           }
           mpInstance._APIClient.sendEventToServer(commerceEvent, options);
+
+          // https://go.mparticle.com/work/SQDSDKS-6038
           mpInstance._Persistence.update();
         } else {
           mpInstance.Logger.verbose(Messages$3.InformationMessages.AbandonLogEvent);
@@ -5168,6 +5214,11 @@ var mParticle = (function () {
       };
     }
 
+    var _Constants$IdentityMe$1 = Constants.IdentityMethods,
+      Modify$2 = _Constants$IdentityMe$1.Modify,
+      Identify$1 = _Constants$IdentityMe$1.Identify,
+      Login = _Constants$IdentityMe$1.Login,
+      Logout = _Constants$IdentityMe$1.Logout;
     function Forwarders(mpInstance, kitBlocker) {
       var self = this;
       var UserAttributeActionTypes = {
@@ -5398,6 +5449,8 @@ var mParticle = (function () {
           }
         });
       };
+
+      // TODO: https://go.mparticle.com/work/SQDSDKS-6036
       this.setForwarderUserIdentities = function (userIdentities) {
         mpInstance._Store.activeForwarders.forEach(function (forwarder) {
           var filteredUserIdentities = mpInstance._Helpers.filterUserIdentities(userIdentities, forwarder.userIdentityFilters);
@@ -5426,30 +5479,31 @@ var mParticle = (function () {
         var result;
         mpInstance._Store.activeForwarders.forEach(function (forwarder) {
           var filteredUser = filteredMparticleUser(user.getMPID(), forwarder, mpInstance, kitBlocker);
-          if (identityMethod === 'identify') {
+          var filteredUserIdentities = filteredUser.getUserIdentities();
+          if (identityMethod === Identify$1) {
             if (forwarder.onIdentifyComplete) {
-              result = forwarder.onIdentifyComplete(filteredUser);
+              result = forwarder.onIdentifyComplete(filteredUser, filteredUserIdentities);
               if (result) {
                 mpInstance.Logger.verbose(result);
               }
             }
-          } else if (identityMethod === 'login') {
+          } else if (identityMethod === Login) {
             if (forwarder.onLoginComplete) {
-              result = forwarder.onLoginComplete(filteredUser);
+              result = forwarder.onLoginComplete(filteredUser, filteredUserIdentities);
               if (result) {
                 mpInstance.Logger.verbose(result);
               }
             }
-          } else if (identityMethod === 'logout') {
+          } else if (identityMethod === Logout) {
             if (forwarder.onLogoutComplete) {
-              result = forwarder.onLogoutComplete(filteredUser);
+              result = forwarder.onLogoutComplete(filteredUser, filteredUserIdentities);
               if (result) {
                 mpInstance.Logger.verbose(result);
               }
             }
-          } else if (identityMethod === 'modify') {
+          } else if (identityMethod === Modify$2) {
             if (forwarder.onModifyComplete) {
-              result = forwarder.onModifyComplete(filteredUser);
+              result = forwarder.onModifyComplete(filteredUser, filteredUserIdentities);
               if (result) {
                 mpInstance.Logger.verbose(result);
               }
@@ -5649,14 +5703,11 @@ var mParticle = (function () {
         if (event.CustomFlags.hasOwnProperty(prop)) {
           if (Array.isArray(event.CustomFlags[prop])) {
             event.CustomFlags[prop].forEach(function (customFlagProperty) {
-              // TODO: Can we use our utility functions here?
-              if (typeof customFlagProperty === 'number' || typeof customFlagProperty === 'string' || typeof customFlagProperty === 'boolean') {
+              if (isValidCustomFlagProperty(customFlagProperty)) {
                 valueArray.push(customFlagProperty.toString());
               }
             });
-          } else if (
-          // TODO: Can we use our utility functions here?
-          typeof event.CustomFlags[prop] === 'number' || typeof event.CustomFlags[prop] === 'string' || typeof event.CustomFlags[prop] === 'boolean') {
+          } else if (isValidCustomFlagProperty(event.CustomFlags[prop])) {
             valueArray.push(event.CustomFlags[prop].toString());
           }
           if (valueArray.length) {
@@ -5992,6 +6043,9 @@ var mParticle = (function () {
 
     var Messages$2 = Constants.Messages,
       HTTPCodes$2 = Constants.HTTPCodes;
+    var _Constants$IdentityMe = Constants.IdentityMethods,
+      Identify = _Constants$IdentityMe.Identify,
+      Modify$1 = _Constants$IdentityMe.Modify;
     function Identity(mpInstance) {
       var self = this;
       this.checkIdentitySwap = function (previousMPID, currentMPID, currentSessionMPIDs) {
@@ -6897,7 +6951,7 @@ var mParticle = (function () {
             mpInstance._Persistence.setFirstSeenTime(identityApiResult.mpid);
           }
           if (xhr.status === 200) {
-            if (method === 'modify') {
+            if (method === Modify$1) {
               newIdentitiesByType = mpInstance._Identity.IdentityRequest.combineUserIdentities(previousUIByName, identityApiData.userIdentities);
               mpInstance._Persistence.saveUserIdentitiesToPersistence(previousMPID, newIdentitiesByType);
             } else {
@@ -6909,7 +6963,7 @@ var mParticle = (function () {
               //this covers an edge case where, users stored before "firstSeenTime" was introduced
               //will not have a value for "fst" until the current MPID changes, and in some cases,
               //the current MPID will never change
-              if (method === 'identify' && prevUser && identityApiResult.mpid === prevUser.getMPID()) {
+              if (method === Identify && prevUser && identityApiResult.mpid === prevUser.getMPID()) {
                 mpInstance._Persistence.setFirstSeenTime(identityApiResult.mpid);
               }
               indexOfMPID = mpInstance._Store.currentSessionMPIDs.indexOf(identityApiResult.mpid);
@@ -6925,6 +6979,8 @@ var mParticle = (function () {
               if (identityApiData && identityApiData.userIdentities && Object.keys(identityApiData.userIdentities).length) {
                 newIdentitiesByType = self.IdentityRequest.combineUserIdentities(incomingMpidUIByName, identityApiData.userIdentities);
               }
+
+              // https://go.mparticle.com/work/SQDSDKS-6041
               mpInstance._Persistence.saveUserIdentitiesToPersistence(identityApiResult.mpid, newIdentitiesByType);
               mpInstance._Persistence.update();
               mpInstance._Persistence.findPrevCookiesBasedOnUI(identityApiData);
@@ -6945,15 +7001,17 @@ var mParticle = (function () {
               if (!prevUser || newUser.getMPID() !== prevUser.getMPID() || prevUser.isLoggedIn() !== newUser.isLoggedIn()) {
                 mpInstance._Forwarders.initForwarders(newUser.getUserIdentities().userIdentities, mpInstance._APIClient.prepareForwardingStats);
               }
+
+              // TODO: https://go.mparticle.com/work/SQDSDKS-6036
               mpInstance._Forwarders.setForwarderUserIdentities(newUser.getUserIdentities().userIdentities);
               mpInstance._Forwarders.setForwarderOnIdentityComplete(newUser, method);
-              mpInstance._Forwarders.setForwarderOnUserIdentified(newUser, method);
+              mpInstance._Forwarders.setForwarderOnUserIdentified(newUser);
             }
             var newIdentitiesByName = {};
             for (var key in newIdentitiesByType) {
               newIdentitiesByName[Types.IdentityType.getIdentityName(mpInstance._Helpers.parseNumber(key))] = newIdentitiesByType[key];
             }
-            self.sendUserIdentityChangeEvent(newIdentitiesByName, method, identityApiResult.mpid, method === 'modify' ? previousUIByNameCopy : incomingMpidUIByNameCopy);
+            self.sendUserIdentityChangeEvent(newIdentitiesByName, method, identityApiResult.mpid, method === Modify$1 ? previousUIByNameCopy : incomingMpidUIByNameCopy);
           }
           if (callback) {
             if (xhr.status === 0) {
@@ -7840,6 +7898,7 @@ var mParticle = (function () {
 
     var HTTPCodes$1 = Constants.HTTPCodes,
       Messages$1 = Constants.Messages;
+    var Modify = Constants.IdentityMethods.Modify;
     function IdentityAPIClient(mpInstance) {
       this.sendAliasRequest = function (aliasRequest, callback) {
         var xhr,
@@ -7894,7 +7953,7 @@ var mParticle = (function () {
               mpInstance._Helpers.invokeCallback(callback, HTTPCodes$1.activeIdentityRequest, 'There is currently an Identity request processing. Please wait for this to return before requesting again');
             } else {
               previousMPID = mpid || null;
-              if (method === 'modify') {
+              if (method === Modify) {
                 xhr.open('post', mpInstance._Helpers.createServiceUrl(mpInstance._Store.SDKConfig.identityUrl) + mpid + '/' + method);
               } else {
                 xhr.open('post', mpInstance._Helpers.createServiceUrl(mpInstance._Store.SDKConfig.identityUrl) + method);
@@ -8873,6 +8932,8 @@ var mParticle = (function () {
       }
       mpInstance._Store.webviewBridgeEnabled = mpInstance._NativeSdkHelpers.isWebviewEnabled(mpInstance._Store.SDKConfig.requiredWebviewBridgeName, mpInstance._Store.SDKConfig.minWebviewBridgeVersion);
       mpInstance._Store.configurationLoaded = true;
+
+      // https://go.mparticle.com/work/SQDSDKS-6044
       if (!mpInstance._Store.webviewBridgeEnabled) {
         // Load any settings/identities/attributes from cookie or localStorage
         mpInstance._Persistence.initializeStorage();
@@ -8917,6 +8978,7 @@ var mParticle = (function () {
         mpInstance._Events.logAST();
 
         // Call mParticle._Store.SDKConfig.identityCallback when identify was not called due to a reload or a sessionId already existing
+        // Any identity callback should always be ran regardless if an identity call is made
         if (!mpInstance._Store.identifyCalled && mpInstance._Store.SDKConfig.identityCallback && currentUser && currentUser.getMPID()) {
           mpInstance._Store.SDKConfig.identityCallback({
             httpCode: HTTPCodes.activeSession,
@@ -8953,6 +9015,8 @@ var mParticle = (function () {
         });
         mpInstance._preInit.readyQueue = [];
       }
+
+      // https://go.mparticle.com/work/SQDSDKS-6040
       if (mpInstance._Store.isFirstRun) {
         mpInstance._Store.isFirstRun = false;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mparticle/web-sdk",
-    "version": "2.23.7",
+    "version": "2.23.9",
     "description": "mParticle core SDK for web applications",
     "license": "Apache-2.0",
     "keywords": [
@@ -22,20 +22,25 @@
     "repository": "https://github.com/mParticle/mparticle-web-sdk",
     "scripts": {
         "build": "cross-env ENVIRONMENT=prod BUILDALL=true rollup --config rollup.config.js",
+        "build:cbt": "rollup --config test/cross-browser-testing/rollup.CBT.config.js",
         "build:dev": "cross-env ENVIRONMENT=dev BUILD=iife rollup --config rollup.config.js",
         "build:iife": "cross-env ENVIRONMENT=prod BUILD=iife rollup --config rollup.config.js",
         "build:npm": "cross-env ENVIRONMENT=prod BUILD=cjs rollup --config rollup.config.js",
         "build:esm": "cross-env ENVIRONMENT=prod BUILD=esm rollup --config rollup.config.js",
         "build:stub": "cross-env ENVIRONMENT=prod BUILD=stub rollup --config rollup.config.js",
         "build:snippet": "uglifyjs snippet.js -m -o snippet.min.js",
+        "build:tests": "cross-env ENVIRONMENT=prod TESTTYPE=main rollup --config rollup.test.config.js",
         "build:test-bundle": "cross-env TESTTYPE=main ENVIRONMENT=prod rollup --config rollup.test.config.js",
         "build:browserify:cjs": "browserify test/integrations/cjs/browserify/index.js -o test/integrations/cjs/dist/browserify-output.js",
         "build:rollup:cjs": "rollup --config test/integrations/cjs/rollup/rollup.config.js",
         "build:webpack:cjs": "webpack --config test/integrations/cjs/webpack/webpack.config.js",
         "build:rollup:module": "rollup --config test/integrations/module/rollup/rollup.config.js",
         "build:webpack:module": "webpack --config test/integrations/module/webpack/webpack.config.js",
+        "build:rollup:requirejs": "rollup --config test/integrations/requirejs/rollup.requirejs.config.js",
         "build:ts": "tsc -p .",
         "test": "npm run build && npm run build:test-bundle && cross-env DEBUG=false karma start test/karma.config.js",
+        "test:browserstack": "karma start test/cross-browser-testing/browserstack.karma.config.js",
+        "test:browserstack:debug": "cross-env DEBUG=true karma start test/cross-browser-testing/browserstack.karma.config.js",
         "test:debug": "cross-env DEBUG=true karma start test/karma.config.js",
         "test:stub": "cross-env TESTTYPE=stub ENVIRONMENT=prod rollup --config rollup.test.config.js && karma start test/stub/karma.stub.config.js",
         "test:integrations": "npm run test:requirejs && npm run test:integrations:cjs && npm run test:integrations:module",
@@ -46,7 +51,7 @@
         "test:integrations:module": "npm run test:integrations:module:webpack && npm run test:integrations:module:rollup",
         "test:integrations:module:webpack": "npm run build:webpack:module && npm run test:karma:webpack:module",
         "test:integrations:module:rollup": "npm run build:rollup:module && npm run test:karma:rollup:module",
-        "test:requirejs": "npm run build && npm run test:requirejs:before && npm run test:requirejs:after",
+        "test:requirejs": "npm run build:iife && npm run build:rollup:requirejs && npm run test:requirejs:before && npm run test:requirejs:after",
         "test:requirejs:before": "cross-env FILE_ORDER=before_mp karma start test/integrations/requirejs/karma.requirejs.config.js",
         "test:requirejs:after": "cross-env FILE_ORDER=after_mp karma start test/integrations/requirejs/karma.requirejs.config.js",
         "test:karma:webpack:cjs": "cross-env BUNDLER=webpack karma start test/integrations/cjs/karma.webpack.config.js",
@@ -101,15 +106,17 @@
         "browser-sync": "^2.26.3",
         "browserify": "^17.0.0",
         "chai": "^4.2.0",
+        "core-js": "^3.33.0",
         "cross-env": "^7.0.3",
         "eslint": "^8.36.0",
         "eslint-config-prettier": "9.0.0",
         "eslint-plugin-prettier": "3.4.1",
-        "fetch-mock": "^7.5.1",
+        "fetch-mock": "^9.1.1",
         "gts": "^5.0.1",
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
         "karma": "^6.3.2",
+        "karma-browserstack-launcher": "^1.6.0",
         "karma-chai": "^0.1.0",
         "karma-chrome-launcher": "^3.1.0",
         "karma-edge-launcher": "^0.4.1",
@@ -125,7 +132,7 @@
         "rollup": "^2.75.7",
         "shelljs": "^0.8.4",
         "should": "^7.1.0",
-        "sinon": "^11.0.0",
+        "sinon": "^16.1.3",
         "ts-jest": "^29.1.0",
         "tslib": "^2.1.0",
         "typescript": "^5.0.2",
@@ -134,6 +141,6 @@
         "webpack-cli": "^5.0.2"
     },
     "dependencies": {
-        "@babel/runtime": "^7.6.0"
+        "@babel/runtime": "^7.23.2"
     }
 }

package/src/apiClient.ts

@@ -1,15 +1,11 @@
 import Constants from './constants';
 import Types from './types';
 import { BatchUploader } from './batchUploader';
-import {
-    MParticleUser,
-    MParticleWebSDK,
-    MPForwarder,
-    SDKEvent,
-} from './sdkRuntimeModels';
+import { MParticleUser, MParticleWebSDK, SDKEvent } from './sdkRuntimeModels';
 import KitBlocker from './kitBlocking';
-import { Dictionary, getRampNumber, isEmpty } from './utils';
+import { Dictionary, isEmpty } from './utils';
 import { IUploadObject } from './serverModel';
+import { MPForwarder } from './forwarders.interfaces';
 
 export type ForwardingStatsData = Dictionary<any>;
 
@@ -49,6 +45,7 @@ export default function APIClient(
         }
         this.uploader.queueEvent(event);
 
+        // https://go.mparticle.com/work/SQDSDKS-6038
         mpInstance._Persistence.update();
     };
 
@@ -120,6 +117,7 @@ export default function APIClient(
             return;
         }
 
+        // https://go.mparticle.com/work/SQDSDKS-6038
         if (options.shouldUploadEvent) {
             this.queueEventForBatchUpload(event);
         }

package/src/constants.ts

@@ -146,6 +146,8 @@ const Constants = {
         ia: 1,
         con: 1,
     },
+
+    // https://go.mparticle.com/work/SQDSDKS-6039
     SDKv2NonMPIDCookieKeys: {
         gs: 1,
         cu: 1,
@@ -169,6 +171,12 @@ const Constants = {
     },
     DefaultInstance: 'default_instance',
     CCPAPurpose: 'data_sale_opt_out',
+    IdentityMethods: {
+        Modify: 'modify',
+        Logout: 'logout',
+        Login: 'login',
+        Identify: 'identify',
+    },
 } as const;
 
 export default Constants;

package/src/events.js

@@ -349,6 +349,8 @@ export default function Events(mpInstance) {
             }
 
             mpInstance._APIClient.sendEventToServer(commerceEvent, options);
+
+            // https://go.mparticle.com/work/SQDSDKS-6038
             mpInstance._Persistence.update();
         } else {
             mpInstance.Logger.verbose(

package/src/forwarders.interfaces.ts

@@ -1,9 +1,18 @@
-import { MParticleUser, SDKEvent, SDKEventCustomFlags, SDKUserIdentity } from './sdkRuntimeModels';
+import {
+    MParticleUser,
+    SDKEvent,
+    SDKEventCustomFlags,
+    SDKUserIdentity,
+} from './sdkRuntimeModels';
 import { Dictionary } from './utils';
 import { IKitConfigs } from './configAPIClient';
 import { UserAttributes } from './persistence.interfaces';
 import { IdentityApiData } from '@mparticle/web-sdk';
 
+// TODO: https://go.mparticle.com/work/SQDSDKS-6035
+export type Kit = Dictionary;
+export type MPForwarder = Dictionary;
+
 // The state of the kit when accessed via window.KitName via CDN
 // or imported as an NPM package
 export interface UnregisteredKit {
@@ -32,11 +41,24 @@ export interface ConfiguredKit
         appVersion: string,
         appName: string,
         customFlags: SDKEventCustomFlags,
-        clientId: string): string;
-    onIdentifyComplete(user: MParticleUser, filteredIdentityRequest: IdentityApiData): string | KitMappedMethodFailure;
-    onLoginComplete(user: MParticleUser, filteredIdentityRequest: IdentityApiData): string | KitMappedMethodFailure;
-    onLogoutComplete(user: MParticleUser, filteredIdentityRequest: IdentityApiData): string | KitMappedMethodFailure;
-    onModifyComplete(user: MParticleUser, filteredIdentityRequest: IdentityApiData): string | KitMappedMethodFailure;
+        clientId: string
+    ): string;
+    onIdentifyComplete(
+        user: MParticleUser,
+        filteredIdentityRequest: IdentityApiData
+    ): string | KitMappedMethodFailure;
+    onLoginComplete(
+        user: MParticleUser,
+        filteredIdentityRequest: IdentityApiData
+    ): string | KitMappedMethodFailure;
+    onLogoutComplete(
+        user: MParticleUser,
+        filteredIdentityRequest: IdentityApiData
+    ): string | KitMappedMethodFailure;
+    onModifyComplete(
+        user: MParticleUser,
+        filteredIdentityRequest: IdentityApiData
+    ): string | KitMappedMethodFailure;
     onUserIdentified(user: MParticleUser): string | KitMappedMethodFailure;
     process(event: SDKEvent): string;
     setOptOut(isOptingOut: boolean): string | KitMappedMethodFailure;

package/src/forwarders.js

@@ -2,6 +2,9 @@ import Types from './types';
 import filteredMparticleUser from './filteredMparticleUser';
 import { isEmpty } from './utils';
 import KitFilterHelper from './kitFilterHelper';
+import Constants from './constants';
+
+const { Modify, Identify, Login, Logout } = Constants.IdentityMethods;
 
 export default function Forwarders(mpInstance, kitBlocker) {
     var self = this;
@@ -440,6 +443,7 @@ export default function Forwarders(mpInstance, kitBlocker) {
         });
     };
 
+    // TODO: https://go.mparticle.com/work/SQDSDKS-6036
     this.setForwarderUserIdentities = function(userIdentities) {
         mpInstance._Store.activeForwarders.forEach(function(forwarder) {
             var filteredUserIdentities = mpInstance._Helpers.filterUserIdentities(
@@ -487,30 +491,45 @@ export default function Forwarders(mpInstance, kitBlocker) {
                 mpInstance,
                 kitBlocker
             );
-            if (identityMethod === 'identify') {
+
+            const filteredUserIdentities = filteredUser.getUserIdentities();
+
+            if (identityMethod === Identify) {
                 if (forwarder.onIdentifyComplete) {
-                    result = forwarder.onIdentifyComplete(filteredUser);
+                    result = forwarder.onIdentifyComplete(
+                        filteredUser,
+                        filteredUserIdentities
+                    );
                     if (result) {
                         mpInstance.Logger.verbose(result);
                     }
                 }
-            } else if (identityMethod === 'login') {
+            } else if (identityMethod === Login) {
                 if (forwarder.onLoginComplete) {
-                    result = forwarder.onLoginComplete(filteredUser);
+                    result = forwarder.onLoginComplete(
+                        filteredUser,
+                        filteredUserIdentities
+                    );
                     if (result) {
                         mpInstance.Logger.verbose(result);
                     }
                 }
-            } else if (identityMethod === 'logout') {
+            } else if (identityMethod === Logout) {
                 if (forwarder.onLogoutComplete) {
-                    result = forwarder.onLogoutComplete(filteredUser);
+                    result = forwarder.onLogoutComplete(
+                        filteredUser,
+                        filteredUserIdentities
+                    );
                     if (result) {
                         mpInstance.Logger.verbose(result);
                     }
                 }
-            } else if (identityMethod === 'modify') {
+            } else if (identityMethod === Modify) {
                 if (forwarder.onModifyComplete) {
-                    result = forwarder.onModifyComplete(filteredUser);
+                    result = forwarder.onModifyComplete(
+                        filteredUser,
+                        filteredUserIdentities
+                    );
                     if (result) {
                         mpInstance.Logger.verbose(result);
                     }