@@ -133,83 +133,90 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
133133 func setEmail( _ email: String ? , authToken: String ? = nil , successHandler: OnSuccessHandler ? = nil , failureHandler: OnFailureHandler ? = nil , identityResolution: IterableIdentityResolution ? = nil ) {
134134
135135 ITBInfo ( )
136-
137- let merge = identityResolution? . mergeOnAnonymousToKnown ?? config. identityResolution. mergeOnAnonymousToKnown
138- let replay = identityResolution? . replayOnVisitorToKnown ?? config. identityResolution. replayOnVisitorToKnown
139-
140136 if self . _email == email && email != nil {
141137 self . checkAndUpdateAuthToken ( authToken)
142138 return
143139 }
144-
140+
145141 if self . _email == email {
146142 return
147143 }
148144
149145 self . logoutPreviousUser ( )
150-
146+
151147 self . _email = email
152148 self . _userId = nil
153-
154- if config. enableAnonTracking, let email = email {
155- attemptAndProcessMerge (
156- merge: merge ?? true ,
157- replay: replay ?? true ,
158- destinationUser: email,
159- isEmail: true ,
160- failureHandler: failureHandler
161- )
162- self . localStorage. userIdAnnon = nil
149+
150+ self . onLogin ( authToken) { [ weak self] ( ) -> Void in
151+ guard let self = self else {
152+ return
153+ }
154+ let merge = identityResolution? . mergeOnAnonymousToKnown ?? config. identityResolution. mergeOnAnonymousToKnown
155+ let replay = identityResolution? . replayOnVisitorToKnown ?? config. identityResolution. replayOnVisitorToKnown
156+ if config. enableAnonTracking, let email = email {
157+ attemptAndProcessMerge (
158+ merge: merge ?? true ,
159+ replay: replay ?? true ,
160+ destinationUser: email,
161+ isEmail: true ,
162+ failureHandler: failureHandler
163+ )
164+ self . localStorage. userIdAnnon = nil
165+ }
163166 }
167+
168+
164169 self . _successCallback = successHandler
165170 self . _failureCallback = failureHandler
166171 self . storeIdentifierData ( )
167- self . onLogin ( authToken)
168-
169172 }
170173
171174 func setUserId( _ userId: String ? , authToken: String ? = nil , successHandler: OnSuccessHandler ? = nil , failureHandler: OnFailureHandler ? = nil , isAnon: Bool = false , identityResolution: IterableIdentityResolution ? = nil ) {
172175 ITBInfo ( )
173-
174- let merge = identityResolution? . mergeOnAnonymousToKnown ?? config. identityResolution. mergeOnAnonymousToKnown
175- let replay = identityResolution? . replayOnVisitorToKnown ?? config. identityResolution. replayOnVisitorToKnown
176-
176+
177177 if self . _userId == userId && userId != nil {
178178 self . checkAndUpdateAuthToken ( authToken)
179179 return
180180 }
181-
181+
182182 if self . _userId == userId {
183183 return
184184 }
185-
185+
186186 self . logoutPreviousUser ( )
187-
187+
188188 self . _email = nil
189189 self . _userId = userId
190190
191- if config. enableAnonTracking {
192- if let userId = userId, userId != localStorage. userIdAnnon {
193- attemptAndProcessMerge (
194- merge: merge ?? true ,
195- replay: replay ?? true ,
196- destinationUser: userId,
197- isEmail: false ,
198- failureHandler: failureHandler
199- )
191+ self . onLogin ( authToken) { [ weak self] ( ) -> Void in
192+ guard let self = self else {
193+ return
200194 }
201-
202- if !isAnon {
203- localStorage. userIdAnnon = nil
195+ if config. enableAnonTracking {
196+ if let userId = userId, userId != localStorage. userIdAnnon {
197+ let merge = identityResolution? . mergeOnAnonymousToKnown ?? config. identityResolution. mergeOnAnonymousToKnown
198+ let replay = identityResolution? . replayOnVisitorToKnown ?? config. identityResolution. replayOnVisitorToKnown
199+ attemptAndProcessMerge (
200+ merge: merge ?? true ,
201+ replay: replay ?? true ,
202+ destinationUser: userId,
203+ isEmail: false ,
204+ failureHandler: failureHandler
205+ )
206+ }
207+
208+ if !isAnon {
209+ localStorage. userIdAnnon = nil
210+ }
204211 }
205212 }
206-
213+
207214 self . _successCallback = successHandler
208215 self . _failureCallback = failureHandler
209216 self . storeIdentifierData ( )
210- self . onLogin ( authToken )
217+
211218 }
212-
219+
213220 func logoutUser( ) {
214221 logoutPreviousUser ( )
215222 }
@@ -233,6 +240,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
233240 self . localStorage. anonymousUserEvents = nil
234241 self . localStorage. anonymousSessions = nil
235242 self . localStorage. anonymousUserUpdate = nil
243+ self . localStorage. userIdAnnon = nil
236244
237245 if isAnonymousUsageTracked && config. enableAnonTracking {
238246 ITBInfo ( " CONSENT GIVEN and ANON TRACKING ENABLED - Criteria fetched " )
@@ -726,35 +734,35 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
726734 private func storeIdentifierData( ) {
727735 localStorage. email = _email
728736 localStorage. userId = _userId
737+
729738 }
730739
731- private func onLogin( _ authToken: String ? = nil ) {
740+ private func onLogin( _ authToken: String ? = nil , onloginSuccess onloginSuccessCallBack : ( ( ) -> ( ) ) ? = nil ) {
732741 ITBInfo ( )
733742
734743 self . authManager. pauseAuthRetries ( false )
735744 if let authToken = authToken {
736745 self . authManager. setNewToken ( authToken)
737- completeUserLogin ( )
746+ completeUserLogin ( onloginSuccessCallBack : onloginSuccessCallBack )
738747 } else if isEitherUserIdOrEmailSet ( ) && config. authDelegate != nil {
739- requestNewAuthToken ( )
748+ requestNewAuthToken ( onloginSuccessCallBack : onloginSuccessCallBack )
740749 } else {
741- completeUserLogin ( )
750+ completeUserLogin ( onloginSuccessCallBack : onloginSuccessCallBack )
742751 }
743752 }
744753
745- private func requestNewAuthToken( ) {
754+ private func requestNewAuthToken( onloginSuccessCallBack : ( ( ) -> ( ) ) ? = nil ) {
746755 ITBInfo ( )
747756
748757 authManager. requestNewAuthToken ( hasFailedPriorAuth: false , onSuccess: { [ weak self] token in
749758 if token != nil {
750- self ? . completeUserLogin ( )
759+ self ? . completeUserLogin ( onloginSuccessCallBack : onloginSuccessCallBack )
751760 }
752761 } , shouldIgnoreRetryPolicy: true )
753762 }
754763
755- private func completeUserLogin( ) {
764+ private func completeUserLogin( onloginSuccessCallBack : ( ( ) -> ( ) ) ? = nil ) {
756765 ITBInfo ( )
757-
758766 guard isEitherUserIdOrEmailSet ( ) else {
759767 return
760768 }
@@ -766,6 +774,9 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
766774 }
767775
768776 _ = inAppManager. scheduleSync ( )
777+ if onloginSuccessCallBack != nil {
778+ onloginSuccessCallBack!( )
779+ }
769780 }
770781
771782 private func retrieveIdentifierData( ) {
0 commit comments