Feature/add messaging custom payload

CHANGELOG.md

@@ -17,6 +17,10 @@ UPCOMING
 - Added `setPhoneNumber` API to the `BatchProfileAttributeEditor` class. This requires to have a user identifier registered or to call the `identify` method beforehand.
 - Added `setSMSMarketingSubscription` API to the `BatchProfileAttributeEditor` class.
 
+**Messaging**
+- Added `messagingCustomPayload` property to `BatchMessagingEventPayload` (only for In-App Message).
+- Added `pushPayload` property to `BatchMessagingEventPayload` (only for Landing Mobile).
+
 
 9.0.2
 ----

android/src/main/java/com/batch/batch_rn/RNBatchEventDispatcher.java

@@ -1,18 +1,23 @@
 package com.batch.batch_rn;
 
 import android.util.Log;
+import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.batch.android.Batch;
 import com.batch.android.BatchEventDispatcher;
+import com.batch.android.BatchMessage;
 import com.batch.android.BatchPushPayload;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.LinkedList;
 
 /**
@@ -83,6 +88,30 @@ public void dispatchEvent(@NonNull Batch.EventDispatcher.Type type,
                 params.putMap("pushPayload", Arguments.fromBundle(pushPayload.getPushBundle()));
             }
 
+            BatchMessage messagingPayload = payload.getMessagingPayload();
+            if (messagingPayload != null) {
+                Bundle bundle = new Bundle();
+                messagingPayload.writeToBundle(bundle);
+                Bundle messagingBundle =  bundle.getBundle(BatchMessage.MESSAGING_EXTRA_PAYLOAD_KEY);
+                if (messagingBundle != null) {
+                    Bundle dataBundle = messagingBundle.getBundle("data");
+                    if(dataBundle != null) {
+                        Bundle landingPushPayload = dataBundle.getBundle("batchPushPayload");
+                        if (landingPushPayload != null) {
+                            params.putMap("pushPayload", Arguments.fromBundle(landingPushPayload));
+                        }
+                        String customPayload =  dataBundle.getString("custom_payload");
+                        if(customPayload != null) {
+                            try {
+                                JSONObject customPayloadJSON = new JSONObject(customPayload);
+                                params.putMap("messagingCustomPayload", RNUtils.convertJSONObjectToWritableMap(customPayloadJSON));
+                            } catch (JSONException e) {
+                                Log.d(RNBatchModuleImpl.LOGGER_TAG,"Failed to parse messaging custom payload");
+                            }
+                        }
+                    }
+                }
+            }
             RNBatchEvent event = new RNBatchEvent(eventName, params);
             if (!isModuleReady() || !hasListener) {
                 Log.d(RNBatchModuleImpl.LOGGER_TAG,

android/src/main/java/com/batch/batch_rn/RNUtils.java

@@ -14,10 +14,14 @@
 import com.facebook.react.bridge.WritableNativeMap;
 
 import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -144,4 +148,22 @@ public static List<String> convertReadableArrayToList(ReadableArray array) {
         }
         return list;
     }
+
+    /**
+     * Convert a JSONObject into a Map
+     * @param jsonObject The JSONObject to convert
+     * @return the Map
+     */
+    public static WritableMap convertJSONObjectToWritableMap(JSONObject jsonObject) throws JSONException {
+        Map<String, Object> map = new HashMap<>();
+        Iterator<String> keys = jsonObject.keys();
+
+        while (keys.hasNext()) {
+            String key = keys.next();
+            Object value = jsonObject.get(key);
+            map.put(key, value);
+        }
+
+        return convertMapToWritableMap(map);
+    }
 }

ios/RNBatchEventDispatcher.mm

@@ -67,7 +67,7 @@ - (void)dequeueEvents {
 /// Batch event dispatcher callback
 - (void)dispatchEventWithType:(BatchEventDispatcherType)type
                       payload:(nonnull id<BatchEventDispatcherPayload>)payload {
-    
+
 
     NSString* eventName = [RNBatchEventDispatcher mapBatchEventDispatcherTypeToRNEvent:type];
     if (eventName != nil) {
@@ -124,6 +124,13 @@ - (NSDictionary*) dictionaryWithEventDispatcherPayload:(id<BatchEventDispatcherP
         output[@"pushPayload"] = payload.notificationUserInfo;
     }
 
+    if (payload.sourceMessage != nil) {
+        BatchMessage* sourceMessage = payload.sourceMessage;
+        if ([sourceMessage isKindOfClass:BatchInAppMessage.class]) {
+            output[@"messagingCustomPayload"] = ((BatchInAppMessage*) sourceMessage).customPayload;
+        }
+    }
+
     return output;
 }
 

src/BatchMessaging.ts

@@ -6,6 +6,8 @@ export interface BatchMessagingEventPayload {
   isPositiveAction: boolean;
   trackingId?: string | null;
   webViewAnalyticsIdentifier?: string | null;
+  messagingCustomPayload?: Record<string, unknown>; // Custom payload attached to In-App message
+  pushPayload?: Record<string, unknown>; // Push Payload (only on Mobile Landing event)
   deeplink?: string | null;
 }