Merge pull request #463 from Iterable/MOB-4641-Add-Success-and-failure-jwt-callbacks

[MOB-4641] - Add success and failure callback to AuthHandler

Author: Ayyanchira

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

@@ -220,7 +220,7 @@ void setNotificationData(IterableNotificationData data) {
         }
     }
 
-    void setAuthToken(String authToken) {
+    public void setAuthToken(String authToken) {
         setAuthToken(authToken, false);
     }
 
@@ -351,7 +351,9 @@ public void setEmail(@Nullable String email) {
     }
 
     public void setEmail(@Nullable String email, @Nullable String authToken) {
+        //Only if passed in same non-null email
         if (_email != null && _email.equals(email)) {
+            checkAndUpdateAuthToken(authToken);
             return;
         }
 
@@ -380,7 +382,9 @@ public void setUserId(@Nullable String userId) {
     }
 
     public void setUserId(@Nullable String userId, @Nullable String authToken) {
+        //If same non null userId is passed
         if (_userId != null && _userId.equals(userId)) {
+            checkAndUpdateAuthToken(authToken);
             return;
         }
 
@@ -397,6 +401,13 @@ public void setUserId(@Nullable String userId, @Nullable String authToken) {
         onLogin(authToken);
     }
 
+    private void checkAndUpdateAuthToken(@Nullable String authToken) {
+        // If authHandler exists and if authToken is new, it will be considered as a call to update the authToken.
+        if (config.authHandler != null && authToken != null && authToken != _authToken) {
+            setAuthToken(authToken);
+        }
+    }
+
     /**
      * Tracks a click on the uri if it is an iterable link.
      * @param uri the

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

@@ -2,4 +2,6 @@
 
 public interface IterableAuthHandler {
     String onAuthTokenRequested();
+    void onTokenRegistrationSuccessful(String authToken);
+    void onTokenRegistrationFailed(Throwable object);
 }

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

@@ -2,7 +2,6 @@
 
 import android.util.Base64;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.iterable.iterableapi.util.Future;
@@ -35,44 +34,37 @@ 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();
-
-                                    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();
-                                }
-                            });
+                        @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();
+                            authHandler.onTokenRegistrationSuccessful(authToken);
+                        }
+                    })
+                    .onFailure(new Future.FailureCallback() {
+                        @Override
+                        public void onFailure(Throwable throwable) {
+                            IterableLogger.e(TAG, "Error while requesting Auth Token", throwable);
+                            authHandler.onTokenRegistrationFailed(throwable);
+                            pendingAuth = false;
+                            reSyncAuth();
+                        }
+                    });
                 }
             } else if (!hasFailedPriorAuth) {
                 //setFlag to resync auth after current auth returns