react-native-marketap-sdk 0.1.0-beta.12 → 0.1.0-beta.13

package/android/build.gradle

@@ -99,7 +99,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
 
   // MarketapSDK dependency with forced version constraints
-  implementation('com.github.marketap-dev:marketap-android-sdk:1.2.0') {
+  implementation('com.github.marketap-dev:marketap-android-sdk:1.3.2') {
     exclude group: 'androidx.appcompat', module: 'appcompat'
     exclude group: 'androidx.core', module: 'core-ktx'
   }

package/android/src/main/AndroidManifest.xml

@@ -1,12 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.marketapsdk">
-    <application>
-        <service
-            android:name="com.marketap.sdk.client.push.MarketapFirebaseMessagingService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-    </application>
-</manifest>
+</manifest>

package/android/src/main/java/com/marketapsdk/MarketapSdkModule.kt

@@ -60,8 +60,9 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
     get() = isModuleActive && hasListeners && isReactInstanceReady()
 
   @ReactMethod
-  fun initialize(projectId: String, promise: Promise) {
+  fun initialize(payload: ReadableMap?, promise: Promise) {
     try {
+      val projectId = payload?.getString("projectId") ?: ""
       if (!isMainProcess()) {
         promise.resolve(null)
         return
@@ -91,7 +92,13 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun setLogLevel(logLevel: Int) {
+  fun setLogLevel(payload: ReadableMap?) {
+    val logLevel =
+      if (payload != null && payload.hasKey("logLevel") && !payload.isNull("logLevel")) {
+        payload.getInt("logLevel")
+      } else {
+        0
+      }
     val resolvedLevel = MarketapLogLevel.values().firstOrNull { level ->
       level.value == logLevel
     } ?: MarketapLogLevel.NONE
@@ -104,16 +111,29 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun signup(
-    userId: String,
-    userProperties: ReadableMap?,
-    eventProperties: ReadableMap?,
-    persistUser: Boolean?,
-    promise: Promise
-  ) {
+  fun signup(payload: ReadableMap?, promise: Promise) {
     try {
+      val userId = payload?.getString("userId") ?: ""
+      val userProperties =
+        if (payload != null && payload.hasKey("userProperties") && !payload.isNull("userProperties")) {
+          payload.getMap("userProperties")
+        } else {
+          null
+        }
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
+      val persistUser =
+        if (payload != null && payload.hasKey("persistUser") && !payload.isNull("persistUser")) {
+          payload.getBoolean("persistUser")
+        } else {
+          true
+        }
       // Call MarketapSDK signup method
-      Marketap.signup(userId, userProperties.toNonNullableMap(), eventProperties.toNonNullableMap(), persistUser ?: true)
+      Marketap.signup(userId, userProperties.toNonNullableMap(), eventProperties.toNonNullableMap(), persistUser)
       promise.resolve(null)
     } catch (e: Exception) {
       promise.reject("SIGNUP_ERROR", e.message, e)
@@ -121,13 +141,21 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun login(
-    userId: String,
-    userProperties: ReadableMap?,
-    eventProperties: ReadableMap?,
-    promise: Promise
-  ) {
+  fun login(payload: ReadableMap?, promise: Promise) {
     try {
+      val userId = payload?.getString("userId") ?: ""
+      val userProperties =
+        if (payload != null && payload.hasKey("userProperties") && !payload.isNull("userProperties")) {
+          payload.getMap("userProperties")
+        } else {
+          null
+        }
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK login method
       Marketap.login(userId, userProperties.toNonNullableMap(), eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -137,8 +165,14 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun logout(eventProperties: ReadableMap?, promise: Promise) {
+  fun logout(payload: ReadableMap?, promise: Promise) {
     try {
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK logout method
       Marketap.logout(eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -148,8 +182,15 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun track(eventName: String, eventProperties: ReadableMap?, promise: Promise) {
+  fun track(payload: ReadableMap?, promise: Promise) {
     try {
+      val eventName = payload?.getString("eventName") ?: ""
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK track method
       Marketap.track(eventName, eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -159,8 +200,20 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun trackPurchase(revenue: Double, eventProperties: ReadableMap?, promise: Promise) {
+  fun trackPurchase(payload: ReadableMap?, promise: Promise) {
     try {
+      val revenue =
+        if (payload != null && payload.hasKey("revenue") && !payload.isNull("revenue")) {
+          payload.getDouble("revenue")
+        } else {
+          0.0
+        }
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK trackPurchase method
       Marketap.trackPurchase(revenue, eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -170,13 +223,21 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun trackRevenue(
-    eventName: String,
-    revenue: Double,
-    eventProperties: ReadableMap?,
-    promise: Promise
-  ) {
+  fun trackRevenue(payload: ReadableMap?, promise: Promise) {
     try {
+      val eventName = payload?.getString("eventName") ?: ""
+      val revenue =
+        if (payload != null && payload.hasKey("revenue") && !payload.isNull("revenue")) {
+          payload.getDouble("revenue")
+        } else {
+          0.0
+        }
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK trackRevenue method
       Marketap.trackRevenue(eventName, revenue, eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -186,8 +247,14 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun trackPageView(eventProperties: ReadableMap?, promise: Promise) {
+  fun trackPageView(payload: ReadableMap?, promise: Promise) {
     try {
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK trackPageView method
       Marketap.trackPageView(eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -197,8 +264,15 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun identify(userId: String, userProperties: ReadableMap?, promise: Promise) {
+  fun identify(payload: ReadableMap?, promise: Promise) {
     try {
+      val userId = payload?.getString("userId") ?: ""
+      val userProperties =
+        if (payload != null && payload.hasKey("userProperties") && !payload.isNull("userProperties")) {
+          payload.getMap("userProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK identify method
       Marketap.identify(userId, userProperties.toNonNullableMap())
       promise.resolve(null)
@@ -249,39 +323,23 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  @ReactMethod
-  fun setPushToken(token: String, promise: Promise) {
-    try {
-      // Android: setPushToken not available - MarketapFirebaseMessagingService handles tokens automatically
-      promise.resolve(null)
-    } catch (e: Exception) {
-      promise.reject("PUSH_TOKEN_ERROR", e.message, e)
-    }
-  }
-
-  @ReactMethod
-  fun getInitialNotification(promise: Promise) {
-    try {
-      val pendingEvent = ReactNativeBridgeRegistry.popPendingClick()
-      if (pendingEvent != null) {
-        promise.resolve(pendingEvent)
-      } else {
-        promise.resolve(null)
-      }
-    } catch (e: Exception) {
-      promise.reject("GET_INITIAL_NOTIFICATION_ERROR", e.message, e)
-    }
-  }
-
   // 웹브릿지 인앱 메시지 관련 메서드
   @ReactMethod
-  fun trackFromWebBridge(
-      eventName: String,
-      eventProperties: ReadableMap?,
-      handleInAppInReactNative: Boolean,
-      promise: Promise
-  ) {
+  fun trackFromWebBridge(payload: ReadableMap?, promise: Promise) {
       try {
+          val eventName = payload?.getString("eventName") ?: ""
+          val eventProperties =
+            if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+              payload.getMap("eventProperties")
+            } else {
+              null
+            }
+          val handleInAppInReactNative =
+            if (payload != null && payload.hasKey("handleInAppInReactNative") && !payload.isNull("handleInAppInReactNative")) {
+              payload.getBoolean("handleInAppInReactNative")
+            } else {
+              false
+            }
           if (handleInAppInReactNative) {
               ReactNativeBridgeRegistry.setWebBridgeSourceTarget(this)
               MarketapWebBridge.setExternalWebBridgeActive(true)
@@ -292,13 +350,19 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
           MarketapPlugin.trackEvent(eventName, eventProperties.toNonNullableMap())
           promise.resolve(null)
       } catch (e: Exception) {
-          promise.reject("TRACK_REVENUE_ERROR", e.message, e)
+          promise.reject("TRACK_FROM_WEB_BRIDGE_ERROR", e.message, e)
       }
   }
 
   @ReactMethod
-  fun setUserProperties(userProperties: ReadableMap?, promise: Promise) {
+  fun setUserProperties(payload: ReadableMap?, promise: Promise) {
     try {
+      val userProperties =
+        if (payload != null && payload.hasKey("userProperties") && !payload.isNull("userProperties")) {
+          payload.getMap("userProperties")
+        } else {
+          null
+        }
       val props = userProperties.toNonNullableMap()
       if (props == null) {
         promise.reject("ARG_ERROR", "Missing userProperties", null)
@@ -312,13 +376,11 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun trackInAppImpression(
-    campaignId: String?,
-    messageId: String?,
-    layoutSubType: String?,
-    promise: Promise
-  ) {
+  fun trackInAppImpression(payload: ReadableMap?, promise: Promise) {
     try {
+      val campaignId = payload?.getString("campaignId")
+      val messageId = payload?.getString("messageId")
+      val layoutSubType = payload?.getString("layoutSubType")
       if (campaignId == null || messageId == null) {
         android.util.Log.w(
           NAME,
@@ -335,15 +397,13 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun trackInAppClick(
-    campaignId: String?,
-    messageId: String?,
-    locationId: String?,
-    url: String?,
-    layoutSubType: String?,
-    promise: Promise
-  ) {
+  fun trackInAppClick(payload: ReadableMap?, promise: Promise) {
     try {
+      val campaignId = payload?.getString("campaignId")
+      val messageId = payload?.getString("messageId")
+      val locationId = payload?.getString("locationId")
+      val url = payload?.getString("url")
+      val layoutSubType = payload?.getString("layoutSubType")
       if (campaignId == null || messageId == null || locationId == null) {
         android.util.Log.w(
           NAME,
@@ -360,8 +420,10 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun hideCampaign(campaignId: String?, hideType: String?, promise: Promise) {
+  fun hideCampaign(payload: ReadableMap?, promise: Promise) {
     try {
+      val campaignId = payload?.getString("campaignId")
+      val hideType = payload?.getString("hideType")
       if (campaignId == null) {
         android.util.Log.w(NAME, "hideCampaign: missing campaignId")
         promise.resolve(null)
@@ -374,6 +436,22 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  @ReactMethod
+  fun setDeviceOptIn(payload: ReadableMap?, promise: Promise) {
+    try {
+      val optIn: Boolean? =
+        if (payload != null && payload.hasKey("optIn") && !payload.isNull("optIn")) {
+          payload.getBoolean("optIn")
+        } else {
+          null
+        }
+      Marketap.setDeviceOptIn(optIn)
+      promise.resolve(null)
+    } catch (e: Exception) {
+      promise.reject("SET_DEVICE_OPT_IN_ERROR", e.message, e)
+    }
+  }
+
   @ReactMethod
   fun addListener(eventName: String) {
     hasListeners = true

package/ios/MarketapSdk.m

@@ -8,51 +8,41 @@
   return YES;
 }
 
-RCT_EXTERN_METHOD(initialize:(nonnull NSString *)projectId
+RCT_EXTERN_METHOD(initialize:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(setLogLevel:(nonnull NSNumber *)logLevel)
+RCT_EXTERN_METHOD(setLogLevel:(nullable NSDictionary *)payload)
 
-RCT_EXTERN_METHOD(signup:(nonnull NSString *)userId
-                 userProperties:(nullable NSDictionary *)userProperties
-                 eventProperties:(nullable NSDictionary *)eventProperties
-                 persistUser:(nullable NSNumber *)persistUser
+RCT_EXTERN_METHOD(signup:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(login:(nonnull NSString *)userId
-                 userProperties:(nullable NSDictionary *)userProperties
-                 eventProperties:(nullable NSDictionary *)eventProperties
+RCT_EXTERN_METHOD(login:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(logout:(nullable NSDictionary *)eventProperties
+RCT_EXTERN_METHOD(logout:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(track:(nonnull NSString *)eventName
-                 eventProperties:(nullable NSDictionary *)eventProperties
+RCT_EXTERN_METHOD(track:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(trackPurchase:(nonnull NSNumber *)revenue
-                 eventProperties:(nullable NSDictionary *)eventProperties
+RCT_EXTERN_METHOD(trackPurchase:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(trackRevenue:(nonnull NSString *)eventName
-                 revenue:(nonnull NSNumber *)revenue
-                 eventProperties:(nullable NSDictionary *)eventProperties
+RCT_EXTERN_METHOD(trackRevenue:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(trackPageView:(nullable NSDictionary *)eventProperties
+RCT_EXTERN_METHOD(trackPageView:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(identify:(nonnull NSString *)userId
-                 userProperties:(nullable NSDictionary *)userProperties
+RCT_EXTERN_METHOD(identify:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
@@ -65,39 +55,27 @@ RCT_EXTERN_METHOD(setClickHandler:(RCTPromiseResolveBlock)resolve
 RCT_EXTERN_METHOD(requestAuthorizationForPushNotifications:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(setPushToken:(nonnull NSString *)token
+RCT_EXTERN_METHOD(trackFromWebBridge:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(getInitialNotification:(RCTPromiseResolveBlock)resolve
-                 withRejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(trackFromWebBridge:(nonnull NSString *)eventName
-                 eventProperties:(nullable NSDictionary *)eventProperties
-                 handleInAppInReactNative:(nonnull NSNumber *)handleInAppInReactNative
+RCT_EXTERN_METHOD(setUserProperties:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(setUserProperties:(nullable NSDictionary *)userProperties
+RCT_EXTERN_METHOD(trackInAppImpression:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(trackInAppImpression:(nullable NSString *)campaignId
-                 messageId:(nullable NSString *)messageId
-                 layoutSubType:(nullable NSString *)layoutSubType
+RCT_EXTERN_METHOD(trackInAppClick:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(trackInAppClick:(nullable NSString *)campaignId
-                 messageId:(nullable NSString *)messageId
-                 locationId:(nullable NSString *)locationId
-                 url:(nullable NSString *)url
-                 layoutSubType:(nullable NSString *)layoutSubType
+RCT_EXTERN_METHOD(setDeviceOptIn:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(hideCampaign:(nullable NSString *)campaignId
-                 hideType:(nullable NSString *)hideType
+RCT_EXTERN_METHOD(hideCampaign:(nullable NSDictionary *)payload
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)