Merge pull request #447 from Iterable/jay/MOB-4439-update-email

[MOB-4439] add update email with auth token

Author: roninopf

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

@@ -560,7 +560,15 @@ public void trackPurchase(double total, @NonNull List<CommerceItem> items, @Null
      * @param newEmail New email
      */
     public void updateEmail(final @NonNull String newEmail) {
-        updateEmail(newEmail, null, null);
+        updateEmail(newEmail, null, null, null);
+    }
+
+    public void updateEmail(final @NonNull String newEmail, final @NonNull String authToken) {
+        updateEmail(newEmail, authToken, null, null);
+    }
+
+    public void updateEmail(final @NonNull String newEmail, final @Nullable IterableHelper.SuccessHandler successHandler, @Nullable IterableHelper.FailureHandler failureHandler) {
+        updateEmail(newEmail, null, successHandler, failureHandler);
     }
 
     /**
@@ -570,14 +578,15 @@ public void updateEmail(final @NonNull String newEmail) {
      * @param successHandler Success handler. Called when the server returns a success code.
      * @param failureHandler Failure handler. Called when the server call failed.
      */
-    public void updateEmail(final @NonNull String newEmail, final @Nullable IterableHelper.SuccessHandler successHandler, @Nullable IterableHelper.FailureHandler failureHandler) {
+    public void updateEmail(final @NonNull String newEmail, final @Nullable String authToken, final @Nullable IterableHelper.SuccessHandler successHandler, @Nullable IterableHelper.FailureHandler failureHandler) {
        if (!checkSDKInitialization()) {
             IterableLogger.e(TAG, "The Iterable SDK must be initialized with email or userId before " +
                     "calling updateEmail");
             if (failureHandler != null) {
                 failureHandler.onFailure("The Iterable SDK must be initialized with email or " +
                         "userId before calling updateEmail", null);
             }
+
             return;
         }
 
@@ -586,13 +595,14 @@ public void updateEmail(final @NonNull String newEmail, final @Nullable Iterable
             public void onSuccess(@NonNull JSONObject data) {
                 if (_email != null) {
                     _email = newEmail;
+                    _authToken = authToken;
                 }
 
                 storeAuthData();
                 getAuthManager().requestNewAuthToken(false);
+
                 if (successHandler != null) {
                     successHandler.onSuccess(data);
-
                 }
             }
         }, failureHandler);

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

@@ -2,6 +2,7 @@
 
 import android.util.Base64;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.iterable.iterableapi.util.Future;
@@ -34,35 +35,44 @@ public class IterableAuthManager {
     }
 
     public synchronized void requestNewAuthToken(boolean hasFailedPriorAuth) {
+        requestNewAuthToken(hasFailedPriorAuth, null);
+    }
+
+    public synchronized void requestNewAuthToken(boolean hasFailedPriorAuth, @Nullable final IterableHelper.SuccessAuthHandler onSuccess) {
         if (authHandler != null) {
             if (!pendingAuth) {
                 if (!(this.hasFailedPriorAuth && hasFailedPriorAuth)) {
                     this.hasFailedPriorAuth = hasFailedPriorAuth;
                     pendingAuth = true;
                     Future.runAsync(new Callable<String>() {
-                        @Override
-                        public String call() throws Exception {
-                            return authHandler.onAuthTokenRequested();
-                        }
-                    }).onSuccess(new Future.SuccessCallback<String>() {
-                        @Override
-                        public void onSuccess(String authToken) {
-                            if (authToken != null) {
-                                queueExpirationRefresh(authToken);
-                            }
-                            IterableApi.getInstance().setAuthToken(authToken);
-                            pendingAuth = false;
-                            reSyncAuth();
-                        }
-                    })
-                    .onFailure(new Future.FailureCallback() {
-                        @Override
-                        public void onFailure(Throwable throwable) {
-                            IterableLogger.e(TAG, "Error while requesting Auth Token", throwable);
-                            pendingAuth = false;
-                            reSyncAuth();
-                        }
-                    });
+                                @Override
+                                public String call() throws Exception {
+                                    return authHandler.onAuthTokenRequested();
+                                }
+                            }).onSuccess(new Future.SuccessCallback<String>() {
+                                @Override
+                                public void onSuccess(String authToken) {
+                                    if (authToken != null) {
+                                        queueExpirationRefresh(authToken);
+                                    }
+
+                                    IterableApi.getInstance().setAuthToken(authToken);
+                                    pendingAuth = false;
+                                    reSyncAuth();
+
+                                    if (onSuccess != null) {
+                                        onSuccess(authToken);
+                                    }
+                                }
+                            })
+                            .onFailure(new Future.FailureCallback() {
+                                @Override
+                                public void onFailure(Throwable throwable) {
+                                    IterableLogger.e(TAG, "Error while requesting Auth Token", throwable);
+                                    pendingAuth = false;
+                                    reSyncAuth();
+                                }
+                            });
                 }
             } else if (!hasFailedPriorAuth) {
                 //setFlag to resync auth after current auth returns