Merge pull request #430 from Iterable/MOB-2365-jwt-set-radio

[MOB-2365] account for more JWT cases

Author: roninopf

swift-sdk/Internal/AuthManager.swift

@@ -43,6 +43,8 @@ class AuthManager: IterableInternalAuthManagerProtocol {
 
     // @objc attribute only needed for the pre-iOS 10 Timer constructor in queueAuthTokenExpirationRefresh
     @objc func requestNewAuthToken(hasFailedPriorAuth: Bool = false, onSuccess: AuthTokenRetrievalHandler? = nil) {
+        ITBInfo()
+        
         guard !pendingAuth else {
             return
         }
@@ -61,6 +63,8 @@ class AuthManager: IterableInternalAuthManagerProtocol {
     }
 
     func logoutUser() {
+        ITBInfo()
+        
         authToken = nil
 
         storeAuthToken()
@@ -70,9 +74,8 @@ class AuthManager: IterableInternalAuthManagerProtocol {
 
     // MARK: - Private/Internal
 
-    private var expirationRefreshTimer: Timer?
-    
     private var authToken: String?
+    private var expirationRefreshTimer: Timer?
 
     private var pendingAuth: Bool = false
     private var hasFailedPriorAuth: Bool = false
@@ -107,6 +110,8 @@ class AuthManager: IterableInternalAuthManagerProtocol {
     }
 
     private func queueAuthTokenExpirationRefresh(_ authToken: String?) {
+        ITBInfo()
+        
         guard let authToken = authToken, let expirationDate = AuthManager.decodeExpirationDateFromAuthToken(authToken) else {
             return
         }

swift-sdk/Internal/InAppManager.swift

@@ -552,7 +552,9 @@ extension InAppManager: InAppNotifiable {
     func scheduleSync() -> Future<Bool, Error> {
         ITBInfo()
 
-        return InAppManager.getAppIsReady(applicationStateProvider: applicationStateProvider, displayer: displayer).flatMap { self.scheduleSync(appIsReady: $0) }
+        return InAppManager.getAppIsReady(applicationStateProvider: applicationStateProvider,
+                                          displayer: displayer)
+            .flatMap { self.scheduleSync(appIsReady: $0) }
     }
 
     private func scheduleSync(appIsReady: Bool) -> Future<Bool, Error> {

swift-sdk/Internal/IterableAPIInternal.swift

@@ -92,37 +92,51 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
     }
 
     func setEmail(_ email: String?) {
-        if email != _email {
+        ITBInfo()
+        
+        if email == nil {
             logoutPreviousUser()
-            
-            _email = email
-            _userId = nil
-            
-            storeIdentifierData()
-            
-            authManager.requestNewAuthToken(hasFailedPriorAuth: false, onSuccess: { [weak self] authToken in
-                _ = self?.inAppManager.scheduleSync()
-            })
-            
-            loginNewUser()
+            return
+        }
+        
+        if _email == email {
+            requestNewAuthToken()
+            return
         }
+        
+        logoutPreviousUser()
+        
+        _email = email
+        _userId = nil
+        
+        storeIdentifierData()
+        
+        requestNewAuthToken()
+        loginNewUser()
     }
 
     func setUserId(_ userId: String?) {
-        if userId != _userId {
+        ITBInfo()
+        
+        if userId == nil {
             logoutPreviousUser()
-            
-            _email = nil
-            _userId = userId
-            
-            storeIdentifierData()
-            
-            authManager.requestNewAuthToken(hasFailedPriorAuth: false, onSuccess: { [weak self] authToken in
-                _ = self?.inAppManager.scheduleSync()
-            })
-            
-            loginNewUser()
+            return
         }
+        
+        if _userId == userId {
+            requestNewAuthToken()
+            return
+        }
+        
+        logoutPreviousUser()
+        
+        _email = nil
+        _userId = userId
+        
+        storeIdentifierData()
+        
+        requestNewAuthToken()
+        loginNewUser()
     }
 
     func logoutUser() {
@@ -425,6 +439,12 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
         IterableUtil.isNotNullOrEmpty(string: _email) || IterableUtil.isNotNullOrEmpty(string: _userId)
     }
 
+    private func requestNewAuthToken() {
+        authManager.requestNewAuthToken(hasFailedPriorAuth: false, onSuccess: { [weak self] authToken in
+            _ = self?.inAppManager.scheduleSync()
+        })
+    }
+    
     private func logoutPreviousUser() {
         ITBInfo()
 
@@ -439,10 +459,10 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
         _email = nil
         _userId = nil
 
-        authManager.logoutUser()
-        
         storeIdentifierData()
 
+        authManager.logoutUser()
+        
         _ = inAppManager.reset()
 
         try? requestHandler.handleLogout()

tests/swift-sdk-swift-tests/AuthTests.swift

@@ -702,6 +702,55 @@ class AuthTests: XCTestCase {
         wait(for: [condition2], timeout: 3)
     }
 
+    func testAuthTokenRequestingForAlreadyExistingEmail() {
+        let condition1 = expectation(description: "auth handler didn't get called")
+        
+        let localStorage = MockLocalStorage()
+        localStorage.email = AuthTests.email
+        
+        let authDelegate = createAuthDelegate({ handler in
+            condition1.fulfill()
+        })
+        
+        let config = IterableConfig()
+        config.authDelegate = authDelegate
+        
+        let internalAPI = IterableAPIInternal.initializeForTesting(config: config,
+                                                                   localStorage: localStorage)
+        
+        XCTAssertNotNil(internalAPI.email)
+        XCTAssertNil(internalAPI.authManager.getAuthToken())
+        
+        internalAPI.email = AuthTests.email
+        
+        wait(for: [condition1], timeout: testExpectationTimeout)
+    }
+    
+    func testLoggedOutAuthTokenRequest() {
+        let condition1 = expectation(description: "auth handler was called")
+        condition1.isInverted = true
+        
+        let localStorage = MockLocalStorage()
+        localStorage.email = AuthTests.email
+        
+        let authDelegate = createAuthDelegate({ handler in
+            condition1.fulfill()
+        })
+        
+        let config = IterableConfig()
+        config.authDelegate = authDelegate
+        
+        let internalAPI = IterableAPIInternal.initializeForTesting(config: config,
+                                                                   localStorage: localStorage)
+        
+        XCTAssertNotNil(internalAPI.email)
+        XCTAssertNil(internalAPI.authManager.getAuthToken())
+        
+        internalAPI.logoutUser()
+        
+        wait(for: [condition1], timeout: testExpectationTimeoutForInverted)
+    }
+    
     // MARK: - Private
 
     class DefaultAuthDelegate: IterableAuthDelegate {