Merge pull request #348 from Iterable/MOB-1895-allow-token-change

[MOB-1895] allow same email or userId to only change token

Author: roninopf

swift-sdk/Internal/IterableAPIInternal.swift

@@ -111,35 +111,39 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
     }
 
     func setEmail(_ email: String?, withToken token: String? = nil) {
-        guard email != _email else {
-            return
+        if email != _email {
+            logoutPreviousUser()
+            
+            _email = email
+            _userId = nil
+            authToken = token
+            
+            storeAuthData()
+            
+            loginNewUser()
+        } else if token != authToken {
+            authToken = token
+            
+            storeAuthData()
         }
-        
-        logoutPreviousUser()
-        
-        _email = email
-        _userId = nil
-        authToken = token
-        
-        storeAuthData()
-        
-        loginNewUser()
     }
 
     func setUserId(_ userId: String?, withToken token: String? = nil) {
-        guard userId != _userId else {
-            return
+        if userId != _userId {
+            logoutPreviousUser()
+            
+            _email = nil
+            _userId = userId
+            authToken = token
+            
+            storeAuthData()
+            
+            loginNewUser()
+        } else if token != authToken {
+            authToken = token
+            
+            storeAuthData()
         }
-        
-        logoutPreviousUser()
-        
-        _userId = userId
-        _email = nil
-        authToken = token
-        
-        storeAuthData()
-        
-        loginNewUser()
     }
 
     func logoutUser() {

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

@@ -83,7 +83,7 @@ class AuthTests: XCTestCase {
         XCTAssertNil(internalAPI.auth.authToken)
     }
 
-    func testEmailWithTokenChange() {
+    func testNewEmailWithTokenChange() {
         let internalAPI = IterableAPIInternal.initializeForTesting()
 
         let originalEmail = "[email protected]"
@@ -105,6 +105,28 @@ class AuthTests: XCTestCase {
         XCTAssertEqual(internalAPI.auth.authToken, newToken)
     }
 
+    func testNewUserIdWithTokenChange() {
+        let internalAPI = IterableAPIInternal.initializeForTesting()
+        
+        let originalUserId = "firstUserId"
+        let originalToken = "nen"
+        
+        let newUserId = "secondUserId"
+        let newToken = "greedIsland"
+        
+        internalAPI.setUserId(originalUserId, withToken: originalToken)
+        
+        XCTAssertNil(internalAPI.email)
+        XCTAssertEqual(internalAPI.userId, originalUserId)
+        XCTAssertEqual(internalAPI.auth.authToken, originalToken)
+        
+        internalAPI.setUserId(newUserId, withToken: newToken)
+        
+        XCTAssertNil(internalAPI.email)
+        XCTAssertEqual(internalAPI.userId, newUserId)
+        XCTAssertEqual(internalAPI.auth.authToken, newToken)
+    }
+    
     func testUpdateEmailWithToken() {
         let condition1 = expectation(description: "update email with auth token")
 
@@ -151,4 +173,36 @@ class AuthTests: XCTestCase {
         XCTAssertNil(internalAPI.userId)
         XCTAssertNil(internalAPI.auth.authToken)
     }
+    
+    func testAuthTokenChangeWithSameEmail() {
+        let internalAPI = IterableAPIInternal.initializeForTesting()
+        
+        internalAPI.setEmail(AuthTests.email, withToken: AuthTests.authToken)
+        
+        XCTAssertEqual(internalAPI.email, AuthTests.email)
+        XCTAssertEqual(internalAPI.auth.authToken, AuthTests.authToken)
+        
+        let newAuthToken = AuthTests.authToken + "3984ru398gj893"
+        
+        internalAPI.setEmail(AuthTests.email, withToken: newAuthToken)
+        
+        XCTAssertEqual(internalAPI.email, AuthTests.email)
+        XCTAssertEqual(internalAPI.auth.authToken, newAuthToken)
+    }
+    
+    func testAuthTokenChangeWithSameUserId() {
+        let internalAPI = IterableAPIInternal.initializeForTesting()
+        
+        internalAPI.setUserId(AuthTests.userId, withToken: AuthTests.authToken)
+        
+        XCTAssertEqual(internalAPI.userId, AuthTests.userId)
+        XCTAssertEqual(internalAPI.auth.authToken, AuthTests.authToken)
+        
+        let newAuthToken = AuthTests.authToken + "3984ru398gj893"
+        
+        internalAPI.setUserId(AuthTests.userId, withToken: newAuthToken)
+        
+        XCTAssertEqual(internalAPI.userId, AuthTests.userId)
+        XCTAssertEqual(internalAPI.auth.authToken, newAuthToken)
+    }
 }