Merge branch 'feature/itbl_track_anon_user' into feature/MOB-9746-Use-destinationUser-JWT-when-calling-merge

Author: evantk91

swift-sdk/Internal/InternalIterableAPI.swift

@@ -258,6 +258,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     func register(token: Data,
                   onSuccess: OnSuccessHandler? = nil,
                   onFailure: OnFailureHandler? = nil) {
+        
         guard let appName = pushIntegrationName else {
             let errorMessage = "Not registering device token - appName must not be nil"
             ITBError(errorMessage)
@@ -574,7 +575,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
                       source: InAppDeleteSource? = nil,
                       inboxSessionId: String? = nil,
                       onSuccess: OnSuccessHandler? = nil,
-                      onFailure: OnFailureHandler? = nil) -> Pending<SendRequestValue, SendRequestError> {
+                      onFailure: OnFailureHandler? = nil) -> Pending<SendRequestValue, SendRequestError> {       
         requestHandler.inAppConsume(message: message,
                                     location: location,
                                     source: source,
@@ -699,6 +700,17 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         }
     }
 
+    
+    func isSDKInitialized() -> Bool {
+        let isInitialized = !apiKey.isEmpty && isEitherUserIdOrEmailSet()
+        
+        if !isInitialized {
+            ITBInfo("Iterable SDK must be initialized with an API key and user email/userId before calling SDK methods")
+        }
+        
+        return isInitialized
+    }
+    
     public func isEitherUserIdOrEmailSet() -> Bool {
         IterableUtil.isNotNullOrEmpty(string: _email) || IterableUtil.isNotNullOrEmpty(string: _userId)
     }
@@ -710,9 +722,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     private func logoutPreviousUser() {
         ITBInfo()
 
-        guard isEitherUserIdOrEmailSet() else {
-            return
-        }
+        guard isSDKInitialized() else { return }
 
         if config.autoPushRegistration {
             disableDeviceForCurrentUser()
@@ -737,10 +747,12 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     }
 
     private func onLogin(_ authToken: String? = nil, onloginSuccess onloginSuccessCallBack: (()->())? = nil) {
+        guard isSDKInitialized() else { return }
+
         ITBInfo()
 
         self.authManager.pauseAuthRetries(false)
-        if let authToken = authToken {
+        if let authToken {
             self.authManager.setNewToken(authToken)
             completeUserLogin(onloginSuccessCallBack: onloginSuccessCallBack)
         } else if isEitherUserIdOrEmailSet() && config.authDelegate != nil {
@@ -761,10 +773,8 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     }
 
     private func completeUserLogin(onloginSuccessCallBack: (()->())? = nil) {
-        ITBInfo()
-        guard isEitherUserIdOrEmailSet() else {
-            return
-        }
+        ITBInfo()        
+        guard isSDKInitialized() else { return }
 
         if config.autoPushRegistration {
             notificationStateProvider.registerForRemoteNotifications()