Merge branch 'master' into offline-events

# Conflicts:
#	swift-sdk/Internal/IterableAPIInternal.swift
#	swift-sdk/IterableConfig.swift

Author: tapashmajumder

.github/workflows/build-and-test.yml

@@ -3,7 +3,7 @@ name: Build and test
 on: pull_request
 
 jobs:
-  build:
+  run-tests-job:
     runs-on: macos-latest
 
     steps:
@@ -15,7 +15,7 @@ jobs:
 
     - name: Build and test
       run: |
-        xcodebuild test -project swift-sdk.xcodeproj -scheme swift-sdk -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11' -enableCodeCoverage YES CODE_SIGNING_REQUIRED=NO | xcpretty || exit 1
+        xcodebuild test -project swift-sdk.xcodeproj -scheme swift-sdk -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11' -enableCodeCoverage YES CODE_SIGNING_REQUIRED=NO | xcpretty && exit ${PIPESTATUS[0]}
         
     - name: CocoaPods lint
       run: pod lib lint

.github/workflows/e2e.yml

@@ -3,7 +3,7 @@ name: Integration Testing
 on: pull_request
 
 jobs:
-  build:
+  run-e2e-job:
     runs-on: macos-latest
 
     steps:

swift-sdk.xcodeproj/project.pbxproj

@@ -541,7 +541,6 @@
 		ACFD5AC524C8216A008E497A /* TasksCRUDTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TasksCRUDTests.swift; sourceTree = "<group>"; };
 		ACFD5AC724C8290E008E497A /* IterableTaskManagedObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableTaskManagedObject.swift; sourceTree = "<group>"; };
 		ACFF429E24656BDF00FDF10D /* ui-tests-app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ui-tests-app.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		ACFF429F24656BDF00FDF10D /* host-app copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "host-app copy-Info.plist"; path = "/Users/tapash.majumder/work/iterable/mobile/ios/swift-sdk/host-app copy-Info.plist"; sourceTree = "<absolute>"; };
 		ACFF42A324656CA100FDF10D /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		ACFF42A624656D2600FDF10D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		ACFF42A824656D8E00FDF10D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -717,7 +716,6 @@
 				ACDA975A23159C37004C412E /* inbox-ui-tests-app */,
 				ACFCA72920EB02DB00BFB277 /* tests */,
 				5550F22324217CFC0014456A /* misc */,
