From 8b95b5cc0577d2708445562dad5c6e0ae3c22b0d Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Wed, 3 Apr 2024 19:04:38 +0530
Subject: [PATCH 01/27] JWT improvements

1. Provide a method to stop JWT retries (regardless of retry policy)
2. Make it possible to specify a retry policy (on IterableConfig)
---
 app/build.gradle                              |   2 +-
 .../androidsdk/IterableJWTGenerator.java      | 111 ++++++++++++++++++
 .../com/iterable/androidsdk/MainActivity.java |  73 +++++++++++-
 app/src/main/res/layout/content_main.xml      |  41 ++++++-
 .../com/iterable/iterableapi/IterableApi.java |   7 +-
 .../iterableapi/IterableAuthManager.java      |  48 ++++++--
 .../iterable/iterableapi/IterableConfig.java  |  51 ++++++++
 .../iterableapi/IterableConstants.java        |   2 +
 .../iterableapi/IterableRequestTask.java      |   5 +-
 .../com/iterable/iterableapi/RetryPolicy.java |   6 +
 10 files changed, 329 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/java/com/iterable/androidsdk/IterableJWTGenerator.java
 create mode 100644 iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java

diff --git a/app/build.gradle b/app/build.gradle
index 8fe296c7e..b002f2493 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
     testNamespace 'iterable.com.iterableapi'
 
     defaultConfig {
-        applicationId "com.iterable.iterableapi.testapp"
+        applicationId "com.iterable.androidsdk"
         minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
diff --git a/app/src/main/java/com/iterable/androidsdk/IterableJWTGenerator.java b/app/src/main/java/com/iterable/androidsdk/IterableJWTGenerator.java
new file mode 100644
index 000000000..0ef9ed5fd
--- /dev/null
+++ b/app/src/main/java/com/iterable/androidsdk/IterableJWTGenerator.java
@@ -0,0 +1,111 @@
+package com.iterable.androidsdk;
+
+import android.os.Build;
+
+import androidx.annotation.RequiresApi;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Base64;
+import java.util.Base64.Encoder;
+
+/**
+ * Utility class to generate JWTs for use with the Iterable API
+ *
+ * @author engineering@iterable.com
+ */
+@RequiresApi(api = Build.VERSION_CODES.O)
+public class IterableJWTGenerator {
+    static Encoder encoder = Base64.getUrlEncoder().withoutPadding();
+
+    private static final String algorithm = "HmacSHA256";
+
+    // Iterable enforces a 1-year maximum token lifetime
+    private static final Duration maxTokenLifetime = Duration.ofDays(365);
+
+    private static long millisToSeconds(long millis) {
+        return millis / 1000;
+    }
+
+    private static final String encodedHeader = encoder.encodeToString(
+            "{\"alg\":\"HS256\",\"typ\":\"JWT\"}".getBytes(StandardCharsets.UTF_8)
+    );
+
+    /**
+     * Generates a JWT from the provided secret, header, and payload. Does not
+     * validate the header or payload.
+     *
+     * @param secret  Your organization's shared secret with Iterable
+     * @param payload The JSON payload
+     *
+     * @return a signed JWT
+     */
+    public static String generateToken(String secret, String payload) {
+        try {
+            String encodedPayload = encoder.encodeToString(
+                    payload.getBytes(StandardCharsets.UTF_8)
+            );
+            String encodedHeaderAndPayload = encodedHeader + "." + encodedPayload;
+
+            // HMAC setup
+            Mac hmac = Mac.getInstance(algorithm);
+            SecretKeySpec keySpec = new SecretKeySpec(
+                    secret.getBytes(StandardCharsets.UTF_8), algorithm
+            );
+            hmac.init(keySpec);
+
+            String signature = encoder.encodeToString(
+                    hmac.doFinal(
+                            encodedHeaderAndPayload.getBytes(StandardCharsets.UTF_8)
+                    )
+            );
+
+            return encodedHeaderAndPayload + "." + signature;
+
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
+    /**
+     * Generates a JWT (issued now, expires after the provided duration).
+     *
+     * @param secret   Your organization's shared secret with Iterable.
+     * @param duration The token's expiration time. Up to one year.
+     * @param email    The email to included in the token, or null.
+     * @param userId   The userId to include in the token, or null.
+     *
+     * @return A JWT string
+     */
+    public static String generateToken(
+            String secret, Duration duration, String email, String userId) {
+
+        if (duration.compareTo(maxTokenLifetime) > 0)
+            /*throw new IllegalArgumentException(
+                    "Duration must be one year or less."
+            );*/
+
+        if ((userId != null && email != null) || (userId == null && email == null))
+            throw new IllegalArgumentException(
+                    "The token must include a userId or email, but not both."
+            );
+
+        long now = millisToSeconds(System.currentTimeMillis());
+
+        String payload;
+        if (userId != null)
+            payload = String.format(
+                    "{ \"userId\": \"%s\", \"iat\": %d, \"exp\": %d }",
+                    userId, now, now + millisToSeconds(duration.toMillis())
+            );
+        else
+            payload = String.format(
+                    "{ \"email\": \"%s\", \"iat\": %d, \"exp\": %d }",
+                    email, now, now + millisToSeconds(duration.toMillis())
+            );
+
+        return generateToken(secret, payload);
+    }
+}
diff --git a/app/src/main/java/com/iterable/androidsdk/MainActivity.java b/app/src/main/java/com/iterable/androidsdk/MainActivity.java
index c5f0725b8..cc0130778 100644
--- a/app/src/main/java/com/iterable/androidsdk/MainActivity.java
+++ b/app/src/main/java/com/iterable/androidsdk/MainActivity.java
@@ -1,17 +1,47 @@
 package com.iterable.androidsdk;
 
+import android.os.Build;
 import android.os.Bundle;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
+
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+
+import android.util.Log;
 import android.view.View;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.iterable.iterableapi.IterableApi;
+import com.iterable.iterableapi.IterableAuthHandler;
+import com.iterable.iterableapi.IterableConfig;
+import com.iterable.iterableapi.RetryPolicy;
 import com.iterable.iterableapi.testapp.R;
 
-public class MainActivity extends AppCompatActivity {
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.time.Duration;
+import java.util.Objects;
+
+@RequiresApi(api = Build.VERSION_CODES.O)
+public class MainActivity extends AppCompatActivity implements IterableAuthHandler {
+
+    private static final String secret = "34992609011249b410db9e1a568db9b65063c73e618bdb0229a674aeed7db7fba1bdc06e9b42d021120b9c88f795a734c18ab88ff7b6ecbccc50a945899d3666";
+    private static final String email = "harrymash2006@gmail.com";
+    private static final String userId = "harrymash2006";
+    private static final String apiKey = "4236278428294f04be8443007d3daf89";
+    private static final Duration days7 = Duration.ofDays(7);
+    private static final Duration days366 = Duration.ofDays(366);
+    private static final int issuedAt = 1516239022;
+    private static final int expiration = 1516239023;
+    private static final String payload = String.format(
+            "{ \"email\": \"%s\", \"iat\": %d, \"exp\": %d }",
+            email, issuedAt, expiration
+    );
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -28,6 +58,30 @@ public void onClick(View view) {
                         .setAction("Action", null).show();
             }
         });
+        IterableConfig config = new IterableConfig.Builder()
+                .setAuthHandler(this)
+                .setMaxRetries(4)
+                .setRetryBackoff(RetryPolicy.LINEAR)
+                .setRetryInterval(2L)
+                .build();
+
+        IterableApi.initialize(this, apiKey, config);
+
+        findViewById(R.id.btn_set_user).setOnClickListener(v -> IterableApi.getInstance().setUserId("hani7"));
+
+        findViewById(R.id.btn_update_user).setOnClickListener(v -> {
+            try {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("firstName", "Hani");
+                IterableApi.getInstance().updateUser(jsonObject);
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        findViewById(R.id.btn_logout).setOnClickListener(view -> IterableApi.getInstance().setUserId(null));
+        findViewById(R.id.btn_pauseAuthRetry).setOnClickListener(view -> IterableApi.getInstance().pauseAuthRetries(true));
+        findViewById(R.id.btn_resumeAuthRetry).setOnClickListener(view -> IterableApi.getInstance().pauseAuthRetries(false));
     }
 
     @Override
@@ -51,4 +105,21 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public String onAuthTokenRequested() {
+        String token = IterableJWTGenerator.generateToken(secret, days366, null, "hani7");
+        Log.i("jwt token::", token);
+        return token;
+    }
+
+    @Override
+    public void onTokenRegistrationSuccessful(String authToken) {
+        Log.i("success:", "token registration successful.");
+    }
+
+    @Override
+    public void onTokenRegistrationFailed(Throwable object) {
+        Log.e("failed:", Objects.requireNonNull(object.getMessage()));
+    }
 }
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 5646874e1..4f6cb30fd 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -10,10 +10,45 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context="com.iterable.androidsdk.MainActivity"
-    tools:showIn="@layout/activity_main">
+    tools:showIn="@layout/activity_main"
+    android:gravity="center"
+    android:orientation="vertical">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!" />
-</RelativeLayout>
+
+    <Button
+        android:id="@+id/btn_set_user"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="set user id" />
+
+    <Button
+        android:id="@+id/btn_update_user"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="set user name" />
+
+    <Button
+        android:visibility="visible"
+        android:id="@+id/btn_logout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Logout"/>
+
+    <Button
+        android:visibility="visible"
+        android:id="@+id/btn_pauseAuthRetry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Pause AuthRetry"/>
+
+    <Button
+        android:visibility="visible"
+        android:id="@+id/btn_resumeAuthRetry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Resume AuthRetry"/>
+</LinearLayout>
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
index 84ce93fb1..dd07e3c05 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
@@ -355,6 +355,7 @@ private void onLogin(@Nullable String authToken) {
             return;
         }
 
+        pauseAuthRetries(false);
         if (authToken != null) {
             setAuthToken(authToken);
         } else {
@@ -457,7 +458,7 @@ private void retrieveEmailAndUserId() {
                 getAuthManager().queueExpirationRefresh(_authToken);
             } else {
                 IterableLogger.d(TAG, "Auth token found as null. Scheduling token refresh in 10 seconds...");
-                getAuthManager().scheduleAuthTokenRefresh(10000);
+                getAuthManager().scheduleAuthTokenRefresh(authManager.getNextRetryInterval(), true, null);
             }
         }
     }
@@ -696,7 +697,9 @@ public IterableAttributionInfo getAttributionInfo() {
                 IterableUtil.retrieveExpirableJsonObject(getPreferences(), IterableConstants.SHARED_PREFS_ATTRIBUTION_INFO_KEY)
         );
     }
-
+    public void pauseAuthRetries(boolean pauseRetry) {
+        getAuthManager().pauseAuthRetries(pauseRetry);
+    }
     public void setEmail(@Nullable String email) {
         setEmail(email, null, null, null);
     }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 562e86bd7..5fcf1fe69 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -1,7 +1,6 @@
 package com.iterable.iterableapi;
 
 import android.util.Base64;
-
 import androidx.annotation.VisibleForTesting;
 
 import org.json.JSONException;
@@ -20,12 +19,13 @@ public class IterableAuthManager {
     private final IterableApi api;
     private final IterableAuthHandler authHandler;
     private final long expiringAuthTokenRefreshPeriod;
-    private final long scheduledRefreshPeriod = 10000;
     @VisibleForTesting
     Timer timer;
     private boolean hasFailedPriorAuth;
     private boolean pendingAuth;
     private boolean requiresAuthRefresh;
+    private boolean pauseAuthRetry;
+    private int retryCount;
 
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
 
@@ -36,7 +36,19 @@ public class IterableAuthManager {
     }
 
     public synchronized void requestNewAuthToken(boolean hasFailedPriorAuth) {
-        requestNewAuthToken(hasFailedPriorAuth, null);
+        requestNewAuthToken(hasFailedPriorAuth, null, false);
+    }
+
+    public void pauseAuthRetries(boolean pauseRetry) {
+        pauseAuthRetry = pauseRetry;
+        if (!pauseAuthRetry) {
+            resetRetryCount();
+        }
+    }
+
+    void resetRetryCount() {
+        if (retryCount > 0) retryCount = -1;
+        else retryCount = 0;
     }
 
     private void handleSuccessForAuthToken(String authToken, IterableHelper.SuccessHandler successCallback) {
@@ -51,7 +63,12 @@ private void handleSuccessForAuthToken(String authToken, IterableHelper.SuccessH
 
     public synchronized void requestNewAuthToken(
             boolean hasFailedPriorAuth,
-            final IterableHelper.SuccessHandler successCallback) {
+            final IterableHelper.SuccessHandler successCallback,
+            boolean shouldRefreshOnFailure) {
+        if ((shouldRefreshOnFailure && pauseAuthRetry) || (retryCount >= api.config.maxRetry && shouldRefreshOnFailure)) {
+            return;
+        }
+
         if (authHandler != null) {
             if (!pendingAuth) {
                 if (!(this.hasFailedPriorAuth && hasFailedPriorAuth)) {
@@ -63,6 +80,7 @@ public synchronized void requestNewAuthToken(
                         public void run() {
                             try {
                                 final String authToken = authHandler.onAuthTokenRequested();
+                                retryCount++;
                                 handleAuthTokenSuccess(authToken, successCallback);
                             } catch (final Exception e) {
                                 handleAuthTokenFailure(e);
@@ -89,7 +107,7 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
         } else {
             IterableLogger.w(TAG, "Auth token received as null. Calling the handler in 10 seconds");
             //TODO: Make this time configurable and in sync with SDK initialization flow for auth null scenario
-            scheduleAuthTokenRefresh(scheduledRefreshPeriod);
+            scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
             authHandler.onTokenRegistrationFailed(new Throwable("Auth token null"));
             return;
         }
@@ -112,7 +130,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             long expirationTimeSeconds = decodedExpiration(encodedJWT);
             long triggerExpirationRefreshTime = expirationTimeSeconds * 1000L - expiringAuthTokenRefreshPeriod - IterableUtil.currentTimeMillis();
             if (triggerExpirationRefreshTime > 0) {
-                scheduleAuthTokenRefresh(triggerExpirationRefreshTime);
+                scheduleAuthTokenRefresh(triggerExpirationRefreshTime, false, null);
             } else {
                 IterableLogger.w(TAG, "The expiringAuthTokenRefreshPeriod has already passed for the current JWT");
             }
@@ -120,7 +138,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             IterableLogger.e(TAG, "Error while parsing JWT for the expiration", e);
             authHandler.onTokenRegistrationFailed(new Throwable("Auth token decode failure. Scheduling auth token refresh in 10 seconds..."));
             //TODO: Sync with configured time duration once feature is available.
-            scheduleAuthTokenRefresh(scheduledRefreshPeriod);
+            scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
         }
     }
 
@@ -135,14 +153,26 @@ void reSyncAuth() {
         }
     }
 
-    void scheduleAuthTokenRefresh(long timeDuration) {
+    long getNextRetryInterval() {
+        long nextRetryInterval = api.config.retryInterval;
+        if (api.config.retryBackoff == RetryPolicy.EXPONENTIAL) {
+            nextRetryInterval *= Math.pow(IterableConstants.EXPONENTIAL_FACTOR, retryCount-1); // Exponential backoff
+        }
+        return nextRetryInterval;
+    }
+
+    void scheduleAuthTokenRefresh(long timeDuration, boolean shouldRetryJWTRefresh, final IterableHelper.SuccessHandler successCallback) {
+        if (pauseAuthRetry && shouldRetryJWTRefresh) {
+            // we only stop schedule token refresh it is called from retry (in case of failure). The normal auth token refresh schedule would work
+            return;
+        }
         timer = new Timer(true);
         try {
             timer.schedule(new TimerTask() {
                 @Override
                 public void run() {
                     if (api.getEmail() != null || api.getUserId() != null) {
-                        api.getAuthManager().requestNewAuthToken(false);
+                        api.getAuthManager().requestNewAuthToken(false, successCallback, shouldRetryJWTRefresh);
                     } else {
                         IterableLogger.w(TAG, "Email or userId is not available. Skipping token refresh");
                     }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
index 14f370c45..98ba4ff4d 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
@@ -65,6 +65,21 @@ public class IterableConfig {
      */
     final long expiringAuthTokenRefreshPeriod;
 
+    /**
+     * Number of consecutive JWT refresh retries the SDK should attempt before disabling JWT refresh attempts altogether.
+     */
+    final int maxRetry;
+
+    /**
+     * Configurable duration between JWT refresh retries. Starting point for the retry backoff.
+     */
+    final long retryInterval;
+
+    /**
+     * Linear or Exponential. Determines the backoff pattern to apply between retry attempts.
+     */
+    final RetryPolicy retryBackoff;
+
     /**
      * By default, the SDK allows navigation/calls to URLs with the `https` protocol (e.g. deep links or external links)
      * If you'd like to allow other protocols like `http`, `tel`, etc., add them to the `allowedProtocols` array
@@ -100,6 +115,9 @@ private IterableConfig(Builder builder) {
         inAppDisplayInterval = builder.inAppDisplayInterval;
         authHandler = builder.authHandler;
         expiringAuthTokenRefreshPeriod = builder.expiringAuthTokenRefreshPeriod;
+        maxRetry = builder.maxRetry;
+        retryInterval = builder.retryInterval;
+        retryBackoff = builder.retryBackoff;
         allowedProtocols = builder.allowedProtocols;
         dataRegion = builder.dataRegion;
         useInMemoryStorageForInApps = builder.useInMemoryStorageForInApps;
@@ -118,6 +136,9 @@ public static class Builder {
         private double inAppDisplayInterval = 30.0;
         private IterableAuthHandler authHandler;
         private long expiringAuthTokenRefreshPeriod = 60000L;
+        private int maxRetry = 10;
+        private long retryInterval = 1000L;
+        private RetryPolicy retryBackoff = RetryPolicy.LINEAR;
         private String[] allowedProtocols = new String[0];
         private IterableDataRegion dataRegion = IterableDataRegion.US;
         private boolean useInMemoryStorageForInApps = false;
@@ -224,6 +245,36 @@ public Builder setAuthHandler(@NonNull IterableAuthHandler authHandler) {
             return this;
         }
 
+        /**
+         * Set max retries before it disables JWT refresh attempts altogether
+         * @param retryTimes
+         */
+        @NonNull
+        public Builder setMaxRetries(@NonNull int retryTimes) {
+            this.maxRetry = retryTimes;
+            return this;
+        }
+
+        /**
+         * Set a custom period to automatically retrieve a new token on JWT Refresh in case of failure
+         * @param period in seconds
+         */
+        @NonNull
+        public Builder setRetryInterval(@NonNull Long period) {
+            this.retryInterval = period * 1000L;
+            return this;
+        }
+
+        /**
+         * Set a custom period to automatically retrieve a new token on JWT Refresh in case of failure
+         * @param type either Linear or Exponential
+         */
+        @NonNull
+        public Builder setRetryBackoff(@NonNull RetryPolicy type) {
+            this.retryBackoff = type;
+            return this;
+        }
+
         /**
          * Set a custom period before an auth token expires to automatically retrieve a new token
          * @param period in seconds
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
index f61b03315..43e4bd70f 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
@@ -260,6 +260,8 @@ public final class IterableConstants {
     public static final int ITERABLE_IN_APP_ANIMATION_DURATION           = 500;
     public static final int ITERABLE_IN_APP_BACKGROUND_ANIMATION_DURATION = 300;
 
+    public static final int EXPONENTIAL_FACTOR                              = 2;
+
     public static final double ITERABLE_IN_APP_PRIORITY_LEVEL_LOW           = 400.0;
     public static final double ITERABLE_IN_APP_PRIORITY_LEVEL_MEDIUM        = 300.0;
     public static final double ITERABLE_IN_APP_PRIORITY_LEVEL_HIGH          = 200.0;
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index f011ba273..8f03d9bec 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -330,6 +330,8 @@ public void run() {
 
     private void handleSuccessResponse(IterableApiResponse response) {
         IterableApi.getInstance().getAuthManager().resetFailedAuth();
+        IterableApi.getInstance().getAuthManager().pauseAuthRetries(false);
+
         if (iterableApiRequest.successCallback != null) {
             iterableApiRequest.successCallback.onSuccess(response.responseJson);
         }
@@ -346,7 +348,8 @@ private void handleErrorResponse(IterableApiResponse response) {
     }
 
     private void requestNewAuthTokenAndRetry(IterableApiResponse response) {
-        IterableApi.getInstance().getAuthManager().requestNewAuthToken(false, data -> {
+        long retryInterval = IterableApi.getInstance().getAuthManager().getNextRetryInterval();
+        IterableApi.getInstance().getAuthManager().scheduleAuthTokenRefresh(retryInterval, true, data -> {
             try {
                 String newAuthToken = data.getString("newAuthToken");
                 retryRequestWithNewAuthToken(newAuthToken);
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java b/iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java
new file mode 100644
index 000000000..9c61c553c
--- /dev/null
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java
@@ -0,0 +1,6 @@
+package com.iterable.iterableapi;
+
+public enum RetryPolicy {
+    LINEAR,
+    EXPONENTIAL
+}

From 01d9fd1f1f4e3be7e103687c913891da416c1a54 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Wed, 3 Apr 2024 20:07:57 +0530
Subject: [PATCH 02/27] removed sample app changes

---
 .../androidsdk/IterableJWTGenerator.java      | 111 ------------------
 .../com/iterable/androidsdk/MainActivity.java |  75 +-----------
 app/src/main/res/layout/content_main.xml      |  41 +------
 3 files changed, 5 insertions(+), 222 deletions(-)
 delete mode 100644 app/src/main/java/com/iterable/androidsdk/IterableJWTGenerator.java

diff --git a/app/src/main/java/com/iterable/androidsdk/IterableJWTGenerator.java b/app/src/main/java/com/iterable/androidsdk/IterableJWTGenerator.java
deleted file mode 100644
index 0ef9ed5fd..000000000
--- a/app/src/main/java/com/iterable/androidsdk/IterableJWTGenerator.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.iterable.androidsdk;
-
-import android.os.Build;
-
-import androidx.annotation.RequiresApi;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.Base64;
-import java.util.Base64.Encoder;
-
-/**
- * Utility class to generate JWTs for use with the Iterable API
- *
- * @author engineering@iterable.com
- */
-@RequiresApi(api = Build.VERSION_CODES.O)
-public class IterableJWTGenerator {
-    static Encoder encoder = Base64.getUrlEncoder().withoutPadding();
-
-    private static final String algorithm = "HmacSHA256";
-
-    // Iterable enforces a 1-year maximum token lifetime
-    private static final Duration maxTokenLifetime = Duration.ofDays(365);
-
-    private static long millisToSeconds(long millis) {
-        return millis / 1000;
-    }
-
-    private static final String encodedHeader = encoder.encodeToString(
-            "{\"alg\":\"HS256\",\"typ\":\"JWT\"}".getBytes(StandardCharsets.UTF_8)
-    );
-
-    /**
-     * Generates a JWT from the provided secret, header, and payload. Does not
-     * validate the header or payload.
-     *
-     * @param secret  Your organization's shared secret with Iterable
-     * @param payload The JSON payload
-     *
-     * @return a signed JWT
-     */
-    public static String generateToken(String secret, String payload) {
-        try {
-            String encodedPayload = encoder.encodeToString(
-                    payload.getBytes(StandardCharsets.UTF_8)
-            );
-            String encodedHeaderAndPayload = encodedHeader + "." + encodedPayload;
-
-            // HMAC setup
-            Mac hmac = Mac.getInstance(algorithm);
-            SecretKeySpec keySpec = new SecretKeySpec(
-                    secret.getBytes(StandardCharsets.UTF_8), algorithm
-            );
-            hmac.init(keySpec);
-
-            String signature = encoder.encodeToString(
-                    hmac.doFinal(
-                            encodedHeaderAndPayload.getBytes(StandardCharsets.UTF_8)
-                    )
-            );
-
-            return encodedHeaderAndPayload + "." + signature;
-
-        } catch (Exception e) {
-            throw new RuntimeException(e.getMessage());
-        }
-    }
-
-    /**
-     * Generates a JWT (issued now, expires after the provided duration).
-     *
-     * @param secret   Your organization's shared secret with Iterable.
-     * @param duration The token's expiration time. Up to one year.
-     * @param email    The email to included in the token, or null.
-     * @param userId   The userId to include in the token, or null.
-     *
-     * @return A JWT string
-     */
-    public static String generateToken(
-            String secret, Duration duration, String email, String userId) {
-
-        if (duration.compareTo(maxTokenLifetime) > 0)
-            /*throw new IllegalArgumentException(
-                    "Duration must be one year or less."
-            );*/
-
-        if ((userId != null && email != null) || (userId == null && email == null))
-            throw new IllegalArgumentException(
-                    "The token must include a userId or email, but not both."
-            );
-
-        long now = millisToSeconds(System.currentTimeMillis());
-
-        String payload;
-        if (userId != null)
-            payload = String.format(
-                    "{ \"userId\": \"%s\", \"iat\": %d, \"exp\": %d }",
-                    userId, now, now + millisToSeconds(duration.toMillis())
-            );
-        else
-            payload = String.format(
-                    "{ \"email\": \"%s\", \"iat\": %d, \"exp\": %d }",
-                    email, now, now + millisToSeconds(duration.toMillis())
-            );
-
-        return generateToken(secret, payload);
-    }
-}
diff --git a/app/src/main/java/com/iterable/androidsdk/MainActivity.java b/app/src/main/java/com/iterable/androidsdk/MainActivity.java
index cc0130778..3b39a9a79 100644
--- a/app/src/main/java/com/iterable/androidsdk/MainActivity.java
+++ b/app/src/main/java/com/iterable/androidsdk/MainActivity.java
@@ -1,47 +1,17 @@
 package com.iterable.androidsdk;
 
-import android.os.Build;
 import android.os.Bundle;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
-
-import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-
-import android.util.Log;
 import android.view.View;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import com.iterable.iterableapi.IterableApi;
-import com.iterable.iterableapi.IterableAuthHandler;
-import com.iterable.iterableapi.IterableConfig;
-import com.iterable.iterableapi.RetryPolicy;
 import com.iterable.iterableapi.testapp.R;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.time.Duration;
-import java.util.Objects;
-
-@RequiresApi(api = Build.VERSION_CODES.O)
-public class MainActivity extends AppCompatActivity implements IterableAuthHandler {
-
-    private static final String secret = "34992609011249b410db9e1a568db9b65063c73e618bdb0229a674aeed7db7fba1bdc06e9b42d021120b9c88f795a734c18ab88ff7b6ecbccc50a945899d3666";
-    private static final String email = "harrymash2006@gmail.com";
-    private static final String userId = "harrymash2006";
-    private static final String apiKey = "4236278428294f04be8443007d3daf89";
-    private static final Duration days7 = Duration.ofDays(7);
-    private static final Duration days366 = Duration.ofDays(366);
-    private static final int issuedAt = 1516239022;
-    private static final int expiration = 1516239023;
-    private static final String payload = String.format(
-            "{ \"email\": \"%s\", \"iat\": %d, \"exp\": %d }",
-            email, issuedAt, expiration
-    );
-
+public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -58,30 +28,6 @@ public void onClick(View view) {
                         .setAction("Action", null).show();
             }
         });
-        IterableConfig config = new IterableConfig.Builder()
-                .setAuthHandler(this)
-                .setMaxRetries(4)
-                .setRetryBackoff(RetryPolicy.LINEAR)
-                .setRetryInterval(2L)
-                .build();
-
-        IterableApi.initialize(this, apiKey, config);
-
-        findViewById(R.id.btn_set_user).setOnClickListener(v -> IterableApi.getInstance().setUserId("hani7"));
-
-        findViewById(R.id.btn_update_user).setOnClickListener(v -> {
-            try {
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("firstName", "Hani");
-                IterableApi.getInstance().updateUser(jsonObject);
-            } catch (JSONException e) {
-                throw new RuntimeException(e);
-            }
-        });
-
-        findViewById(R.id.btn_logout).setOnClickListener(view -> IterableApi.getInstance().setUserId(null));
-        findViewById(R.id.btn_pauseAuthRetry).setOnClickListener(view -> IterableApi.getInstance().pauseAuthRetries(true));
-        findViewById(R.id.btn_resumeAuthRetry).setOnClickListener(view -> IterableApi.getInstance().pauseAuthRetries(false));
     }
 
     @Override
@@ -105,21 +51,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         return super.onOptionsItemSelected(item);
     }
-
-    @Override
-    public String onAuthTokenRequested() {
-        String token = IterableJWTGenerator.generateToken(secret, days366, null, "hani7");
-        Log.i("jwt token::", token);
-        return token;
-    }
-
-    @Override
-    public void onTokenRegistrationSuccessful(String authToken) {
-        Log.i("success:", "token registration successful.");
-    }
-
-    @Override
-    public void onTokenRegistrationFailed(Throwable object) {
-        Log.e("failed:", Objects.requireNonNull(object.getMessage()));
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 4f6cb30fd..009e2dafb 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -10,45 +10,10 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context="com.iterable.androidsdk.MainActivity"
-    tools:showIn="@layout/activity_main"
-    android:gravity="center"
-    android:orientation="vertical">
+    tools:showIn="@layout/activity_main">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!" />
-
-    <Button
-        android:id="@+id/btn_set_user"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="set user id" />
-
-    <Button
-        android:id="@+id/btn_update_user"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="set user name" />
-
-    <Button
-        android:visibility="visible"
-        android:id="@+id/btn_logout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Logout"/>
-
-    <Button
-        android:visibility="visible"
-        android:id="@+id/btn_pauseAuthRetry"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Pause AuthRetry"/>
-
-    <Button
-        android:visibility="visible"
-        android:id="@+id/btn_resumeAuthRetry"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Resume AuthRetry"/>
-</LinearLayout>
+</RelativeLayout>
\ No newline at end of file

From 2afca4c20016efa0904fbd124fa7495bb91b0a72 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Wed, 3 Apr 2024 20:10:07 +0530
Subject: [PATCH 03/27] sample app revert

---
 app/build.gradle                                            | 2 +-
 app/src/main/java/com/iterable/androidsdk/MainActivity.java | 1 +
 app/src/main/res/layout/content_main.xml                    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b002f2493..8fe296c7e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
     testNamespace 'iterable.com.iterableapi'
 
     defaultConfig {
-        applicationId "com.iterable.androidsdk"
+        applicationId "com.iterable.iterableapi.testapp"
         minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
diff --git a/app/src/main/java/com/iterable/androidsdk/MainActivity.java b/app/src/main/java/com/iterable/androidsdk/MainActivity.java
index 3b39a9a79..12e6f4c9e 100644
--- a/app/src/main/java/com/iterable/androidsdk/MainActivity.java
+++ b/app/src/main/java/com/iterable/androidsdk/MainActivity.java
@@ -51,4 +51,5 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         return super.onOptionsItemSelected(item);
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 009e2dafb..6e166ede5 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -16,4 +16,5 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!" />
+
 </RelativeLayout>
\ No newline at end of file

From 281a19e77e10a2a833a815fe15c1678619a526f6 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Wed, 3 Apr 2024 20:13:59 +0530
Subject: [PATCH 04/27] sample app revert

---
 app/src/main/java/com/iterable/androidsdk/MainActivity.java | 3 +--
 app/src/main/res/layout/content_main.xml                    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/iterable/androidsdk/MainActivity.java b/app/src/main/java/com/iterable/androidsdk/MainActivity.java
index 12e6f4c9e..c5f0725b8 100644
--- a/app/src/main/java/com/iterable/androidsdk/MainActivity.java
+++ b/app/src/main/java/com/iterable/androidsdk/MainActivity.java
@@ -51,5 +51,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         return super.onOptionsItemSelected(item);
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 6e166ede5..5646874e1 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -16,5 +16,4 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!" />
-
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>

From 4dfafb98ab85129de7fcfb0b8cebc0a51f3b49f0 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Thu, 4 Apr 2024 19:17:43 +0530
Subject: [PATCH 05/27] updates

---
 .../iterableapi/IterableAuthManager.java      | 13 ++---
 .../iterable/iterableapi/IterableConfig.java  | 50 +++----------------
 .../com/iterable/iterableapi/RetryPolicy.java | 30 +++++++++--
 3 files changed, 40 insertions(+), 53 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 5fcf1fe69..0662dfca8 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -41,14 +41,11 @@ public synchronized void requestNewAuthToken(boolean hasFailedPriorAuth) {
 
     public void pauseAuthRetries(boolean pauseRetry) {
         pauseAuthRetry = pauseRetry;
-        if (!pauseAuthRetry) {
-            resetRetryCount();
-        }
+        resetRetryCount();
     }
 
     void resetRetryCount() {
-        if (retryCount > 0) retryCount = -1;
-        else retryCount = 0;
+        retryCount = 0;
     }
 
     private void handleSuccessForAuthToken(String authToken, IterableHelper.SuccessHandler successCallback) {
@@ -65,7 +62,7 @@ public synchronized void requestNewAuthToken(
             boolean hasFailedPriorAuth,
             final IterableHelper.SuccessHandler successCallback,
             boolean shouldRefreshOnFailure) {
-        if ((shouldRefreshOnFailure && pauseAuthRetry) || (retryCount >= api.config.maxRetry && shouldRefreshOnFailure)) {
+        if ((shouldRefreshOnFailure && pauseAuthRetry) || (retryCount >= api.config.retryPolicy.maxRetry && shouldRefreshOnFailure)) {
             return;
         }
 
@@ -154,8 +151,8 @@ void reSyncAuth() {
     }
 
     long getNextRetryInterval() {
-        long nextRetryInterval = api.config.retryInterval;
-        if (api.config.retryBackoff == RetryPolicy.EXPONENTIAL) {
+        long nextRetryInterval = api.config.retryPolicy.retryInterval;
+        if (api.config.retryPolicy.retryBackoff == RetryPolicy.Type.EXPONENTIAL) {
             nextRetryInterval *= Math.pow(IterableConstants.EXPONENTIAL_FACTOR, retryCount-1); // Exponential backoff
         }
         return nextRetryInterval;
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
index 98ba4ff4d..feb7824c5 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
@@ -66,19 +66,9 @@ public class IterableConfig {
     final long expiringAuthTokenRefreshPeriod;
 
     /**
-     * Number of consecutive JWT refresh retries the SDK should attempt before disabling JWT refresh attempts altogether.
+     * Retry policy for JWT Refresh.
      */
-    final int maxRetry;
-
-    /**
-     * Configurable duration between JWT refresh retries. Starting point for the retry backoff.
-     */
-    final long retryInterval;
-
-    /**
-     * Linear or Exponential. Determines the backoff pattern to apply between retry attempts.
-     */
-    final RetryPolicy retryBackoff;
+    final RetryPolicy retryPolicy;
 
     /**
      * By default, the SDK allows navigation/calls to URLs with the `https` protocol (e.g. deep links or external links)
@@ -115,9 +105,7 @@ private IterableConfig(Builder builder) {
         inAppDisplayInterval = builder.inAppDisplayInterval;
         authHandler = builder.authHandler;
         expiringAuthTokenRefreshPeriod = builder.expiringAuthTokenRefreshPeriod;
-        maxRetry = builder.maxRetry;
-        retryInterval = builder.retryInterval;
-        retryBackoff = builder.retryBackoff;
+        retryPolicy = builder.retryPolicy;
         allowedProtocols = builder.allowedProtocols;
         dataRegion = builder.dataRegion;
         useInMemoryStorageForInApps = builder.useInMemoryStorageForInApps;
@@ -136,9 +124,7 @@ public static class Builder {
         private double inAppDisplayInterval = 30.0;
         private IterableAuthHandler authHandler;
         private long expiringAuthTokenRefreshPeriod = 60000L;
-        private int maxRetry = 10;
-        private long retryInterval = 1000L;
-        private RetryPolicy retryBackoff = RetryPolicy.LINEAR;
+        private RetryPolicy retryPolicy = new RetryPolicy(10, 6L, RetryPolicy.Type.LINEAR);
         private String[] allowedProtocols = new String[0];
         private IterableDataRegion dataRegion = IterableDataRegion.US;
         private boolean useInMemoryStorageForInApps = false;
@@ -246,32 +232,12 @@ public Builder setAuthHandler(@NonNull IterableAuthHandler authHandler) {
         }
 
         /**
-         * Set max retries before it disables JWT refresh attempts altogether
-         * @param retryTimes
-         */
-        @NonNull
-        public Builder setMaxRetries(@NonNull int retryTimes) {
-            this.maxRetry = retryTimes;
-            return this;
-        }
-
-        /**
-         * Set a custom period to automatically retrieve a new token on JWT Refresh in case of failure
-         * @param period in seconds
-         */
-        @NonNull
-        public Builder setRetryInterval(@NonNull Long period) {
-            this.retryInterval = period * 1000L;
-            return this;
-        }
-
-        /**
-         * Set a custom period to automatically retrieve a new token on JWT Refresh in case of failure
-         * @param type either Linear or Exponential
+         * Set retry policy for JWT Refresh
+         * @param retryPolicy
          */
         @NonNull
-        public Builder setRetryBackoff(@NonNull RetryPolicy type) {
-            this.retryBackoff = type;
+        public Builder setRetryPolicy(@NonNull RetryPolicy retryPolicy) {
+            this.retryPolicy = retryPolicy;
             return this;
         }
 
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java b/iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java
index 9c61c553c..d57266d24 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java
@@ -1,6 +1,30 @@
 package com.iterable.iterableapi;
 
-public enum RetryPolicy {
-    LINEAR,
-    EXPONENTIAL
+
+public class RetryPolicy {
+
+    /**
+     * Number of consecutive JWT refresh retries the SDK should attempt before disabling JWT refresh attempts altogether.
+     */
+    int maxRetry;
+
+    /**
+     * Configurable duration between JWT refresh retries. Starting point for the retry backoff.
+     */
+    long retryInterval;
+
+    /**
+     * Linear or Exponential. Determines the backoff pattern to apply between retry attempts.
+     */
+    RetryPolicy.Type retryBackoff;
+    public enum Type {
+        LINEAR,
+        EXPONENTIAL
+    }
+    public RetryPolicy(int maxRetry, long retryInterval, RetryPolicy.Type retryBackoff) {
+        this.maxRetry = maxRetry;
+        this.retryInterval = retryInterval * 1000L;
+        this.retryBackoff = retryBackoff;
+    }
 }
+

From 680b6fac907e7f30c0e6847ffdba4b53f1db0521 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Thu, 4 Apr 2024 19:20:52 +0530
Subject: [PATCH 06/27] Update IterableConfig.java

---
 .../src/main/java/com/iterable/iterableapi/IterableConfig.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
index feb7824c5..598e9a216 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
@@ -236,7 +236,7 @@ public Builder setAuthHandler(@NonNull IterableAuthHandler authHandler) {
          * @param retryPolicy
          */
         @NonNull
-        public Builder setRetryPolicy(@NonNull RetryPolicy retryPolicy) {
+        public Builder setAuthRetryPolicy(@NonNull RetryPolicy retryPolicy) {
             this.retryPolicy = retryPolicy;
             return this;
         }

From 8d860c4cab1dbb4876bb06e1351a696c5ae65b80 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Thu, 4 Apr 2024 19:23:57 +0530
Subject: [PATCH 07/27] Update IterableRequestTask.java

---
 .../com/iterable/iterableapi/IterableRequestTask.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index 8f03d9bec..558ef39e9 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -1,5 +1,8 @@
 package com.iterable.iterableapi;
 
+import static com.iterable.iterableapi.IterableConstants.ENDPOINT_DISABLE_DEVICE;
+import static com.iterable.iterableapi.IterableConstants.ENDPOINT_GET_REMOTE_CONFIGURATION;
+
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Handler;
@@ -22,6 +25,7 @@
 import java.net.URL;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.Objects;
 
 /**
  * Async task to handle sending data to the Iterable server
@@ -330,7 +334,9 @@ public void run() {
 
     private void handleSuccessResponse(IterableApiResponse response) {
         IterableApi.getInstance().getAuthManager().resetFailedAuth();
-        IterableApi.getInstance().getAuthManager().pauseAuthRetries(false);
+        if (!Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_GET_REMOTE_CONFIGURATION) && !Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_DISABLE_DEVICE)) {
+            IterableApi.getInstance().getAuthManager().pauseAuthRetries(false);
+        }
 
         if (iterableApiRequest.successCallback != null) {
             iterableApiRequest.successCallback.onSuccess(response.responseJson);

From 4f9f52ad6d95ce06720519683f3cb58932162c16 Mon Sep 17 00:00:00 2001
From: hardikmashru <150107929+hardikmashru@users.noreply.github.com>
Date: Fri, 5 Apr 2024 12:47:26 +0530
Subject: [PATCH 08/27] Jwt imrovement part1 (#722)

* JWT improvements

1. Provide a method to stop JWT retries (regardless of retry policy)
2. Make it possible to specify a retry policy (on IterableConfig)

* removed sample app changes

* sample app revert

* sample app revert

* updates

* Update IterableConfig.java

* Update IterableRequestTask.java
---
 .../com/iterable/iterableapi/IterableApi.java |  7 ++-
 .../iterableapi/IterableAuthManager.java      | 45 +++++++++++++++----
 .../iterable/iterableapi/IterableConfig.java  | 17 +++++++
 .../iterableapi/IterableConstants.java        |  2 +
 .../iterableapi/IterableRequestTask.java      | 11 ++++-
 .../com/iterable/iterableapi/RetryPolicy.java | 30 +++++++++++++
 6 files changed, 100 insertions(+), 12 deletions(-)
 create mode 100644 iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
index 84ce93fb1..dd07e3c05 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
@@ -355,6 +355,7 @@ private void onLogin(@Nullable String authToken) {
             return;
         }
 
+        pauseAuthRetries(false);
         if (authToken != null) {
             setAuthToken(authToken);
         } else {
@@ -457,7 +458,7 @@ private void retrieveEmailAndUserId() {
                 getAuthManager().queueExpirationRefresh(_authToken);
             } else {
                 IterableLogger.d(TAG, "Auth token found as null. Scheduling token refresh in 10 seconds...");
-                getAuthManager().scheduleAuthTokenRefresh(10000);
+                getAuthManager().scheduleAuthTokenRefresh(authManager.getNextRetryInterval(), true, null);
             }
         }
     }
@@ -696,7 +697,9 @@ public IterableAttributionInfo getAttributionInfo() {
                 IterableUtil.retrieveExpirableJsonObject(getPreferences(), IterableConstants.SHARED_PREFS_ATTRIBUTION_INFO_KEY)
         );
     }
-
+    public void pauseAuthRetries(boolean pauseRetry) {
+        getAuthManager().pauseAuthRetries(pauseRetry);
+    }
     public void setEmail(@Nullable String email) {
         setEmail(email, null, null, null);
     }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 562e86bd7..0662dfca8 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -1,7 +1,6 @@
 package com.iterable.iterableapi;
 
 import android.util.Base64;
-
 import androidx.annotation.VisibleForTesting;
 
 import org.json.JSONException;
@@ -20,12 +19,13 @@ public class IterableAuthManager {
     private final IterableApi api;
     private final IterableAuthHandler authHandler;
     private final long expiringAuthTokenRefreshPeriod;
-    private final long scheduledRefreshPeriod = 10000;
     @VisibleForTesting
     Timer timer;
     private boolean hasFailedPriorAuth;
     private boolean pendingAuth;
     private boolean requiresAuthRefresh;
+    private boolean pauseAuthRetry;
+    private int retryCount;
 
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
 
@@ -36,7 +36,16 @@ public class IterableAuthManager {
     }
 
     public synchronized void requestNewAuthToken(boolean hasFailedPriorAuth) {
-        requestNewAuthToken(hasFailedPriorAuth, null);
+        requestNewAuthToken(hasFailedPriorAuth, null, false);
+    }
+
+    public void pauseAuthRetries(boolean pauseRetry) {
+        pauseAuthRetry = pauseRetry;
+        resetRetryCount();
+    }
+
+    void resetRetryCount() {
+        retryCount = 0;
     }
 
     private void handleSuccessForAuthToken(String authToken, IterableHelper.SuccessHandler successCallback) {
@@ -51,7 +60,12 @@ private void handleSuccessForAuthToken(String authToken, IterableHelper.SuccessH
 
     public synchronized void requestNewAuthToken(
             boolean hasFailedPriorAuth,
-            final IterableHelper.SuccessHandler successCallback) {
+            final IterableHelper.SuccessHandler successCallback,
+            boolean shouldRefreshOnFailure) {
+        if ((shouldRefreshOnFailure && pauseAuthRetry) || (retryCount >= api.config.retryPolicy.maxRetry && shouldRefreshOnFailure)) {
+            return;
+        }
+
         if (authHandler != null) {
             if (!pendingAuth) {
                 if (!(this.hasFailedPriorAuth && hasFailedPriorAuth)) {
@@ -63,6 +77,7 @@ public synchronized void requestNewAuthToken(
                         public void run() {
                             try {
                                 final String authToken = authHandler.onAuthTokenRequested();
+                                retryCount++;
                                 handleAuthTokenSuccess(authToken, successCallback);
                             } catch (final Exception e) {
                                 handleAuthTokenFailure(e);
@@ -89,7 +104,7 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
         } else {
             IterableLogger.w(TAG, "Auth token received as null. Calling the handler in 10 seconds");
             //TODO: Make this time configurable and in sync with SDK initialization flow for auth null scenario
-            scheduleAuthTokenRefresh(scheduledRefreshPeriod);
+            scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
             authHandler.onTokenRegistrationFailed(new Throwable("Auth token null"));
             return;
         }
@@ -112,7 +127,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             long expirationTimeSeconds = decodedExpiration(encodedJWT);
             long triggerExpirationRefreshTime = expirationTimeSeconds * 1000L - expiringAuthTokenRefreshPeriod - IterableUtil.currentTimeMillis();
             if (triggerExpirationRefreshTime > 0) {
-                scheduleAuthTokenRefresh(triggerExpirationRefreshTime);
+                scheduleAuthTokenRefresh(triggerExpirationRefreshTime, false, null);
             } else {
                 IterableLogger.w(TAG, "The expiringAuthTokenRefreshPeriod has already passed for the current JWT");
             }
@@ -120,7 +135,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             IterableLogger.e(TAG, "Error while parsing JWT for the expiration", e);
             authHandler.onTokenRegistrationFailed(new Throwable("Auth token decode failure. Scheduling auth token refresh in 10 seconds..."));
             //TODO: Sync with configured time duration once feature is available.
-            scheduleAuthTokenRefresh(scheduledRefreshPeriod);
+            scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
         }
     }
 
@@ -135,14 +150,26 @@ void reSyncAuth() {
         }
     }
 
-    void scheduleAuthTokenRefresh(long timeDuration) {
+    long getNextRetryInterval() {
+        long nextRetryInterval = api.config.retryPolicy.retryInterval;
+        if (api.config.retryPolicy.retryBackoff == RetryPolicy.Type.EXPONENTIAL) {
+            nextRetryInterval *= Math.pow(IterableConstants.EXPONENTIAL_FACTOR, retryCount-1); // Exponential backoff
+        }
+        return nextRetryInterval;
+    }
+
+    void scheduleAuthTokenRefresh(long timeDuration, boolean shouldRetryJWTRefresh, final IterableHelper.SuccessHandler successCallback) {
+        if (pauseAuthRetry && shouldRetryJWTRefresh) {
+            // we only stop schedule token refresh it is called from retry (in case of failure). The normal auth token refresh schedule would work
+            return;
+        }
         timer = new Timer(true);
         try {
             timer.schedule(new TimerTask() {
                 @Override
                 public void run() {
                     if (api.getEmail() != null || api.getUserId() != null) {
-                        api.getAuthManager().requestNewAuthToken(false);
+                        api.getAuthManager().requestNewAuthToken(false, successCallback, shouldRetryJWTRefresh);
                     } else {
                         IterableLogger.w(TAG, "Email or userId is not available. Skipping token refresh");
                     }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
index 14f370c45..598e9a216 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
@@ -65,6 +65,11 @@ public class IterableConfig {
      */
     final long expiringAuthTokenRefreshPeriod;
 
+    /**
+     * Retry policy for JWT Refresh.
+     */
+    final RetryPolicy retryPolicy;
+
     /**
      * By default, the SDK allows navigation/calls to URLs with the `https` protocol (e.g. deep links or external links)
      * If you'd like to allow other protocols like `http`, `tel`, etc., add them to the `allowedProtocols` array
@@ -100,6 +105,7 @@ private IterableConfig(Builder builder) {
         inAppDisplayInterval = builder.inAppDisplayInterval;
         authHandler = builder.authHandler;
         expiringAuthTokenRefreshPeriod = builder.expiringAuthTokenRefreshPeriod;
+        retryPolicy = builder.retryPolicy;
         allowedProtocols = builder.allowedProtocols;
         dataRegion = builder.dataRegion;
         useInMemoryStorageForInApps = builder.useInMemoryStorageForInApps;
@@ -118,6 +124,7 @@ public static class Builder {
         private double inAppDisplayInterval = 30.0;
         private IterableAuthHandler authHandler;
         private long expiringAuthTokenRefreshPeriod = 60000L;
+        private RetryPolicy retryPolicy = new RetryPolicy(10, 6L, RetryPolicy.Type.LINEAR);
         private String[] allowedProtocols = new String[0];
         private IterableDataRegion dataRegion = IterableDataRegion.US;
         private boolean useInMemoryStorageForInApps = false;
@@ -224,6 +231,16 @@ public Builder setAuthHandler(@NonNull IterableAuthHandler authHandler) {
             return this;
         }
 
+        /**
+         * Set retry policy for JWT Refresh
+         * @param retryPolicy
+         */
+        @NonNull
+        public Builder setAuthRetryPolicy(@NonNull RetryPolicy retryPolicy) {
+            this.retryPolicy = retryPolicy;
+            return this;
+        }
+
         /**
          * Set a custom period before an auth token expires to automatically retrieve a new token
          * @param period in seconds
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
index f61b03315..43e4bd70f 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
@@ -260,6 +260,8 @@ public final class IterableConstants {
     public static final int ITERABLE_IN_APP_ANIMATION_DURATION           = 500;
     public static final int ITERABLE_IN_APP_BACKGROUND_ANIMATION_DURATION = 300;
 
+    public static final int EXPONENTIAL_FACTOR                              = 2;
+
     public static final double ITERABLE_IN_APP_PRIORITY_LEVEL_LOW           = 400.0;
     public static final double ITERABLE_IN_APP_PRIORITY_LEVEL_MEDIUM        = 300.0;
     public static final double ITERABLE_IN_APP_PRIORITY_LEVEL_HIGH          = 200.0;
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index f011ba273..558ef39e9 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -1,5 +1,8 @@
 package com.iterable.iterableapi;
 
+import static com.iterable.iterableapi.IterableConstants.ENDPOINT_DISABLE_DEVICE;
+import static com.iterable.iterableapi.IterableConstants.ENDPOINT_GET_REMOTE_CONFIGURATION;
+
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Handler;
@@ -22,6 +25,7 @@
 import java.net.URL;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.Objects;
 
 /**
  * Async task to handle sending data to the Iterable server
@@ -330,6 +334,10 @@ public void run() {
 
     private void handleSuccessResponse(IterableApiResponse response) {
         IterableApi.getInstance().getAuthManager().resetFailedAuth();
+        if (!Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_GET_REMOTE_CONFIGURATION) && !Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_DISABLE_DEVICE)) {
+            IterableApi.getInstance().getAuthManager().pauseAuthRetries(false);
+        }
+
         if (iterableApiRequest.successCallback != null) {
             iterableApiRequest.successCallback.onSuccess(response.responseJson);
         }
@@ -346,7 +354,8 @@ private void handleErrorResponse(IterableApiResponse response) {
     }
 
     private void requestNewAuthTokenAndRetry(IterableApiResponse response) {
-        IterableApi.getInstance().getAuthManager().requestNewAuthToken(false, data -> {
+        long retryInterval = IterableApi.getInstance().getAuthManager().getNextRetryInterval();
+        IterableApi.getInstance().getAuthManager().scheduleAuthTokenRefresh(retryInterval, true, data -> {
             try {
                 String newAuthToken = data.getString("newAuthToken");
                 retryRequestWithNewAuthToken(newAuthToken);
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java b/iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java
new file mode 100644
index 000000000..d57266d24
--- /dev/null
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/RetryPolicy.java
@@ -0,0 +1,30 @@
+package com.iterable.iterableapi;
+
+
+public class RetryPolicy {
+
+    /**
+     * Number of consecutive JWT refresh retries the SDK should attempt before disabling JWT refresh attempts altogether.
+     */
+    int maxRetry;
+
+    /**
+     * Configurable duration between JWT refresh retries. Starting point for the retry backoff.
+     */
+    long retryInterval;
+
+    /**
+     * Linear or Exponential. Determines the backoff pattern to apply between retry attempts.
+     */
+    RetryPolicy.Type retryBackoff;
+    public enum Type {
+        LINEAR,
+        EXPONENTIAL
+    }
+    public RetryPolicy(int maxRetry, long retryInterval, RetryPolicy.Type retryBackoff) {
+        this.maxRetry = maxRetry;
+        this.retryInterval = retryInterval * 1000L;
+        this.retryBackoff = retryBackoff;
+    }
+}
+

From e69ca6511f20852beef1fa988eb8956de5add338 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Fri, 5 Apr 2024 12:52:06 +0530
Subject: [PATCH 09/27] Merge branch 'JWT_Imrovement_Part2' into
 feature/JWTRetryEnhancement

---
 .../com/iterable/iterableapi/AuthFailure.java | 29 +++++++++++++++++++
 .../iterableapi/IterableAuthHandler.java      |  2 +-
 .../iterableapi/IterableAuthManager.java      | 22 ++++++++++++--
 .../iterableapi/IterableConstants.java        | 13 +++++++++
 .../iterableapi/IterableRequestTask.java      | 29 +++++++++++++++++++
 5 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
new file mode 100644
index 000000000..88e1e521d
--- /dev/null
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
@@ -0,0 +1,29 @@
+package com.iterable.iterableapi;
+
+/**
+ * Represents an auth failure object.
+ */
+public class AuthFailure {
+
+    /** userId or email of the signed-in user */
+    public final String userKey;
+
+    /** the authToken which casued the failure */
+    public final String failedAuthToken;
+
+    /** the timestamp of the failed request */
+    public final long failedRequestTime;
+
+    /** indicates a reason for failure */
+    public final String failureReason;
+
+    public AuthFailure(String userKey,
+                       String failedAuthToken,
+                       long failedRequestTime,
+                       String failureReason){
+        this.userKey = userKey;
+        this.failedAuthToken = failedAuthToken;
+        this.failedRequestTime = failedRequestTime;
+        this.failureReason = failureReason;
+    }
+}
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthHandler.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthHandler.java
index c8c09cf66..17509df33 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthHandler.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthHandler.java
@@ -3,5 +3,5 @@
 public interface IterableAuthHandler {
     String onAuthTokenRequested();
     void onTokenRegistrationSuccessful(String authToken);
-    void onTokenRegistrationFailed(Throwable object);
+    void onAuthFailure(AuthFailure authFailure);
 }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 0662dfca8..f16cb869a 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -105,7 +105,7 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
             IterableLogger.w(TAG, "Auth token received as null. Calling the handler in 10 seconds");
             //TODO: Make this time configurable and in sync with SDK initialization flow for auth null scenario
             scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
-            authHandler.onTokenRegistrationFailed(new Throwable("Auth token null"));
+            handleAuthFailure(null, IterableConstants.AUTH_TOKEN_NULL);
             return;
         }
         IterableApi.getInstance().setAuthToken(authToken);
@@ -116,7 +116,7 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
 
     private void handleAuthTokenFailure(Throwable throwable) {
         IterableLogger.e(TAG, "Error while requesting Auth Token", throwable);
-        authHandler.onTokenRegistrationFailed(throwable);
+        handleAuthFailure(null, IterableConstants.AUTH_TOKEN_GENERATION_ERROR);
         pendingAuth = false;
         reSyncAuth();
     }
@@ -133,7 +133,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             }
         } catch (Exception e) {
             IterableLogger.e(TAG, "Error while parsing JWT for the expiration", e);
-            authHandler.onTokenRegistrationFailed(new Throwable("Auth token decode failure. Scheduling auth token refresh in 10 seconds..."));
+            handleAuthFailure(encodedJWT, IterableConstants.AUTH_TOKEN_PAYLOAD_INVALID);
             //TODO: Sync with configured time duration once feature is available.
             scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
         }
@@ -150,6 +150,10 @@ void reSyncAuth() {
         }
     }
 
+    void handleAuthFailure(String authToken, String failureReason) {
+        authHandler.onAuthFailure(new AuthFailure(getEmailOrUserId(), authToken, IterableUtil.currentTimeMillis(), failureReason));
+    }
+
     long getNextRetryInterval() {
         long nextRetryInterval = api.config.retryPolicy.retryInterval;
         if (api.config.retryPolicy.retryBackoff == RetryPolicy.Type.EXPONENTIAL) {
@@ -180,6 +184,18 @@ public void run() {
         }
     }
 
+    private String getEmailOrUserId() {
+        String email = api.getEmail();
+        String userId = api.getUserId();
+
+        if (email != null) {
+            return email;
+        } else if (userId != null) {
+            return userId;
+        }
+        return null;
+    }
+
     private static long decodedExpiration(String encodedJWT) throws Exception {
         long exp = 0;
             String[] split = encodedJWT.split("\\.");
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
index 43e4bd70f..a668bb421 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
@@ -257,6 +257,19 @@ public final class IterableConstants {
     public static final String ITERABLE_INBOX_IMP_DISPLAY_COUNT          = "displayCount";
     public static final String ITERABLE_INBOX_IMP_DISPLAY_DURATION       = "displayDuration";
     public static final String ITERABLE_IN_APP_SHOULD_ANIMATE            = "shouldAnimate";
+    public static final String AUTH_TOKEN_NULL                           = "AUTH_TOKEN_NULL";
+    public static final String AUTH_TOKEN_GENERATION_ERROR               = "AUTH_TOKEN_GENERATION_ERROR";
+
+    public static final String AUTH_TOKEN_GENERIC_ERROR                  = "AUTH_TOKEN_GENERIC_ERROR";
+    public static final String AUTH_TOKEN_EXPIRED                        = "AUTH_TOKEN_EXPIRED";
+    public static final String AUTH_TOKEN_EXPIRATION_INVALID             = "AUTH_TOKEN_EXPIRATION_INVALID";
+    public static final String AUTH_TOKEN_SIGNATURE_INVALID              = "AUTH_TOKEN_SIGNATURE_INVALID";
+    public static final String AUTH_TOKEN_FORMAT_INVALID                 = "AUTH_TOKEN_FORMAT_INVALID";
+    public static final String AUTH_TOKEN_INVALIDATED                    = "AUTH_TOKEN_INVALIDATED";
+    public static final String AUTH_TOKEN_PAYLOAD_INVALID                = "AUTH_TOKEN_PAYLOAD_INVALID";
+    public static final String AUTH_TOKEN_USER_KEY_INVALID               = "AUTH_TOKEN_USER_KEY_INVALID";
+
+
     public static final int ITERABLE_IN_APP_ANIMATION_DURATION           = 500;
     public static final int ITERABLE_IN_APP_BACKGROUND_ANIMATION_DURATION = 300;
 
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index 558ef39e9..eddda6fd1 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -196,6 +196,7 @@ static IterableApiResponse executeApiRequest(IterableApiRequest iterableApiReque
                 if (responseCode == 401) {
                     if (matchesErrorCode(jsonResponse, ERROR_CODE_INVALID_JWT_PAYLOAD)) {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "JWT Authorization header error");
+                        IterableApi.getInstance().getAuthManager().handleAuthFailure(iterableApiRequest.authToken, getMappedErrorCodeForMessage(jsonResponse));
                     } else {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "Invalid API Key");
                     }
@@ -269,6 +270,34 @@ private static boolean matchesErrorCode(JSONObject jsonResponse, String errorCod
         }
     }
 
+    private static String getMappedErrorCodeForMessage(JSONObject jsonResponse) {
+        try {
+            if (jsonResponse == null || !jsonResponse.has("msg")) {
+                return null;
+            }
+
+            String errorMessage = jsonResponse.getString("msg");
+
+            switch (errorMessage.toLowerCase()) {
+                case "exp must be less than 1 year from iat":
+                    return IterableConstants.AUTH_TOKEN_EXPIRATION_INVALID;
+                case "jwt format is invalid":
+                    return IterableConstants.AUTH_TOKEN_FORMAT_INVALID;
+                case "jwt token is expired":
+                    return IterableConstants.AUTH_TOKEN_EXPIRED;
+                case "jwt is invalid":
+                    return IterableConstants.AUTH_TOKEN_SIGNATURE_INVALID;
+                case "jwt payload requires a value for userid or email":
+                    return IterableConstants.AUTH_TOKEN_USER_KEY_INVALID;
+                default:
+                    return errorMessage;
+            }
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+
     private static void logError(IterableApiRequest iterableApiRequest, String baseUrl, Exception e) {
         IterableLogger.e(TAG, "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n" +
                 "Exception occurred for : " + baseUrl + iterableApiRequest.resourcePath);

From cd972d3d5025912e1819fa57f70c0807d900816a Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Thu, 11 Apr 2024 18:48:48 +0530
Subject: [PATCH 10/27] Implemented suggested changes

---
 .../com/iterable/iterableapi/AuthFailure.java |  6 ++++--
 .../iterableapi/AuthFailureReason.java        | 14 ++++++++++++++
 .../iterableapi/IterableAuthManager.java      |  8 ++++----
 .../iterableapi/IterableConstants.java        | 13 -------------
 .../iterableapi/IterableRequestTask.java      | 19 ++++++++++++-------
 5 files changed, 34 insertions(+), 26 deletions(-)
 create mode 100644 iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
index 88e1e521d..34c512ec7 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
@@ -15,15 +15,17 @@ public class AuthFailure {
     public final long failedRequestTime;
 
     /** indicates a reason for failure */
-    public final String failureReason;
+    public final AuthFailureReason failureReason;
 
     public AuthFailure(String userKey,
                        String failedAuthToken,
                        long failedRequestTime,
-                       String failureReason){
+                       AuthFailureReason failureReason){
         this.userKey = userKey;
         this.failedAuthToken = failedAuthToken;
         this.failedRequestTime = failedRequestTime;
         this.failureReason = failureReason;
     }
 }
+
+
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java
new file mode 100644
index 000000000..4d1793a62
--- /dev/null
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java
@@ -0,0 +1,14 @@
+package com.iterable.iterableapi;
+
+public enum AuthFailureReason {
+    AUTH_TOKEN_EXPIRED,
+    AUTH_TOKEN_GENERIC_ERROR,
+    AUTH_TOKEN_EXPIRATION_INVALID,
+    AUTH_TOKEN_SIGNATURE_INVALID,
+    AUTH_TOKEN_FORMAT_INVALID,
+    AUTH_TOKEN_INVALIDATED,
+    AUTH_TOKEN_PAYLOAD_INVALID,
+    AUTH_TOKEN_USER_KEY_INVALID,
+    AUTH_TOKEN_NULL,
+    AUTH_TOKEN_GENERATION_ERROR
+}
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index f16cb869a..b1d7b4d9c 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -105,7 +105,7 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
             IterableLogger.w(TAG, "Auth token received as null. Calling the handler in 10 seconds");
             //TODO: Make this time configurable and in sync with SDK initialization flow for auth null scenario
             scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
-            handleAuthFailure(null, IterableConstants.AUTH_TOKEN_NULL);
+            handleAuthFailure(null, AuthFailureReason.AUTH_TOKEN_NULL);
             return;
         }
         IterableApi.getInstance().setAuthToken(authToken);
@@ -116,7 +116,7 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
 
     private void handleAuthTokenFailure(Throwable throwable) {
         IterableLogger.e(TAG, "Error while requesting Auth Token", throwable);
-        handleAuthFailure(null, IterableConstants.AUTH_TOKEN_GENERATION_ERROR);
+        handleAuthFailure(null, AuthFailureReason.AUTH_TOKEN_GENERATION_ERROR);
         pendingAuth = false;
         reSyncAuth();
     }
@@ -133,7 +133,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             }
         } catch (Exception e) {
             IterableLogger.e(TAG, "Error while parsing JWT for the expiration", e);
-            handleAuthFailure(encodedJWT, IterableConstants.AUTH_TOKEN_PAYLOAD_INVALID);
+            handleAuthFailure(encodedJWT, AuthFailureReason.AUTH_TOKEN_PAYLOAD_INVALID);
             //TODO: Sync with configured time duration once feature is available.
             scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
         }
@@ -150,7 +150,7 @@ void reSyncAuth() {
         }
     }
 
-    void handleAuthFailure(String authToken, String failureReason) {
+    void handleAuthFailure(String authToken, AuthFailureReason failureReason) {
         authHandler.onAuthFailure(new AuthFailure(getEmailOrUserId(), authToken, IterableUtil.currentTimeMillis(), failureReason));
     }
 
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
index a668bb421..43e4bd70f 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
@@ -257,19 +257,6 @@ public final class IterableConstants {
     public static final String ITERABLE_INBOX_IMP_DISPLAY_COUNT          = "displayCount";
     public static final String ITERABLE_INBOX_IMP_DISPLAY_DURATION       = "displayDuration";
     public static final String ITERABLE_IN_APP_SHOULD_ANIMATE            = "shouldAnimate";
-    public static final String AUTH_TOKEN_NULL                           = "AUTH_TOKEN_NULL";
-    public static final String AUTH_TOKEN_GENERATION_ERROR               = "AUTH_TOKEN_GENERATION_ERROR";
-
-    public static final String AUTH_TOKEN_GENERIC_ERROR                  = "AUTH_TOKEN_GENERIC_ERROR";
-    public static final String AUTH_TOKEN_EXPIRED                        = "AUTH_TOKEN_EXPIRED";
-    public static final String AUTH_TOKEN_EXPIRATION_INVALID             = "AUTH_TOKEN_EXPIRATION_INVALID";
-    public static final String AUTH_TOKEN_SIGNATURE_INVALID              = "AUTH_TOKEN_SIGNATURE_INVALID";
-    public static final String AUTH_TOKEN_FORMAT_INVALID                 = "AUTH_TOKEN_FORMAT_INVALID";
-    public static final String AUTH_TOKEN_INVALIDATED                    = "AUTH_TOKEN_INVALIDATED";
-    public static final String AUTH_TOKEN_PAYLOAD_INVALID                = "AUTH_TOKEN_PAYLOAD_INVALID";
-    public static final String AUTH_TOKEN_USER_KEY_INVALID               = "AUTH_TOKEN_USER_KEY_INVALID";
-
-
     public static final int ITERABLE_IN_APP_ANIMATION_DURATION           = 500;
     public static final int ITERABLE_IN_APP_BACKGROUND_ANIMATION_DURATION = 300;
 
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index eddda6fd1..d11a07daf 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -270,7 +270,7 @@ private static boolean matchesErrorCode(JSONObject jsonResponse, String errorCod
         }
     }
 
-    private static String getMappedErrorCodeForMessage(JSONObject jsonResponse) {
+    private static AuthFailureReason getMappedErrorCodeForMessage(JSONObject jsonResponse) {
         try {
             if (jsonResponse == null || !jsonResponse.has("msg")) {
                 return null;
@@ -280,17 +280,22 @@ private static String getMappedErrorCodeForMessage(JSONObject jsonResponse) {
 
             switch (errorMessage.toLowerCase()) {
                 case "exp must be less than 1 year from iat":
-                    return IterableConstants.AUTH_TOKEN_EXPIRATION_INVALID;
+                    return AuthFailureReason.AUTH_TOKEN_EXPIRATION_INVALID;
                 case "jwt format is invalid":
-                    return IterableConstants.AUTH_TOKEN_FORMAT_INVALID;
+                    return AuthFailureReason.AUTH_TOKEN_FORMAT_INVALID;
                 case "jwt token is expired":
-                    return IterableConstants.AUTH_TOKEN_EXPIRED;
+                    return AuthFailureReason.AUTH_TOKEN_EXPIRED;
                 case "jwt is invalid":
-                    return IterableConstants.AUTH_TOKEN_SIGNATURE_INVALID;
+                    return AuthFailureReason.AUTH_TOKEN_SIGNATURE_INVALID;
                 case "jwt payload requires a value for userid or email":
-                    return IterableConstants.AUTH_TOKEN_USER_KEY_INVALID;
+                case "email could not be found":
+                    return AuthFailureReason.AUTH_TOKEN_USER_KEY_INVALID;
+                case "jwt token has been invalidated":
+                    return AuthFailureReason.AUTH_TOKEN_INVALIDATED;
+                case "invalid payload":
+                    return AuthFailureReason.AUTH_TOKEN_PAYLOAD_INVALID;
                 default:
-                    return errorMessage;
+                    return null;
             }
         } catch (JSONException e) {
             return null;

From 9cb490971ec87b7d54160bf4dff5f1a2a80f6954 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Mon, 15 Apr 2024 17:04:10 +0530
Subject: [PATCH 11/27] updates for retry mechanism

---
 .../iterableapi/AuthFailureReason.java        |  5 ++--
 .../iterableapi/IterableAuthManager.java      | 30 ++++++++++++-------
 .../iterableapi/IterableRequestTask.java      | 27 +++++++++--------
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java
index 4d1793a62..03156c7cc 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java
@@ -10,5 +10,6 @@ public enum AuthFailureReason {
     AUTH_TOKEN_PAYLOAD_INVALID,
     AUTH_TOKEN_USER_KEY_INVALID,
     AUTH_TOKEN_NULL,
-    AUTH_TOKEN_GENERATION_ERROR
-}
+    AUTH_TOKEN_GENERATION_ERROR,
+    AUTH_TOKEN_MISSING,
+    }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index b1d7b4d9c..a941253e5 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -27,6 +27,7 @@ public class IterableAuthManager {
     private boolean pauseAuthRetry;
     private int retryCount;
 
+    private boolean isLastAuthTokenValid;
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     IterableAuthManager(IterableApi api, IterableAuthHandler authHandler, long expiringAuthTokenRefreshPeriod) {
@@ -36,7 +37,7 @@ public class IterableAuthManager {
     }
 
     public synchronized void requestNewAuthToken(boolean hasFailedPriorAuth) {
-        requestNewAuthToken(hasFailedPriorAuth, null, false);
+        requestNewAuthToken(hasFailedPriorAuth, null, true);
     }
 
     public void pauseAuthRetries(boolean pauseRetry) {
@@ -44,6 +45,9 @@ public void pauseAuthRetries(boolean pauseRetry) {
         resetRetryCount();
     }
 
+    void markLastAuthToken(boolean isValid) {
+        isLastAuthTokenValid = isValid;
+    }
     void resetRetryCount() {
         retryCount = 0;
     }
@@ -61,8 +65,9 @@ private void handleSuccessForAuthToken(String authToken, IterableHelper.SuccessH
     public synchronized void requestNewAuthToken(
             boolean hasFailedPriorAuth,
             final IterableHelper.SuccessHandler successCallback,
-            boolean shouldRefreshOnFailure) {
-        if ((shouldRefreshOnFailure && pauseAuthRetry) || (retryCount >= api.config.retryPolicy.maxRetry && shouldRefreshOnFailure)) {
+            boolean shouldIgnoreRetryPolicy) {
+
+        if ((!shouldIgnoreRetryPolicy && pauseAuthRetry) || (retryCount >= api.config.retryPolicy.maxRetry && !shouldIgnoreRetryPolicy)) {
             return;
         }
 
@@ -76,6 +81,11 @@ public synchronized void requestNewAuthToken(
                         @Override
                         public void run() {
                             try {
+                                if (isLastAuthTokenValid && !shouldIgnoreRetryPolicy) {
+                                    // if some JWT retry had valid token it will not fetch the auth token again from developer function
+                                    handleAuthTokenSuccess(IterableApi.getInstance().getAuthToken(), successCallback);
+                                    return;
+                                }
                                 final String authToken = authHandler.onAuthTokenRequested();
                                 retryCount++;
                                 handleAuthTokenSuccess(authToken, successCallback);
@@ -104,7 +114,7 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
         } else {
             IterableLogger.w(TAG, "Auth token received as null. Calling the handler in 10 seconds");
             //TODO: Make this time configurable and in sync with SDK initialization flow for auth null scenario
-            scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
+            scheduleAuthTokenRefresh(getNextRetryInterval(), false, null);
             handleAuthFailure(null, AuthFailureReason.AUTH_TOKEN_NULL);
             return;
         }
@@ -127,7 +137,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             long expirationTimeSeconds = decodedExpiration(encodedJWT);
             long triggerExpirationRefreshTime = expirationTimeSeconds * 1000L - expiringAuthTokenRefreshPeriod - IterableUtil.currentTimeMillis();
             if (triggerExpirationRefreshTime > 0) {
-                scheduleAuthTokenRefresh(triggerExpirationRefreshTime, false, null);
+                scheduleAuthTokenRefresh(triggerExpirationRefreshTime, true, null);
             } else {
                 IterableLogger.w(TAG, "The expiringAuthTokenRefreshPeriod has already passed for the current JWT");
             }
@@ -135,7 +145,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             IterableLogger.e(TAG, "Error while parsing JWT for the expiration", e);
             handleAuthFailure(encodedJWT, AuthFailureReason.AUTH_TOKEN_PAYLOAD_INVALID);
             //TODO: Sync with configured time duration once feature is available.
-            scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
+            scheduleAuthTokenRefresh(getNextRetryInterval(), false, null);
         }
     }
 
@@ -162,9 +172,9 @@ long getNextRetryInterval() {
         return nextRetryInterval;
     }
 
-    void scheduleAuthTokenRefresh(long timeDuration, boolean shouldRetryJWTRefresh, final IterableHelper.SuccessHandler successCallback) {
-        if (pauseAuthRetry && shouldRetryJWTRefresh) {
-            // we only stop schedule token refresh it is called from retry (in case of failure). The normal auth token refresh schedule would work
+    void scheduleAuthTokenRefresh(long timeDuration, boolean isScheduledRefresh, final IterableHelper.SuccessHandler successCallback) {
+        if (pauseAuthRetry && !isScheduledRefresh) {
+            // we only stop schedule token refresh if it is called from retry (in case of failure). The normal auth token refresh schedule would work
             return;
         }
         timer = new Timer(true);
@@ -173,7 +183,7 @@ void scheduleAuthTokenRefresh(long timeDuration, boolean shouldRetryJWTRefresh,
                 @Override
                 public void run() {
                     if (api.getEmail() != null || api.getUserId() != null) {
-                        api.getAuthManager().requestNewAuthToken(false, successCallback, shouldRetryJWTRefresh);
+                        api.getAuthManager().requestNewAuthToken(false, successCallback, isScheduledRefresh);
                     } else {
                         IterableLogger.w(TAG, "Email or userId is not available. Skipping token refresh");
                     }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index d11a07daf..2396439a6 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -26,6 +26,8 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Objects;
+import java.util.Timer;
+import java.util.TimerTask;
 
 /**
  * Async task to handle sending data to the Iterable server
@@ -42,9 +44,8 @@ class IterableRequestTask extends AsyncTask<IterableApiRequest, Void, IterableAp
     static final int MAX_RETRY_COUNT = 5;
 
     static final String ERROR_CODE_INVALID_JWT_PAYLOAD = "InvalidJwtPayload";
-
+    static final String ERROR_CODE_MISSING_JWT_PAYLOAD = "BadAuthorizationHeader";
     int retryCount = 0;
-    boolean shouldRetryWhileJwtInvalid = true;
     IterableApiRequest iterableApiRequest;
 
     /**
@@ -62,10 +63,6 @@ protected IterableApiResponse doInBackground(IterableApiRequest... params) {
         return executeApiRequest(iterableApiRequest);
     }
 
-    public void setShouldRetryWhileJwtInvalid(boolean shouldRetryWhileJwtInvalid) {
-        this.shouldRetryWhileJwtInvalid = shouldRetryWhileJwtInvalid;
-    }
-
     private void retryRequestWithNewAuthToken(String newAuthToken) {
         IterableApiRequest request = new IterableApiRequest(
                 iterableApiRequest.apiKey,
@@ -75,7 +72,6 @@ private void retryRequestWithNewAuthToken(String newAuthToken) {
                 newAuthToken,
                 iterableApiRequest.legacyCallback);
         IterableRequestTask requestTask = new IterableRequestTask();
-        requestTask.setShouldRetryWhileJwtInvalid(false);
         requestTask.execute(request);
     }
 
@@ -194,7 +190,7 @@ static IterableApiResponse executeApiRequest(IterableApiRequest iterableApiReque
 
                 // Handle HTTP status codes
                 if (responseCode == 401) {
-                    if (matchesErrorCode(jsonResponse, ERROR_CODE_INVALID_JWT_PAYLOAD)) {
+                    if (matchesErrorCode(jsonResponse, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_MISSING_JWT_PAYLOAD)) {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "JWT Authorization header error");
                         IterableApi.getInstance().getAuthManager().handleAuthFailure(iterableApiRequest.authToken, getMappedErrorCodeForMessage(jsonResponse));
                     } else {
@@ -294,6 +290,8 @@ private static AuthFailureReason getMappedErrorCodeForMessage(JSONObject jsonRes
                     return AuthFailureReason.AUTH_TOKEN_INVALIDATED;
                 case "invalid payload":
                     return AuthFailureReason.AUTH_TOKEN_PAYLOAD_INVALID;
+                case "jwt authorization header is not set":
+                    return AuthFailureReason.AUTH_TOKEN_MISSING;
                 default:
                     return null;
             }
@@ -370,6 +368,7 @@ private void handleSuccessResponse(IterableApiResponse response) {
         IterableApi.getInstance().getAuthManager().resetFailedAuth();
         if (!Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_GET_REMOTE_CONFIGURATION) && !Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_DISABLE_DEVICE)) {
             IterableApi.getInstance().getAuthManager().pauseAuthRetries(false);
+            IterableApi.getInstance().getAuthManager().markLastAuthToken(true);
         }
 
         if (iterableApiRequest.successCallback != null) {
@@ -378,8 +377,9 @@ private void handleSuccessResponse(IterableApiResponse response) {
     }
 
     private void handleErrorResponse(IterableApiResponse response) {
-        if (matchesErrorCode(response.responseJson, ERROR_CODE_INVALID_JWT_PAYLOAD) && shouldRetryWhileJwtInvalid) {
-            requestNewAuthTokenAndRetry(response);
+        if (matchesErrorCode(response.responseJson, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(response.responseJson, ERROR_CODE_MISSING_JWT_PAYLOAD)) {
+            IterableApi.getInstance().getAuthManager().markLastAuthToken(false);
+            requestNewAuthTokenAndRetry();
         }
 
         if (iterableApiRequest.failureCallback != null) {
@@ -387,16 +387,17 @@ private void handleErrorResponse(IterableApiResponse response) {
         }
     }
 
-    private void requestNewAuthTokenAndRetry(IterableApiResponse response) {
+    private void requestNewAuthTokenAndRetry() {
         long retryInterval = IterableApi.getInstance().getAuthManager().getNextRetryInterval();
-        IterableApi.getInstance().getAuthManager().scheduleAuthTokenRefresh(retryInterval, true, data -> {
+        Handler handler = new Handler();
+        handler.postDelayed(() -> IterableApi.getInstance().getAuthManager().requestNewAuthToken(false, data -> {
             try {
                 String newAuthToken = data.getString("newAuthToken");
                 retryRequestWithNewAuthToken(newAuthToken);
             } catch (JSONException e) {
                 e.printStackTrace();
             }
-        });
+        }, false), retryInterval);
     }
 
     protected void setRetryCount(int count) {

From 95497d8be1789267a9ffa51940ad159cb78e60a8 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Mon, 15 Apr 2024 17:06:35 +0530
Subject: [PATCH 12/27] Update IterableRequestTask.java

---
 .../main/java/com/iterable/iterableapi/IterableRequestTask.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index 2396439a6..906d59af4 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -26,8 +26,6 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Objects;
-import java.util.Timer;
-import java.util.TimerTask;
 
 /**
  * Async task to handle sending data to the Iterable server

From f8d7b7411cee79ee3ce3c447ca8840dfe92ccf15 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Mon, 15 Apr 2024 17:45:06 +0530
Subject: [PATCH 13/27] updates

---
 .../iterableapi/IterableAuthManager.java      | 28 +++++++++++++------
 .../iterableapi/IterableRequestTask.java      | 23 +++++++--------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 0662dfca8..9725fa17a 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -26,6 +26,7 @@ public class IterableAuthManager {
     private boolean requiresAuthRefresh;
     private boolean pauseAuthRetry;
     private int retryCount;
+    private boolean isLastAuthTokenValid;
 
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
 
@@ -36,7 +37,7 @@ public class IterableAuthManager {
     }
 
     public synchronized void requestNewAuthToken(boolean hasFailedPriorAuth) {
-        requestNewAuthToken(hasFailedPriorAuth, null, false);
+        requestNewAuthToken(hasFailedPriorAuth, null, true);
     }
 
     public void pauseAuthRetries(boolean pauseRetry) {
@@ -44,6 +45,10 @@ public void pauseAuthRetries(boolean pauseRetry) {
         resetRetryCount();
     }
 
+    void markLastAuthToken(boolean isValid) {
+        isLastAuthTokenValid = isValid;
+    }
+
     void resetRetryCount() {
         retryCount = 0;
     }
@@ -61,8 +66,8 @@ private void handleSuccessForAuthToken(String authToken, IterableHelper.SuccessH
     public synchronized void requestNewAuthToken(
             boolean hasFailedPriorAuth,
             final IterableHelper.SuccessHandler successCallback,
-            boolean shouldRefreshOnFailure) {
-        if ((shouldRefreshOnFailure && pauseAuthRetry) || (retryCount >= api.config.retryPolicy.maxRetry && shouldRefreshOnFailure)) {
+            boolean shouldIgnoreRetryPolicy) {
+        if ((!shouldIgnoreRetryPolicy && pauseAuthRetry) || (retryCount >= api.config.retryPolicy.maxRetry && !shouldIgnoreRetryPolicy)) {
             return;
         }
 
@@ -76,6 +81,11 @@ public synchronized void requestNewAuthToken(
                         @Override
                         public void run() {
                             try {
+                                if (isLastAuthTokenValid && !shouldIgnoreRetryPolicy) {
+                                    // if some JWT retry had valid token it will not fetch the auth token again from developer function
+                                    handleAuthTokenSuccess(IterableApi.getInstance().getAuthToken(), successCallback);
+                                    return;
+                                }
                                 final String authToken = authHandler.onAuthTokenRequested();
                                 retryCount++;
                                 handleAuthTokenSuccess(authToken, successCallback);
@@ -104,7 +114,7 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
         } else {
             IterableLogger.w(TAG, "Auth token received as null. Calling the handler in 10 seconds");
             //TODO: Make this time configurable and in sync with SDK initialization flow for auth null scenario
-            scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
+            scheduleAuthTokenRefresh(getNextRetryInterval(), false, null);
             authHandler.onTokenRegistrationFailed(new Throwable("Auth token null"));
             return;
         }
@@ -127,7 +137,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             long expirationTimeSeconds = decodedExpiration(encodedJWT);
             long triggerExpirationRefreshTime = expirationTimeSeconds * 1000L - expiringAuthTokenRefreshPeriod - IterableUtil.currentTimeMillis();
             if (triggerExpirationRefreshTime > 0) {
-                scheduleAuthTokenRefresh(triggerExpirationRefreshTime, false, null);
+                scheduleAuthTokenRefresh(triggerExpirationRefreshTime, true, null);
             } else {
                 IterableLogger.w(TAG, "The expiringAuthTokenRefreshPeriod has already passed for the current JWT");
             }
@@ -135,7 +145,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             IterableLogger.e(TAG, "Error while parsing JWT for the expiration", e);
             authHandler.onTokenRegistrationFailed(new Throwable("Auth token decode failure. Scheduling auth token refresh in 10 seconds..."));
             //TODO: Sync with configured time duration once feature is available.
-            scheduleAuthTokenRefresh(getNextRetryInterval(), true, null);
+            scheduleAuthTokenRefresh(getNextRetryInterval(), false, null);
         }
     }
 
@@ -158,8 +168,8 @@ long getNextRetryInterval() {
         return nextRetryInterval;
     }
 
-    void scheduleAuthTokenRefresh(long timeDuration, boolean shouldRetryJWTRefresh, final IterableHelper.SuccessHandler successCallback) {
-        if (pauseAuthRetry && shouldRetryJWTRefresh) {
+    void scheduleAuthTokenRefresh(long timeDuration, boolean isScheduledRefresh, final IterableHelper.SuccessHandler successCallback) {
+        if (pauseAuthRetry && !isScheduledRefresh) {
             // we only stop schedule token refresh it is called from retry (in case of failure). The normal auth token refresh schedule would work
             return;
         }
@@ -169,7 +179,7 @@ void scheduleAuthTokenRefresh(long timeDuration, boolean shouldRetryJWTRefresh,
                 @Override
                 public void run() {
                     if (api.getEmail() != null || api.getUserId() != null) {
-                        api.getAuthManager().requestNewAuthToken(false, successCallback, shouldRetryJWTRefresh);
+                        api.getAuthManager().requestNewAuthToken(false, successCallback, isScheduledRefresh);
                     } else {
                         IterableLogger.w(TAG, "Email or userId is not available. Skipping token refresh");
                     }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index 558ef39e9..88711db0f 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -42,9 +42,8 @@ class IterableRequestTask extends AsyncTask<IterableApiRequest, Void, IterableAp
     static final int MAX_RETRY_COUNT = 5;
 
     static final String ERROR_CODE_INVALID_JWT_PAYLOAD = "InvalidJwtPayload";
-
+    static final String ERROR_CODE_MISSING_JWT_PAYLOAD = "BadAuthorizationHeader";
     int retryCount = 0;
-    boolean shouldRetryWhileJwtInvalid = true;
     IterableApiRequest iterableApiRequest;
 
     /**
@@ -62,10 +61,6 @@ protected IterableApiResponse doInBackground(IterableApiRequest... params) {
         return executeApiRequest(iterableApiRequest);
     }
 
-    public void setShouldRetryWhileJwtInvalid(boolean shouldRetryWhileJwtInvalid) {
-        this.shouldRetryWhileJwtInvalid = shouldRetryWhileJwtInvalid;
-    }
-
     private void retryRequestWithNewAuthToken(String newAuthToken) {
         IterableApiRequest request = new IterableApiRequest(
                 iterableApiRequest.apiKey,
@@ -75,7 +70,6 @@ private void retryRequestWithNewAuthToken(String newAuthToken) {
                 newAuthToken,
                 iterableApiRequest.legacyCallback);
         IterableRequestTask requestTask = new IterableRequestTask();
-        requestTask.setShouldRetryWhileJwtInvalid(false);
         requestTask.execute(request);
     }
 
@@ -194,7 +188,7 @@ static IterableApiResponse executeApiRequest(IterableApiRequest iterableApiReque
 
                 // Handle HTTP status codes
                 if (responseCode == 401) {
-                    if (matchesErrorCode(jsonResponse, ERROR_CODE_INVALID_JWT_PAYLOAD)) {
+                    if (matchesErrorCode(jsonResponse, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_MISSING_JWT_PAYLOAD)) {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "JWT Authorization header error");
                     } else {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "Invalid API Key");
@@ -336,6 +330,7 @@ private void handleSuccessResponse(IterableApiResponse response) {
         IterableApi.getInstance().getAuthManager().resetFailedAuth();
         if (!Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_GET_REMOTE_CONFIGURATION) && !Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_DISABLE_DEVICE)) {
             IterableApi.getInstance().getAuthManager().pauseAuthRetries(false);
+            IterableApi.getInstance().getAuthManager().markLastAuthToken(true);
         }
 
         if (iterableApiRequest.successCallback != null) {
@@ -344,8 +339,9 @@ private void handleSuccessResponse(IterableApiResponse response) {
     }
 
     private void handleErrorResponse(IterableApiResponse response) {
-        if (matchesErrorCode(response.responseJson, ERROR_CODE_INVALID_JWT_PAYLOAD) && shouldRetryWhileJwtInvalid) {
-            requestNewAuthTokenAndRetry(response);
+        if (matchesErrorCode(response.responseJson, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(response.responseJson, ERROR_CODE_MISSING_JWT_PAYLOAD)) {
+            IterableApi.getInstance().getAuthManager().markLastAuthToken(false);
+            requestNewAuthTokenAndRetry();
         }
 
         if (iterableApiRequest.failureCallback != null) {
@@ -353,16 +349,17 @@ private void handleErrorResponse(IterableApiResponse response) {
         }
     }
 
-    private void requestNewAuthTokenAndRetry(IterableApiResponse response) {
+    private void requestNewAuthTokenAndRetry() {
         long retryInterval = IterableApi.getInstance().getAuthManager().getNextRetryInterval();
-        IterableApi.getInstance().getAuthManager().scheduleAuthTokenRefresh(retryInterval, true, data -> {
+        Handler handler = new Handler();
+        handler.postDelayed(() -> IterableApi.getInstance().getAuthManager().requestNewAuthToken(false, data -> {
             try {
                 String newAuthToken = data.getString("newAuthToken");
                 retryRequestWithNewAuthToken(newAuthToken);
             } catch (JSONException e) {
                 e.printStackTrace();
             }
-        });
+        }, false), retryInterval);
     }
 
     protected void setRetryCount(int count) {

From eb136f9399a7dbc4b735c58186e7e64956f68fc5 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Mon, 15 Apr 2024 23:36:19 +0530
Subject: [PATCH 14/27] further improvements on parallel API calls to respect
 retrycount

---
 .../com/iterable/iterableapi/IterableApi.java     |  1 +
 .../iterable/iterableapi/IterableAuthManager.java | 15 +++++++++++----
 .../iterable/iterableapi/IterableRequestTask.java | 15 +++++++--------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
index dd07e3c05..8a6d8df85 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
@@ -345,6 +345,7 @@ private void logoutPreviousUser() {
         getInAppManager().reset();
         getEmbeddedManager().reset();
         getAuthManager().clearRefreshTimer();
+        getAuthManager().setIsLastAuthTokenValid(false);
 
         apiClient.onLogout();
     }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 9725fa17a..cd8e311b2 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -28,6 +28,7 @@ public class IterableAuthManager {
     private int retryCount;
     private boolean isLastAuthTokenValid;
 
+    private boolean isTimerScheduled;
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     IterableAuthManager(IterableApi api, IterableAuthHandler authHandler, long expiringAuthTokenRefreshPeriod) {
@@ -45,7 +46,7 @@ public void pauseAuthRetries(boolean pauseRetry) {
         resetRetryCount();
     }
 
-    void markLastAuthToken(boolean isValid) {
+    void setIsLastAuthTokenValid(boolean isValid) {
         isLastAuthTokenValid = isValid;
     }
 
@@ -165,15 +166,19 @@ long getNextRetryInterval() {
         if (api.config.retryPolicy.retryBackoff == RetryPolicy.Type.EXPONENTIAL) {
             nextRetryInterval *= Math.pow(IterableConstants.EXPONENTIAL_FACTOR, retryCount-1); // Exponential backoff
         }
+
         return nextRetryInterval;
     }
 
     void scheduleAuthTokenRefresh(long timeDuration, boolean isScheduledRefresh, final IterableHelper.SuccessHandler successCallback) {
-        if (pauseAuthRetry && !isScheduledRefresh) {
-            // we only stop schedule token refresh it is called from retry (in case of failure). The normal auth token refresh schedule would work
+        if (pauseAuthRetry && !isScheduledRefresh && isTimerScheduled) {
+            // we only stop schedule token refresh if it is called from retry (in case of failure). The normal auth token refresh schedule would work
             return;
         }
-        timer = new Timer(true);
+        if (timer == null) {
+            timer = new Timer(true);
+        }
+
         try {
             timer.schedule(new TimerTask() {
                 @Override
@@ -183,8 +188,10 @@ public void run() {
                     } else {
                         IterableLogger.w(TAG, "Email or userId is not available. Skipping token refresh");
                     }
+                    isTimerScheduled = false;
                 }
             }, timeDuration);
+            isTimerScheduled = true;
         } catch (Exception e) {
             IterableLogger.e(TAG, "timer exception: " + timer, e);
         }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index 88711db0f..a1e7823be 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -43,6 +43,7 @@ class IterableRequestTask extends AsyncTask<IterableApiRequest, Void, IterableAp
 
     static final String ERROR_CODE_INVALID_JWT_PAYLOAD = "InvalidJwtPayload";
     static final String ERROR_CODE_MISSING_JWT_PAYLOAD = "BadAuthorizationHeader";
+    static final String ERROR_CODE_JWT_USER_IDENTIFIERS_MISMATCHED = "JwtUserIdentifiersMismatched";
     int retryCount = 0;
     IterableApiRequest iterableApiRequest;
 
@@ -57,7 +58,6 @@ protected IterableApiResponse doInBackground(IterableApiRequest... params) {
         if (params != null && params.length > 0) {
             iterableApiRequest = params[0];
         }
-
         return executeApiRequest(iterableApiRequest);
     }
 
@@ -188,7 +188,7 @@ static IterableApiResponse executeApiRequest(IterableApiRequest iterableApiReque
 
                 // Handle HTTP status codes
                 if (responseCode == 401) {
-                    if (matchesErrorCode(jsonResponse, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_MISSING_JWT_PAYLOAD)) {
+                    if (matchesErrorCode(jsonResponse, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_MISSING_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_JWT_USER_IDENTIFIERS_MISMATCHED)) {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "JWT Authorization header error");
                     } else {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "Invalid API Key");
@@ -330,7 +330,7 @@ private void handleSuccessResponse(IterableApiResponse response) {
         IterableApi.getInstance().getAuthManager().resetFailedAuth();
         if (!Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_GET_REMOTE_CONFIGURATION) && !Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_DISABLE_DEVICE)) {
             IterableApi.getInstance().getAuthManager().pauseAuthRetries(false);
-            IterableApi.getInstance().getAuthManager().markLastAuthToken(true);
+            IterableApi.getInstance().getAuthManager().setIsLastAuthTokenValid(true);
         }
 
         if (iterableApiRequest.successCallback != null) {
@@ -339,8 +339,8 @@ private void handleSuccessResponse(IterableApiResponse response) {
     }
 
     private void handleErrorResponse(IterableApiResponse response) {
-        if (matchesErrorCode(response.responseJson, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(response.responseJson, ERROR_CODE_MISSING_JWT_PAYLOAD)) {
-            IterableApi.getInstance().getAuthManager().markLastAuthToken(false);
+        if (matchesErrorCode(response.responseJson, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(response.responseJson, ERROR_CODE_MISSING_JWT_PAYLOAD) || matchesErrorCode(response.responseJson, ERROR_CODE_JWT_USER_IDENTIFIERS_MISMATCHED)) {
+            IterableApi.getInstance().getAuthManager().setIsLastAuthTokenValid(false);
             requestNewAuthTokenAndRetry();
         }
 
@@ -351,15 +351,14 @@ private void handleErrorResponse(IterableApiResponse response) {
 
     private void requestNewAuthTokenAndRetry() {
         long retryInterval = IterableApi.getInstance().getAuthManager().getNextRetryInterval();
-        Handler handler = new Handler();
-        handler.postDelayed(() -> IterableApi.getInstance().getAuthManager().requestNewAuthToken(false, data -> {
+        IterableApi.getInstance().getAuthManager().scheduleAuthTokenRefresh(retryInterval, false, data -> {
             try {
                 String newAuthToken = data.getString("newAuthToken");
                 retryRequestWithNewAuthToken(newAuthToken);
             } catch (JSONException e) {
                 e.printStackTrace();
             }
-        }, false), retryInterval);
+        });
     }
 
     protected void setRetryCount(int count) {

From c3d1cf49b0b0ca78a97edef3cee9eef2154a2f77 Mon Sep 17 00:00:00 2001
From: hardikmashru <150107929+hardikmashru@users.noreply.github.com>
Date: Tue, 16 Apr 2024 21:35:09 +0530
Subject: [PATCH 15/27] Update IterableRequestTask.java

merge fixes
---
 .../java/com/iterable/iterableapi/IterableRequestTask.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index 3adce3b7a..f534cd6f2 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -395,7 +395,7 @@ private void requestNewAuthTokenAndRetry() {
             } catch (JSONException e) {
                 e.printStackTrace();
             }
-        }, false), retryInterval);
+        });
     }
 
     protected void setRetryCount(int count) {
@@ -531,4 +531,4 @@ static IterableApiResponse success(int responseCode, String body, @NonNull JSONO
     static IterableApiResponse failure(int responseCode, String body, @Nullable JSONObject json, String errorMessage) {
         return new IterableApiResponse(false, responseCode, body, json, errorMessage);
     }
-}
\ No newline at end of file
+}

From 0ea96a2338fd25eb48bf46f2c36df7a954933c83 Mon Sep 17 00:00:00 2001
From: hardikmashru <150107929+hardikmashru@users.noreply.github.com>
Date: Tue, 16 Apr 2024 22:01:25 +0530
Subject: [PATCH 16/27] conflict fixes

---
 .../java/com/iterable/iterableapi/IterableAuthManager.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 3475cb331..2a3266d0a 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -183,12 +183,7 @@ void scheduleAuthTokenRefresh(long timeDuration, boolean isScheduledRefresh, fin
         if (timer == null) {
             timer = new Timer(true);
         }
-
-        if (pauseAuthRetry && !isScheduledRefresh) {
-            // we only stop schedule token refresh if it is called from retry (in case of failure). The normal auth token refresh schedule would work
-            return;
-        }
-        timer = new Timer(true);
+        
         try {
             timer.schedule(new TimerTask() {
                 @Override

From d2704955cd777f69ea0a725dd894360d37715e36 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Wed, 17 Apr 2024 16:46:13 +0530
Subject: [PATCH 17/27] authmanager reset function added

---
 .../src/main/java/com/iterable/iterableapi/IterableApi.java  | 3 +--
 .../java/com/iterable/iterableapi/IterableAuthManager.java   | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
index 8a6d8df85..e0950d4e2 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
@@ -344,8 +344,7 @@ private void logoutPreviousUser() {
 
         getInAppManager().reset();
         getEmbeddedManager().reset();
-        getAuthManager().clearRefreshTimer();
-        getAuthManager().setIsLastAuthTokenValid(false);
+        getAuthManager().reset();
 
         apiClient.onLogout();
     }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 2a3266d0a..5415ad9f9 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -46,6 +46,11 @@ public void pauseAuthRetries(boolean pauseRetry) {
         resetRetryCount();
     }
 
+    void reset() {
+        clearRefreshTimer();
+        setIsLastAuthTokenValid(false);
+    }
+
     void setIsLastAuthTokenValid(boolean isValid) {
         isLastAuthTokenValid = isValid;
     }

From fe9a16600bcc7b8502447b7ae95745ca35ad11cd Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Fri, 19 Apr 2024 13:04:17 +0530
Subject: [PATCH 18/27] did suggested changes

---
 .../java/com/iterable/iterableapi/IterableApi.java  | 13 +++++++++++--
 .../iterable/iterableapi/IterableAuthManager.java   | 11 +++++++----
 .../iterable/iterableapi/IterableRequestTask.java   | 10 +++++++---
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
index e0950d4e2..dbdb98d32 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
@@ -131,7 +131,7 @@ Context getMainActivityContext() {
     @NonNull
     IterableAuthManager getAuthManager() {
         if (authManager == null) {
-            authManager = new IterableAuthManager(this, config.authHandler, config.expiringAuthTokenRefreshPeriod);
+            authManager = new IterableAuthManager(this, config.authHandler, config.retryPolicy, config.expiringAuthTokenRefreshPeriod);
         }
         return authManager;
     }
@@ -355,7 +355,7 @@ private void onLogin(@Nullable String authToken) {
             return;
         }
 
-        pauseAuthRetries(false);
+        getAuthManager().pauseAuthRetries(false);
         if (authToken != null) {
             setAuthToken(authToken);
         } else {
@@ -697,9 +697,18 @@ public IterableAttributionInfo getAttributionInfo() {
                 IterableUtil.retrieveExpirableJsonObject(getPreferences(), IterableConstants.SHARED_PREFS_ATTRIBUTION_INFO_KEY)
         );
     }
+
+    /**
+     * // This method gets called from developer end only.
+     * @param pauseRetry to pause/unpause auth retries
+     */
     public void pauseAuthRetries(boolean pauseRetry) {
         getAuthManager().pauseAuthRetries(pauseRetry);
+        if (!pauseRetry) { // request new auth token as soon as unpause
+            getAuthManager().requestNewAuthToken(false);
+        }
     }
+
     public void setEmail(@Nullable String email) {
         setEmail(email, null, null, null);
     }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 5415ad9f9..e192e2d56 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -24,6 +24,7 @@ public class IterableAuthManager {
     private boolean hasFailedPriorAuth;
     private boolean pendingAuth;
     private boolean requiresAuthRefresh;
+    private RetryPolicy authRetryPolicy;
     private boolean pauseAuthRetry;
     private int retryCount;
     private boolean isLastAuthTokenValid;
@@ -31,9 +32,10 @@ public class IterableAuthManager {
 
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
 
-    IterableAuthManager(IterableApi api, IterableAuthHandler authHandler, long expiringAuthTokenRefreshPeriod) {
+    IterableAuthManager(IterableApi api, IterableAuthHandler authHandler, RetryPolicy authRetryPolicy, long expiringAuthTokenRefreshPeriod) {
         this.api = api;
         this.authHandler = authHandler;
+        this.authRetryPolicy = authRetryPolicy;
         this.expiringAuthTokenRefreshPeriod = expiringAuthTokenRefreshPeriod;
     }
 
@@ -74,7 +76,7 @@ public synchronized void requestNewAuthToken(
             final IterableHelper.SuccessHandler successCallback,
             boolean shouldIgnoreRetryPolicy) {
       
-        if ((!shouldIgnoreRetryPolicy && pauseAuthRetry) || (retryCount >= api.config.retryPolicy.maxRetry && !shouldIgnoreRetryPolicy)) {
+        if ((!shouldIgnoreRetryPolicy && pauseAuthRetry) || (retryCount >= authRetryPolicy.maxRetry && !shouldIgnoreRetryPolicy)) {
             return;
         }
 
@@ -95,6 +97,7 @@ public void run() {
                                 }
                                 final String authToken = authHandler.onAuthTokenRequested();
                                 retryCount++;
+                                IterableLogger.v("TAG", "AuthRetry::" + retryCount + " of "+authRetryPolicy.maxRetry);
                                 handleAuthTokenSuccess(authToken, successCallback);
                             } catch (final Exception e) {
                                 handleAuthTokenFailure(e);
@@ -172,8 +175,8 @@ void handleAuthFailure(String authToken, AuthFailureReason failureReason) {
     }
 
     long getNextRetryInterval() {
-        long nextRetryInterval = api.config.retryPolicy.retryInterval;
-        if (api.config.retryPolicy.retryBackoff == RetryPolicy.Type.EXPONENTIAL) {
+        long nextRetryInterval = authRetryPolicy.retryInterval;
+        if (authRetryPolicy.retryBackoff == RetryPolicy.Type.EXPONENTIAL) {
             nextRetryInterval *= Math.pow(IterableConstants.EXPONENTIAL_FACTOR, retryCount-1); // Exponential backoff
         }
    
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index f534cd6f2..d7bba0db5 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -189,7 +189,7 @@ static IterableApiResponse executeApiRequest(IterableApiRequest iterableApiReque
 
                 // Handle HTTP status codes
                 if (responseCode == 401) {
-                    if (matchesErrorCode(jsonResponse, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_MISSING_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_JWT_USER_IDENTIFIERS_MISMATCHED)) {
+                    if (matchesJWTErrorCodes(jsonResponse)) {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "JWT Authorization header error");
                         IterableApi.getInstance().getAuthManager().handleAuthFailure(iterableApiRequest.authToken, getMappedErrorCodeForMessage(jsonResponse));
                     } else {
@@ -265,6 +265,10 @@ private static boolean matchesErrorCode(JSONObject jsonResponse, String errorCod
         }
     }
 
+    private static boolean matchesJWTErrorCodes(JSONObject jsonResponse) {
+        return matchesErrorCode(jsonResponse, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_MISSING_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_JWT_USER_IDENTIFIERS_MISMATCHED);
+    }
+
     private static AuthFailureReason getMappedErrorCodeForMessage(JSONObject jsonResponse) {
         try {
             if (jsonResponse == null || !jsonResponse.has("msg")) {
@@ -364,8 +368,8 @@ public void run() {
     }
 
     private void handleSuccessResponse(IterableApiResponse response) {
-        IterableApi.getInstance().getAuthManager().resetFailedAuth();
         if (!Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_GET_REMOTE_CONFIGURATION) && !Objects.equals(iterableApiRequest.resourcePath, ENDPOINT_DISABLE_DEVICE)) {
+            IterableApi.getInstance().getAuthManager().resetFailedAuth();
             IterableApi.getInstance().getAuthManager().pauseAuthRetries(false);
             IterableApi.getInstance().getAuthManager().setIsLastAuthTokenValid(true);
         }
@@ -376,7 +380,7 @@ private void handleSuccessResponse(IterableApiResponse response) {
     }
 
     private void handleErrorResponse(IterableApiResponse response) {
-        if (matchesErrorCode(response.responseJson, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(response.responseJson, ERROR_CODE_MISSING_JWT_PAYLOAD) || matchesErrorCode(response.responseJson, ERROR_CODE_JWT_USER_IDENTIFIERS_MISMATCHED)) {
+        if (matchesJWTErrorCodes(response.responseJson)) {
             IterableApi.getInstance().getAuthManager().setIsLastAuthTokenValid(false);
             requestNewAuthTokenAndRetry();
         }

From 59809271eb8bbd8bd4d98749fbab199ee01aa7ef Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Fri, 19 Apr 2024 15:14:59 +0530
Subject: [PATCH 19/27] style updates

---
 .../src/main/java/com/iterable/iterableapi/AuthFailure.java  | 2 +-
 .../java/com/iterable/iterableapi/IterableAuthManager.java   | 5 ++---
 .../java/com/iterable/iterableapi/IterableRequestTask.java   | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
index 34c512ec7..dfb856cbf 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
@@ -20,7 +20,7 @@ public class AuthFailure {
     public AuthFailure(String userKey,
                        String failedAuthToken,
                        long failedRequestTime,
-                       AuthFailureReason failureReason){
+                       AuthFailureReason failureReason) {
         this.userKey = userKey;
         this.failedAuthToken = failedAuthToken;
         this.failedRequestTime = failedRequestTime;
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index e192e2d56..1acde09dc 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -97,7 +97,6 @@ public void run() {
                                 }
                                 final String authToken = authHandler.onAuthTokenRequested();
                                 retryCount++;
-                                IterableLogger.v("TAG", "AuthRetry::" + retryCount + " of "+authRetryPolicy.maxRetry);
                                 handleAuthTokenSuccess(authToken, successCallback);
                             } catch (final Exception e) {
                                 handleAuthTokenFailure(e);
@@ -177,9 +176,9 @@ void handleAuthFailure(String authToken, AuthFailureReason failureReason) {
     long getNextRetryInterval() {
         long nextRetryInterval = authRetryPolicy.retryInterval;
         if (authRetryPolicy.retryBackoff == RetryPolicy.Type.EXPONENTIAL) {
-            nextRetryInterval *= Math.pow(IterableConstants.EXPONENTIAL_FACTOR, retryCount-1); // Exponential backoff
+            nextRetryInterval *= Math.pow(IterableConstants.EXPONENTIAL_FACTOR, retryCount - 1); // Exponential backoff
         }
-   
+
         return nextRetryInterval;
     }
 
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index d7bba0db5..751130d8e 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -44,7 +44,6 @@ class IterableRequestTask extends AsyncTask<IterableApiRequest, Void, IterableAp
     static final String ERROR_CODE_INVALID_JWT_PAYLOAD = "InvalidJwtPayload";
     static final String ERROR_CODE_MISSING_JWT_PAYLOAD = "BadAuthorizationHeader";
     static final String ERROR_CODE_JWT_USER_IDENTIFIERS_MISMATCHED = "JwtUserIdentifiersMismatched";
-  
     int retryCount = 0;
     IterableApiRequest iterableApiRequest;
 

From 7fad778c7077cb93172e488c58ec13a336515802 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Fri, 19 Apr 2024 15:21:29 +0530
Subject: [PATCH 20/27] checkstyle fixes

---
 .../main/java/com/iterable/iterableapi/IterableAuthManager.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 1acde09dc..2aaea5c36 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -75,7 +75,6 @@ public synchronized void requestNewAuthToken(
             boolean hasFailedPriorAuth,
             final IterableHelper.SuccessHandler successCallback,
             boolean shouldIgnoreRetryPolicy) {
-      
         if ((!shouldIgnoreRetryPolicy && pauseAuthRetry) || (retryCount >= authRetryPolicy.maxRetry && !shouldIgnoreRetryPolicy)) {
             return;
         }
@@ -190,7 +189,6 @@ void scheduleAuthTokenRefresh(long timeDuration, boolean isScheduledRefresh, fin
         if (timer == null) {
             timer = new Timer(true);
         }
-        
         try {
             timer.schedule(new TimerTask() {
                 @Override

From 08dfedc17fcfc893e3d6eeb1d47864af2abf9d5e Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Fri, 19 Apr 2024 15:40:57 +0530
Subject: [PATCH 21/27] Update IterableAuthManager.java

---
 .../java/com/iterable/iterableapi/IterableAuthManager.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 2aaea5c36..deefc8ab3 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -169,7 +169,9 @@ void reSyncAuth() {
     }
 
     void handleAuthFailure(String authToken, AuthFailureReason failureReason) {
-        authHandler.onAuthFailure(new AuthFailure(getEmailOrUserId(), authToken, IterableUtil.currentTimeMillis(), failureReason));
+        if (authHandler != null) {
+            authHandler.onAuthFailure(new AuthFailure(getEmailOrUserId(), authToken, IterableUtil.currentTimeMillis(), failureReason));
+        }
     }
 
     long getNextRetryInterval() {

From 32b9922a04750572ec83a750ad164a300cbcd669 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Mon, 22 Apr 2024 11:54:09 +0530
Subject: [PATCH 22/27] removed Part 2 code

---
 .../com/iterable/iterableapi/AuthFailure.java | 31 ----------------
 .../iterableapi/AuthFailureReason.java        | 15 --------
 .../iterableapi/IterableAuthHandler.java      |  2 +-
 .../iterableapi/IterableAuthManager.java      | 12 ++-----
 .../iterableapi/IterableRequestTask.java      | 36 -------------------
 5 files changed, 4 insertions(+), 92 deletions(-)
 delete mode 100644 iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
 delete mode 100644 iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
deleted file mode 100644
index dfb856cbf..000000000
--- a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailure.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.iterable.iterableapi;
-
-/**
- * Represents an auth failure object.
- */
-public class AuthFailure {
-
-    /** userId or email of the signed-in user */
-    public final String userKey;
-
-    /** the authToken which casued the failure */
-    public final String failedAuthToken;
-
-    /** the timestamp of the failed request */
-    public final long failedRequestTime;
-
-    /** indicates a reason for failure */
-    public final AuthFailureReason failureReason;
-
-    public AuthFailure(String userKey,
-                       String failedAuthToken,
-                       long failedRequestTime,
-                       AuthFailureReason failureReason) {
-        this.userKey = userKey;
-        this.failedAuthToken = failedAuthToken;
-        this.failedRequestTime = failedRequestTime;
-        this.failureReason = failureReason;
-    }
-}
-
-
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java b/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java
deleted file mode 100644
index 03156c7cc..000000000
--- a/iterableapi/src/main/java/com/iterable/iterableapi/AuthFailureReason.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.iterable.iterableapi;
-
-public enum AuthFailureReason {
-    AUTH_TOKEN_EXPIRED,
-    AUTH_TOKEN_GENERIC_ERROR,
-    AUTH_TOKEN_EXPIRATION_INVALID,
-    AUTH_TOKEN_SIGNATURE_INVALID,
-    AUTH_TOKEN_FORMAT_INVALID,
-    AUTH_TOKEN_INVALIDATED,
-    AUTH_TOKEN_PAYLOAD_INVALID,
-    AUTH_TOKEN_USER_KEY_INVALID,
-    AUTH_TOKEN_NULL,
-    AUTH_TOKEN_GENERATION_ERROR,
-    AUTH_TOKEN_MISSING,
-    }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthHandler.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthHandler.java
index 17509df33..c8c09cf66 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthHandler.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthHandler.java
@@ -3,5 +3,5 @@
 public interface IterableAuthHandler {
     String onAuthTokenRequested();
     void onTokenRegistrationSuccessful(String authToken);
-    void onAuthFailure(AuthFailure authFailure);
+    void onTokenRegistrationFailed(Throwable object);
 }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index deefc8ab3..274d8724b 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -123,7 +123,7 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
             IterableLogger.w(TAG, "Auth token received as null. Calling the handler in 10 seconds");
             //TODO: Make this time configurable and in sync with SDK initialization flow for auth null scenario
             scheduleAuthTokenRefresh(getNextRetryInterval(), false, null);
-            handleAuthFailure(null, AuthFailureReason.AUTH_TOKEN_NULL);
+            authHandler.onTokenRegistrationFailed(new Throwable("Auth token null"));
             return;
         }
         IterableApi.getInstance().setAuthToken(authToken);
@@ -134,7 +134,7 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
 
     private void handleAuthTokenFailure(Throwable throwable) {
         IterableLogger.e(TAG, "Error while requesting Auth Token", throwable);
-        handleAuthFailure(null, AuthFailureReason.AUTH_TOKEN_GENERATION_ERROR);
+        authHandler.onTokenRegistrationFailed(throwable);
         pendingAuth = false;
         reSyncAuth();
     }
@@ -151,7 +151,7 @@ public void queueExpirationRefresh(String encodedJWT) {
             }
         } catch (Exception e) {
             IterableLogger.e(TAG, "Error while parsing JWT for the expiration", e);
-            handleAuthFailure(encodedJWT, AuthFailureReason.AUTH_TOKEN_PAYLOAD_INVALID);
+            authHandler.onTokenRegistrationFailed(new Throwable("Auth token decode failure. Scheduling auth token refresh in 10 seconds..."));
             //TODO: Sync with configured time duration once feature is available.
             scheduleAuthTokenRefresh(getNextRetryInterval(), false, null);
         }
@@ -168,12 +168,6 @@ void reSyncAuth() {
         }
     }
 
-    void handleAuthFailure(String authToken, AuthFailureReason failureReason) {
-        if (authHandler != null) {
-            authHandler.onAuthFailure(new AuthFailure(getEmailOrUserId(), authToken, IterableUtil.currentTimeMillis(), failureReason));
-        }
-    }
-
     long getNextRetryInterval() {
         long nextRetryInterval = authRetryPolicy.retryInterval;
         if (authRetryPolicy.retryBackoff == RetryPolicy.Type.EXPONENTIAL) {
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index 751130d8e..7013cee9c 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -190,7 +190,6 @@ static IterableApiResponse executeApiRequest(IterableApiRequest iterableApiReque
                 if (responseCode == 401) {
                     if (matchesJWTErrorCodes(jsonResponse)) {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "JWT Authorization header error");
-                        IterableApi.getInstance().getAuthManager().handleAuthFailure(iterableApiRequest.authToken, getMappedErrorCodeForMessage(jsonResponse));
                     } else {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "Invalid API Key");
                     }
@@ -268,41 +267,6 @@ private static boolean matchesJWTErrorCodes(JSONObject jsonResponse) {
         return matchesErrorCode(jsonResponse, ERROR_CODE_INVALID_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_MISSING_JWT_PAYLOAD) || matchesErrorCode(jsonResponse, ERROR_CODE_JWT_USER_IDENTIFIERS_MISMATCHED);
     }
 
-    private static AuthFailureReason getMappedErrorCodeForMessage(JSONObject jsonResponse) {
-        try {
-            if (jsonResponse == null || !jsonResponse.has("msg")) {
-                return null;
-            }
-
-            String errorMessage = jsonResponse.getString("msg");
-
-            switch (errorMessage.toLowerCase()) {
-                case "exp must be less than 1 year from iat":
-                    return AuthFailureReason.AUTH_TOKEN_EXPIRATION_INVALID;
-                case "jwt format is invalid":
-                    return AuthFailureReason.AUTH_TOKEN_FORMAT_INVALID;
-                case "jwt token is expired":
-                    return AuthFailureReason.AUTH_TOKEN_EXPIRED;
-                case "jwt is invalid":
-                    return AuthFailureReason.AUTH_TOKEN_SIGNATURE_INVALID;
-                case "jwt payload requires a value for userid or email":
-                case "email could not be found":
-                    return AuthFailureReason.AUTH_TOKEN_USER_KEY_INVALID;
-                case "jwt token has been invalidated":
-                    return AuthFailureReason.AUTH_TOKEN_INVALIDATED;
-                case "invalid payload":
-                    return AuthFailureReason.AUTH_TOKEN_PAYLOAD_INVALID;
-                case "jwt authorization header is not set":
-                    return AuthFailureReason.AUTH_TOKEN_MISSING;
-                default:
-                    return null;
-            }
-        } catch (JSONException e) {
-            return null;
-        }
-    }
-
-
     private static void logError(IterableApiRequest iterableApiRequest, String baseUrl, Exception e) {
         IterableLogger.e(TAG, "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n" +
                 "Exception occurred for : " + baseUrl + iterableApiRequest.resourcePath);

From 03861a772bfc3cde64d9b92efb5c94600b6e52d9 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Tue, 23 Apr 2024 15:57:10 +0530
Subject: [PATCH 23/27] Update IterableRequestTask.java

---
 .../iterableapi/IterableRequestTask.java      | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index 7013cee9c..78234dd3a 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -61,7 +61,7 @@ protected IterableApiResponse doInBackground(IterableApiRequest... params) {
         return executeApiRequest(iterableApiRequest);
     }
 
-    private void retryRequestWithNewAuthToken(String newAuthToken) {
+    private static void retryRequestWithNewAuthToken(String newAuthToken, IterableApiRequest iterableApiRequest) {
         IterableApiRequest request = new IterableApiRequest(
                 iterableApiRequest.apiKey,
                 iterableApiRequest.resourcePath,
@@ -190,6 +190,8 @@ static IterableApiResponse executeApiRequest(IterableApiRequest iterableApiReque
                 if (responseCode == 401) {
                     if (matchesJWTErrorCodes(jsonResponse)) {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "JWT Authorization header error");
+                        // We handle the JWT Retry for both online and offline here rather than handling online request in onPostExecute
+                        handleErrorResponse(apiResponse, iterableApiRequest);
                     } else {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "Invalid API Key");
                     }
@@ -302,8 +304,6 @@ protected void onPostExecute(IterableApiResponse response) {
             return;
         } else if (response.success) {
             handleSuccessResponse(response);
-        } else {
-            handleErrorResponse(response);
         }
 
         if (iterableApiRequest.legacyCallback != null) {
@@ -342,23 +342,23 @@ private void handleSuccessResponse(IterableApiResponse response) {
         }
     }
 
-    private void handleErrorResponse(IterableApiResponse response) {
-        if (matchesJWTErrorCodes(response.responseJson)) {
-            IterableApi.getInstance().getAuthManager().setIsLastAuthTokenValid(false);
-            requestNewAuthTokenAndRetry();
-        }
+    private static void handleErrorResponse(IterableApiResponse response, IterableApiRequest iterableApiRequest) {
+        requestNewAuthTokenAndRetry(newToken -> {
+            retryRequestWithNewAuthToken(newToken, iterableApiRequest);
+        });
 
         if (iterableApiRequest.failureCallback != null) {
             iterableApiRequest.failureCallback.onFailure(response.errorMessage, response.responseJson);
         }
     }
 
-    private void requestNewAuthTokenAndRetry() {
+    private static void requestNewAuthTokenAndRetry(IterableAuthTokenReceiver iterableAuthTokenReceiver) {
+        IterableApi.getInstance().getAuthManager().setIsLastAuthTokenValid(false);
         long retryInterval = IterableApi.getInstance().getAuthManager().getNextRetryInterval();
         IterableApi.getInstance().getAuthManager().scheduleAuthTokenRefresh(retryInterval, false, data -> {
             try {
                 String newAuthToken = data.getString("newAuthToken");
-                retryRequestWithNewAuthToken(newAuthToken);
+                iterableAuthTokenReceiver.onFetchNewAuthToken(newAuthToken);
             } catch (JSONException e) {
                 e.printStackTrace();
             }
@@ -370,6 +370,10 @@ protected void setRetryCount(int count) {
     }
 }
 
+
+interface IterableAuthTokenReceiver {
+    void onFetchNewAuthToken(String newToken);
+}
 /**
  *  Iterable Request object
  */

From cc80f400e980874f067c77658af1d754d35cf5ed Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Tue, 23 Apr 2024 16:16:36 +0530
Subject: [PATCH 24/27] Update IterableRequestTask.java

---
 .../iterable/iterableapi/IterableRequestTask.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index 78234dd3a..719186407 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -191,7 +191,7 @@ static IterableApiResponse executeApiRequest(IterableApiRequest iterableApiReque
                     if (matchesJWTErrorCodes(jsonResponse)) {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "JWT Authorization header error");
                         // We handle the JWT Retry for both online and offline here rather than handling online request in onPostExecute
-                        handleErrorResponse(apiResponse, iterableApiRequest);
+                        handleJWTError(apiResponse, iterableApiRequest);
                     } else {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "Invalid API Key");
                     }
@@ -304,6 +304,8 @@ protected void onPostExecute(IterableApiResponse response) {
             return;
         } else if (response.success) {
             handleSuccessResponse(response);
+        } else {
+            handleErrorResponse(response, iterableApiRequest);
         }
 
         if (iterableApiRequest.legacyCallback != null) {
@@ -343,13 +345,17 @@ private void handleSuccessResponse(IterableApiResponse response) {
     }
 
     private static void handleErrorResponse(IterableApiResponse response, IterableApiRequest iterableApiRequest) {
+        if (iterableApiRequest.failureCallback != null) {
+            iterableApiRequest.failureCallback.onFailure(response.errorMessage, response.responseJson);
+        }
+    }
+
+    private static void handleJWTError(IterableApiResponse response, IterableApiRequest iterableApiRequest) {
         requestNewAuthTokenAndRetry(newToken -> {
             retryRequestWithNewAuthToken(newToken, iterableApiRequest);
         });
 
-        if (iterableApiRequest.failureCallback != null) {
-            iterableApiRequest.failureCallback.onFailure(response.errorMessage, response.responseJson);
-        }
+        handleErrorResponse(response, iterableApiRequest);
     }
 
     private static void requestNewAuthTokenAndRetry(IterableAuthTokenReceiver iterableAuthTokenReceiver) {

From b6c8a14e79306a205bc4b987458755948b673d50 Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Tue, 23 Apr 2024 16:37:17 +0530
Subject: [PATCH 25/27] Update IterableRequestTask.java

---
 .../iterableapi/IterableRequestTask.java      | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
index 719186407..430853d77 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequestTask.java
@@ -191,7 +191,7 @@ static IterableApiResponse executeApiRequest(IterableApiRequest iterableApiReque
                     if (matchesJWTErrorCodes(jsonResponse)) {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "JWT Authorization header error");
                         // We handle the JWT Retry for both online and offline here rather than handling online request in onPostExecute
-                        handleJWTError(apiResponse, iterableApiRequest);
+                        requestNewAuthTokenAndRetry(iterableApiRequest);
                     } else {
                         apiResponse = IterableApiResponse.failure(responseCode, requestResult, jsonResponse, "Invalid API Key");
                     }
@@ -305,7 +305,7 @@ protected void onPostExecute(IterableApiResponse response) {
         } else if (response.success) {
             handleSuccessResponse(response);
         } else {
-            handleErrorResponse(response, iterableApiRequest);
+            handleErrorResponse(response);
         }
 
         if (iterableApiRequest.legacyCallback != null) {
@@ -344,27 +344,19 @@ private void handleSuccessResponse(IterableApiResponse response) {
         }
     }
 
-    private static void handleErrorResponse(IterableApiResponse response, IterableApiRequest iterableApiRequest) {
+    private void handleErrorResponse(IterableApiResponse response) {
         if (iterableApiRequest.failureCallback != null) {
             iterableApiRequest.failureCallback.onFailure(response.errorMessage, response.responseJson);
         }
     }
 
-    private static void handleJWTError(IterableApiResponse response, IterableApiRequest iterableApiRequest) {
-        requestNewAuthTokenAndRetry(newToken -> {
-            retryRequestWithNewAuthToken(newToken, iterableApiRequest);
-        });
-
-        handleErrorResponse(response, iterableApiRequest);
-    }
-
-    private static void requestNewAuthTokenAndRetry(IterableAuthTokenReceiver iterableAuthTokenReceiver) {
+    private static void requestNewAuthTokenAndRetry(IterableApiRequest iterableApiRequest) {
         IterableApi.getInstance().getAuthManager().setIsLastAuthTokenValid(false);
         long retryInterval = IterableApi.getInstance().getAuthManager().getNextRetryInterval();
         IterableApi.getInstance().getAuthManager().scheduleAuthTokenRefresh(retryInterval, false, data -> {
             try {
                 String newAuthToken = data.getString("newAuthToken");
-                iterableAuthTokenReceiver.onFetchNewAuthToken(newAuthToken);
+                retryRequestWithNewAuthToken(newAuthToken, iterableApiRequest);
             } catch (JSONException e) {
                 e.printStackTrace();
             }
@@ -376,10 +368,6 @@ protected void setRetryCount(int count) {
     }
 }
 
-
-interface IterableAuthTokenReceiver {
-    void onFetchNewAuthToken(String newToken);
-}
 /**
  *  Iterable Request object
  */

From 95687c2d1798d3b0f3bf52d2cb8b58d52882015f Mon Sep 17 00:00:00 2001
From: Hardik Mashru <hardik.mashru@iterable.com>
Date: Thu, 25 Apr 2024 23:33:47 +0530
Subject: [PATCH 26/27] handled null and exception scenario for authtoken

---
 .../com/iterable/iterableapi/IterableAuthManager.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index 274d8724b..a61d71415 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -95,9 +95,11 @@ public void run() {
                                     return;
                                 }
                                 final String authToken = authHandler.onAuthTokenRequested();
+                                pendingAuth = false;
                                 retryCount++;
                                 handleAuthTokenSuccess(authToken, successCallback);
                             } catch (final Exception e) {
+                                retryCount++;
                                 handleAuthTokenFailure(e);
                             }
                         }
@@ -127,7 +129,6 @@ private void handleAuthTokenSuccess(String authToken, IterableHelper.SuccessHand
             return;
         }
         IterableApi.getInstance().setAuthToken(authToken);
-        pendingAuth = false;
         reSyncAuth();
         authHandler.onTokenRegistrationSuccessful(authToken);
     }
@@ -136,7 +137,7 @@ private void handleAuthTokenFailure(Throwable throwable) {
         IterableLogger.e(TAG, "Error while requesting Auth Token", throwable);
         authHandler.onTokenRegistrationFailed(throwable);
         pendingAuth = false;
-        reSyncAuth();
+        scheduleAuthTokenRefresh(getNextRetryInterval(), false, null);
     }
 
     public void queueExpirationRefresh(String encodedJWT) {
@@ -164,7 +165,7 @@ void resetFailedAuth() {
     void reSyncAuth() {
         if (requiresAuthRefresh) {
             requiresAuthRefresh = false;
-            requestNewAuthToken(false);
+            scheduleAuthTokenRefresh(getNextRetryInterval(), false, null);
         }
     }
 
@@ -178,7 +179,7 @@ long getNextRetryInterval() {
     }
 
     void scheduleAuthTokenRefresh(long timeDuration, boolean isScheduledRefresh, final IterableHelper.SuccessHandler successCallback) {
-        if (pauseAuthRetry && !isScheduledRefresh && isTimerScheduled) {
+        if ((pauseAuthRetry && !isScheduledRefresh) || isTimerScheduled) {
             // we only stop schedule token refresh if it is called from retry (in case of failure). The normal auth token refresh schedule would work
             return;
         }

From 4074a89cf3e2f885df0a29a02158962772c507b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CAkshay?= <“ayyanchira.akshay@gmail.com”>
Date: Tue, 7 May 2024 18:37:37 -0700
Subject: [PATCH 27/27] Making some properties package friendly

This will allow Iterable tester apps to read values from auth Manager for testing purpose
---
 .../java/com/iterable/iterableapi/IterableAuthManager.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
index a61d71415..87e51f1cd 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java
@@ -24,9 +24,9 @@ public class IterableAuthManager {
     private boolean hasFailedPriorAuth;
     private boolean pendingAuth;
     private boolean requiresAuthRefresh;
-    private RetryPolicy authRetryPolicy;
-    private boolean pauseAuthRetry;
-    private int retryCount;
+    RetryPolicy authRetryPolicy;
+    boolean pauseAuthRetry;
+    int retryCount;
     private boolean isLastAuthTokenValid;
     private boolean isTimerScheduled;