Merge branch 'loren/embedded/MOB-12265-start-end-session' into loren/embedded/MOB-12264-android-sync-and-get-messages

Author: lposen

CHANGELOG.md

@@ -1,13 +1,4 @@
-## 2.2.0-alpha.1
-
-### Updates
-* [SDK-149] Added logout functionality
-
-### Fixes
-* [SDK-151] Fixed "cannot read property authtoken of undefined" error
-
-
-## 2.2.0-alpha.0
+## 2.2.0
 
 ### Updates
 - Updated Android SDK version to [3.6.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.6.2)
@@ -18,13 +9,19 @@
   - Added `onJwtError` and `retryPolicy` for control over JWT flow
 - Moved all native calls to `IterableApi.ts`
 - Added JWT example to our example app
+- Changed `onJWTError` to `onJwtError`
+- Changed `IterableRetryBackoff` enum keys to be lowercase for consistency
+  across application
+- [SDK-149] Added logout functionality
 
 ### Fixes
 - Created a standalone `IterableLogger` to avoid circular dependencies
+- [SDK-151] Fixed "cannot read property authtoken of undefined" error
+- Fixed Android `retryInterval` not being updated on re-initialization.
 
 ## 2.1.0
 ### Updates
-* SDK is now compatible with both New Architecture and Legacy Architecture. Fix
+- SDK is now compatible with both New Architecture and Legacy Architecture. Fix
   for #691, #602, #563.
 
 ### Fixes

android/src/main/java/com/iterable/reactnative/RNIterableAPIModuleImpl.java

@@ -26,6 +26,7 @@
 import com.iterable.iterableapi.IterableApi;
 import com.iterable.iterableapi.IterableAttributionInfo;
 import com.iterable.iterableapi.IterableAuthHandler;
+import com.iterable.iterableapi.IterableAuthManager;
 import com.iterable.iterableapi.IterableConfig;
 import com.iterable.iterableapi.IterableCustomActionHandler;
 import com.iterable.iterableapi.IterableEmbeddedMessage;
@@ -91,11 +92,36 @@ public void initializeWithApiKey(String apiKey, ReadableMap configReadableMap, S
             configBuilder.setAuthHandler(this);
         }
 
