@mparticle/web-sdk 2.26.10 → 2.28.0

package/dist/mparticle.js

@@ -393,7 +393,7 @@ var mParticle = (function () {
         return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
     };
 
-    var version = "2.26.10";
+    var version = "2.28.0";
 
     var Constants = {
       sdkVersion: version,
@@ -2101,7 +2101,7 @@ var mParticle = (function () {
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                return [4 /*yield*/, this.makeRequest(this.url, fetchPayload.body)];
+                return [4 /*yield*/, this.makeRequest(this.url, fetchPayload.body, fetchPayload.method)];
               case 1:
                 response = _a.sent();
                 return [2 /*return*/, response];
@@ -2109,7 +2109,17 @@ var mParticle = (function () {
           });
         });
       };
-      XHRUploader.prototype.makeRequest = function (url, data) {
+      // XHR Ready States
+      // https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/readyState
+      // 0   UNSENT  open() has not been called yet.
+      // 1   OPENED  send() has been called.
+      // 2   HEADERS_RECEIVED    send() has been called, and headers and status are available.
+      // 3   LOADING Downloading; responseText holds partial data.
+      // 4   DONE    The operation is complete.
+      XHRUploader.prototype.makeRequest = function (url, data, method) {
+        if (method === void 0) {
+          method = 'post';
+        }
         return __awaiter(this, void 0, void 0, function () {
           var xhr;
           return __generator(this, function (_a) {
@@ -2124,7 +2134,7 @@ var mParticle = (function () {
                   reject(xhr);
                 }
               };
-              xhr.open('post', url);
+              xhr.open(method, url);
               xhr.send(data);
             })];
           });
@@ -3809,12 +3819,13 @@ var mParticle = (function () {
         });
         return appEvents;
       };
-      this.createCommerceEventObject = function (customFlags) {
+      this.createCommerceEventObject = function (customFlags, options) {
         var baseEvent;
         mpInstance.Logger.verbose(Messages$5.InformationMessages.StartingLogCommerceEvent);
         if (mpInstance._Helpers.canLog()) {
           baseEvent = mpInstance._ServerModel.createEventObject({
-            messageType: Types.MessageType.Commerce
+            messageType: Types.MessageType.Commerce,
+            sourceMessageId: options === null || options === void 0 ? void 0 : options.sourceMessageId
           });
           baseEvent.EventName = 'eCommerce - ';
           baseEvent.CurrencyCode = mpInstance._Store.currencyCode;
@@ -4178,10 +4189,14 @@ var mParticle = (function () {
       this.processConfig = function (config) {
         var workspaceToken = config.workspaceToken,
           requiredWebviewBridgeName = config.requiredWebviewBridgeName;
-        // We should reprocess the flags in case they have changed when we request an updated config
+        // We should reprocess the flags and baseUrls in case they have changed when we request an updated config
         // such as if the SDK is being self-hosted and the flags are different on the server config
         // https://go.mparticle.com/work/SQDSDKS-6317
         _this.SDKConfig.flags = processFlags(config);
+        var baseUrls = processBaseUrls(config, _this.SDKConfig.flags, apiKey);
+        for (var baseUrlKeys in baseUrls) {
+          _this.SDKConfig[baseUrlKeys] = baseUrls[baseUrlKeys];
+        }
         if (workspaceToken) {
           _this.SDKConfig.workspaceToken = workspaceToken;
         } else {
@@ -5220,7 +5235,7 @@ var mParticle = (function () {
         }
       };
       this.logProductActionEvent = function (productActionType, product, customAttrs, customFlags, transactionAttributes, options) {
-        var event = mpInstance._Ecommerce.createCommerceEventObject(customFlags);
+        var event = mpInstance._Ecommerce.createCommerceEventObject(customFlags, options);
         var productList = Array.isArray(product) ? product : [product];
         productList.forEach(function (product) {
           if (product.TotalAmount) {
@@ -7416,7 +7431,7 @@ var mParticle = (function () {
         var newIdentitiesByType = {};
         mpInstance._Store.identityCallInFlight = false;
         try {
-          var _identityApiResult;
+          var _identityApiResult, _mpInstance$_APIClien;
           mpInstance.Logger.verbose('Parsing "' + method + '" identity response from server');
           identityApiResult = xhr.responseText ? JSON.parse(xhr.responseText) : null;
           mpInstance._Store.isLoggedIn = ((_identityApiResult = identityApiResult) === null || _identityApiResult === void 0 ? void 0 : _identityApiResult.is_logged_in) || false;
@@ -7492,7 +7507,9 @@ var mParticle = (function () {
             mpInstance.Logger.error('Received HTTP response code of ' + xhr.status + ' - ' + identityApiResult.errors[0].message);
           }
           mpInstance.Logger.verbose('Successfully parsed Identity Response');
-          mpInstance._APIClient.processQueuedEvents();
+
+          // https://go.mparticle.com/work/SQDSDKS-6654
+          (_mpInstance$_APIClien = mpInstance._APIClient) === null || _mpInstance$_APIClien === void 0 || _mpInstance$_APIClien.processQueuedEvents();
         } catch (e) {
           if (callback) {
             mpInstance._Helpers.invokeCallback(callback, xhr.status, identityApiResult || null);
@@ -7517,12 +7534,13 @@ var mParticle = (function () {
         for (var identityType in newUserIdentities) {
           // Verifies a change actually happened
           if (prevUserIdentities[identityType] !== newUserIdentities[identityType]) {
+            var _mpInstance$_APIClien2;
             // If a new identity type was introduced when the identity changes
             // we need to notify the server so that the user profile is updated in
             // the mParticle UI.
             var isNewUserIdentityType = !prevUserIdentities[identityType];
             var userIdentityChangeEvent = self.createUserIdentityChange(identityType, newUserIdentities[identityType], prevUserIdentities[identityType], isNewUserIdentityType, currentUserInMemory);
-            mpInstance._APIClient.sendEventToServer(userIdentityChangeEvent);
+            (_mpInstance$_APIClien2 = mpInstance._APIClient) === null || _mpInstance$_APIClien2 === void 0 || _mpInstance$_APIClien2.sendEventToServer(userIdentityChangeEvent);
           }
         }
       };
@@ -7551,7 +7569,8 @@ var mParticle = (function () {
       this.sendUserAttributeChangeEvent = function (attributeKey, newUserAttributeValue, previousUserAttributeValue, isNewAttribute, deleted, user) {
         var userAttributeChangeEvent = self.createUserAttributeChange(attributeKey, newUserAttributeValue, previousUserAttributeValue, isNewAttribute, deleted, user);
         if (userAttributeChangeEvent) {
-          mpInstance._APIClient.sendEventToServer(userAttributeChangeEvent);
+          var _mpInstance$_APIClien3;
+          (_mpInstance$_APIClien3 = mpInstance._APIClient) === null || _mpInstance$_APIClien3 === void 0 || _mpInstance$_APIClien3.sendEventToServer(userAttributeChangeEvent);
         }
       };
       this.createUserAttributeChange = function (key, newValue, previousUserAttributeValue, isNewAttribute, deleted, user) {
@@ -7576,14 +7595,16 @@ var mParticle = (function () {
       };
       this.reinitForwardersOnUserChange = function (prevUser, newUser) {
         if (hasMPIDAndUserLoginChanged(prevUser, newUser)) {
-          mpInstance._Forwarders.initForwarders(newUser.getUserIdentities().userIdentities, mpInstance._APIClient.prepareForwardingStats);
+          var _mpInstance$_Forwarde;
+          (_mpInstance$_Forwarde = mpInstance._Forwarders) === null || _mpInstance$_Forwarde === void 0 || _mpInstance$_Forwarde.initForwarders(newUser.getUserIdentities().userIdentities, mpInstance._APIClient.prepareForwardingStats);
         }
       };
       this.setForwarderCallbacks = function (user, method) {
+        var _mpInstance$_Forwarde2, _mpInstance$_Forwarde3, _mpInstance$_Forwarde4;
         // https://go.mparticle.com/work/SQDSDKS-6036
-        mpInstance._Forwarders.setForwarderUserIdentities(user.getUserIdentities().userIdentities);
-        mpInstance._Forwarders.setForwarderOnIdentityComplete(user, method);
-        mpInstance._Forwarders.setForwarderOnUserIdentified(user);
+        (_mpInstance$_Forwarde2 = mpInstance._Forwarders) === null || _mpInstance$_Forwarde2 === void 0 || _mpInstance$_Forwarde2.setForwarderUserIdentities(user.getUserIdentities().userIdentities);
+        (_mpInstance$_Forwarde3 = mpInstance._Forwarders) === null || _mpInstance$_Forwarde3 === void 0 || _mpInstance$_Forwarde3.setForwarderOnIdentityComplete(user, method);
+        (_mpInstance$_Forwarde4 = mpInstance._Forwarders) === null || _mpInstance$_Forwarde4 === void 0 || _mpInstance$_Forwarde4.setForwarderOnUserIdentified(user);
       };
     }
 
@@ -8350,48 +8371,73 @@ var mParticle = (function () {
       return KitBlocker;
     }();
 
-    function ConfigAPIClient() {
-      this.getSDKConfiguration = function (apiKey, config, completeSDKInitialization, mpInstance) {
-        var url;
-        try {
-          var xhrCallback = function xhrCallback() {
-            if (xhr_1.readyState === 4) {
-              // when a 200 returns, merge current config with what comes back from config, prioritizing user inputted config
-              if (xhr_1.status === 200) {
-                config = mpInstance._Helpers.extend({}, config, JSON.parse(xhr_1.responseText));
-                completeSDKInitialization(apiKey, config, mpInstance);
-                mpInstance.Logger.verbose('Successfully received configuration from server');
-              } else {
-                // if for some reason a 200 doesn't return, then we initialize with the just the passed through config
-                completeSDKInitialization(apiKey, config, mpInstance);
-                mpInstance.Logger.verbose('Issue with receiving configuration from server, received HTTP Code of ' + xhr_1.status);
-              }
-            }
-          };
-          var xhr_1 = mpInstance._Helpers.createXHR(xhrCallback);
-          url = 'https://' + mpInstance._Store.SDKConfig.configUrl + apiKey + '/config?env=';
-          if (config.isDevelopmentMode) {
-            url = url + '1';
-          } else {
-            url = url + '0';
-          }
-          var dataPlan = config.dataPlan;
-          if (dataPlan) {
-            if (dataPlan.planId) {
-              url = url + '&plan_id=' + dataPlan.planId || '';
-            }
-            if (dataPlan.planVersion) {
-              url = url + '&plan_version=' + dataPlan.planVersion || '';
+    var buildUrl = function buildUrl(configUrl, apiKey, dataPlanConfig, isDevelopmentMode) {
+      var url = configUrl + apiKey + '/config';
+      var env = isDevelopmentMode ? '1' : '0';
+      var queryParams = ["env=".concat(env)];
+      var _a = dataPlanConfig || {},
+        planId = _a.planId,
+        planVersion = _a.planVersion;
+      if (planId) {
+        queryParams.push("plan_id=".concat(planId));
+      }
+      if (planVersion) {
+        queryParams.push("plan_version=".concat(planVersion));
+      }
+      return "".concat(url, "?").concat(queryParams.join('&'));
+    };
+    function ConfigAPIClient(apiKey, config, mpInstance) {
+      var _this = this;
+      var baseUrl = 'https://' + mpInstance._Store.SDKConfig.configUrl;
+      var isDevelopmentMode = config.isDevelopmentMode;
+      var dataPlan = config.dataPlan;
+      var uploadUrl = buildUrl(baseUrl, apiKey, dataPlan, isDevelopmentMode);
+      var uploader = window.fetch ? new FetchUploader(uploadUrl) : new XHRUploader(uploadUrl);
+      this.getSDKConfiguration = function () {
+        return __awaiter(_this, void 0, void 0, function () {
+          var configResponse, fetchPayload, response, xhrResponse;
+          var _a, _b, _c;
+          return __generator(this, function (_d) {
+            switch (_d.label) {
+              case 0:
+                fetchPayload = {
+                  method: 'get',
+                  headers: {
+                    Accept: 'text/plain;charset=UTF-8',
+                    'Content-Type': 'text/plain;charset=UTF-8'
+                  },
+                  body: null
+                };
+                _d.label = 1;
+              case 1:
+                _d.trys.push([1, 6,, 7]);
+                return [4 /*yield*/, uploader.upload(fetchPayload)];
+              case 2:
+                response = _d.sent();
+                if (!(response.status === 200)) return [3 /*break*/, 5];
+                (_a = mpInstance === null || mpInstance === void 0 ? void 0 : mpInstance.Logger) === null || _a === void 0 ? void 0 : _a.verbose('Successfully received configuration from server');
+                if (!response.json) return [3 /*break*/, 4];
+                return [4 /*yield*/, response.json()];
+              case 3:
+                configResponse = _d.sent();
+                return [2 /*return*/, configResponse];
+              case 4:
+                xhrResponse = response;
+                configResponse = JSON.parse(xhrResponse.responseText);
+                return [2 /*return*/, configResponse];
+              case 5:
+                (_b = mpInstance === null || mpInstance === void 0 ? void 0 : mpInstance.Logger) === null || _b === void 0 ? void 0 : _b.verbose('Issue with receiving configuration from server, received HTTP Code of ' + response.statusText);
+                return [3 /*break*/, 7];
+              case 6:
+                _d.sent();
+                (_c = mpInstance === null || mpInstance === void 0 ? void 0 : mpInstance.Logger) === null || _c === void 0 ? void 0 : _c.error('Error getting forwarder configuration from mParticle servers.');
+                return [3 /*break*/, 7];
+              case 7:
+                // Returns the original config object if we cannot retrieve the remote config
+                return [2 /*return*/, config];
             }
-          }
-          if (xhr_1) {
-            xhr_1.open('get', url);
-            xhr_1.send(null);
-          }
-        } catch (e) {
-          completeSDKInitialization(apiKey, config, mpInstance);
-          mpInstance.Logger.error('Error getting forwarder configuration from mParticle servers.');
-        }
+          });
+        });
       };
     }
 
@@ -8534,6 +8580,7 @@ var mParticle = (function () {
         }
       }
       this.init = function (apiKey, config) {
+        var _this = this;
         if (!config) {
           console.warn('You did not pass a config object to init(). mParticle will not initialize properly');
         }
@@ -8544,7 +8591,11 @@ var mParticle = (function () {
         // to it for it to be run after fetched
         if (config) {
           if (!config.hasOwnProperty('requestConfig') || config.requestConfig) {
-            new ConfigAPIClient().getSDKConfiguration(apiKey, config, completeSDKInitialization, this);
+            var configApiClient = new ConfigAPIClient(apiKey, config, this);
+            configApiClient.getSDKConfiguration().then(function (result) {
+              var mergedConfig = _this._Helpers.extend({}, config, result);
+              completeSDKInitialization(apiKey, mergedConfig, _this);
+            });
           } else {
             completeSDKInitialization(apiKey, config, this);
           }

package/package.json

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

package/src/configAPIClient.ts

@@ -7,12 +7,12 @@ import {
     SDKInitConfig,
 } from './sdkRuntimeModels';
 import { Dictionary } from './utils';
-
-export type SDKCompleteInitCallback = (
-    apiKey: string,
-    config: SDKInitConfig,
-    mpInstance: MParticleWebSDK
-) => void;
+import {
+    AsyncUploader,
+    fetchPayload,
+    FetchUploader,
+    XHRUploader,
+} from './uploaders';
 
 export interface IKitConfigs extends IKitFilterSettings {
     name: string;
@@ -47,13 +47,13 @@ export interface IKitFilterSettings {
 export interface IFilteringEventAttributeValue {
     eventAttributeName: string;
     eventAttributeValue: string;
-    includeOnMatch: boolean
+    includeOnMatch: boolean;
 }
 
 export interface IFilteringUserAttributeValue {
     userAttributeName: string;
     userAttributeValue: string;
-    includeOnMatch: boolean
+    includeOnMatch: boolean;
 }
 export interface IFilteringConsentRuleValues {
     includeOnMatch: boolean;
@@ -62,10 +62,9 @@ export interface IFilteringConsentRuleValues {
 
 export interface IConsentRuleValue {
     consentPurpose: string;
-    hasConsented: boolean
+    hasConsented: boolean;
 }
 
-
 export interface IPixelConfig {
     name: string;
     moduleId: number;
@@ -91,78 +90,92 @@ export interface IConfigResponse {
 }
 
 export interface IConfigAPIClient {
-    getSDKConfiguration: (
-        apiKey: string,
-        config: SDKInitConfig,
-        completeSDKInitialization: SDKCompleteInitCallback,
-        mpInstance: MParticleWebSDK
-    ) => void;
+    apiKey: string;
+    config: SDKInitConfig;
+    mpInstance: MParticleWebSDK;
+    getSDKConfiguration: () => Promise<IConfigResponse>;
 }
 
-export default function ConfigAPIClient(this: IConfigAPIClient) {
-    this.getSDKConfiguration = (
-        apiKey,
-        config,
-        completeSDKInitialization,
-        mpInstance
-    ): void => {
-        let url: string;
+const buildUrl = (
+    configUrl: string,
+    apiKey: string,
+    dataPlanConfig?: DataPlanConfig | null,
+    isDevelopmentMode?: boolean | null
+): string => {
+    const url = configUrl + apiKey + '/config';
+    const env = isDevelopmentMode ? '1' : '0';
+    const queryParams = [`env=${env}`];
+
+    const { planId, planVersion } = dataPlanConfig || {};
+
+    if (planId) {
+        queryParams.push(`plan_id=${planId}`);
+    }
+
+    if (planVersion) {
+        queryParams.push(`plan_version=${planVersion}`);
+    }
+
+    return `${url}?${queryParams.join('&')}`;
+};
+
+export default function ConfigAPIClient(
+    this: IConfigAPIClient,
+    apiKey: string,
+    config: SDKInitConfig,
+    mpInstance: MParticleWebSDK
+): void {
+    const baseUrl = 'https://' + mpInstance._Store.SDKConfig.configUrl;
+    const { isDevelopmentMode } = config;
+    const dataPlan = config.dataPlan as DataPlanConfig;
+    const uploadUrl = buildUrl(baseUrl, apiKey, dataPlan, isDevelopmentMode);
+    const uploader: AsyncUploader = window.fetch
+        ? new FetchUploader(uploadUrl)
+        : new XHRUploader(uploadUrl);
+
+    this.getSDKConfiguration = async (): Promise<IConfigResponse> => {
+        let configResponse: IConfigResponse;
+        const fetchPayload: fetchPayload = {
+            method: 'get',
+            headers: {
+                Accept: 'text/plain;charset=UTF-8',
+                'Content-Type': 'text/plain;charset=UTF-8',
+            },
+            body: null,
+        };
+
         try {
-            const xhrCallback = function() {
-                if (xhr.readyState === 4) {
-                    // when a 200 returns, merge current config with what comes back from config, prioritizing user inputted config
-                    if (xhr.status === 200) {
-                        config = mpInstance._Helpers.extend(
-                            {},
-                            config,
-                            JSON.parse(xhr.responseText)
-                        );
-                        completeSDKInitialization(apiKey, config, mpInstance);
-                        mpInstance.Logger.verbose(
-                            'Successfully received configuration from server'
-                        );
-                    } else {
-                        // if for some reason a 200 doesn't return, then we initialize with the just the passed through config
-                        completeSDKInitialization(apiKey, config, mpInstance);
-                        mpInstance.Logger.verbose(
-                            'Issue with receiving configuration from server, received HTTP Code of ' +
-                                xhr.status
-                        );
-                    }
-                }
-            };
-
-            const xhr = mpInstance._Helpers.createXHR(xhrCallback);
-            url =
-                'https://' +
-                mpInstance._Store.SDKConfig.configUrl +
-                apiKey +
-                '/config?env=';
-            if (config.isDevelopmentMode) {
-                url = url + '1';
-            } else {
-                url = url + '0';
-            }
+            const response = await uploader.upload(fetchPayload);
+            if (response.status === 200) {
+                mpInstance?.Logger?.verbose(
+                    'Successfully received configuration from server'
+                );
 
-            const dataPlan = config.dataPlan as DataPlanConfig;
-            if (dataPlan) {
-                if (dataPlan.planId) {
-                    url = url + '&plan_id=' + dataPlan.planId || '';
-                }
-                if (dataPlan.planVersion) {
-                    url = url + '&plan_version=' + dataPlan.planVersion || '';
+                // https://go.mparticle.com/work/SQDSDKS-6568
+                // FetchUploader returns the response as a JSON object that we have to await
+                if (response.json) {
+                    configResponse = await response.json();
+                    return configResponse;
+                } else {
+                    // https://go.mparticle.com/work/SQDSDKS-6568
+                    // XHRUploader returns the response as a string that we need to parse
+                    const xhrResponse = response as unknown as XMLHttpRequest;
+                    configResponse = JSON.parse(xhrResponse.responseText);
+                    return configResponse;
                 }
             }
 
-            if (xhr) {
-                xhr.open('get', url);
-                xhr.send(null);
-            }
+            mpInstance?.Logger?.verbose(
+                'Issue with receiving configuration from server, received HTTP Code of ' +
+                    response.statusText
+            );
         } catch (e) {
-            completeSDKInitialization(apiKey, config, mpInstance);
-            mpInstance.Logger.error(
+            mpInstance?.Logger?.error(
                 'Error getting forwarder configuration from mParticle servers.'
             );
         }
+
+        // Returns the original config object if we cannot retrieve the remote config
+        return config as IConfigResponse;
     };
 }

package/src/ecommerce.js

@@ -523,7 +523,7 @@ export default function Ecommerce(mpInstance) {
         return appEvents;
     };
 
-    this.createCommerceEventObject = function(customFlags) {
+    this.createCommerceEventObject = function(customFlags, options) {
         var baseEvent;
 
         mpInstance.Logger.verbose(
@@ -533,6 +533,7 @@ export default function Ecommerce(mpInstance) {
         if (mpInstance._Helpers.canLog()) {
             baseEvent = mpInstance._ServerModel.createEventObject({
                 messageType: Types.MessageType.Commerce,
+                sourceMessageId: options?.sourceMessageId,
             });
             baseEvent.EventName = 'eCommerce - ';
 

package/src/events.js

@@ -129,7 +129,8 @@ export default function Events(mpInstance) {
         options
     ) {
         var event = mpInstance._Ecommerce.createCommerceEventObject(
-            customFlags
+            customFlags,
+            options
         );
 
         var productList = Array.isArray(product) ? product : [product];

package/src/identity.js

@@ -1665,7 +1665,8 @@ export default function Identity(mpInstance) {
 
             mpInstance.Logger.verbose('Successfully parsed Identity Response');
 
-            mpInstance._APIClient.processQueuedEvents();
+            // https://go.mparticle.com/work/SQDSDKS-6654
+            mpInstance._APIClient?.processQueuedEvents();
         } catch (e) {
             if (callback) {
                 mpInstance._Helpers.invokeCallback(
@@ -1716,7 +1717,7 @@ export default function Identity(mpInstance) {
                     isNewUserIdentityType,
                     currentUserInMemory
                 );
-                mpInstance._APIClient.sendEventToServer(
+                mpInstance._APIClient?.sendEventToServer(
                     userIdentityChangeEvent
                 );
             }
@@ -1770,7 +1771,7 @@ export default function Identity(mpInstance) {
             user
         );
         if (userAttributeChangeEvent) {
-            mpInstance._APIClient.sendEventToServer(userAttributeChangeEvent);
+            mpInstance._APIClient?.sendEventToServer(userAttributeChangeEvent);
         }
     };
 
@@ -1807,7 +1808,7 @@ export default function Identity(mpInstance) {
 
     this.reinitForwardersOnUserChange = function(prevUser, newUser) {
         if (hasMPIDAndUserLoginChanged(prevUser, newUser)) {
-            mpInstance._Forwarders.initForwarders(
+            mpInstance._Forwarders?.initForwarders(
                 newUser.getUserIdentities().userIdentities,
                 mpInstance._APIClient.prepareForwardingStats
             );
@@ -1816,11 +1817,11 @@ export default function Identity(mpInstance) {
 
     this.setForwarderCallbacks = function(user, method) {
         // https://go.mparticle.com/work/SQDSDKS-6036
-        mpInstance._Forwarders.setForwarderUserIdentities(
+        mpInstance._Forwarders?.setForwarderUserIdentities(
             user.getUserIdentities().userIdentities
         );
-        mpInstance._Forwarders.setForwarderOnIdentityComplete(user, method);
-        mpInstance._Forwarders.setForwarderOnUserIdentified(user);
+        mpInstance._Forwarders?.setForwarderOnIdentityComplete(user, method);
+        mpInstance._Forwarders?.setForwarderOnUserIdentified(user);
     };
 }
 

package/src/mp-instance.js

@@ -117,12 +117,21 @@ export default function mParticleInstance(instanceName) {
                 !config.hasOwnProperty('requestConfig') ||
                 config.requestConfig
             ) {
-                new ConfigAPIClient().getSDKConfiguration(
+                const configApiClient = new ConfigAPIClient(
                     apiKey,
                     config,
-                    completeSDKInitialization,
                     this
                 );
+
+                configApiClient.getSDKConfiguration().then(result => {
+                    const mergedConfig = this._Helpers.extend(
+                        {},
+                        config,
+                        result
+                    );
+
+                    completeSDKInitialization(apiKey, mergedConfig, this);
+                });
             } else {
                 completeSDKInitialization(apiKey, config, this);
             }

package/src/sdkRuntimeModels.ts

@@ -256,7 +256,7 @@ export interface SDKHelpersApi {
     canLog?(): boolean;
     createMainStorageName?(workspaceToken: string): string;
     createProductStorageName?(workspaceToken: string): string;
-    createServiceUrl(url: string, devToken?: string): void;
+    createServiceUrl(url: string, devToken?: string): string;
     createXHR?(cb: () => void): XMLHttpRequest;
     extend?(...args: any[]);
     parseNumber?(value: string | number): number;

package/src/store.ts

@@ -83,6 +83,7 @@ export interface SDKConfig {
     useNativeSdk?: boolean;
     useCookieStorage?: boolean;
     v1SecureServiceUrl?: string;
+    // https://go.mparticle.com/work/SQDSDKS-6618
     v2SecureServiceUrl?: string;
     v3SecureServiceUrl?: string;
     webviewBridgeName?: string;
@@ -661,11 +662,21 @@ export default function Store(
     this.processConfig = (config: SDKInitConfig) => {
         const { workspaceToken, requiredWebviewBridgeName } = config;
 
-        // We should reprocess the flags in case they have changed when we request an updated config
+        // We should reprocess the flags and baseUrls in case they have changed when we request an updated config
         // such as if the SDK is being self-hosted and the flags are different on the server config
         // https://go.mparticle.com/work/SQDSDKS-6317
         this.SDKConfig.flags = processFlags(config);
 
+        const baseUrls: Dictionary<string> = processBaseUrls(
+            config,
+            this.SDKConfig.flags,
+            apiKey
+        );
+
+        for (const baseUrlKeys in baseUrls) {
+            this.SDKConfig[baseUrlKeys] = baseUrls[baseUrlKeys];
+        }
+
         if (workspaceToken) {
             this.SDKConfig.workspaceToken = workspaceToken;
         } else {