react-native-insider 8.0.0 → 8.0.1-nh

package/RNInsider.podspec

@@ -9,12 +9,19 @@ Pod::Spec.new do |s|
   s.authors      = package_json['author']
   s.license      = 'MIT'
   s.platform     = :ios, '12.0'
-  s.source = {:http => 'https://mobilesdk.useinsider.com/iOS/15.0.0/InsiderMobileIOSFramework.zip'}
+  s.source = {:http => 'https://mobilesdk.useinsider.com/iOS/15.0.1/InsiderMobileIOSFramework.zip'}
   s.source_files = 'ios/RNInsider/*.{h,m}'
   s.requires_arc = true
   s.static_framework = true
   s.dependency 'React'
-  s.dependency 'InsiderMobile', '15.0.0'
+  s.dependency 'InsiderMobile', '15.0.1'
   s.dependency 'InsiderGeofence', '1.2.4'
   s.dependency 'InsiderHybrid', '1.7.6'
+
+  s.test_spec 'Tests' do |test_spec|
+    test_spec.source_files = 'ios/RNInsiderTests/**/*.{h,m}'
+    test_spec.frameworks    = 'XCTest'
+    test_spec.requires_app_host = false
+    test_spec.dependency 'OCMock', '~> 3.9'
+  end
 end

package/android/build.gradle