-        if (configReadableMap.hasKey("enableEmbeddedMessaging")) {
-            configBuilder.setEnableEmbeddedMessaging(configReadableMap.getBoolean("enableEmbeddedMessaging"));
+        IterableConfig config = configBuilder.build();
+        IterableApi.initialize(reactContext, apiKey, config);
+
+        // Update retry policy on existing authManager if it was already created
+        // This fixes the issue where retryInterval is not respected after
+        // re-initialization
+        // TODO [SDK-197]: Fix the root cause of this issue, instead of this hack
+        try {
+            // Use reflection to access package-private fields and methods
+            java.lang.reflect.Field configRetryPolicyField = config.getClass().getDeclaredField("retryPolicy");
+            configRetryPolicyField.setAccessible(true);
+            Object retryPolicy = configRetryPolicyField.get(config);
+
+            if (retryPolicy != null) {
+                java.lang.reflect.Method getAuthManagerMethod = IterableApi.getInstance().getClass().getDeclaredMethod("getAuthManager");
+                getAuthManagerMethod.setAccessible(true);
+                IterableAuthManager authManager = (IterableAuthManager) getAuthManagerMethod.invoke(IterableApi.getInstance());
+
+                if (authManager != null) {
+                    // Update the retry policy field on the authManager
+                    java.lang.reflect.Field authRetryPolicyField = authManager.getClass().getDeclaredField("authRetryPolicy");
+                    authRetryPolicyField.setAccessible(true);
+                    authRetryPolicyField.set(authManager, retryPolicy);
+                    IterableLogger.d(TAG, "Updated retry policy on existing authManager");
+                }
+            }
+        } catch (Exception e) {
+            IterableLogger.e(TAG, "Failed to update retry policy: " + e.getMessage());
         }
 
-        IterableApi.initialize(reactContext, apiKey, configBuilder.build());
         IterableApi.getInstance().setDeviceAttribute("reactNativeSDKVersion", version);
 
         IterableApi.getInstance().getInAppManager().addListener(this);
@@ -126,15 +152,40 @@ public void initialize2WithApiKey(String apiKey, ReadableMap configReadableMap,
             configBuilder.setAuthHandler(this);
         }
 
-        if (configReadableMap.hasKey("enableEmbeddedMessaging")) {
-            configBuilder.setEnableEmbeddedMessaging(configReadableMap.getBoolean("enableEmbeddedMessaging"));
-        }
-
         // NOTE: There does not seem to be a way to set the API endpoint
         // override in the Android SDK.  Check with @Ayyanchira and @evantk91 to
         // see what the best approach is.
 
-        IterableApi.initialize(reactContext, apiKey, configBuilder.build());
+        IterableConfig config = configBuilder.build();
+        IterableApi.initialize(reactContext, apiKey, config);
+
+        // Update retry policy on existing authManager if it was already created
+        // This fixes the issue where retryInterval is not respected after
+        // re-initialization
+        // TODO [SDK-197]: Fix the root cause of this issue, instead of this hack
+        try {
+            // Use reflection to access package-private fields and methods
+            java.lang.reflect.Field configRetryPolicyField = config.getClass().getDeclaredField("retryPolicy");
+            configRetryPolicyField.setAccessible(true);
+            Object retryPolicy = configRetryPolicyField.get(config);
+
+            if (retryPolicy != null) {
+                java.lang.reflect.Method getAuthManagerMethod = IterableApi.getInstance().getClass().getDeclaredMethod("getAuthManager");
+                getAuthManagerMethod.setAccessible(true);
+                IterableAuthManager authManager = (IterableAuthManager) getAuthManagerMethod.invoke(IterableApi.getInstance());
+
+                if (authManager != null) {
+                    // Update the retry policy field on the authManager
+                    java.lang.reflect.Field authRetryPolicyField = authManager.getClass().getDeclaredField("authRetryPolicy");
+                    authRetryPolicyField.setAccessible(true);
+                    authRetryPolicyField.set(authManager, retryPolicy);
+                    IterableLogger.d(TAG, "Updated retry policy on existing authManager");
+                }
+            }
+        } catch (Exception e) {
+            IterableLogger.e(TAG, "Failed to update retry policy: " + e.getMessage());
+        }
+
         IterableApi.getInstance().setDeviceAttribute("reactNativeSDKVersion", version);
 
         IterableApi.getInstance().getInAppManager().addListener(this);

example/ios/ReactNativeSdkExample/Info.plist

@@ -52,27 +52,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>UIAppFonts</key>
-	<array>
-		<string>AntDesign.ttf</string>
-		<string>Entypo.ttf</string>
-		<string>EvilIcons.ttf</string>
-		<string>Feather.ttf</string>
-		<string>FontAwesome.ttf</string>
-		<string>FontAwesome5_Brands.ttf</string>
-		<string>FontAwesome5_Regular.ttf</string>
-		<string>FontAwesome5_Solid.ttf</string>
-		<string>FontAwesome6_Brands.ttf</string>
-		<string>FontAwesome6_Regular.ttf</string>
-		<string>FontAwesome6_Solid.ttf</string>
-		<string>Foundation.ttf</string>
-		<string>Ionicons.ttf</string>
-		<string>MaterialIcons.ttf</string>
-		<string>MaterialCommunityIcons.ttf</string>
-		<string>SimpleLineIcons.ttf</string>
-		<string>Octicons.ttf</string>
-		<string>Zocial.ttf</string>
-		<string>Fontisto.ttf</string>
-	</array>
 </dict>
 </plist>

example/package.json

@@ -25,7 +25,7 @@
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.3",
     "@babel/runtime": "^7.25.0",
-    "@react-native-community/cli": "18.0.0",
+    "@react-native-community/cli": "18.0.1",
     "@react-native-community/cli-platform-android": "18.0.0",
     "@react-native-community/cli-platform-ios": "18.0.0",
     "@react-native/babel-preset": "0.79.3",

example/src/hooks/useIterableApp.tsx

@@ -89,6 +89,8 @@ const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 
 const getIsEmail = (id: string) => EMAIL_REGEX.test(id);
 
+let lastTimeStamp = 0;
+
 export const IterableAppProvider: FunctionComponent<
   React.PropsWithChildren<unknown>
 > = ({ children }) => {
@@ -147,17 +149,15 @@ export const IterableAppProvider: FunctionComponent<
 
   const initialize = useCallback(
     (navigation: Navigation) => {
-      if (getUserId()) {
-        login();
-      }
+      logout();
 
       const config = new IterableConfig();
 
       config.inAppDisplayInterval = 1.0; // Min gap between in-apps. No need to set this in production.
 
       config.retryPolicy = {
         maxRetry: 5,
-        retryInterval: 10,
+        retryInterval: 5,
         retryBackoff: IterableRetryBackoff.linear,
       };
 
@@ -209,8 +209,16 @@ export const IterableAppProvider: FunctionComponent<
         process.env.ITBL_JWT_SECRET
       ) {
         config.authHandler = async () => {
+          console.group('authHandler');
+          const now = Date.now();
+          if (lastTimeStamp !== 0) {
+            console.log('Time since last call:', now - lastTimeStamp);
+          }
+          lastTimeStamp = now;
+          console.groupEnd();
+
+          // return 'InvalidToken'; // Uncomment this to test the failure callback
           const token = await getJwtToken();
-          // return 'SomethingNotValid'; // Uncomment this to test the failure callback
           return token;
         };
       }
@@ -229,6 +237,10 @@ export const IterableAppProvider: FunctionComponent<
         .then((isSuccessful) => {
           setIsInitialized(isSuccessful);
 
+          if (isSuccessful && getUserId()) {
+            return login();
+          }
+
           if (!isSuccessful) {
             return Promise.reject('`Iterable.initialize` failed');
           }
@@ -252,6 +264,8 @@ export const IterableAppProvider: FunctionComponent<
   const logout = useCallback(() => {
     Iterable.setEmail(null);
     Iterable.setUserId(null);
+    Iterable.logout();
+    lastTimeStamp = 0;
     setIsLoggedIn(false);
   }, []);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iterable/react-native-sdk",
-  "version": "2.2.0-alpha.1",
+  "version": "2.2.0",
   "description": "Iterable SDK for React Native.",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

src/__mocks__/MockRNIterableAPI.ts

@@ -86,6 +86,28 @@ export class MockRNIterableAPI {
     });
   }
 
+  static async getInboxMessages(): Promise<IterableInAppMessage[] | undefined> {
+    return await new Promise((resolve) => {
+      // Filter messages that are marked for inbox
+      const inboxMessages =
+        MockRNIterableAPI.messages?.filter((msg) => msg.saveToInbox) || [];
+      resolve(inboxMessages);
+    });
+  }
+
+  static async getHtmlInAppContentForMessage(
+    messageId: string
+  ): Promise<unknown> {
+    return await new Promise((resolve) => {
+      // Mock HTML content for testing
+      const mockHtmlContent = {
+        edgeInsets: { top: 10, left: 20, bottom: 30, right: 40 },
+        html: `<div>Mock HTML content for message ${messageId}</div>`,
+      };
+      resolve(mockHtmlContent);
+    });
+  }
+
   static setAutoDisplayPaused = jest.fn();
 
   static showMessage = jest.fn(
@@ -113,22 +135,12 @@ export class MockRNIterableAPI {
 
   static updateSubscriptions = jest.fn();
 
-  static getInboxMessages = jest.fn(
-    async (): Promise<IterableInAppMessage[] | undefined> => {
-      return await new Promise((resolve) => {
-        resolve(MockRNIterableAPI.messages);
-      });
-    }
-  );
-
   static startSession = jest.fn();
 
   static endSession = jest.fn();
 
   static updateVisibleRows = jest.fn();
 
-  static getHtmlInAppContentForMessage = jest.fn();
-
   static startEmbeddedSession = jest.fn();
 
   static endEmbeddedSession = jest.fn();

src/core/classes/Iterable.ts

@@ -938,10 +938,16 @@ export class Iterable {
   private static removeAllEventListeners() {
     RNEventEmitter.removeAllListeners(IterableEventName.handleUrlCalled);
     RNEventEmitter.removeAllListeners(IterableEventName.handleInAppCalled);
-    RNEventEmitter.removeAllListeners(IterableEventName.handleCustomActionCalled);
+    RNEventEmitter.removeAllListeners(
+      IterableEventName.handleCustomActionCalled
+    );
     RNEventEmitter.removeAllListeners(IterableEventName.handleAuthCalled);
-    RNEventEmitter.removeAllListeners(IterableEventName.handleAuthSuccessCalled);
-    RNEventEmitter.removeAllListeners(IterableEventName.handleAuthFailureCalled);
+    RNEventEmitter.removeAllListeners(
+      IterableEventName.handleAuthSuccessCalled
+    );
+    RNEventEmitter.removeAllListeners(
+      IterableEventName.handleAuthFailureCalled
+    );
   }
 
   /**
@@ -1041,11 +1047,15 @@ export class Iterable {
                 }
               }, 1000);
             } else if (typeof promiseResult === 'string') {
-              //If promise only returns string
+              // If promise only returns string
+              Iterable.authManager.passAlongAuthToken(promiseResult);
+            } else if (promiseResult === null || promiseResult === undefined) {
+              // Even though this will cause authentication to fail, we want to
+              // allow for this for JWT handling.
               Iterable.authManager.passAlongAuthToken(promiseResult);
             } else {
               IterableLogger?.log(
-                'Unexpected promise returned. Auth token expects promise of String or AuthResponse type.'
+                'Unexpected promise returned. Auth token expects promise of String, null, undefined, or AuthResponse type.'
               );
             }
           })

src/core/classes/IterableApi.test.ts

@@ -730,7 +730,7 @@ describe('IterableApi', () => {
       const result = await IterableApi.getInboxMessages();
 
       // THEN the messages are returned
-      expect(result).toBe(mockMessages);
+      expect(result).toStrictEqual(mockMessages);
     });
   });
 

src/core/classes/IterableConfig.ts

@@ -202,9 +202,9 @@ export class IterableConfig {
    * ```
    *
    * @returns A promise that resolves to an `IterableAuthResponse`, a `string`,
-   * or `undefined`.
+   * `null`, or `undefined`.
    */
-  authHandler?: () => Promise<IterableAuthResponse | string | undefined>;
+  authHandler?: () => Promise<IterableAuthResponse | string | null | undefined>;
 
   /**
    * A callback function that is called when the SDK encounters an error while