@mparticle/web-sdk 2.18.2 → 2.18.3

package/src/{apiClient.js → apiClient.ts}

@@ -1,15 +1,51 @@
 import Constants from './constants';
 import Types from './types';
 import { BatchUploader } from './batchUploader';
+import {
+    MParticleUser,
+    MParticleWebSDK,
+    MPForwarder,
+    SDKEvent,
+} from './sdkRuntimeModels';
+import KitBlocker from './kitBlocking';
+import { Dictionary } from './utils';
+import { IUploadObject } from './serverModel';
 
-var Messages = Constants.Messages;
+const Messages = Constants.Messages;
 
-export default function APIClient(mpInstance, kitBlocker) {
+export type ForwardingStatsData = Dictionary<any>;
+
+export interface IAPIClient {
+    uploader: BatchUploader | null;
+    queueEventForBatchUpload: (event: SDKEvent) => void;
+    shouldEnableBatching: () => boolean;
+    processQueuedEvents: () => void;
+    appendUserInfoToEvents: (user: MParticleUser, events: SDKEvent[]) => void;
+    sendEventToServer: (event: SDKEvent, _options?: Dictionary<any>) => void;
+    sendSingleEventToServer: (event: SDKEvent) => void;
+    sendBatchForwardingStatsToServer: (
+        forwardingStatsData: ForwardingStatsData,
+        xhr: XMLHttpRequest
+    ) => void;
+    sendSingleForwardingStatsToServer: (
+        forwardingStatsData: ForwardingStatsData
+    ) => void;
+    prepareForwardingStats: (
+        forwarder: MPForwarder,
+        event: IUploadObject
+    ) => void;
+}
+
+export default function APIClient(
+    this: IAPIClient,
+    mpInstance: MParticleWebSDK,
+    kitBlocker: KitBlocker
+) {
     this.uploader = null;
-    var self = this;
-    this.queueEventForBatchUpload = function(event) {
+    const self = this;
+    this.queueEventForBatchUpload = function(event: SDKEvent) {
         if (!this.uploader) {
-            var millis = mpInstance._Helpers.getFeatureFlag(
+            const millis = mpInstance._Helpers.getFeatureFlag(
                 Constants.FeatureFlags.EventBatchingIntervalMillis
             );
             this.uploader = new BatchUploader(mpInstance, millis);
@@ -22,7 +58,7 @@ export default function APIClient(mpInstance, kitBlocker) {
     this.shouldEnableBatching = function() {
         // Returns a string of a number that must be parsed
         // Invalid strings will be parsed to NaN which is falsey
-        var eventsV3Percentage = parseInt(
+        const eventsV3Percentage = parseInt(
             mpInstance._Helpers.getFeatureFlag(Constants.FeatureFlags.EventsV3),
             10
         );
@@ -31,20 +67,20 @@ export default function APIClient(mpInstance, kitBlocker) {
             return false;
         }
 
-        var rampNumber = mpInstance._Helpers.getRampNumber(
+        const rampNumber = mpInstance._Helpers.getRampNumber(
             mpInstance._Store.deviceId
         );
         return eventsV3Percentage >= rampNumber;
     };
 
     this.processQueuedEvents = function() {
-        var mpid,
+        let mpid,
             currentUser = mpInstance.Identity.getCurrentUser();
         if (currentUser) {
             mpid = currentUser.getMPID();
         }
         if (mpInstance._Store.eventQueue.length && mpid) {
-            var localQueueCopy = mpInstance._Store.eventQueue;
+            const localQueueCopy = mpInstance._Store.eventQueue;
             mpInstance._Store.eventQueue = [];
             this.appendUserInfoToEvents(currentUser, localQueueCopy);
             localQueueCopy.forEach(function(event) {
@@ -62,10 +98,10 @@ export default function APIClient(mpInstance, kitBlocker) {
     };
 
     this.sendEventToServer = function(event, _options) {
-        var defaultOptions = {
+        const defaultOptions = {
             shouldUploadEvent: true,
         };
-        var options = mpInstance._Helpers.extend(defaultOptions, _options);
+        const options = mpInstance._Helpers.extend(defaultOptions, _options);
 
         if (mpInstance._Store.webviewBridgeEnabled) {
             mpInstance._NativeSdkHelpers.sendToNative(
@@ -75,7 +111,7 @@ export default function APIClient(mpInstance, kitBlocker) {
             return;
         }
 
-        var mpid,
+        let mpid,
             currentUser = mpInstance.Identity.getCurrentUser();
         if (currentUser) {
             mpid = currentUser.getMPID();
@@ -126,7 +162,7 @@ export default function APIClient(mpInstance, kitBlocker) {
         if (event.EventDataType === Types.MessageType.Media) {
             return;
         }
-        var xhr,
+        let xhr,
             xhrCallback = function() {
                 if (xhr.readyState === 4) {
                     mpInstance.Logger.verbose(
@@ -153,7 +189,9 @@ export default function APIClient(mpInstance, kitBlocker) {
                 );
                 xhr.send(
                     JSON.stringify(
-                        mpInstance._ServerModel.convertEventToDTO(event)
+                        mpInstance._ServerModel.convertEventToDTO(
+                            event as IUploadObject
+                        )
                     )
                 );
             } catch (e) {
@@ -165,7 +203,8 @@ export default function APIClient(mpInstance, kitBlocker) {
     };
 
     this.sendBatchForwardingStatsToServer = function(forwardingStatsData, xhr) {
-        var url, data;
+        let url;
+        let data;
         try {
             url = mpInstance._Helpers.createServiceUrl(
                 mpInstance._Store.SDKConfig.v2SecureServiceUrl,
@@ -188,9 +227,10 @@ export default function APIClient(mpInstance, kitBlocker) {
     };
 
     this.sendSingleForwardingStatsToServer = function(forwardingStatsData) {
-        var url, data;
+        let url;
+        let data;
         try {
-            var xhrCallback = function() {
+            const xhrCallback = function() {
                 if (xhr.readyState === 4) {
                     if (xhr.status === 202) {
                         mpInstance.Logger.verbose(
@@ -201,7 +241,7 @@ export default function APIClient(mpInstance, kitBlocker) {
                     }
                 }
             };
-            var xhr = mpInstance._Helpers.createXHR(xhrCallback);
+            const xhr = mpInstance._Helpers.createXHR(xhrCallback);
             url = mpInstance._Helpers.createServiceUrl(
                 mpInstance._Store.SDKConfig.v1SecureServiceUrl,
                 mpInstance._Store.devToken
@@ -220,8 +260,8 @@ export default function APIClient(mpInstance, kitBlocker) {
     };
 
     this.prepareForwardingStats = function(forwarder, event) {
-        var forwardingStatsData,
-            queue = mpInstance._Forwarders.getForwarderStatsQueue();
+        let forwardingStatsData;
+        const queue = mpInstance._Forwarders.getForwarderStatsQueue();
 
         if (forwarder && forwarder.isVisible) {
             forwardingStatsData = {

package/src/consent.interfaces.ts

@@ -0,0 +1,89 @@
+// TODO: Migrate this to Consent.ts when that is created
+import { ConsentState, PrivacyConsentState } from '@mparticle/web-sdk';
+
+export interface IGDPRConsentObject {
+    purpose: string;
+}
+
+export interface ICCPAConsentObject {
+    purpose: string;
+}
+
+export interface IConsentJSONObject {
+    gdpr?: Partial<IGDPRConsentObject>;
+    ccpa?: Partial<ICCPAConsentObject>;
+}
+
+interface ICreatePrivacyConsentFunction {
+    (
+        consented: boolean,
+        timestamp?: number,
+        consentDocument?: string,
+        location?: string,
+        hardwareId?: string
+    ): PrivacyConsentState | null;
+}
+
+// TODO: Refactor this with Consent Namespace in @types/mparticle-web-sdk
+//       https://go.mparticle.com/work/SQDSDKS-5009
+export interface SDKConsentApi {
+    createGDPRConsent: ICreatePrivacyConsentFunction;
+    createCCPAConsent: ICreatePrivacyConsentFunction;
+    createConsentState: (consentState?: ConsentState) => ConsentState;
+    ConsentSerialization: IConsentSerialization;
+    createPrivacyConsent: ICreatePrivacyConsentFunction;
+}
+
+export interface IConsentSerialization {
+    toMinifiedJsonObject: (state: ConsentState) => IConsentJSONObject;
+    fromMinifiedJsonObject: (json: IConsentJSONObject) => ConsentState;
+}
+
+// TODO: Resolve discrepency between ConsentState and SDKConsentState
+//       https://go.mparticle.com/work/SQDSDKS-5009
+export interface SDKConsentState
+    extends Omit<ConsentState, 'getGDPRConsentState' | 'getCCPAConsentState'> {
+    getGDPRConsentState(): SDKGDPRConsentState;
+    getCCPAConsentState(): SDKCCPAConsentState;
+}
+
+export interface SDKGDPRConsentState {
+    [key: string]: SDKConsentStateData;
+}
+
+// TODO: Resolve discrepency between ConsentState and SDKConsentState
+//       https://go.mparticle.com/work/SQDSDKS-5009
+//       Specifically PrivacyConsentState, GDPRConsentState and CCPAConsentState
+//       Treat all attributes as required, but we had to override this
+//       to be optional for a bugfix:
+//       https://github.com/mParticle/mparticle-web-sdk/commit/3b11ead79f25b417737442a4fabd6435750f46b8
+export interface SDKConsentStateData {
+    Consented: boolean;
+    Timestamp?: number;
+    ConsentDocument?: string;
+    Location?: string;
+    HardwareId?: string;
+}
+
+export interface SDKCCPAConsentState extends SDKConsentStateData {}
+
+export interface IPrivacyV2DTO {
+    c: boolean; // Consented
+    ts: number; // Timestamp
+    d: string; // Document
+    l: string; // Location
+    h: string; // HardwareID
+}
+
+export interface IGDPRConsentStateDTO {
+    [key: string]: IPrivacyV2DTO;
+}
+
+export interface ICCPAConsentStateDTO {
+    data_sale_opt_out: IPrivacyV2DTO;
+}
+
+export interface IConsentStateDTO {
+    gdpr?: IGDPRConsentStateDTO;
+    ccpa?: ICCPAConsentStateDTO;
+}

package/src/mockBatchCreator.ts

@@ -7,15 +7,15 @@ import * as EventsApi from '@mparticle/event-models';
 
 const mockFunction = function () {
     return null;
-}
+};
 export default class _BatchValidator {
     private getMPInstance() {
         return {
             // Certain Helper, Store, and Identity properties need to be mocked to be used in the `returnBatch` method
             _Helpers: {
-                sanitizeAttributes: window.mParticle.getInstance()._Helpers
-                    .sanitizeAttributes,
-                generateUniqueId: function() {
+                sanitizeAttributes:
+                    window.mParticle.getInstance()._Helpers.sanitizeAttributes,
+                generateUniqueId: function () {
                     return 'mockId';
                 },
                 extend: window.mParticle.getInstance()._Helpers.extend,
@@ -28,6 +28,11 @@ export default class _BatchValidator {
             _resetForTests: mockFunction,
             _APIClient: null,
             _Consent: null,
+            _Forwarders: null,
+            _NativeSdkHelpers: null,
+            _Persistence: null,
+            _preInit: null,
+            Consent: null,
             _ServerModel: null,
             _SessionManager: null,
             _Store: {

package/src/sdkRuntimeModels.ts

@@ -1,12 +1,12 @@
 import * as EventsApi from '@mparticle/event-models';
-import { Batch } from '@mparticle/event-models';
-import { DataPlanVersion, DataPlan } from '@mparticle/data-planning-models';
+import { DataPlanVersion } from '@mparticle/data-planning-models';
 import { MPConfiguration, IdentityApiData } from '@mparticle/web-sdk';
-import { IStore, SDKConfig } from './store';
+import { IStore } from './store';
 import Validators from './validators';
 import { Dictionary } from './utils';
 import { IServerModel } from './serverModel';
 import { IKitConfigs } from './configAPIClient';
+import { SDKConsentApi, SDKConsentState } from './consent.interfaces';
 
 // TODO: Resolve this with version in @mparticle/web-sdk
 export type SDKEventCustomFlags = Dictionary<any>;
@@ -131,12 +131,17 @@ export interface MParticleWebSDK {
     Logger: SDKLoggerApi;
     _APIClient: any; // TODO: Set up API Client
     _Store: IStore;
+    _Forwarders: any;
     _Helpers: SDKHelpersApi;
     config: SDKInitConfig;
     _ServerModel: IServerModel;
     _SessionManager: any; // TODO: Set up Session Manager
-    _Consent: any; // TODO: Set up Consent SDK
-    _resetForTests(MPConfig?: SDKConfig): void;
+    _Consent: SDKConsentApi;
+    Consent: SDKConsentApi;
+    _NativeSdkHelpers: any; // TODO: Set up API
+    _Persistence: any; // TODO: Set up Persistence API
+    _preInit: any; // TODO: Set up API
+    _resetForTests(MPConfig?: SDKInitConfig): void;
     init(apiKey: string, config: SDKInitConfig, instanceName?: string): void;
     getAppName(): string;
     getAppVersion(): string;
@@ -220,12 +225,19 @@ export interface SDKIdentityApi {
 export interface SDKHelpersApi {
     createServiceUrl(arg0: string, arg1: string): void;
     createXHR?(cb: () => void): XMLHttpRequest;
-    extend(...args: any[]);
-    parseNumber(value: string | number): number;
+    extend?(...args: any[]);
+    parseNumber?(value: string | number): number;
     generateUniqueId();
-    isObject(item: any);
+    getFeatureFlag?(feature: string); // TODO: Feature Constants should be converted to enum
+    getRampNumber?(deviceId: string): number;
+    isDelayedByIntegration?(
+        delayedIntegrations: Dictionary<boolean>,
+        timeoutStart: number,
+        now: number
+    ): boolean;
+    isObject?(item: any);
     returnConvertedBoolean(data: string | boolean | number): boolean;
-    sanitizeAttributes(
+    sanitizeAttributes?(
         attrs: Dictionary<string>,
         name: string
     ): Dictionary<string> | null;
@@ -254,6 +266,9 @@ export interface SDKConfigApi {
     appVersion?: string;
     onCreateBatch(batch: EventsApi.Batch): EventsApi.Batch;
 }
+
+// FIXME: Resolve with User in @types/mparticle-web-sdk
+//        https://go.mparticle.com/work/SQDSDKS-5033
 export interface MParticleUser {
     getMPID(): string;
     getConsentState(): any; // FIXME:
@@ -261,25 +276,6 @@ export interface MParticleUser {
     getUserIdentities(): IdentityApiData; // FIXME: Is this correct?
 }
 
-export interface SDKConsentState {
-    getGDPRConsentState(): SDKGDPRConsentState;
-    getCCPAConsentState(): SDKCCPAConsentState;
-}
-
-export interface SDKGDPRConsentState {
-    [key: string]: SDKConsentStateData;
-}
-
-export interface SDKConsentStateData {
-    Consented: boolean;
-    Timestamp?: number;
-    ConsentDocument?: string;
-    Location?: string;
-    HardwareId?: string;
-}
-
-export interface SDKCCPAConsentState extends SDKConsentStateData {}
-
 export interface SDKUserIdentityChangeData {
     New: Identity;
     Old: Identity;

package/src/sdkToEventsApiConverter.ts

@@ -1,9 +1,6 @@
 import {
     SDKEvent,
-    SDKConsentState,
-    SDKGDPRConsentState,
     SDKGeoLocation,
-    SDKCCPAConsentState,
     SDKProduct,
     SDKPromotion,
     SDKUserIdentity,
@@ -12,7 +9,13 @@ import {
     SDKIdentityTypeEnum,
 } from './sdkRuntimeModels';
 import * as EventsApi from '@mparticle/event-models';
+import {
+    SDKConsentState,
+    SDKGDPRConsentState,
+    SDKCCPAConsentState,
+} from './consent.interfaces';
 import Types from './types';
+import { isEmpty } from './utils';
 
 export function convertEvents(
     mpid: string,
@@ -26,6 +29,8 @@ export function convertEvents(
         return null;
     }
 
+    const user = mpInstance.Identity.getCurrentUser();
+
     const uploadEvents: EventsApi.BaseEvent[] = [];
     let lastEvent: SDKEvent = null;
     for (const sdkEvent of sdkEvents) {
@@ -42,6 +47,15 @@ export function convertEvents(
         return null;
     }
 
+    let currentConsentState: SDKConsentState = null;
+
+    // Add the consent state from either the Last Event or the user
+    if (!isEmpty(lastEvent.ConsentState)) {
+        currentConsentState = lastEvent.ConsentState;
+    } else if (!isEmpty(user)) {
+        currentConsentState = user.getConsentState();
+    }
+
     const upload: EventsApi.Batch = {
         source_request_id: mpInstance._Helpers.generateUniqueId(),
         mpid,
@@ -64,7 +78,7 @@ export function convertEvents(
         },
         user_attributes: lastEvent.UserAttributes,
         user_identities: convertUserIdentities(lastEvent.UserIdentities),
-        consent_state: convertConsentState(lastEvent.ConsentState),
+        consent_state: convertConsentState(currentConsentState),
         integration_attributes: lastEvent.IntegrationAttributes,
     };
 
@@ -82,7 +96,7 @@ export function convertEvents(
 export function convertConsentState(
     sdkConsentState?: SDKConsentState
 ): EventsApi.ConsentState | null {
-    if (!sdkConsentState) {
+    if (isEmpty(sdkConsentState)) {
         return null;
     }
     const consentState: EventsApi.ConsentState = {
@@ -327,7 +341,8 @@ export function convertPromotionAction(
         return null;
     }
     const promotionAction: EventsApi.PromotionAction = {
-        action: sdkEvent.PromotionAction.PromotionActionType as EventsApi.PromotionActionActionEnum,
+        action: sdkEvent.PromotionAction
+            .PromotionActionType as EventsApi.PromotionActionActionEnum,
         promotions: convertPromotions(sdkEvent.PromotionAction.PromotionList),
     };
     return promotionAction;
@@ -388,9 +403,8 @@ export function convertShoppingCart(
 export function convertCommerceEvent(
     sdkEvent: SDKEvent
 ): EventsApi.CommerceEvent {
-    const commonEventData: EventsApi.CommonEventData = convertBaseEventData(
-        sdkEvent
-    );
+    const commonEventData: EventsApi.CommonEventData =
+        convertBaseEventData(sdkEvent);
     let commerceEventData: EventsApi.CommerceEventData = {
         custom_flags: sdkEvent.CustomFlags,
         product_action: convertProductAction(sdkEvent),
@@ -409,9 +423,8 @@ export function convertCommerceEvent(
 export function convertCrashReportEvent(
     sdkEvent: SDKEvent
 ): EventsApi.CrashReportEvent {
-    const commonEventData: EventsApi.CommonEventData = convertBaseEventData(
-        sdkEvent
-    );
+    const commonEventData: EventsApi.CommonEventData =
+        convertBaseEventData(sdkEvent);
     let crashReportEventData: EventsApi.CrashReportEventData = {
         message: sdkEvent.EventName,
     };
@@ -425,9 +438,8 @@ export function convertCrashReportEvent(
 export function convertAST(
     sdkEvent: SDKEvent
 ): EventsApi.ApplicationStateTransitionEvent {
-    const commonEventData: EventsApi.CommonEventData = convertBaseEventData(
-        sdkEvent
-    );
+    const commonEventData: EventsApi.CommonEventData =
+        convertBaseEventData(sdkEvent);
     let astEventData: EventsApi.ApplicationStateTransitionEventData = {
         application_transition_type:
             EventsApi
@@ -447,9 +459,8 @@ export function convertAST(
 export function convertSessionEndEvent(
     sdkEvent: SDKEvent
 ): EventsApi.SessionEndEvent {
-    const commonEventData: EventsApi.CommonEventData = convertBaseEventData(
-        sdkEvent
-    );
+    const commonEventData: EventsApi.CommonEventData =
+        convertBaseEventData(sdkEvent);
     let sessionEndEventData: EventsApi.SessionEndEventData = {
         session_duration_ms: sdkEvent.SessionLength,
         //note: External Events DTO does not support the session mpids array as of this time.
@@ -465,9 +476,8 @@ export function convertSessionEndEvent(
 export function convertSessionStartEvent(
     sdkEvent: SDKEvent
 ): EventsApi.SessionStartEvent {
-    const commonEventData: EventsApi.CommonEventData = convertBaseEventData(
-        sdkEvent
-    );
+    const commonEventData: EventsApi.CommonEventData =
+        convertBaseEventData(sdkEvent);
     let sessionStartEventData: EventsApi.SessionStartEventData = {};
     sessionStartEventData = Object.assign(
         sessionStartEventData,
@@ -482,9 +492,8 @@ export function convertSessionStartEvent(
 export function convertPageViewEvent(
     sdkEvent: SDKEvent
 ): EventsApi.ScreenViewEvent {
-    const commonEventData: EventsApi.CommonEventData = convertBaseEventData(
-        sdkEvent
-    );
+    const commonEventData: EventsApi.CommonEventData =
+        convertBaseEventData(sdkEvent);
     let screenViewEventData: EventsApi.ScreenViewEventData = {
         custom_flags: sdkEvent.CustomFlags,
         screen_name: sdkEvent.EventName,
@@ -497,9 +506,8 @@ export function convertPageViewEvent(
 }
 
 export function convertOptOutEvent(sdkEvent: SDKEvent): EventsApi.OptOutEvent {
-    const commonEventData: EventsApi.CommonEventData = convertBaseEventData(
-        sdkEvent
-    );
+    const commonEventData: EventsApi.CommonEventData =
+        convertBaseEventData(sdkEvent);
     let optOutEventData: EventsApi.OptOutEventData = {
         is_opted_out: sdkEvent.OptOut,
     };
@@ -511,9 +519,8 @@ export function convertOptOutEvent(sdkEvent: SDKEvent): EventsApi.OptOutEvent {
 }
 
 export function convertCustomEvent(sdkEvent: SDKEvent): EventsApi.CustomEvent {
-    const commonEventData: EventsApi.CommonEventData = convertBaseEventData(
-        sdkEvent
-    );
+    const commonEventData: EventsApi.CommonEventData =
+        convertBaseEventData(sdkEvent);
     let customEventData: EventsApi.CustomEventData = {
         custom_event_type: convertSdkEventType(
             sdkEvent.EventCategory
@@ -596,7 +603,7 @@ export function convertBaseEventData(
         session_start_unixtime_ms: sdkEvent.SessionStartDate,
         custom_attributes: sdkEvent.EventAttributes,
         location: convertSDKLocation(sdkEvent.Location),
-        source_message_id: sdkEvent.SourceMessageId
+        source_message_id: sdkEvent.SourceMessageId,
     };
 
     return commonEventData;
@@ -617,9 +624,8 @@ export function convertSDKLocation(
 export function convertUserAttributeChangeEvent(
     sdkEvent: SDKEvent
 ): EventsApi.UserAttributeChangeEvent | null {
-    const commonEventData: EventsApi.CommonEventData = convertBaseEventData(
-        sdkEvent
-    );
+    const commonEventData: EventsApi.CommonEventData =
+        convertBaseEventData(sdkEvent);
     let userAttributeChangeEvent: EventsApi.UserAttributeChangeEventData = {
         user_attribute_name: sdkEvent.UserAttributeChanges.UserAttributeName,
         new: sdkEvent.UserAttributeChanges.New,
@@ -642,9 +648,8 @@ export function convertUserAttributeChangeEvent(
 export function convertUserIdentityChangeEvent(
     sdkEvent: SDKEvent
 ): EventsApi.UserIdentityChangeEvent | null {
-    const commonEventData: EventsApi.CommonEventData = convertBaseEventData(
-        sdkEvent
-    );
+    const commonEventData: EventsApi.CommonEventData =
+        convertBaseEventData(sdkEvent);
 
     let userIdentityChangeEvent: EventsApi.UserIdentityChangeEventData = {
         new: {
@@ -683,48 +688,48 @@ export function convertUserIdentityTypeToServerIdentityType(
 ): EventsApi.IdentityType {
     switch (identityType) {
         case SDKIdentityTypeEnum.other:
-            return EventsApi.IdentityTypeEnum.other
+            return EventsApi.IdentityTypeEnum.other;
         case SDKIdentityTypeEnum.customerId:
-            return EventsApi.IdentityTypeEnum.customerId
+            return EventsApi.IdentityTypeEnum.customerId;
         case SDKIdentityTypeEnum.facebook:
-            return EventsApi.IdentityTypeEnum.facebook
+            return EventsApi.IdentityTypeEnum.facebook;
         case SDKIdentityTypeEnum.twitter:
-            return EventsApi.IdentityTypeEnum.twitter
+            return EventsApi.IdentityTypeEnum.twitter;
         case SDKIdentityTypeEnum.google:
-            return EventsApi.IdentityTypeEnum.google
+            return EventsApi.IdentityTypeEnum.google;
         case SDKIdentityTypeEnum.microsoft:
-            return EventsApi.IdentityTypeEnum.microsoft
+            return EventsApi.IdentityTypeEnum.microsoft;
         case SDKIdentityTypeEnum.yahoo:
-            return EventsApi.IdentityTypeEnum.yahoo
+            return EventsApi.IdentityTypeEnum.yahoo;
         case SDKIdentityTypeEnum.email:
-            return EventsApi.IdentityTypeEnum.email
+            return EventsApi.IdentityTypeEnum.email;
         case SDKIdentityTypeEnum.alias:
-            return EventsApi.IdentityTypeEnum.alias
+            return EventsApi.IdentityTypeEnum.alias;
         case SDKIdentityTypeEnum.facebookCustomAudienceId:
-            return EventsApi.IdentityTypeEnum.facebookCustomAudienceId
+            return EventsApi.IdentityTypeEnum.facebookCustomAudienceId;
         case SDKIdentityTypeEnum.otherId2:
-            return EventsApi.IdentityTypeEnum.otherId2
+            return EventsApi.IdentityTypeEnum.otherId2;
         case SDKIdentityTypeEnum.otherId3:
-            return EventsApi.IdentityTypeEnum.otherId3
+            return EventsApi.IdentityTypeEnum.otherId3;
         case SDKIdentityTypeEnum.otherId4:
-            return EventsApi.IdentityTypeEnum.otherId4
+            return EventsApi.IdentityTypeEnum.otherId4;
         case SDKIdentityTypeEnum.otherId5:
-            return EventsApi.IdentityTypeEnum.otherId5
+            return EventsApi.IdentityTypeEnum.otherId5;
         case SDKIdentityTypeEnum.otherId6:
-            return EventsApi.IdentityTypeEnum.otherId6
+            return EventsApi.IdentityTypeEnum.otherId6;
         case SDKIdentityTypeEnum.otherId7:
-            return EventsApi.IdentityTypeEnum.otherId7
+            return EventsApi.IdentityTypeEnum.otherId7;
         case SDKIdentityTypeEnum.otherId8:
-            return EventsApi.IdentityTypeEnum.otherId8
+            return EventsApi.IdentityTypeEnum.otherId8;
         case SDKIdentityTypeEnum.otherId9:
-            return EventsApi.IdentityTypeEnum.otherId9
+            return EventsApi.IdentityTypeEnum.otherId9;
         case SDKIdentityTypeEnum.otherId10:
-            return EventsApi.IdentityTypeEnum.otherId10
+            return EventsApi.IdentityTypeEnum.otherId10;
         case SDKIdentityTypeEnum.mobileNumber:
-            return EventsApi.IdentityTypeEnum.mobileNumber
+            return EventsApi.IdentityTypeEnum.mobileNumber;
         case SDKIdentityTypeEnum.phoneNumber2:
-            return EventsApi.IdentityTypeEnum.phoneNumber2
+            return EventsApi.IdentityTypeEnum.phoneNumber2;
         case SDKIdentityTypeEnum.phoneNumber3:
-            return EventsApi.IdentityTypeEnum.phoneNumber3
+            return EventsApi.IdentityTypeEnum.phoneNumber3;
     }
 }