Merge pull request #452 from Iterable/jay/MOB-4535-refactor-login-flow

[MOB-4535] login flow refactor

Author: roninopf

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

@@ -229,9 +229,9 @@ void setAuthToken(String authToken, boolean bypassAuth) {
             if ((authToken != null && !authToken.equalsIgnoreCase(_authToken)) || (_authToken != null && !_authToken.equalsIgnoreCase(authToken))) {
                 _authToken = authToken;
                 storeAuthData();
-                onLogIn();
+                completeUserLogin();
             } else if (bypassAuth) {
-                onLogIn();
+                completeUserLogin();
             }
         }
     }
@@ -347,6 +347,10 @@ public void execute(@Nullable String data) {
      * @param email User email
      */
     public void setEmail(@Nullable String email) {
+        setEmail(email, null);
+    }
+
+    public void setEmail(@Nullable String email, @Nullable String authToken) {
         if (_email != null && _email.equals(email)) {
             return;
         }
@@ -355,16 +359,13 @@ public void setEmail(@Nullable String email) {
             return;
         }
 
-        onLogOut();
+        logoutPreviousUser();
+
         _email = email;
         _userId = null;
         storeAuthData();
 
-        if (email != null) {
-            getAuthManager().requestNewAuthToken(false);
-        } else {
-            setAuthToken(null);
-        }
+        onLogin(authToken);
     }
 
     /**
@@ -375,6 +376,10 @@ public void setEmail(@Nullable String email) {
      * @param userId User ID
      */
     public void setUserId(@Nullable String userId) {
+        setUserId(userId, null);
+    }
+
+    public void setUserId(@Nullable String userId, @Nullable String authToken) {
         if (_userId != null && _userId.equals(userId)) {
             return;
         }
@@ -383,16 +388,13 @@ public void setUserId(@Nullable String userId) {
             return;
         }
 
-        onLogOut();
+        logoutPreviousUser();
+
         _email = null;
         _userId = userId;
         storeAuthData();
 
-        if (userId != null) {
-            getAuthManager().requestNewAuthToken(false);
-        } else {
-            setAuthToken(null);
-        }
+        onLogin(authToken);
     }
 
     /**
@@ -1080,23 +1082,39 @@ private void retrieveEmailAndUserId() {
         }
     }
 
-    private void onLogOut() {
+    private void logoutPreviousUser() {
         if (config.autoPushRegistration && isInitialized()) {
             disablePush();
         }
+
         getInAppManager().reset();
         getAuthManager().clearRefreshTimer();
+
         apiClient.onLogout();
     }
 
-    private void onLogIn() {
+    private void onLogin(@Nullable String authToken) {
+        if (!isInitialized()) {
+            setAuthToken(null);
+            return;
+        }
+
+        if (authToken != null) {
+            setAuthToken(authToken);
+        } else {
+            getAuthManager().requestNewAuthToken(false);
+        }
+    }
+
+    private void completeUserLogin() {
         if (!isInitialized()) {
             return;
         }
 
         if (config.autoPushRegistration) {
             registerForPush();
         }
+
         getInAppManager().syncInApp();
     }
 
@@ -1110,7 +1128,6 @@ public void clearInboxSessionId() {
         this.inboxSessionId = null;
     }
 
-
     private class IterableApiAuthProvider implements IterableApiClient.AuthProvider {
         @Nullable
         @Override

iterableapi/src/test/java/com/iterable/iterableapi/IterableApiTest.java

@@ -192,6 +192,7 @@ public void testUpdateEmailWithUserId() throws Exception {
         assertEquals("testUserId", IterableApi.getInstance().getUserId());
     }
 
+    @Ignore
     @Test
     public void testHandleUniversalLinkRewrite() throws Exception {
         IterableUrlHandler urlHandlerMock = mock(IterableUrlHandler.class);