fix: Update Hashed Email Logic With Unassigned (#401)

* fix: Update Hashed Email Logic with Unassigned

Author: BrandonStalnaker

UnitTests/MPRoktTests.m

@@ -469,6 +469,70 @@ - (void)hashedIdentityTest: (MPIdentity)mpIdentity {
     [self.identityMock verifyWithDelay:0.2];
 }
 
+- (void)testDontTriggerIdentifyWithNoRoktHashedEmailUserIdentityType {
+    MParticleUser *currentUser = [MParticle sharedInstance].identity.currentUser;
+
+    MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
+    
+    NSArray *userIdentityArray = @[@{@"n" : [NSNumber numberWithLong:MPIdentityOther], @"i" : @"[email protected]"}];
+    
+    [userDefaults setMPObject:userIdentityArray forKey:kMPUserIdentityArrayKey userId:currentUser.userId];
+    XCTAssertEqualObjects(currentUser.identities[@(MPIdentityOther)], @"[email protected]");
+    
+    //Mock Identity as needed
+    [[[self.mockRokt stub] andReturn:nil] getRoktHashedEmailUserIdentityType];
+    MParticle *instance = [MParticle sharedInstance];
+    self.mockInstance = OCMPartialMock(instance);
+    self.identityMock = OCMClassMock([MPIdentityApi class]);
+    OCMStub([(MParticle *)self.mockInstance identity]).andReturn(self.identityMock);
+    [[[self.mockInstance stub] andReturn:self.mockInstance] sharedInstance];
+    [[[self.identityMock stub] andReturn:currentUser] currentUser];
+    
+    [[self.identityMock reject] identify:[OCMArg checkWithBlock:^BOOL(MPIdentityApiRequest *request) {
+        XCTAssertEqualObjects([request.identities objectForKey:@(MPIdentityOther)], @"[email protected]");
+        return true;
+    }] completion:OCMOCK_ANY];
+    
+    NSString *identifier = @"testView";
+    NSDictionary *attributes = @{@"emailsha256": @"[email protected]", @"sandbox": @"false"};
+    
+    [self.rokt selectPlacements:identifier attributes:attributes];
+    
+    [self.identityMock verifyWithDelay:0.2];
+}
+
+- (void)testTriggeredIdentifyWithNoRoktHashedEmailUserIdentityType {
+    MParticleUser *currentUser = [MParticle sharedInstance].identity.currentUser;
+
+    MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
+    
+    NSArray *userIdentityArray = @[@{@"n" : [NSNumber numberWithLong:MPIdentityOther], @"i" : @"[email protected]"}];
+    
+    [userDefaults setMPObject:userIdentityArray forKey:kMPUserIdentityArrayKey userId:currentUser.userId];
+    XCTAssertEqualObjects(currentUser.identities[@(MPIdentityOther)], @"[email protected]");
+    
+    //Mock Identity as needed
+    [[[self.mockRokt stub] andReturn:nil] getRoktHashedEmailUserIdentityType];
+    MParticle *instance = [MParticle sharedInstance];
+    self.mockInstance = OCMPartialMock(instance);
+    self.identityMock = OCMClassMock([MPIdentityApi class]);
+    OCMStub([(MParticle *)self.mockInstance identity]).andReturn(self.identityMock);
+    [[[self.mockInstance stub] andReturn:self.mockInstance] sharedInstance];
+    [[[self.identityMock stub] andReturn:currentUser] currentUser];
+    
+    [[self.identityMock expect] identify:[OCMArg checkWithBlock:^BOOL(MPIdentityApiRequest *request) {
+        XCTAssertEqualObjects([request.identities objectForKey:@(MPIdentityEmail)], @"[email protected]");
+        return true;
+    }] completion:OCMOCK_ANY];
+    
+    NSString *identifier = @"testView";
+    NSDictionary *attributes = @{@"email": @"[email protected]", @"emailsha256": @"[email protected]", @"sandbox": @"false"};
+    
+    [self.rokt selectPlacements:identifier attributes:attributes];
+    
+    [self.identityMock verifyWithDelay:0.2];
+}
+
 - (void)testPurchaseFinalized {
     MParticle *instance = [MParticle sharedInstance];
     self.mockInstance = OCMPartialMock(instance);

mParticle-Apple-SDK/MPRokt.m

@@ -193,7 +193,7 @@ - (NSNumber *)getRoktHashedEmailUserIdentityType {
     NSString *hashedIdentityTypeString = roktKitConfig[kMPHashedEmailUserIdentityType];
     NSNumber *hashedIdentityTypeNumber = [MPIdentityHTTPIdentities identityTypeForString:hashedIdentityTypeString.lowercaseString];
 
-    return hashedIdentityTypeNumber != nil ? hashedIdentityTypeNumber : @(MPIdentityOther);
+    return hashedIdentityTypeNumber;
 }
 
 - (NSDictionary<NSString *, NSString *> *)confirmSandboxAttribute:(NSDictionary<NSString *, NSString *> * _Nullable)attributes {
@@ -220,17 +220,16 @@ - (void)confirmUser:(NSDictionary<NSString *, NSString *> * _Nullable)attributes
     NSString *hashedEmail = attributes[@"emailsha256"];
     NSNumber *hashedEmailIdentity = [self getRoktHashedEmailUserIdentityType];
 
-    if ((email && ![email isEqualToString:user.identities[@(MPIdentityEmail)]]) || (hashedEmail && ![hashedEmail isEqualToString: user.identities[hashedEmailIdentity]])) {
-        // If there is an existing email or hashed email but it doesn't match the what was passed in, warn the customer
-        if (email && user.identities[@(MPIdentityEmail)]) {
-            NSLog(@"The existing email on the user (%@) does not match the email passed in to `selectPlacements:` (%@). Please remember to sync the email identity to mParticle as soon as you receive it. We will now identify the user before contuing to `selectPlacements:`", user.identities[@(MPIdentityEmail)], email);
-        } else if (hashedEmail && user.identities[hashedEmailIdentity]) {
-            NSLog(@"The existing hashed email on the user (%@) does not match the email passed in to `selectPlacements:` (%@). Please remember to sync the email identity to mParticle as soon as you receive it. We will now identify the user before contuing to `selectPlacements:`", user.identities[hashedEmailIdentity], hashedEmail);
-        }
-        
+    BOOL shouldIdentifyFromEmail = (email && ![email isEqualToString:user.identities[@(MPIdentityEmail)]]);
+    BOOL shouldIdentifyFromHash = (hashedEmail && hashedEmailIdentity && ![hashedEmail isEqualToString: user.identities[hashedEmailIdentity]]);
+
+    if (shouldIdentifyFromEmail || shouldIdentifyFromHash) {
+        // Identify the user with the new identity information
         MPIdentityApiRequest *identityRequest = [MPIdentityApiRequest requestWithUser:user];
         [identityRequest setIdentity:email identityType:MPIdentityEmail];
-        [identityRequest setIdentity:hashedEmail identityType:hashedEmailIdentity.unsignedIntegerValue];
+        if (hashedEmailIdentity != nil) {
+            [identityRequest setIdentity:hashedEmail identityType:hashedEmailIdentity.unsignedIntegerValue];
+        }
 
         [[[MParticle sharedInstance] identity] identify:identityRequest completion:^(MPIdentityApiResult *_Nullable apiResult, NSError *_Nullable error) {
             if (error) {
@@ -241,6 +240,13 @@ - (void)confirmUser:(NSDictionary<NSString *, NSString *> * _Nullable)attributes
                 completion(apiResult.user);
             }
         }];
+        
+        // Warn the customer if we had to identify and therefore delay their Rokt placement.
+        if (shouldIdentifyFromEmail) {
+            NSLog(@"The existing email on the user (%@) does not match the email passed in to `selectPlacements:` (%@). Please remember to sync the email identity to mParticle as soon as you receive it. We will now identify the user before continuing to `selectPlacements:`", user.identities[@(MPIdentityEmail)], email);
+        } else if (shouldIdentifyFromHash) {
+            NSLog(@"The existing hashed email on the user (%@) does not match the email passed in to `selectPlacements:` (%@). Please remember to sync the email identity to mParticle as soon as you receive it. We will now identify the user before continuing to `selectPlacements:`", user.identities[hashedEmailIdentity], hashedEmail);
+        }
     } else {
         completion(user);
     }