Merge pull request #845 from Iterable/evan/MOB-9974

[MOB-9974] fix event replay from visitor to known user

Author: evantk91

swift-sdk/Internal/AnonymousUserManager.swift

@@ -143,7 +143,7 @@ public class AnonymousUserManager: AnonymousUserManagerProtocol {
     }
 
     // Syncs locally saved data through track APIs
-    private func syncEvents() {
+    public func syncEvents() {
         let events = localStorage.anonymousUserEvents
         var successfulSyncedData: [Int] = []
 

swift-sdk/Internal/AnonymousUserManagerProtocol.swift

@@ -13,5 +13,5 @@ import Foundation
     func trackAnonUpdateUser(_ dataFields: [AnyHashable: Any])
     func updateAnonSession()
     func getAnonCriteria()
-    func syncNonSyncedEvents()
+    func syncEvents()
 }

swift-sdk/Internal/InternalIterableAPI.swift

@@ -137,13 +137,6 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         let merge = identityResolution?.mergeOnAnonymousToKnown ?? config.identityResolution.mergeOnAnonymousToKnown
         let replay = identityResolution?.replayOnVisitorToKnown ?? config.identityResolution.replayOnVisitorToKnown
 
-        if(config.enableAnonTracking) {
-            if(email != nil) {
-                attemptAndProcessMerge(merge: merge ?? true, replay: replay ?? true, destinationUser: email, isEmail: true, failureHandler: failureHandler)
-            }
-            self.localStorage.userIdAnnon = nil
-        }
-        
         if self._email == email && email != nil {
             self.checkAndUpdateAuthToken(authToken)
             return
@@ -158,6 +151,16 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         self._email = email
         self._userId = nil
 
+        if config.enableAnonTracking, let email = email {
+            attemptAndProcessMerge(
+                merge: merge ?? true,
+                replay: replay ?? true,
+                destinationUser: email,
+                isEmail: true,
+                failureHandler: failureHandler
+            )
+            self.localStorage.userIdAnnon = nil
+        }
         self._successCallback = successHandler
         self._failureCallback = failureHandler
         self.storeIdentifierData()
@@ -171,16 +174,6 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         let merge = identityResolution?.mergeOnAnonymousToKnown ?? config.identityResolution.mergeOnAnonymousToKnown
         let replay = identityResolution?.replayOnVisitorToKnown ?? config.identityResolution.replayOnVisitorToKnown
 
-        if(config.enableAnonTracking) {
-            if(userId != nil && userId != localStorage.userIdAnnon) {
-                attemptAndProcessMerge(merge: merge ?? true, replay: replay ?? true, destinationUser: userId, isEmail: false, failureHandler: failureHandler)
-            }
-
-            if(!isAnon) {
-                self.localStorage.userIdAnnon = nil
-            }
-        }
-   
         if self._userId == userId && userId != nil {
             self.checkAndUpdateAuthToken(authToken)
             return
@@ -195,6 +188,22 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         self._email = nil
         self._userId = userId
 
+        if config.enableAnonTracking {
+            if let userId = userId, userId != localStorage.userIdAnnon {
+                attemptAndProcessMerge(
+                    merge: merge ?? true,
+                    replay: replay ?? true,
+                    destinationUser: userId,
+                    isEmail: false,
+                    failureHandler: failureHandler
+                )
+            }
+            
+            if !isAnon {
+                localStorage.userIdAnnon = nil
+            }
+        }
+        
         self._successCallback = successHandler
         self._failureCallback = failureHandler
         self.storeIdentifierData()
@@ -210,7 +219,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
 
             if mergeResult == MergeResult.mergenotrequired ||  mergeResult == MergeResult.mergesuccessful {
                 if (replay) {
-                    self.anonymousUserManager.syncNonSyncedEvents()
+                    self.anonymousUserManager.syncEvents()
                 }
             } else {
                 failureHandler?(error, nil)