turn comments

Author: rmi22186

src/roktManager.ts

@@ -191,9 +191,9 @@ export default class RoktManager {
                 newHashedEmail = mappedAttributes['emailsha256'] as string || undefined;
             }
 
-            const emailChanged = !!(newEmail && (!currentEmail || currentEmail !== newEmail));
-            const hashedEmailChanged = !!(newHashedEmail && (!currentHashedEmail || currentHashedEmail !== newHashedEmail));
-            // https://go.mparticle.com/work/SQDSDKS-7338
+            const emailChanged = this.hasIdentityChanged(currentEmail, newEmail);
+            const hashedEmailChanged = this.hasIdentityChanged(currentHashedEmail, newHashedEmail);
+
             const newIdentities: UserIdentities = {};
             if (emailChanged) {
                 newIdentities.email = newEmail;
@@ -206,6 +206,7 @@ export default class RoktManager {
                 newIdentities[normalizedHashedEmailUserIdentityType] = newHashedEmail;
                 this.logger.warning(`emailsha256 mismatch detected. Current mParticle ${normalizedHashedEmailUserIdentityType} identity, ${currentHashedEmail}, differs from from 'emailsha256' passed to selectPlacements call, ${newHashedEmail}. Proceeding to call identify with ${normalizedHashedEmailUserIdentityType} set to ${newHashedEmail}. Please verify your implementation`);
             }
+
             if (!isEmpty(newIdentities)) {
                 // Call identify with the new user identities
                 try {
@@ -327,4 +328,27 @@ export default class RoktManager {
     private queueMessage(message: IRoktMessage): void {
         this.messageQueue.push(message);
     }
+
+    /**
+     * Checks if an identity value has changed by comparing current and new values
+     * 
+     * @param {string | undefined} currentValue - The current identity value
+     * @param {string | undefined} newValue - The new identity value to compare against
+     * @returns {boolean} True if the identity has changed (new value exists and differs from current), false otherwise
+     */
+    private hasIdentityChanged(currentValue: string | undefined, newValue: string | undefined): boolean {
+        if (!newValue) {
+            return false;
+        }
+        
+        if (!currentValue) {
+            return true; // New value exists but no current value
+        }
+        
+        if (currentValue !== newValue) {
+            return true; // Values are different
+        }
+        
+        return false; // Values are the same
+    }
 }

test/jest/roktManager.spec.ts

@@ -1266,4 +1266,71 @@ describe('RoktManager', () => {
             }).toThrow('Error setting extension data: ' + mockError.message);
         });
     });
+
+    describe('#hasIdentityChanged', () => {
+        it('should return false when newValue is null', () => {
+            const result = roktManager['hasIdentityChanged']('current@example.com', null);
+            expect(result).toBe(false);
+        });
+
+        it('should return false when newValue is undefined', () => {
+            const result = roktManager['hasIdentityChanged']('current@example.com', undefined);
+            expect(result).toBe(false);
+        });
+
+        it('should return false when newValue is empty string', () => {
+            const result = roktManager['hasIdentityChanged']('current@example.com', '');
+            expect(result).toBe(false);
+        });
+
+        it('should return true when currentValue is null and newValue exists', () => {
+            const result = roktManager['hasIdentityChanged'](null, 'new@example.com');
+            expect(result).toBe(true);
+        });
+
+        it('should return true when currentValue is undefined and newValue exists', () => {
+            const result = roktManager['hasIdentityChanged'](undefined, 'new@example.com');
+            expect(result).toBe(true);
+        });
+
+        it('should return true when currentValue is empty string and newValue exists', () => {
+            const result = roktManager['hasIdentityChanged']('', 'new@example.com');
+            expect(result).toBe(true);
+        });
+
+        it('should return true when currentValue and newValue are different', () => {
+            const result = roktManager['hasIdentityChanged']('old@example.com', 'new@example.com');
+            expect(result).toBe(true);
+        });
+
+        it('should return false when currentValue and newValue are the same', () => {
+            const result = roktManager['hasIdentityChanged']('same@example.com', 'same@example.com');
+            expect(result).toBe(false);
+        });
+
+        it('should return false when both currentValue and newValue are null', () => {
+            const result = roktManager['hasIdentityChanged'](null, null);
+            expect(result).toBe(false);
+        });
+
+        it('should return false when both currentValue and newValue are undefined', () => {
+            const result = roktManager['hasIdentityChanged'](undefined, undefined);
+            expect(result).toBe(false);
+        });
+
+        it('should return false when both currentValue and newValue are empty strings', () => {
+            const result = roktManager['hasIdentityChanged']('', '');
+            expect(result).toBe(false);
+        });
+
+        it('should handle whitespace-only strings as valid values', () => {
+            const result = roktManager['hasIdentityChanged']('old@example.com', '   ');
+            expect(result).toBe(true);
+        });
+
+        it('should be case sensitive', () => {
+            const result = roktManager['hasIdentityChanged']('test@example.com', 'TEST@EXAMPLE.COM');
+            expect(result).toBe(true);
+        });
+    });
 });