@mparticle/web-sdk 2.42.0 → 2.43.1

package/src/sessionManager.ts

@@ -5,6 +5,7 @@ import Types from './types';
 import { generateDeprecationMessage } from './utils';
 import { IMParticleUser } from './identity-user-interfaces';
 import { IMParticleWebSDKInstance } from './mp-instance';
+import { hasIdentityRequestChanged } from './identity-utils';
 
 const { Messages } = Constants;
 
@@ -30,7 +31,7 @@ export default function SessionManager(
 ) {
     const self = this;
 
-    this.initialize = function(): void {
+    this.initialize = function (): void {
         if (mpInstance._Store.sessionId) {
             const sessionTimeoutInMilliseconds: number =
                 mpInstance._Store.SDKConfig.sessionTimeout * 60000;
@@ -46,9 +47,14 @@ export default function SessionManager(
                 self.startNewSession();
             } else {
                 // https://go.mparticle.com/work/SQDSDKS-6045
-                const persistence: IPersistenceMinified = mpInstance._Persistence.getPersistence();
-                if (persistence && !persistence.cu) {
-                    // https://go.mparticle.com/work/SQDSDKS-6323
+                // https://go.mparticle.com/work/SQDSDKS-6323
+                const currentUser = mpInstance.Identity.getCurrentUser();
+                const sdkIdentityRequest =
+                    mpInstance._Store.SDKConfig.identifyRequest;
+
+                if (
+                    hasIdentityRequestChanged(currentUser, sdkIdentityRequest)
+                ) {
                     mpInstance.Identity.identify(
                         mpInstance._Store.SDKConfig.identifyRequest,
                         mpInstance._Store.SDKConfig.identityCallback
@@ -62,7 +68,7 @@ export default function SessionManager(
         }
     };
 
-    this.getSession = function(): string {
+    this.getSession = function (): string {
         mpInstance.Logger.warning(
             generateDeprecationMessage(
                 'SessionManager.getSession()',
@@ -73,11 +79,11 @@ export default function SessionManager(
         return this.getSessionId();
     };
 
-    this.getSessionId = function(): string {
+    this.getSessionId = function (): string {
         return mpInstance._Store.sessionId;
     };
 
-    this.startNewSession = function(): void {
+    this.startNewSession = function (): void {
         mpInstance.Logger.verbose(
             Messages.InformationMessages.StartingNewSession
         );
@@ -87,7 +93,8 @@ export default function SessionManager(
                 .generateUniqueId()
                 .toUpperCase();
 
-            const currentUser: IMParticleUser = mpInstance.Identity.getCurrentUser();
+            const currentUser: IMParticleUser =
+                mpInstance.Identity.getCurrentUser();
             const mpid: MPID = currentUser ? currentUser.getMPID() : null;
 
             if (mpid) {
@@ -121,7 +128,7 @@ export default function SessionManager(
         }
     };
 
-    this.endSession = function(override: boolean): void {
+    this.endSession = function (override: boolean): void {
         mpInstance.Logger.verbose(
             Messages.InformationMessages.StartingEndSession
         );
@@ -152,9 +159,10 @@ export default function SessionManager(
         let sessionTimeoutInMilliseconds: number;
         let timeSinceLastEventSent: number;
 
-        const cookies: IPersistenceMinified = mpInstance._Persistence.getPersistence();
+        const cookies: IPersistenceMinified =
+            mpInstance._Persistence.getPersistence();
 
-        if (!cookies || cookies.gs && !cookies.gs.sid) {
+        if (!cookies || (cookies.gs && !cookies.gs.sid)) {
             mpInstance.Logger.verbose(
                 Messages.InformationMessages.NoSessionToEnd
             );
@@ -189,16 +197,16 @@ export default function SessionManager(
         mpInstance._timeOnSiteTimer?.resetTimer();
     };
 
-    this.setSessionTimer = function(): void {
+    this.setSessionTimer = function (): void {
         const sessionTimeoutInMilliseconds: number =
             mpInstance._Store.SDKConfig.sessionTimeout * 60000;
 
-        mpInstance._Store.globalTimer = window.setTimeout(function() {
+        mpInstance._Store.globalTimer = window.setTimeout(function () {
             self.endSession();
         }, sessionTimeoutInMilliseconds);
     };
 
-    this.resetSessionTimer = function(): void {
+    this.resetSessionTimer = function (): void {
         if (!mpInstance._Store.webviewBridgeEnabled) {
             if (!mpInstance._Store.sessionId) {
                 self.startNewSession();
@@ -209,7 +217,7 @@ export default function SessionManager(
         self.startNewSessionIfNeeded();
     };
 
-    this.clearSessionTimeout = function(): void {
+    this.clearSessionTimeout = function (): void {
         clearTimeout(mpInstance._Store.globalTimer);
     };
 

package/src/validators.ts

@@ -40,7 +40,37 @@ const Validators = {
         );
     },
 
-    validateIdentities: function(
+    removeFalsyIdentityValues: function (
+        identityApiData: IdentityApiData,
+        logger: any
+    ): IdentityApiData {
+        if (!identityApiData || !identityApiData.userIdentities) {
+            return identityApiData;
+        }
+
+        const cleanedData = {} as IdentityApiData;
+        const cleanedUserIdentities = { ...identityApiData.userIdentities };
+
+        for (const identityType in identityApiData.userIdentities) {
+            if (identityApiData.userIdentities.hasOwnProperty(identityType)) {
+                const value = identityApiData.userIdentities[identityType];
+
+                // Check if value is falsy (undefined, false, 0, '', etc.) but not null
+                if (value !== null && !value) {
+                    logger.warning(
+                        `Identity value for '${identityType}' is falsy (${value}). This value will be removed from the request.`
+                    );
+                    delete cleanedUserIdentities[identityType];
+                }
+            }
+        }
+
+        cleanedData.userIdentities = cleanedUserIdentities;
+
+        return cleanedData;
+    },
+
+    validateIdentities: function (
         identityApiData: IdentityApiData,
         method?: IdentityAPIMethod
     ): ValidationIdentitiesReturn {