react-native-nami-sdk 3.0.8 → 3.0.10

package/android/src/main/java/com/nami/reactlibrary/NamiCampaignManagerBridge.kt

@@ -1,17 +1,16 @@
 package com.nami.reactlibrary
 
+import android.app.Activity
 import android.content.Intent
 import android.util.Log
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.namiml.billing.NamiPurchase
+import com.namiml.campaign.LaunchCampaignResult
 import com.namiml.campaign.NamiCampaign
 import com.namiml.campaign.NamiCampaignManager
 import com.namiml.paywall.NamiSKU
 import com.namiml.paywall.model.NamiPaywallAction
-import android.app.Activity
-import com.namiml.billing.NamiPurchase
-import com.namiml.billing.NamiPurchaseState
-import com.namiml.campaign.LaunchCampaignResult
 
 class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext), ActivityEventListener {
@@ -31,24 +30,35 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun launch(label: String?, resultCallback: Callback, actionCallback: Callback) {
-        reactApplicationContext.runOnUiQueueThread {
-            if (label != null) {
-                NamiCampaignManager.launch(currentActivity!!, label,
-                        paywallActionCallback = { action, sku, purchaseError, purchases ->
-                            handlePaywallCallback(action, sku, purchaseError, purchases, actionCallback)
-                        }
-                ) { result -> handleResult(result, resultCallback) }
-            } else {
-                NamiCampaignManager.launch(currentActivity!!,
-                        paywallActionCallback = { action, sku,purchaseError, purchases  ->
-                            handlePaywallCallback(action, sku, purchaseError, purchases, actionCallback)
-                        }
-                ) { result -> handleResult(result, resultCallback) }
+        var theActivity: Activity? = null
+        if (reactApplicationContext.hasCurrentActivity()) {
+            theActivity = reactApplicationContext.getCurrentActivity()
+        }
+
+        if (theActivity != null) {
+            reactApplicationContext.runOnUiQueueThread {
+                if (label != null) {
+                    NamiCampaignManager.launch(
+                        theActivity,
+                        label,
+                        paywallActionCallback = { campaignId, campaignLabel, paywallId, action, sku, purchaseError, purchases ->
+                            handlePaywallCallback(campaignId, campaignLabel, paywallId, action, sku, purchaseError, purchases, actionCallback)
+                        },
+                    ) { result -> handleResult(result, resultCallback) }
+                } else {
+                    NamiCampaignManager.launch(
+                        theActivity,
+                        paywallActionCallback = { campaignId, campaignLabel, paywallId, action, sku, purchaseError, purchases ->
+                            handlePaywallCallback(campaignId, campaignLabel, paywallId, action, sku, purchaseError, purchases, actionCallback)
+                        },
+                    ) { result -> handleResult(result, resultCallback) }
+                }
             }
         }
+
     }
 
-    private fun handlePaywallCallback(action: NamiPaywallAction, sku: NamiSKU?, purchaseError: String?, purchases: List<NamiPurchase>?,  actionCallback: Callback){
+    private fun handlePaywallCallback(campaignId: String, campaignLabel: String?, paywallId: String, action: NamiPaywallAction, sku: NamiSKU?, purchaseError: String?, purchases: List<NamiPurchase>?, actionCallback: Callback) {
         val actionString = action.toString()
         val skuString = sku?.skuId.orEmpty()
         val purchasesArray: WritableArray = WritableNativeArray()
@@ -58,13 +68,16 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
             }
         }
         val resultMap = Arguments.createMap()
+        resultMap.putString("campaignId", campaignId)
+        resultMap.putString("campaignLabel", campaignLabel)
+        resultMap.putString("paywallId", paywallId)
         resultMap.putString("action", actionString)
         resultMap.putString("skuId", skuString)
         resultMap.putString("purchaseError", purchaseError)
         resultMap.putArray("purchases", purchasesArray)
         reactApplicationContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                .emit("ResultCampaign", resultMap)
+            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+            .emit("ResultCampaign", resultMap)
     }
 
     private fun handleResult(result: LaunchCampaignResult, resultCallback: Callback) {
@@ -80,10 +93,10 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
     }
 
     override fun onActivityResult(
-            activity: Activity?,
-            requestCode: Int,
-            resultCode: Int,
-            intent: Intent?
+        activity: Activity?,
+        requestCode: Int,
+        resultCode: Int,
+        intent: Intent?,
     ) {
         Log.d(LOG_TAG, "Nami Activity result listener activated, code is $requestCode")
     }
@@ -93,7 +106,7 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun allCampaigns(promise: Promise){
+    fun allCampaigns(promise: Promise) {
         val campaigns = NamiCampaignManager.allCampaigns()
         val array = WritableNativeArray()
         campaigns.forEach { campaign ->
@@ -103,7 +116,7 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun isCampaignAvailable(label: String?, promise: Promise){
+    fun isCampaignAvailable(label: String?, promise: Promise) {
         val isCampaignAvailable: Boolean
         if (label != null) {
             isCampaignAvailable = NamiCampaignManager.isCampaignAvailable(label)
@@ -114,8 +127,8 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun refresh(){
-        NamiCampaignManager.refresh() {  }
+    fun refresh() {
+        NamiCampaignManager.refresh() { }
     }
 
     @ReactMethod
@@ -126,8 +139,16 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
                 array.pushMap(campaignToReadableMap(campaign))
             }
             reactApplicationContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                    .emit("AvailableCampaignsChanged", array)
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("AvailableCampaignsChanged", array)
         }
     }
+
+    @ReactMethod
+    fun addListener(eventName: String?) {
+    }
+
+    @ReactMethod
+    fun removeListeners(count: Int?) {
+    }
 }

package/android/src/main/java/com/nami/reactlibrary/NamiCustomerManagerBridge.kt

@@ -1,13 +1,10 @@
 package com.nami.reactlibrary
 
-import android.util.Log
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.namiml.campaign.NamiCampaignManager
 import com.namiml.customer.CustomerJourneyState
 import com.namiml.customer.NamiCustomerManager
 
-
 class NamiCustomerManagerBridgeModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
 
@@ -26,58 +23,69 @@ class NamiCustomerManagerBridgeModule(reactContext: ReactApplicationContext) :
         readableMap.putBoolean("inAccountHold", journeyState.inAccountHold)
         return readableMap
     }
+
     @ReactMethod
-    fun setCustomerAttribute(key: String, value: String){
+    fun setCustomerAttribute(key: String, value: String) {
         NamiCustomerManager.setCustomerAttribute(key, value)
     }
 
     @ReactMethod
-    fun getCustomerAttribute(key: String, promise: Promise){
+    fun getCustomerAttribute(key: String, promise: Promise) {
         val customerAttribute = NamiCustomerManager.getCustomerAttribute(key)
         promise.resolve(customerAttribute)
     }
 
     @ReactMethod
-    fun clearCustomerAttribute(key: String){
+    fun clearCustomerAttribute(key: String) {
         NamiCustomerManager.clearCustomerAttribute(key)
     }
 
     @ReactMethod
-    fun clearAllCustomerAttributes(){
+    fun clearAllCustomerAttributes() {
         NamiCustomerManager.clearAllCustomerAttributes()
     }
 
     @ReactMethod
-   fun journeyState(promise: Promise){
-     val journeyState = NamiCustomerManager.journeyState()
-       if (journeyState != null) {
-           val handledJourneyState = journeyStateToReadableMap(journeyState)
-           promise.resolve(handledJourneyState)
-       } else {
-           promise.resolve(null)
-       }
-   }
+    fun clearCustomerDataPlatformId() {
+        NamiCustomerManager.clearCustomerDataPlatformId()
+    }
 
     @ReactMethod
-    fun isLoggedIn(promise: Promise){
+    fun setCustomerDataPlatformId(cdpId: String) {
+        NamiCustomerManager.setCustomerDataPlatformId(cdpId)
+    }
+
+    @ReactMethod
+    fun journeyState(promise: Promise) {
+        val journeyState = NamiCustomerManager.journeyState()
+        if (journeyState == null) {
+            promise.resolve(null)
+        } else {
+            val handledJourneyState = journeyStateToReadableMap(journeyState)
+            promise.resolve(handledJourneyState)
+        }
+    }
+
+    @ReactMethod
+    fun isLoggedIn(promise: Promise) {
         val isLoggedIn = NamiCustomerManager.isLoggedIn()
         promise.resolve(isLoggedIn)
     }
 
     @ReactMethod
-    fun loggedInId(promise: Promise){
+    fun loggedInId(promise: Promise) {
         val id = NamiCustomerManager.loggedInId()
         promise.resolve(id)
     }
 
     @ReactMethod
-    fun deviceId(promise: Promise){
+    fun deviceId(promise: Promise) {
         val id = NamiCustomerManager.deviceId()
         promise.resolve(id)
     }
 
     @ReactMethod
-    fun login(customerId: String){
+    fun login(customerId: String) {
         NamiCustomerManager.login(customerId)
     }
 
@@ -91,8 +99,8 @@ class NamiCustomerManagerBridgeModule(reactContext: ReactApplicationContext) :
         NamiCustomerManager.registerJourneyStateHandler { journeyState ->
             val handledJourneyState = journeyStateToReadableMap(journeyState)
             reactApplicationContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                    .emit("JourneyStateChanged", handledJourneyState)
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("JourneyStateChanged", handledJourneyState)
         }
     }
 
@@ -104,8 +112,16 @@ class NamiCustomerManagerBridgeModule(reactContext: ReactApplicationContext) :
             body.putBoolean("success", success)
             body.putString("error", error.toString())
             reactApplicationContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                    .emit("AccountStateChanged", body)
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("AccountStateChanged", body)
         }
     }
+
+    @ReactMethod
+    fun addListener(eventName: String?) {
+    }
+
+    @ReactMethod
+    fun removeListeners(count: Int?) {
+    }
 }

package/android/src/main/java/com/nami/reactlibrary/NamiEntitlementManagerBridgeModule.kt

@@ -1,14 +1,9 @@
 package com.nami.reactlibrary
 
-import android.util.Log
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.namiml.entitlement.NamiEntitlement
 import com.namiml.entitlement.NamiEntitlementManager
-//import com.namiml.entitlement.NamiEntitlementSetter
-import com.namiml.entitlement.NamiPlatformType
-import java.util.ArrayList
-import java.util.Date
+// import com.namiml.entitlement.NamiEntitlementSetter
 import com.facebook.react.bridge.Callback
 
 class NamiEntitlementManagerBridgeModule(reactContext: ReactApplicationContext) :
@@ -19,25 +14,25 @@ class NamiEntitlementManagerBridgeModule(reactContext: ReactApplicationContext)
     }
 
     @ReactMethod
-    fun isEntitlementActive(referenceId: String, promise: Promise){
+    fun isEntitlementActive(referenceId: String, promise: Promise) {
         val isEntitlementActive = NamiEntitlementManager.isEntitlementActive(referenceId)
         promise.resolve(isEntitlementActive)
     }
 
     @ReactMethod
-    fun active(promise: Promise){
+    fun active(promise: Promise) {
         val nativeEntitlements = NamiEntitlementManager.active()
         val resultArray: WritableArray = WritableNativeArray()
         for (entitlement in nativeEntitlements) {
             entitlement.toEntitlementDict()?.let { entitlementDict ->
                 resultArray.pushMap(entitlementDict)
-           }
+            }
         }
         promise.resolve(resultArray)
     }
 
     @ReactMethod
-    fun refresh(callback: Callback){
+    fun refresh(callback: Callback) {
         NamiEntitlementManager.refresh { activeNativeEntitlements ->
             val resultArray: WritableArray = WritableNativeArray()
             if (activeNativeEntitlements != null) {
@@ -61,8 +56,16 @@ class NamiEntitlementManagerBridgeModule(reactContext: ReactApplicationContext)
                 }
             }
             reactApplicationContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                    .emit("EntitlementsChanged", resultArray)
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("EntitlementsChanged", resultArray)
         }
     }
+
+    @ReactMethod
+    fun addListener(eventName: String?) {
+    }
+
+    @ReactMethod
+    fun removeListeners(count: Int?) {
+    }
 }

package/android/src/main/java/com/nami/reactlibrary/NamiMLManagerBridgeModule.kt

@@ -47,4 +47,12 @@ class NamiMLManagerBridgeModule(reactContext: ReactApplicationContext) :
             NamiMLManager.coreAction(label)
         }
     }
+
+    @ReactMethod
+    fun addListener(eventName: String?) {
+    }
+
+    @ReactMethod
+    fun removeListeners(count: Int?) {
+    }
 }

package/android/src/main/java/com/nami/reactlibrary/NamiPaywallManagerBridgeModule.kt

@@ -3,88 +3,230 @@ package com.nami.reactlibrary
 import android.app.Activity
 import android.content.Intent
 import android.util.Log
-import com.android.billingclient.api.Purchase
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.namiml.paywall.NamiPaywallManager
-import com.namiml.paywall.PreparePaywallResult
+import com.namiml.paywall.NamiPurchaseSource
+import com.namiml.paywall.NamiSKU
+import com.namiml.paywall.NamiSKUType
+import com.namiml.paywall.model.NamiPurchaseSuccess
+import java.util.*
 
 class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext), ActivityEventListener {
 
-    private var blockRaisePaywall: Boolean = false
+    var latestPaywallActivity: Activity? = null
 
     override fun getName(): String {
         return "RNNamiPaywallManager"
     }
 
     @ReactMethod
-    fun buySkuComplete(purchase: WritableMap, skuRefId: String) {
-//        NamiPaywallManager.buySkuComplete(currentActivity!!, purchase, skuRefId)
-    }
+    fun buySkuComplete(dict: ReadableMap, storeType: String) {
+        var product: ReadableMap? = null
+        var productId: String? = null
+        var skuId: String? = null
+        var typeString: String? = null
+        var purchaseSourceString: String? = null
+        var expiresDateInt: Int? = null
+        var purchaseDateInt: Int? = null
+
+        var expiresDate: Date? = null
+        var purchaseDate: Date? = null
+
+        var skuType: NamiSKUType?
+
+        var purchaseToken: String? = null
+        var orderId: String? = null
+
+        var receiptId: String? = null
+        var localizedPrice: String? = null
+        var userId: String? = null
+        var marketplace: String? = null
+
+        if (dict.hasKey("product")) {
+            product = dict.getMap("product")
+        }
+
+        if (product != null) {
+            if (product.hasKey("id")) {
+                productId = product.getString("id")
+            }
+
+            if (product.hasKey("skuId")) {
+                skuId = product.getString("skuId")
+            }
+
+            if (product.hasKey("type")) {
+                typeString = product.getString("type")
+            }
+        }
+
+        if (dict.hasKey("purchaseSource")) {
+            purchaseSourceString = dict.getString("purchaseSource")
+        }
+
+        if (dict.hasKey("expiresDate")) {
+            expiresDateInt = dict.getInt("expiresDate")
+            expiresDate = Date(expiresDateInt * 1000L)
+        }
+        if (dict.hasKey("purchaseDate")) {
+            purchaseDateInt = dict.getInt("purchaseDate")
+            purchaseDate = Date(purchaseDateInt * 1000L)
+        }
+
+        skuType = when (typeString) {
+            "UNKNOWN" -> {
+                NamiSKUType.UNKNOWN
+            }
+            "SUBSCRIPTION" -> {
+                NamiSKUType.SUBSCRIPTION
+            }
+            "ONE_TIME_PURCHASE" -> {
+                NamiSKUType.ONE_TIME_PURCHASE
+            }
+            else -> {
+                NamiSKUType.UNKNOWN
+            }
+        }
+
+        val purchaseSource = when (purchaseSourceString) {
+            "CAMPAIGN" -> {
+                NamiPurchaseSource.CAMPAIGN
+            }
+            "MARKETPLACE" -> {
+                NamiPurchaseSource.MARKETPLACE
+            }
+            "UNKNOWN" -> {
+                NamiPurchaseSource.UNKNOWN
+            }
+            else -> {
+                NamiPurchaseSource.UNKNOWN
+            }
+        }
 
+        if (productId != null && skuId != null && skuType != null) {
+            val namiSku = NamiSKU(
+                skuId = skuId,
+                skuDetails = null,
+                amazonProduct = null,
+                id = productId,
+                type = skuType,
+                name = "",
+                featured = false,
+                rawDisplayText = null,
+                rawSubDisplayText = null,
+                entitlements = emptyList(),
+                variables = null,
+            )
+            var purchaseSuccess: NamiPurchaseSuccess? = null
+
+            if (storeType == "GooglePlay") {
+                if (dict.hasKey("purchaseToken")) {
+                    purchaseToken = dict.getString("purchaseToken")
+                }
+                if (dict.hasKey("orderId")) {
+                    orderId = dict.getString("orderId")
+                }
+                Log.d(LOG_TAG, "$namiSku $purchaseToken $orderId $purchaseDateInt $purchaseDate")
+
+                if (namiSku != null && purchaseToken != null && orderId != null && purchaseDate != null) {
+                    purchaseSuccess = NamiPurchaseSuccess.GooglePlay(
+                        product = namiSku,
+                        expiresDate = expiresDate,
+                        purchaseDate = purchaseDate,
+                        purchaseSource = purchaseSource,
+                        description = null,
+                        orderId = orderId,
+                        purchaseToken = purchaseToken,
+                    )
+                }
+            } else if (storeType == "Amazon") {
+                if (dict.hasKey("receiptId")) {
+                    receiptId = dict.getString("receiptId")
+                }
+                if (dict.hasKey("localizedPrice")) {
+                    localizedPrice = dict.getString("localizedPrice")
+                }
+                if (dict.hasKey("userId")) {
+                    userId = dict.getString("userId")
+                }
+                if (dict.hasKey("marketplace")) {
+                    marketplace = dict.getString("marketplace")
+                }
+                if (namiSku != null && receiptId != null && localizedPrice != null && userId != null && marketplace != null && purchaseDate != null) {
+                    purchaseSuccess = NamiPurchaseSuccess.Amazon(
+                        product = namiSku,
+                        expiresDate = expiresDate,
+                        purchaseDate = purchaseDate,
+                        purchaseSource = purchaseSource,
+                        description = null,
+                        receiptId = receiptId,
+                        localizedPrice = localizedPrice,
+                        userId = userId,
+                        marketplace = marketplace,
+                    )
+                }
+            }
+
+            if (purchaseSuccess != null) {
+                NamiPaywallManager.buySkuComplete(currentActivity!!, purchaseSuccess)
+            } else {
+                Log.d(LOG_TAG, "Unable to create a valid NamiPurchaseSuccess object, so buySkuComplete will not succeed. Paywall conversion will not be reported for this purchase.")
+            }
+        }
+    }
 
     @ReactMethod
-    fun registerCloseHandler(blockDismiss: Boolean) {
+    fun registerCloseHandler() {
         NamiPaywallManager.registerCloseHandler { activity ->
-            val resultMap = Arguments.createMap()
-            resultMap.putBoolean("blockingPaywallClosed", true)
-            reactApplicationContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                    .emit("BlockingPaywallClosed", resultMap)
-            if (!blockDismiss) {
-                activity.finish()
+            latestPaywallActivity = activity
+            val map = Arguments.createMap().apply {
+                putBoolean("paywallCloseRequested", true)
             }
+            reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("PaywallCloseRequested", map)
+        }
+    }
+
+    @ReactMethod
+    fun dismiss(animated: Boolean) {
+        if (latestPaywallActivity != null) {
+            val paywallActivity = latestPaywallActivity as Activity
+            NamiPaywallManager.dismiss(paywallActivity)
         }
     }
 
     @ReactMethod
     fun registerBuySkuHandler() {
         NamiPaywallManager.registerBuySkuHandler { activity, sku ->
+            latestPaywallActivity = activity
             val dictionary = sku.toSkuDict()
             reactApplicationContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                    .emit("RegisterBuySKU", dictionary)
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("RegisterBuySKU", dictionary)
         }
     }
 
+    @ReactMethod
+    fun addListener(eventName: String?) {
+    }
+
+    @ReactMethod
+    fun removeListeners(count: Int?) {
+    }
 
     override fun onActivityResult(
         activity: Activity?,
         requestCode: Int,
         resultCode: Int,
-        data: Intent?
+        data: Intent?,
     ) {
         Log.d(LOG_TAG, "Nami Activity result listener activated, code is $requestCode")
-        if (NamiPaywallManager.didUserCloseBlockingNamiPaywall(requestCode, resultCode)) {
-            Log.i(
-                LOG_TAG, "User closed blocking paywall, sending event.  " +
-                    "Activity was." + activity.toString()
-            )
-            emitBockedPaywallClosed()
-        }
-    }
-
-    private fun emitBockedPaywallClosed() {
-        val map = Arguments.createMap().apply {
-            putBoolean("blockingPaywallClosed", true)
-        }
-        try {
-            reactApplicationContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                .emit("BlockingPaywallClosed", map)
-        } catch (e: Exception) {
-            Log.e(LOG_TAG, "Caught Exception: " + e.message)
-        }
     }
 
     override fun onNewIntent(intent: Intent?) {
         // do nothing
     }
-
-//    @ReactMethod
-//    fun blockRaisePaywall(blockRaise: Boolean) {
-//        blockRaisePaywall = blockRaise
-//    }
-
 }