@mparticle/web-sdk 2.26.1 → 2.26.2

package/src/sdkRuntimeModels.ts

@@ -26,7 +26,10 @@ export interface SDKEvent {
     IsFirstRun: boolean;
     EventName: string;
     EventCategory: number;
+
+    // https://go.mparticle.com/work/SQDSDKS-5196
     UserAttributes?: { [key: string]: string | string[] | null };
+
     UserIdentities?: SDKUserIdentity[];
     SourceMessageId: string;
     MPID: string;
@@ -304,13 +307,16 @@ export interface SDKConfigApi {
     onCreateBatch(batch: EventsApi.Batch): EventsApi.Batch;
 }
 
-// FIXME: Resolve with User in @types/mparticle-web-sdk
-//        https://go.mparticle.com/work/SQDSDKS-5033
+// https://go.mparticle.com/work/SQDSDKS-5033
 export interface MParticleUser {
-    getMPID(): string;
-    getConsentState(): SDKConsentState;
-    getAllUserAttributes(): any; // FIXME;
-    getUserIdentities(): IdentityApiData; // FIXME: Is this correct?
+    getMPID?(): string;
+    getConsentState?(): SDKConsentState;
+
+    // https://go.mparticle.com/work/SQDSDKS-5196
+    getAllUserAttributes?(): any;
+
+    getUserIdentities?(): IdentityApiData;
+    isLoggedIn?(): boolean;
 }
 
 export interface SDKUserIdentityChangeData {

package/src/serverModel.ts

@@ -27,6 +27,7 @@ import {
     IPrivacyV2DTO,
     SDKConsentState,
 } from './consent';
+import { UserAttributes } from './persistence.interfaces';
 
 const MessageType = Types.MessageType;
 const ApplicationTransitionType = Types.ApplicationTransitionType;
@@ -47,7 +48,10 @@ export interface IServerV2DTO {
     dp_v?: number;
     n?: string;
     et?: number;
+
+    // https://go.mparticle.com/work/SQDSDKS-5196
     ua?: Dictionary<string | string[]>;
+
     ui?: SDKUserIdentity[];
     ia?: Dictionary<Dictionary<string>>;
     str?: ServerSettings;

package/src/store.ts

@@ -26,6 +26,7 @@ import {
     isEmpty,
     isNumber,
     isObject,
+    moveElementToEnd,
     parseNumber,
     returnConvertedBoolean,
 } from './utils';
@@ -185,6 +186,7 @@ export interface IStore {
     getLastSeenTime?(mpid: MPID): number;
     setLastSeenTime?(mpid: MPID, time?: number): void;
 
+    addMpidToSessionHistory?(mpid: MPID, previousMpid?: MPID): void;
     hasInvalidIdentifyRequest?: () => boolean;
     nullifySession?: () => void;
     processConfig(config: SDKInitConfig): void;
@@ -493,6 +495,22 @@ export default function Store(
         mpInstance._Persistence.update();
     };
 
+    this.addMpidToSessionHistory = (mpid: MPID, previousMPID?: MPID): void => {
+        const indexOfMPID = this.currentSessionMPIDs.indexOf(mpid);
+
+        if (mpid && previousMPID !== mpid && indexOfMPID < 0) {
+            this.currentSessionMPIDs.push(mpid);
+            return;
+        }
+
+        if (indexOfMPID >= 0) {
+            this.currentSessionMPIDs = moveElementToEnd(
+                this.currentSessionMPIDs,
+                indexOfMPID
+            );
+        }
+    };
+
     this.getFirstSeenTime = (mpid: MPID) => {
         if (!mpid) {
             return null;

package/src/type-utils.ts

@@ -0,0 +1,66 @@
+import { IdentityType } from './types.interfaces';
+import { parseNumber } from './utils';
+
+export interface IIdentitiesByType {
+    [key: number]: string;
+}
+
+export function getNewIdentitiesByName(newIdentitiesByType: IIdentitiesByType) {
+    const newIdentitiesByName = {};
+
+    for (var key in newIdentitiesByType) {
+        const identityNameKey = getIdentityName(parseNumber(key));
+        newIdentitiesByName[identityNameKey] = newIdentitiesByType[key];
+    }
+
+    return newIdentitiesByName;
+}
+
+export function getIdentityName(identityType: IdentityType): string | null {
+    switch (identityType) {
+        case IdentityType.Other:
+            return 'other';
+        case IdentityType.CustomerId:
+            return 'customerid';
+        case IdentityType.Facebook:
+            return 'facebook';
+        case IdentityType.Twitter:
+            return 'twitter';
+        case IdentityType.Google:
+            return 'google';
+        case IdentityType.Microsoft:
+            return 'microsoft';
+        case IdentityType.Yahoo:
+            return 'yahoo';
+        case IdentityType.Email:
+            return 'email';
+        case IdentityType.FacebookCustomAudienceId:
+            return 'facebookcustomaudienceid';
+        case IdentityType.Other2:
+            return 'other2';
+        case IdentityType.Other3:
+            return 'other3';
+        case IdentityType.Other4:
+            return 'other4';
+        case IdentityType.Other5:
+            return 'other5';
+        case IdentityType.Other6:
+            return 'other6';
+        case IdentityType.Other7:
+            return 'other7';
+        case IdentityType.Other8:
+            return 'other8';
+        case IdentityType.Other9:
+            return 'other9';
+        case IdentityType.Other10:
+            return 'other10';
+        case IdentityType.MobileNumber:
+            return 'mobile_number';
+        case IdentityType.PhoneNumber2:
+            return 'phone_number_2';
+        case IdentityType.PhoneNumber3:
+            return 'phone_number_3';
+        default:
+            return null;
+    }
+}

package/src/types.js

@@ -1,3 +1,5 @@
+import { getIdentityName } from './type-utils';
+
 var MessageType = {
     SessionStart: 1,
     SessionEnd: 2,
@@ -209,50 +211,7 @@ IdentityType.getIdentityType = function(identityName) {
 };
 
 IdentityType.getIdentityName = function(identityType) {
-    switch (identityType) {
-        case IdentityType.Other:
-            return 'other';
-        case IdentityType.CustomerId:
-            return 'customerid';
-        case IdentityType.Facebook:
-            return 'facebook';
-        case IdentityType.Twitter:
-            return 'twitter';
-        case IdentityType.Google:
-            return 'google';
-        case IdentityType.Microsoft:
-            return 'microsoft';
-        case IdentityType.Yahoo:
-            return 'yahoo';
-        case IdentityType.Email:
-            return 'email';
-        case IdentityType.FacebookCustomAudienceId:
-            return 'facebookcustomaudienceid';
-        case IdentityType.Other2:
-            return 'other2';
-        case IdentityType.Other3:
-            return 'other3';
-        case IdentityType.Other4:
-            return 'other4';
-        case IdentityType.Other5:
-            return 'other5';
-        case IdentityType.Other6:
-            return 'other6';
-        case IdentityType.Other7:
-            return 'other7';
-        case IdentityType.Other8:
-            return 'other8';
-        case IdentityType.Other9:
-            return 'other9';
-        case IdentityType.Other10:
-            return 'other10';
-        case IdentityType.MobileNumber:
-            return 'mobile_number';
-        case IdentityType.PhoneNumber2:
-            return 'phone_number_2';
-        case IdentityType.PhoneNumber3:
-            return 'phone_number_3';
-    }
+    return getIdentityName(identityType);
 };
 
 var ProductActionType = {

package/src/user-utils.ts

@@ -0,0 +1,12 @@
+import { MParticleUser } from './sdkRuntimeModels';
+
+export function didUserChange(
+    previousUser: MParticleUser,
+    newUser: MParticleUser
+): boolean {
+    return (
+        !previousUser ||
+        newUser.getMPID() !== previousUser.getMPID() ||
+        previousUser.isLoggedIn() !== newUser.isLoggedIn()
+    );
+}

package/src/utils.ts

@@ -227,6 +227,9 @@ const mergeObjects = <T extends object>(...objects: T[]): T => {
     return Object.assign({}, ...objects);
 };
 
+const moveElementToEnd = <T>(array: T[], index: number): T[] =>
+    array.slice(0, index).concat(array.slice(index + 1), array[index]);
+
 export {
     createCookieString,
     revertCookieString,
@@ -256,4 +259,5 @@ export {
     isEmpty,
     isValidCustomFlagProperty,
     mergeObjects,
+    moveElementToEnd,
 };