react-native-nami-sdk 3.0.14 → 3.0.15

package/android/build.gradle

@@ -84,7 +84,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation 'com.github.jeziellago:compose-markdown:0.3.0'
-    implementation "com.namiml:sdk-android:3.0.16"
+    implementation "com.namiml:sdk-android:3.0.18"
 
     implementation 'com.facebook.react:react-native:+'  // From node_modules
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"

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

@@ -115,7 +115,7 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
             } else {
                 Arguments.createArray()
             }
-        val settingsList = mutableListOf("extendedClientInfo:react-native:3.0.14")
+        val settingsList = mutableListOf("extendedClientInfo:react-native:3.0.15")
         namiCommandsReact?.toArrayList()?.filterIsInstance<String>()?.let { commandsFromReact ->
             settingsList.addAll(commandsFromReact)
         }

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

@@ -15,6 +15,24 @@ import com.namiml.paywall.model.PaywallLaunchContext
 
 class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext), ActivityEventListener {
+    // handlePaywallCallback metadata
+    companion object {
+        const val CAMPAIGN_ID = "campaignId"
+        const val CAMPAIGN_LABEL = "campaignLabel"
+        const val PAYWALL_ID = "paywallId"
+        const val ACTION = "action"
+        const val SKU_ID = "skuId"
+        const val PURCHASE_ERROR = "purchaseError"
+        const val PURCHASES = "purchases"
+        const val CAMPAIGN_NAME = "campaignName"
+        const val CAMPAIGN_TYPE = "campaignType"
+        const val CAMPAIGN_URL = "campaignUrl"
+        const val PAYWALL_NAME = "paywallName"
+        const val SEGMENT_ID = "segmentId"
+        const val EXTERNAL_SEGMENT_ID = "externalSegmentId"
+        const val DEEP_LINK_URL = "deeplinkUrl"
+        const val _RESULT_CAMPAIGN = "ResultCampaign"
+    }
 
     override fun getName(): String {
         return "RNNamiCampaignManager"
@@ -73,21 +91,50 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
 
         if (theActivity != null) {
             reactApplicationContext.runOnUiQueueThread {
+                val paywallActionCallback = {
+                        campaignId: String,
+                        campaignName: String?,
+                        campaignType: String?,
+                        campaignLabel: String?,
+                        campaignUrl: String?,
+                        paywallId: String,
+                        paywallName: String?,
+                        segmentId: String?,
+                        externalSegmentId: String?,
+                        action: NamiPaywallAction,
+                        sku: NamiSKU?,
+                        purchaseError: String?,
+                        purchases: List<NamiPurchase>?,
+                        deeplinkUrl: String? ->
+                    handlePaywallCallback(
+                        campaignId,
+                        campaignName,
+                        campaignType,
+                        campaignLabel,
+                        campaignUrl,
+                        paywallId,
+                        paywallName,
+                        segmentId,
+                        externalSegmentId,
+                        action,
+                        sku,
+                        purchaseError,
+                        purchases,
+                        deeplinkUrl,
+                        actionCallback)
+                }
+
                 if (label != null) {
                     NamiCampaignManager.launch(
                         theActivity,
                         label,
-                        paywallActionCallback = { campaignId, campaignLabel, paywallId, action, sku, purchaseError, purchases ->
-                            handlePaywallCallback(campaignId, campaignLabel, paywallId, action, sku, purchaseError, purchases, actionCallback)
-                        },
+                        paywallActionCallback = paywallActionCallback,
                         paywallLaunchContext,
                     ) { 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)
-                        },
+                        paywallActionCallback = paywallActionCallback,
                     ) { result -> handleResult(result, resultCallback) }
                 }
             }
@@ -95,26 +142,67 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
 
     }
 
