@mparticle/web-sdk 2.34.0 → 2.35.1

package/src/serverModel.ts

@@ -27,6 +27,7 @@ import {
 } from './consent';
 import { IMParticleUser, ISDKUserIdentity } from './identity-user-interfaces';
 import { IMParticleWebSDKInstance } from './mp-instance';
+import { appendUserInfo } from './user-utils';
 
 const MessageType = Types.MessageType;
 const ApplicationTransitionType = Types.ApplicationTransitionType;
@@ -140,7 +141,6 @@ export interface IServerModel {
     convertEventToV2DTO: (event: IUploadObject) => IServerV2DTO;
     createEventObject: (event: BaseEvent, user?: IMParticleUser) => SDKEvent;
     convertToConsentStateV2DTO: (state: SDKConsentState) => IConsentStateV2DTO;
-    appendUserInfo: (user: IMParticleUser, event: SDKEvent) => void;
 }
 
 // TODO: Make this a pure function that returns a new object
@@ -201,51 +201,6 @@ export default function ServerModel(
 ) {
     var self = this;
 
-    // TODO: Can we refactor this to not mutate the event?
-    this.appendUserInfo = function(
-        user: IMParticleUser,
-        event: SDKEvent
-    ): void {
-        if (!event) {
-            return;
-        }
-        if (!user) {
-            event.MPID = null;
-            event.ConsentState = null;
-            event.UserAttributes = null;
-            event.UserIdentities = null;
-            return;
-        }
-        if (event.MPID && event.MPID === user.getMPID()) {
-            return;
-        }
-        event.MPID = user.getMPID();
-        event.ConsentState = user.getConsentState();
-        event.UserAttributes = user.getAllUserAttributes();
-
-        var userIdentities = user.getUserIdentities().userIdentities;
-        var dtoUserIdentities = {};
-        for (var identityKey in userIdentities) {
-            var identityType = Types.IdentityType.getIdentityType(identityKey);
-            if (identityType !== false) {
-                dtoUserIdentities[identityType] = userIdentities[identityKey];
-            }
-        }
-
-        var validUserIdentities = [];
-        if (mpInstance._Helpers.isObject(dtoUserIdentities)) {
-            if (Object.keys(dtoUserIdentities).length) {
-                for (var key in dtoUserIdentities) {
-                    var userIdentity: Partial<ISDKUserIdentity> = {};
-                    userIdentity.Identity = dtoUserIdentities[key];
-                    userIdentity.Type = mpInstance._Helpers.parseNumber(key);
-                    validUserIdentities.push(userIdentity);
-                }
-            }
-        }
-        event.UserIdentities = validUserIdentities;
-    };
-
     this.convertToConsentStateV2DTO = function(
         state: SDKConsentState
     ): IConsentStateV2DTO {
@@ -397,7 +352,7 @@ export default function ServerModel(
             // FIXME: Remove duplicate occurence
             eventObject.CurrencyCode = mpInstance._Store.currencyCode;
             var currentUser = user || mpInstance.Identity.getCurrentUser();
-            self.appendUserInfo(currentUser, eventObject as SDKEvent);
+            appendUserInfo(currentUser, eventObject as SDKEvent);
 
             if (event.messageType === Types.MessageType.SessionEnd) {
                 eventObject.SessionLength =

package/src/store.ts

@@ -30,7 +30,7 @@ import {
     returnConvertedBoolean,
 } from './utils';
 import { IMinifiedConsentJSONObject, SDKConsentState } from './consent';
-import { Kit, MPForwarder } from './forwarders.interfaces';
+import { ConfiguredKit, MPForwarder, UnregisteredKit } from './forwarders.interfaces';
 import { IdentityCallback, UserAttributes } from './identity-user-interfaces';
 import {
     IGlobalStoreV2MinifiedKeys,
@@ -61,7 +61,7 @@ export interface SDKConfig {
     package?: string;
     flags?: IFeatureFlags;
     kitConfigs: IKitConfigs[];
-    kits: Dictionary<Kit>;
+    kits: Dictionary<UnregisteredKit>;
     logLevel?: LogLevelType;
     cookieDomain?: string;
     maxCookieSize?: number | undefined;
@@ -138,6 +138,8 @@ export interface IFeatureFlags {
     offlineStorage?: string;
     directURLRouting?: boolean;
     cacheIdentity?: boolean;
+    captureIntegrationSpecificIds?: boolean;
+    astBackgroundEvents?: boolean;
 }
 
 // Temporary Interface until Store can be refactored as a class
@@ -176,7 +178,7 @@ export interface IStore {
     isLocalStorageAvailable: boolean | null;
     storageName: string | null;
     prodStorageName: string | null;
-    activeForwarders: MPForwarder[];
+    activeForwarders: ConfiguredKit[];
     kits: Dictionary<MPForwarder>;
     sideloadedKits: MPForwarder[];
     configuredForwarders: MPForwarder[];
@@ -714,6 +716,7 @@ export function processFlags(config: SDKInitConfig): IFeatureFlags {
         CacheIdentity,
         AudienceAPI,
         CaptureIntegrationSpecificIds,
+        AstBackgroundEvents
     } = Constants.FeatureFlags;
 
     if (!config.flags) {
@@ -732,6 +735,7 @@ export function processFlags(config: SDKInitConfig): IFeatureFlags {
     flags[CacheIdentity] = config.flags[CacheIdentity] === 'True';
     flags[AudienceAPI] = config.flags[AudienceAPI] === 'True';
     flags[CaptureIntegrationSpecificIds] = config.flags[CaptureIntegrationSpecificIds] === 'True';
+    flags[AstBackgroundEvents] = config.flags[AstBackgroundEvents] === 'True';
 
     return flags;
 }

package/src/user-utils.ts

@@ -1,4 +1,8 @@
-import { IMParticleUser, IdentityResultBody } from './identity-user-interfaces';
+import { UserIdentities } from '@mparticle/web-sdk';
+import { IMParticleUser, ISDKUserIdentity, IdentityResultBody } from './identity-user-interfaces';
+import { SDKEvent } from './sdkRuntimeModels';
+import Types from './types';
+import { isObject, parseNumber } from './utils';
 
 export function hasMPIDAndUserLoginChanged(
     previousUser: IMParticleUser,
@@ -23,3 +27,49 @@ export function hasMPIDChanged(
             identityApiResult.mpid !== prevUser.getMPID())
     );
 }
+
+// https://go.mparticle.com/work/SQDSDKS-7136
+export function appendUserInfo(
+    user: IMParticleUser,
+    event: SDKEvent
+): void {
+    if (!event) {
+        return;
+    }
+    if (!user) {
+        event.MPID = null;
+        event.ConsentState = null;
+        event.UserAttributes = null;
+        event.UserIdentities = null;
+        return;
+    }
+    if (event.MPID && event.MPID === user.getMPID()) {
+        return;
+    }
+
+    event.MPID = user.getMPID();
+    event.ConsentState = user.getConsentState();
+    event.UserAttributes = user.getAllUserAttributes();
+
+    const userIdentities: UserIdentities = user.getUserIdentities().userIdentities;
+    const dtoUserIdentities = {};
+    for (const identityKey in userIdentities) {
+        const identityType = Types.IdentityType.getIdentityType(identityKey);
+        if (identityType !== false) {
+            dtoUserIdentities[identityType] = userIdentities[identityKey];
+        }
+    }
+
+    const validUserIdentities: ISDKUserIdentity[] = [];
+    if (isObject(dtoUserIdentities)) {
+        if (Object.keys(dtoUserIdentities).length) {
+            for (const key in dtoUserIdentities) {
+                const userIdentity = {} as ISDKUserIdentity;
+                userIdentity.Identity = dtoUserIdentities[key];
+                userIdentity.Type = parseNumber(key);
+                validUserIdentities.push(userIdentity);
+            }
+        }
+    }
+    event.UserIdentities = validUserIdentities;
+}