@@ -2,7 +2,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven { url "https://developer.huawei.com/repo/"}
     }
 
     dependencies {
@@ -30,19 +29,23 @@ android {
     if (major >= 8) {
         namespace "com.useinsider.react"
     }
+
+    testOptions {
+        unitTests.includeAndroidResources = true
+        unitTests.returnDefaultValues = true
+    }
 }
 
 repositories {
     google()
     mavenCentral()
-    maven { url "https://developer.huawei.com/repo/"}
     maven { url "https://mobilesdk.useinsider.com/android" }
 }
 
 
 dependencies {
     implementation "com.facebook.react:react-native:${getVersionFromPartner('reactNativeVersion', '+')}"
-    implementation 'com.useinsider:insider:16.0.1'
+    implementation 'com.useinsider:insider:16.0.1-nh'
     implementation 'com.useinsider:insiderhybrid:1.3.4'
 
     implementation 'androidx.security:security-crypto:1.1.0-alpha06'
@@ -57,4 +60,8 @@ dependencies {
     implementation 'com.huawei.hms:push:6.13.0.300'
     implementation 'com.huawei.hms:ads-identifier:3.4.62.300'
     implementation 'com.huawei.hms:location:6.16.0.302'
+
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:5.12.0'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
 }

package/android/src/main/java/com/useinsider/react/RNInsiderModule.java

@@ -895,10 +895,6 @@ public class RNInsiderModule extends ReactContextBaseJavaModule {
             }
             String provider = Insider.Instance.getCurrentProvider(reactContext);
             switch (provider) {
-                case "huawei":
-                    com.huawei.hms.push.RemoteMessage hmsRemoteMessage = new com.huawei.hms.push.RemoteMessage.Builder("insider").setData(remoteMessageStringMap).build();
-                    Insider.Instance.handleHMSNotification(reactContext, hmsRemoteMessage);
-                    break;
                 case "other":
                 case "google":
                     RemoteMessage fcmRemoteMessage = new RemoteMessage.Builder("insider").setData(remoteMessageStringMap).build();
@@ -913,6 +909,22 @@ public class RNInsiderModule extends ReactContextBaseJavaModule {
         }
     }
 
+    @ReactMethod
+    public void triggerPushProcessWithNotificationData(ReadableMap remoteMessageData) {
+        try {
+            if (remoteMessageData == null)
+                return;
+            Map<String, Object> convertedMap = RNUtils.convertReadableMapToMap(remoteMessageData);
+            Map<String, String> remoteMessageStringMap = new HashMap<>();
+            for (String key : convertedMap.keySet()) {
+                remoteMessageStringMap.put(key, String.valueOf(convertedMap.get(key)));
+            }
+            Insider.Instance.triggerPushProcessWithNotificationData(reactContext, remoteMessageStringMap);
+        } catch (Exception e) {
+            Insider.Instance.putException(e);
+        }
+    }
+
     // Deprecated
     @ReactMethod
     public void enableIDFACollection(final boolean enableIDFACollection) {}

package/android/src/test/java/com/useinsider/react/RNInsiderModuleTest.java

@@ -0,0 +1,169 @@
+package com.useinsider.react;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.ReadableType;
+import com.useinsider.insider.Insider;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Unit tests for {@link RNInsiderModule#triggerPushProcessWithNotificationData(ReadableMap)}.
+ *
+ * MOB-26455: New bridge method that converts the JS notification payload to a
+ * String map and forwards it to {@code Insider.Instance.triggerPushProcessWithNotificationData}.
+ * The bridge must:
+ *   - Treat a null payload as a no-op (early return, no native call).
+ *   - Convert ReadableMap entries to String values via {@link String#valueOf(Object)}.
+ *   - Pass the supplied {@link ReactApplicationContext} to the native SDK.
+ *   - Route any thrown exception through {@code Insider.Instance.putException}
+ *     instead of propagating it to the JS caller.
+ */
+public class RNInsiderModuleTest {
+
+    private RNInsiderModule module;
+    private ReactApplicationContext reactContext;
+    private Insider insiderMock;
+    private Insider originalInstance;
+
+    @Before
+    public void setUp() throws Exception {
+        reactContext = org.mockito.Mockito.mock(ReactApplicationContext.class);
+        insiderMock = org.mockito.Mockito.mock(Insider.class);
+
+        Field instanceField = Insider.class.getDeclaredField("Instance");
+        instanceField.setAccessible(true);
+        originalInstance = (Insider) instanceField.get(null);
+        instanceField.set(null, insiderMock);
+
+        module = new RNInsiderModule(reactContext);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        Field instanceField = Insider.class.getDeclaredField("Instance");
+        instanceField.setAccessible(true);
+        instanceField.set(null, originalInstance);
+    }
+
+    @Test
+    public void triggerPushProcessWithNotificationData_nullPayload_doesNotInvokeNativeSdk() {
+        module.triggerPushProcessWithNotificationData(null);
+
+        verify(insiderMock, never())
+                .triggerPushProcessWithNotificationData(any(), any());
+        verify(insiderMock, never()).putException(any(Exception.class));
+    }
+
+    @Test
+    public void triggerPushProcessWithNotificationData_emptyMap_forwardsEmptyStringMap() {
+        ReadableMap empty = readableMapOf(new HashMap<String, Object>());
+
+        module.triggerPushProcessWithNotificationData(empty);
+
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<Map<String, String>> captor = ArgumentCaptor.forClass(Map.class);
+        verify(insiderMock, times(1))
+                .triggerPushProcessWithNotificationData(eq(reactContext), captor.capture());
+        assertTrue("Empty payload should produce empty String map", captor.getValue().isEmpty());
+    }
+
+    @Test
+    public void triggerPushProcessWithNotificationData_stringValues_passedThroughVerbatim() {
+        Map<String, Object> entries = new HashMap<>();
+        entries.put("title", "Welcome");
+        entries.put("body", "Hello there");
+        ReadableMap payload = readableMapOf(entries);
+
+        module.triggerPushProcessWithNotificationData(payload);
+
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<Map<String, String>> captor = ArgumentCaptor.forClass(Map.class);
+        verify(insiderMock, times(1))
+                .triggerPushProcessWithNotificationData(eq(reactContext), captor.capture());
+        Map<String, String> forwarded = captor.getValue();
+        assertEquals("Welcome", forwarded.get("title"));
+        assertEquals("Hello there", forwarded.get("body"));
+        assertEquals(2, forwarded.size());
+    }
+
+    @Test
+    public void triggerPushProcessWithNotificationData_numericValues_stringifiedViaStringValueOf() {
+        Map<String, Object> entries = new HashMap<>();
+        entries.put("priority", 5.0);
+        entries.put("retry", true);
+        ReadableMap payload = readableMapOf(entries);
+
+        module.triggerPushProcessWithNotificationData(payload);
+
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<Map<String, String>> captor = ArgumentCaptor.forClass(Map.class);
+        verify(insiderMock, times(1))
+                .triggerPushProcessWithNotificationData(eq(reactContext), captor.capture());
+        Map<String, String> forwarded = captor.getValue();
+        assertEquals(String.valueOf(5.0), forwarded.get("priority"));
+        assertEquals("true", forwarded.get("retry"));
+    }
+
+    @Test
+    public void triggerPushProcessWithNotificationData_nativeSdkThrows_swallowedViaPutException() {
+        ReadableMap payload = readableMapOf(new HashMap<String, Object>());
+        RuntimeException boom = new RuntimeException("native failure");
+        org.mockito.Mockito.doThrow(boom)
+                .when(insiderMock)
+                .triggerPushProcessWithNotificationData(any(), any());
+
+        module.triggerPushProcessWithNotificationData(payload);
+
+        verify(insiderMock, times(1)).putException(boom);
+    }
+
+    /**
+     * Builds a {@link ReadableMap} stub backed by a plain Java map. The bridge
+     * only walks the iterator and asks for {@code getType}/{@code getString}/
+     * {@code getDouble}/{@code getBoolean}, so we mirror that minimal contract
+     * instead of pulling in {@code JavaOnlyMap} (which requires the React Native
+     * AAR at test time).
+     */
+    private static ReadableMap readableMapOf(Map<String, Object> entries) {
+        ReadableMap map = org.mockito.Mockito.mock(ReadableMap.class);
+        ReadableMapKeySetIterator iterator = org.mockito.Mockito.mock(ReadableMapKeySetIterator.class);
+        Iterable<String> keys = new java.util.ArrayList<>(entries.keySet());
+        java.util.Iterator<String> keyIter = keys.iterator();
+        when(iterator.hasNextKey()).thenAnswer(invocation -> keyIter.hasNext());
+        when(iterator.nextKey()).thenAnswer(invocation -> keyIter.next());
+        when(map.keySetIterator()).thenReturn(iterator);
+        for (Map.Entry<String, Object> entry : entries.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            if (value instanceof String) {
+                when(map.getType(key)).thenReturn(ReadableType.String);
+                when(map.getString(key)).thenReturn((String) value);
+            } else if (value instanceof Boolean) {
+                when(map.getType(key)).thenReturn(ReadableType.Boolean);
+                when(map.getBoolean(key)).thenReturn((Boolean) value);
+            } else if (value instanceof Number) {
+                when(map.getType(key)).thenReturn(ReadableType.Number);
+                when(map.getDouble(key)).thenReturn(((Number) value).doubleValue());
+            }
+        }
+        return map;
+    }
+}

package/index.d.ts

@@ -202,6 +202,7 @@ declare module 'react-native-insider' {
     static startTrackingGeofence(): void;
     static setAllowsBackgroundLocationUpdates(allowsBackgroundLocationUpdates: boolean): void;
     static handleNotification(notification: any): void;
+    static triggerPushProcessWithNotificationData(notification: any): void;
     static enableIDFACollection(enableIDFACollection: boolean): void;
     static removeInapp(): void;
     static registerWithQuietPermission(enabled: boolean): void;

package/index.js

@@ -744,6 +744,19 @@ export default class RNInsider {
     }
   }
 
+  static triggerPushProcessWithNotificationData(notification) {
+    if (shouldNotProceed()) return;
+    if (checkParameters([{ type: 'object', value: notification }])) {
+        showParameterWarningLog("triggerPushProcessWithNotificationData", [{ type: 'object', value: notification }]);
+        return;
+    }
+    try {
+      Insider.triggerPushProcessWithNotificationData(notification);
+    } catch (error) {
+      Insider.putErrorLog(generateJSONErrorString(error));
+    }
+  }
+
   static setHybridPushToken(token) {
     if (shouldNotProceed()) return;
     if (checkParameters([{ type: 'string', value: token }])) {

package/ios/RNInsider/RNInsider.m

@@ -744,6 +744,10 @@ RCT_EXPORT_METHOD(handleNotification:(NSDictionary *)notification) {
     }
 }
 
+RCT_EXPORT_METHOD(triggerPushProcessWithNotificationData:(NSDictionary *)notification) {
+    [self handleNotification:notification];
+}
+
 RCT_EXPORT_METHOD(enableIDFACollection:(BOOL)enableIDFACollection) {
     @try {
         [Insider enableIDFACollection:enableIDFACollection];

package/ios/RNInsiderTests/RNInsiderTriggerPushProcessTests.m

@@ -0,0 +1,91 @@
+// Unit tests for `triggerPushProcessWithNotificationData:` on the iOS bridge.
+//
+// MOB-26455: The new method delegates straight to `handleNotification:`, which
+// is responsible for stamping `aps = "insider"` and forwarding the payload to
+// the native InsiderMobile entry points. These tests pin that contract so
+// future refactors cannot silently drop the delegation or skip the stamp.
+
+#import <XCTest/XCTest.h>
+#import <OCMock/OCMock.h>
+
+#import "RNInsider.h"
+
+#if __has_include(<InsiderMobile/Insider.h>)
+#import <InsiderMobile/Insider.h>
+#elif __has_include("Insider.h")
+#import "Insider.h"
+#endif
+
+@interface RNInsiderTriggerPushProcessTests : XCTestCase
+@property (nonatomic, strong) RNInsider *bridge;
+@property (nonatomic, strong) id insiderClassMock;
+@end
+
+@implementation RNInsiderTriggerPushProcessTests
+
+- (void)setUp {
+    [super setUp];
+    self.bridge = [RNInsider new];
+    self.insiderClassMock = OCMClassMock([Insider class]);
+}
+
+- (void)tearDown {
+    [self.insiderClassMock stopMocking];
+    self.insiderClassMock = nil;
+    self.bridge = nil;
+    [super tearDown];
+}
+
+- (void)testTriggerPushProcess_delegatesToHandleNotification {
+    id partialBridge = OCMPartialMock(self.bridge);
+    NSDictionary *payload = @{ @"title": @"Hi", @"body": @"There" };
+
+    OCMExpect([partialBridge handleNotification:payload]);
+
+    [self.bridge triggerPushProcessWithNotificationData:payload];
+
+    OCMVerifyAll(partialBridge);
+    [partialBridge stopMocking];
+}
+
+- (void)testTriggerPushProcess_stampsApsKeyAndForwardsToInsider {
+    NSDictionary *payload = @{ @"title": @"Welcome" };
+
+    [self.bridge triggerPushProcessWithNotificationData:payload];
+
+    OCMVerify([self.insiderClassMock handlePushLogWithUserInfo:[OCMArg checkWithBlock:^BOOL(NSDictionary *arg) {
+        return [arg[@"aps"] isEqualToString:@"insider"] && [arg[@"title"] isEqualToString:@"Welcome"];
+    }]]);
+    OCMVerify([self.insiderClassMock trackInteractiveLogWithUserInfo:[OCMArg checkWithBlock:^BOOL(NSDictionary *arg) {
+        return [arg[@"aps"] isEqualToString:@"insider"] && [arg[@"title"] isEqualToString:@"Welcome"];
+    }]]);
+}
+
+- (void)testTriggerPushProcess_emptyDictionary_stillStampsApsKey {
+    [self.bridge triggerPushProcessWithNotificationData:@{}];
+
+    OCMVerify([self.insiderClassMock handlePushLogWithUserInfo:[OCMArg checkWithBlock:^BOOL(NSDictionary *arg) {
+        return [arg[@"aps"] isEqualToString:@"insider"];
+    }]]);
+}
+
+- (void)testTriggerPushProcess_doesNotMutateOriginalDictionary {
+    NSDictionary *payload = @{ @"title": @"Hi" };
+
+    [self.bridge triggerPushProcessWithNotificationData:payload];
+
+    XCTAssertNil(payload[@"aps"], @"Original payload must remain untouched");
+    XCTAssertEqualObjects(payload[@"title"], @"Hi");
+}
+
+- (void)testTriggerPushProcess_swallowsNativeException {
+    OCMStub([self.insiderClassMock handlePushLogWithUserInfo:[OCMArg any]])
+        .andThrow([NSException exceptionWithName:@"BoomException" reason:@"native failure" userInfo:nil]);
+
+    XCTAssertNoThrow([self.bridge triggerPushProcessWithNotificationData:@{ @"title": @"Hi" }],
+                     @"Bridge must catch native exceptions and route them through Insider sendError");
+
+    OCMVerify([self.insiderClassMock sendError:[OCMArg any] desc:[OCMArg any]]);
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-insider",
-    "version": "8.0.0",
+    "version": "8.0.1-nh",
     "description": "React Native Insider SDK",
     "main": "index.js",
     "types": "index.d.ts",

package/src/InsiderAppCard.d.ts

@@ -29,7 +29,7 @@ export class InsiderAppCardImage {
  */
 export class InsiderAppCardButton {
 	/** Unique identifier for the button. */
-	readonly buttonId: string;
+	readonly id: string;
 
 	/** Identifier of the app card this button belongs to. */
 	readonly appCardId: string;
@@ -122,7 +122,7 @@ export type InsiderAppCardType = "message" | "image"
  */
 export class InsiderAppCard {
 	/** Unique identifier for the app card. */
-	readonly appCardId: string;
+	readonly id: string;
 
 	/** Type of the app card (text or image). */
 	readonly type: InsiderAppCardType;

package/src/InsiderAppCard.js

@@ -33,21 +33,21 @@ class InsiderAppCardImage {
 
 class InsiderAppCardButton {
   #data;
-  #buttonId;
+  #id;
   #appCardId;
   #text;
   #action;
 
   constructor(appCardId, data) {
     this.#data = data;
-    this.#buttonId = data.id;
+    this.#id = data.id;
     this.#appCardId = appCardId;
     this.#text = data.text;
     this.#action = InsiderAppCardAction.fromData(data.action);
   }
 
-  get buttonId() {
-    return this.#buttonId;
+  get id() {
+    return this.#id;
   }
 
   get appCardId() {
@@ -164,7 +164,7 @@ class InsiderAppCardFeedbackAction extends InsiderAppCardAction {
 
 class InsiderAppCard {
   #data;
-  #appCardId;
+  #id;
   #type;
   #isRead;
   #images;
@@ -174,7 +174,7 @@ class InsiderAppCard {
 
   constructor(data) {
     this.#data = data;
-    this.#appCardId = data.id;
+    this.#id = data.id;
     this.#type = data.type;
     this.#isRead = data.read;
     this.#images = data.images ? data.images.map(x => new InsiderAppCardImage(x)) : null;
@@ -183,8 +183,8 @@ class InsiderAppCard {
     this.#action = InsiderAppCardAction.fromData(data.action);
   }
 
-  get appCardId() {
-    return this.#appCardId;
+  get id() {
+    return this.#id;
   }
 
   get type() {
@@ -217,7 +217,7 @@ class InsiderAppCard {
 
   markAsRead(completion) {
     const promise = new Promise((resolve, reject) => {
-      InsiderAppCards.markAsRead([this.appCardId], error => {
+      InsiderAppCards.markAsRead([this.id], error => {
         if (error) reject(error);
         else {
           this.#isRead = true;
@@ -231,7 +231,7 @@ class InsiderAppCard {
 
   markAsUnread(completion) {
     const promise = new Promise((resolve, reject) => {
-      InsiderAppCards.markAsUnread([this.appCardId], error => {
+      InsiderAppCards.markAsUnread([this.id], error => {
         if (error) reject(error);
         else {
           this.#isRead = false;
@@ -245,7 +245,7 @@ class InsiderAppCard {
 
   delete(completion) {
     const promise = new Promise((resolve, reject) => {
-      InsiderAppCards.delete([this.appCardId], error => {
+      InsiderAppCards.delete([this.id], error => {
         if (error) reject(error);
         else resolve();
       });

package/src/InsiderAppCards.d.ts

@@ -42,7 +42,7 @@ interface InsiderAppCards {
 	 *     console.log('Failed to fetch campaigns:', error.message);
 	 *   } else {
 	 *     campaignResponse.appCards.forEach(appCard => {
-	 *       console.log('App Card Id:', appCard.appCardId, 'Read:', appCard.isRead);
+	 *       console.log('App Card Id:', appCard.id, 'Read:', appCard.isRead);
 	 *     });
 	 *   }
 	 * });
@@ -63,7 +63,7 @@ interface InsiderAppCards {
 	 * try {
 	 *   const campaignResponse = await appCards.getCampaigns();
 	 *   campaignResponse.appCards.forEach(appCard => {
-	 *     console.log('App Card Id:', appCard.appCardId, 'Read:', appCard.isRead);
+	 *     console.log('App Card Id:', appCard.id, 'Read:', appCard.isRead);
 	 *   });
 	 * } catch (error) {
 	 *   console.log('Failed to fetch campaigns:', error.message);