-    private fun handlePaywallCallback(campaignId: String, campaignLabel: String?, paywallId: String, action: NamiPaywallAction, sku: NamiSKU?, purchaseError: String?, purchases: List<NamiPurchase>?, actionCallback: Callback) {
+    private fun handlePaywallCallback(
+        campaignId: String,
+        campaignName: String?,
+        campaignType: String?,
+        campaignLabel: String?,
+        campaignUrl: String?,
+        paywallId: String,
+        paywallName: String?,
+        segmentId: String?,
+        externalSegmentId: String?,
+        action: NamiPaywallAction,
+        sku: NamiSKU?,
+        purchaseError: String?,
+        purchases: List<NamiPurchase>?,
+        deeplinkUrl: String?,
+        actionCallback: Callback
+    ) {
         val actionString = action.toString()
-        val skuString = sku?.skuId.orEmpty()
-        val purchasesArray: WritableArray = WritableNativeArray()
-        if (purchases != null) {
-            for (purchase in purchases) {
-                purchasesArray.pushMap(purchase.toPurchaseDict())
+        val skuString = sku?.skuId ?: ""
+
+        val purchasesArray = createPurchaseArray(purchases)
+
+        val resultMap = Arguments.createMap().apply {
+            putString(CAMPAIGN_ID, campaignId)
+            putString(CAMPAIGN_LABEL, campaignLabel ?: "")
+            putString(PAYWALL_ID, paywallId)
+            putString(ACTION, actionString)
+            putString(SKU_ID, skuString)
+            putString(PURCHASE_ERROR, purchaseError ?: "")
+            putArray(PURCHASES, purchasesArray)
+            putString(CAMPAIGN_NAME, campaignName ?: "")
+            putString(CAMPAIGN_TYPE, campaignType ?: "")
+            putString(CAMPAIGN_URL, campaignUrl ?: "")
+            putString(PAYWALL_NAME, paywallName ?: "")
+            putString(SEGMENT_ID, segmentId ?: "")
+            putString(EXTERNAL_SEGMENT_ID, externalSegmentId ?: "")
+            putString(DEEP_LINK_URL, deeplinkUrl ?: "")
+        }
+
+        emitEvent(_RESULT_CAMPAIGN, resultMap)
+    }
+
+    private fun createPurchaseArray(purchases: List<NamiPurchase>?): WritableArray {
+        return WritableNativeArray().apply {
+            purchases?.forEach { purchase ->
+                try {
+                    pushMap(purchase.toPurchaseDict())
+                } catch (e: Exception) {
+                    Log.e(LOG_TAG, "Error while converting data in createPurchaseArray to a Map", e)
+                }
             }
         }
-        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)
+    }
+
+    private fun emitEvent(event: String, map: WritableMap) {
+        val emitter = reactApplicationContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+        if (emitter is DeviceEventManagerModule.RCTDeviceEventEmitter) {
+            emitter.emit(event, map)
+        } else {
+            Log.w(LOG_TAG, "Cannot emit $event event: RCTDeviceEventEmitter instance is null")
+        }
     }
 
     private fun handleResult(result: LaunchCampaignResult, resultCallback: Callback) {

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

@@ -55,6 +55,17 @@ class NamiCustomerManagerBridgeModule(reactContext: ReactApplicationContext) :
         NamiCustomerManager.setCustomerDataPlatformId(cdpId)
     }
 
+    @ReactMethod
+    fun setAnonymousMode(anonymousMode: Boolean) {
+        NamiCustomerManager.setAnonymousMode(anonymousMode)
+    }
+
+    @ReactMethod
+    fun inAnonymousMode(promise: Promise) {
+        val anonymousMode = NamiCustomerManager.inAnonymousMode()
+        promise.resolve(anonymousMode)
+    }
+
     @ReactMethod
     fun journeyState(promise: Promise) {
         val journeyState = NamiCustomerManager.journeyState()

package/index.d.ts

@@ -1,20 +1,20 @@
-export { Nami, NamiConfiguration, NamiLanguageCodes } from "./src/Nami";
-export { NamiMLManager } from "./src/NamiMLManager";
+export {Nami, NamiConfiguration, NamiLanguageCodes} from './src/Nami';
+export {NamiMLManager} from './src/NamiMLManager';
 export {
   NamiCampaignManager,
   NamiCampaign,
-  NamiCampaignRuleType,
+  NamiCampaignRule,
   LaunchCampaignError,
-} from "./src/NamiCampaignManager";
+} from './src/NamiCampaignManager';
 export {
   NamiCustomerManager,
   CustomerJourneyState,
   AccountStateAction,
-} from "./src/NamiCustomerManager";
+} from './src/NamiCustomerManager';
 export {
   NamiEntitlementManager,
   NamiEntitlement,
-} from "./src/NamiEntitlementManager";
-export { NamiPurchaseManager, NamiPurchase } from "./src/NamiPurchaseManager";
-export { NamiPaywallManager } from "./src/NamiPaywallManager";
-export { NamiSKU } from "./src/types";
+} from './src/NamiEntitlementManager';
+export {NamiPurchaseManager, NamiPurchase} from './src/NamiPurchaseManager';
+export {NamiPaywallManager} from './src/NamiPaywallManager';
+export {NamiSKU} from './src/types';