-				ACFF429F24656BDF00FDF10D /* host-app copy-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};

swift-sdk/Internal/AuthManager.swift

@@ -7,18 +7,20 @@ import Foundation
 
 @objc public protocol IterableInternalAuthManagerProtocol {
     func getAuthToken() -> String?
-    func requestNewAuthToken()
+    func requestNewAuthToken(hasFailedPriorAuth: Bool, onSuccess: (() -> Void)?)
     func logoutUser()
 }
 
 class AuthManager: IterableInternalAuthManagerProtocol {
     init(onAuthTokenRequestedCallback: (() -> String?)?,
+         refreshWindow: TimeInterval,
          localStorage: LocalStorageProtocol,
-         refreshWindow: TimeInterval = AuthManager.defaultRefreshWindow) {
+         dateProvider: DateProviderProtocol) {
         ITBInfo()
 
         self.onAuthTokenRequestedCallback = onAuthTokenRequestedCallback
         self.localStorage = localStorage
+        self.dateProvider = dateProvider
         self.refreshWindow = refreshWindow
 
         retrieveAuthToken()
@@ -35,11 +37,21 @@ class AuthManager: IterableInternalAuthManagerProtocol {
     }
 
     // @objc attribute only needed for the pre-iOS 10 Timer constructor in queueAuthTokenExpirationRefresh
-    @objc func requestNewAuthToken() {
+    @objc func requestNewAuthToken(hasFailedPriorAuth: Bool = false, onSuccess: (() -> Void)? = nil) {
+        guard !self.hasFailedPriorAuth || !hasFailedPriorAuth else {
+            return
+        }
+        
+        self.hasFailedPriorAuth = hasFailedPriorAuth
+        
         authToken = onAuthTokenRequestedCallback?()
 
         storeAuthToken()
 
+        if authToken != nil {
+            onSuccess?()
+        }
+        
         queueAuthTokenExpirationRefresh(authToken)
     }
 
@@ -49,48 +61,46 @@ class AuthManager: IterableInternalAuthManagerProtocol {
         storeAuthToken()
 
         expirationRefreshTimer?.invalidate()
-    }
-    
-    // MARK: - Auth Manager Functions
-    
-    func storeAuthToken() {
-        localStorage.authToken = authToken
-    }
-    
-    func retrieveAuthToken() {
-        authToken = localStorage.authToken
-        
-        queueAuthTokenExpirationRefresh(authToken)
+        expirationRefreshTimer = nil
     }
 
     // MARK: - Private/Internal
 
-    private let refreshWindow: TimeInterval
-    
     private var expirationRefreshTimer: Timer?
 
     private var authToken: String?
 
-    private var localStorage: LocalStorageProtocol
+    private var hasFailedPriorAuth: Bool = false
 
     private let onAuthTokenRequestedCallback: (() -> String?)?
+    private let refreshWindow: TimeInterval
+    private var localStorage: LocalStorageProtocol
+    private let dateProvider: DateProviderProtocol
+
+    private func storeAuthToken() {
+        localStorage.authToken = authToken
+    }
 
-    static let defaultRefreshWindow: TimeInterval = 60
+    private func retrieveAuthToken() {
+        authToken = localStorage.authToken
+        
+        queueAuthTokenExpirationRefresh(authToken)
+    }
 
     private func queueAuthTokenExpirationRefresh(_ authToken: String?) {
         guard let authToken = authToken, let expirationDate = AuthManager.decodeExpirationDateFromAuthToken(authToken) else {
             return
         }
 
-        let refreshTimeInterval = TimeInterval(expirationDate) - Date().timeIntervalSince1970 - refreshWindow
+        let timeIntervalToRefresh = TimeInterval(expirationDate) - dateProvider.currentDate.timeIntervalSince1970 - refreshWindow
 
         if #available(iOS 10.0, *) {
-            expirationRefreshTimer = Timer.scheduledTimer(withTimeInterval: refreshTimeInterval, repeats: false) { timer in
-                self.requestNewAuthToken()
+            expirationRefreshTimer = Timer.scheduledTimer(withTimeInterval: timeIntervalToRefresh, repeats: false) { [weak self] _ in
+                self?.requestNewAuthToken(hasFailedPriorAuth: false)
             }
         } else {
             // Fallback on earlier versions
-            expirationRefreshTimer = Timer.scheduledTimer(timeInterval: refreshTimeInterval,
+            expirationRefreshTimer = Timer.scheduledTimer(timeInterval: timeIntervalToRefresh,
                                                           target: self,
                                                           selector: #selector(requestNewAuthToken),
                                                           userInfo: nil,

swift-sdk/Internal/DependencyContainer.swift

@@ -41,10 +41,11 @@ extension DependencyContainerProtocol {
                      retryInterval: config.inAppDisplayInterval)
     }
 
-    func createAuthManager(config: IterableConfig,
-                           localStorage: LocalStorageProtocol) -> IterableInternalAuthManagerProtocol {
+    func createAuthManager(config: IterableConfig) -> IterableInternalAuthManagerProtocol {
         AuthManager(onAuthTokenRequestedCallback: config.onAuthTokenRequestedCallback,
-                    localStorage: localStorage)
+                    refreshWindow: config.authTokenRefreshWindow,
+                    localStorage: localStorage,
+                    dateProvider: dateProvider)
     }
 }
 

swift-sdk/Internal/IterableAPIInternal.swift

@@ -68,8 +68,7 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
     }()
 
     lazy var authManager: IterableInternalAuthManagerProtocol = {
-        self.dependencyContainer.createAuthManager(config: self.config,
-                                                   localStorage: self.localStorage)
+        self.dependencyContainer.createAuthManager(config: self.config)
     }()
 
     // MARK: - SDK Functions
@@ -99,7 +98,9 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
             _email = email
             _userId = nil
 
-            authManager.requestNewAuthToken()
+            authManager.requestNewAuthToken(hasFailedPriorAuth: false) { [weak self] in
+                self?.loginNewUser()
+            }
 
             storeIdentifierData()
 
@@ -114,7 +115,9 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
             _email = nil
             _userId = userId
 
-            authManager.requestNewAuthToken()
+            authManager.requestNewAuthToken(hasFailedPriorAuth: false) { [weak self] in
+                self?.loginNewUser()
+            }
 
             storeIdentifierData()
 
@@ -485,18 +488,6 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
         }
     }
 
-    @discardableResult
-    private static func call(successHandler onSuccess: OnSuccessHandler? = nil,
-                             andFailureHandler onFailure: OnFailureHandler? = nil,
-                             forResult result: Future<SendRequestValue, SendRequestError>) -> Future<SendRequestValue, SendRequestError> {
-        result.onSuccess { json in
-            onSuccess?(json)
-        }.onError { error in
-            onFailure?(error.reason, error.data)
-        }
-        return result
-    }
-    
     // package private method. Do not call this directly.
     init(apiKey: String,
          launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil,

swift-sdk/Internal/RequestProcessorUtil.swift

@@ -21,7 +21,7 @@ struct RequestProcessorUtil {
         }.onError { error in
             if error.httpStatusCode == 401, error.iterableCode == JsonValue.Code.invalidJwtPayload {
                 ITBError(error.reason)
-                authManager?.requestNewAuthToken()
+                authManager?.requestNewAuthToken(hasFailedPriorAuth: true, onSuccess: nil)
             } else if error.httpStatusCode == 401, error.iterableCode == JsonValue.Code.badApiKey {
                 ITBError(error.reason)
             }

swift-sdk/IterableConfig.swift

@@ -120,6 +120,9 @@ public class IterableConfig: NSObject {
     /// How many seconds to wait before showing the next in-app, if there are more than one present
     public var inAppDisplayInterval: Double = 30.0
 
+    /// the number of seconds before expiration of the auth token to get a new auth token
+    public var authTokenRefreshWindow: TimeInterval = 60.0
+
     /// If set to true, events will be queued locally when network is offline.
     /// When the network is online again, the queued events will be sent to our backend.
     public var enableOfflineMode = false