package/ios/Nami.m

@@ -52,7 +52,7 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict completion: (RCTResponse
         }
 
         // Start commands with header iformation for Nami to let them know this is a React client.
-        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.0.14"]];
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.0.15"]];
 
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];

package/ios/NamiCampaignManagerBridge.swift

@@ -55,7 +55,7 @@ class RNNamiCampaignManager: RCTEventEmitter {
 
         NamiCampaignManager.launch(label: label, context: paywallLaunchContext, launchHandler: { success, error in
             callback([success, error?._code as Any])
-        }, paywallActionHandler: { campaignId, campaignName, campaignType, campaignLabel, campaignUrl, paywallId, paywallName, segmentId, externalSegmentId, paywallLaunchContext, action, sku, purchaseError, purchases, deeplinkUrl in
+        }, paywallActionHandler: { campaignId, campaignName, campaignType, campaignLabel, campaignUrl, paywallId, paywallName, segmentId, externalSegmentId, _, action, sku, purchaseError, purchases, deeplinkUrl in
             let actionString: String
             switch action {
             case .show_paywall:
@@ -93,12 +93,19 @@ class RNNamiCampaignManager: RCTEventEmitter {
             let dictionaries = purchases.map { purchase in RNNamiPurchaseManager.purchaseToPurchaseDict(purchase) }
             let payload: [String: Any?] = [
                 "campaignId": campaignId,
+                "campaignName": campaignName,
+                "campaignType": campaignType,
                 "campaignLabel": campaignLabel,
+                "campaignUrl": campaignUrl,
                 "paywallId": paywallId,
+                "paywallName": paywallName,
+                "segmentId": segmentId,
+                "externalSegmentId": externalSegmentId,
                 "action": actionString,
                 "skuId": skuId,
                 "purchaseError": errorSting,
                 "purchases": dictionaries,
+                "deeplinkUrl": deeplinkUrl,
             ]
             RNNamiCampaignManager.shared?.sendEvent(withName: "ResultCampaign", body: payload)
         })

package/ios/NamiCustomerManager.m

@@ -21,6 +21,10 @@ RCT_EXTERN_METHOD(setCustomerDataPlatformId:(NSString *)platformId)
 
 RCT_EXTERN_METHOD(clearCustomerDataPlatformId)
 
+RCT_EXTERN_METHOD(setAnonymousMode:(BOOL *)anonymousMode)
+
+RCT_EXTERN_METHOD(inAnonymousMode:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(journeyState:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(isLoggedIn:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)

package/ios/NamiCustomerManager.swift

@@ -66,6 +66,17 @@ class RNNamiCustomerManager: RCTEventEmitter {
         NamiCustomerManager.clearCustomerDataPlatformId()
     }
 
+    @objc(setAnonymousMode:)
+    func setAnonymousMode(anonymousMode: Bool) {
+        NamiCustomerManager.setAnonymousMode(anonymousMode)
+    }
+    
+    @objc(inAnonymousMode:rejecter:)
+    func inAnonymousMode(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
+        let inAnonymousMode: Bool = NamiCustomerManager.inAnonymousMode()
+        resolve(inAnonymousMode)
+    }
+
     @objc(journeyState:rejecter:)
     func journeyState(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
         if let journeyState = NamiCustomerManager.journeyState() {
@@ -137,6 +148,14 @@ class RNNamiCustomerManager: RCTEventEmitter {
                 actionString = "vendor_id_set"
             case .vendor_id_cleared:
                 actionString = "vendor_id_cleared"
+            case .nami_device_id_set:
+                actionString = "nami_device_id_set"
+            case .nami_device_id_cleared:
+                actionString = "nami_device_id_cleared"
+            case .anonymous_mode_on:
+                actionString = "anonymous_mode_on"
+            case .anonymous_mode_off:
+                actionString = "anonymous_mode_off"
             @unknown default:
                 actionString = "unknown"
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "description": "React Native Module for Nami - Easy subscriptions & in-app purchases, with powerful built-in paywalls and A/B testing.",
   "main": "index.js",
   "scripts": {

package/react-native-nami-sdk.podspec

@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,swift}"
   s.requires_arc = true
 
-  s.dependency 'Nami', '3.0.16'
+  s.dependency 'Nami', '3.0.18'
   s.dependency 'React'
 
 end

package/src/NamiCampaignManager.d.ts

@@ -1,6 +1,6 @@
-import { EmitterSubscription } from "react-native";
-import { NamiPurchase } from "./NamiPurchaseManager";
-import { NamiPaywallAction } from "./NamiPaywallManager";
+import {EmitterSubscription} from 'react-native';
+import {NamiPurchase} from './NamiPurchaseManager';
+import {NamiPaywallAction} from './NamiPaywallManager';
 
 export const NamiCampaignManager: {
   allCampaigns: () => Promise<Array<NamiCampaign>>;
@@ -10,19 +10,26 @@ export const NamiCampaignManager: {
     context?: PaywallLaunchContext,
     resultCallback?: (success: boolean, error?: LaunchCampaignError) => void,
     actionCallback?: (
+      campaignId: string,
+      paywallId: string,
       action: NamiPaywallAction,
+      campaignName?: string,
+      campaignType?: string,
+      campaignLabel?: string,
+      campaignUrl?: string,
+      paywallName?: string,
+      segmentId?: string,
+      externalSegmentId?: string,
+      deeplinkUrl?: string,
       skuId?: string,
       purchaseError?: string,
       purchases?: NamiPurchase[],
-      campaignId?: string,
-      campaignLabel?: string,
-      paywallId?: string
-    ) => void
+    ) => void,
   ) => void;
   refresh: () => void;
   registerAvailableCampaignsHandler: (
-    callback: (availableCampaigns: NamiCampaign[]) => void
-  ) => EmitterSubscription["remove"];
+    callback: (availableCampaigns: NamiCampaign[]) => void,
+  ) => EmitterSubscription['remove'];
 };
 
 export type NamiCampaign = {
@@ -30,14 +37,15 @@ export type NamiCampaign = {
   rule: string;
   segment: string;
   paywall: string;
-  type: NamiCampaignRuleType;
+  type: NamiCampaignRule;
   value?: string | null;
 };
 
-export enum NamiCampaignRuleType {
-  DEFAULT = "default",
-  LABEL = "label",
-  UNKNOWN = "unknown",
+export enum NamiCampaignRule {
+  DEFAULT = 'default',
+  LABEL = 'label',
+  UNKNOWN = 'unknown',
+  URL = 'url',
 }
 
 export enum LaunchCampaignError {
@@ -49,8 +57,8 @@ export enum LaunchCampaignError {
 }
 
 export enum LaunchCampaignResultAction {
-  FAILURE = "FAILURE",
-  SUCCESS = "SUCCESS",
+  FAILURE = 'FAILURE',
+  SUCCESS = 'SUCCESS',
 }
 
 export type FailureResultObject = {
@@ -59,5 +67,7 @@ export type FailureResultObject = {
 
 export type PaywallLaunchContext = {
   productGroups?: string[];
-  customAttributes: Map<string, string>;
+  customAttributes?: {
+    [key: string]: string;
+  };
 };

package/src/NamiCampaignManager.js

@@ -1,6 +1,6 @@
-import { NativeModules, NativeEventEmitter } from "react-native";
+import {NativeModules, NativeEventEmitter} from 'react-native';
 
-export const { RNNamiCampaignManager } = NativeModules;
+export const {RNNamiCampaignManager} = NativeModules;
 
 export const NamiCampaignManager = {
   launchSubscription: undefined,
@@ -9,20 +9,28 @@ export const NamiCampaignManager = {
   launch(label, context, resultCallback, actionCallback) {
     this.launchSubscription?.remove();
     this.launchSubscription = this.emitter.addListener(
-      "ResultCampaign",
-      (body) => {
-        var action = body.action;
+      'ResultCampaign',
+      body => {
+        body.action = body.action.startsWith('NAMI_')
+          ? body.action.substring(5, body.action.length)
+          : body.action;
 
-        if (action.startsWith("NAMI_")) {
-          action = action.substring(5, action.length);
-        }
-
-        var skuId = body.skuId;
-        var purchaseError = body.purchaseError;
-        var purchases = body.purchases;
-        var campaignId = body.campaignId;
-        var campaignLabel = body.campaignLabel;
-        var paywallId = body.paywallId;
+        const {
+          action,
+          skuId,
+          purchaseError,
+          purchases,
+          campaignId,
+          campaignLabel,
+          paywallId,
+          campaignName,
+          campaignType,
+          campaignUrl,
+          segmentId,
+          externalSegmentId,
+          paywallName,
+          deeplinkUrl,
+        } = body;
         actionCallback(
           action,
           skuId,
@@ -30,24 +38,32 @@ export const NamiCampaignManager = {
           purchases,
           campaignId,
           campaignLabel,
-          paywallId
+          paywallId,
+          campaignName,
+          campaignType,
+          campaignUrl,
+          segmentId,
+          externalSegmentId,
+          paywallName,
+          deeplinkUrl,
         );
-      }
+      },
     );
+
     RNNamiCampaignManager.launch(
       label ?? null,
       context ?? null,
       resultCallback ?? (() => {}),
-      actionCallback ?? (() => {})
+      actionCallback ?? (() => {}),
     );
   },
-  isCampaignAvailable: (label) => {
+  isCampaignAvailable: label => {
     return RNNamiCampaignManager.isCampaignAvailable(label ?? null);
   },
   registerAvailableCampaignsHandler(callback) {
     const subscription = this.emitter.addListener(
-      "AvailableCampaignsChanged",
-      callback
+      'AvailableCampaignsChanged',
+      callback,
     );
     RNNamiCampaignManager.registerAvailableCampaignsHandler();
     return subscription.remove;

package/src/NamiCustomerManager.d.ts

@@ -26,6 +26,8 @@ export const NamiCustomerManager: {
   ) => EmitterSubscription["remove"];
   clearCustomerDataPlatformId: () => void;
   setCustomerDataPlatformId: (platformId: string) => void;
+  setAnonymousMode: (anonymousMode: boolean) => void;
+  inAnonymousMode: () => Promise<boolean>;
 };
 
 export type CustomerJourneyState = {
@@ -38,4 +40,4 @@ export type CustomerJourneyState = {
   inAccountHold: boolean;
 };
 
-export type AccountStateAction = "login" | "logout";
+export type AccountStateAction = "login" | "logout" | "advertising_id_set" | "vendor_id_set" | "customer_data_platform_id_set" | "nami_device_id_set" | "advertising_id_cleared" | "vendor_id_cleared" | "customer_data_platform_id_cleared" | "nami_device_id_cleared" | "anonymous_mode_on" | "anonymous_mode_off";