react-native-nami-sdk 3.3.0 → 3.3.1

package/android/build.gradle

@@ -85,8 +85,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    playImplementation "com.namiml:sdk-android:3.3.0"
-    amazonImplementation "com.namiml:sdk-amazon:3.3.0"
+    playImplementation "com.namiml:sdk-android:3.3.1"
+    amazonImplementation "com.namiml:sdk-amazon:3.3.1"
 
     implementation "com.facebook.react:react-native:+"  // From node_modules
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"

package/android/src/main/java/com/namiml/reactnative/NamiBridgeModule.kt

@@ -34,6 +34,12 @@ class NamiBridgeModule internal constructor(
         promise.resolve(Nami.isInitialized())
     }
 
+    @ReactMethod
+    fun sdkVersion(promise: Promise) {
+        val version = Nami.sdkVersion()
+        promise.resolve(version)
+    }
+
     @ReactMethod
     fun configure(configDict: ReadableMap, promise: Promise) {
         logNewArchitectureStatus()

package/android/src/main/java/com/namiml/reactnative/NamiCampaignManagerBridge.kt

@@ -158,8 +158,7 @@ class NamiCampaignManagerBridgeModule internal constructor(
         paywallEvent: NamiPaywallEvent,
         actionCallback: Callback,
     ) {
-        val actionString = paywallEvent.action.toString()
-
+        val actionString = paywallEvent.action.toRNActionString()
         val purchasesArray = createPurchaseArray(paywallEvent.purchases)
 
         val resultMap =

package/android/src/main/java/com/namiml/reactnative/NamiFlowManagerBridge.kt

@@ -55,6 +55,18 @@ class NamiFlowManagerBridgeModule internal constructor(
         }, 100L)
     }
 
+    @ReactMethod
+    fun finish() {
+        Handler(Looper.getMainLooper()).postDelayed({
+            NamiFlowManager.finish()
+        }, 100L)
+    }
+
+    @ReactMethod
+    fun isFlowOpen(promise: Promise) {
+        promise.resolve(NamiFlowManager.isFlowOpen())
+    }
+
     private fun sendEvent(eventName: String, params: WritableMap?) {
         reactApplicationContext
             .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)

package/android/src/main/java/com/namiml/reactnative/NamiPaywallManagerBridgeModule.kt

@@ -24,11 +24,12 @@ class NamiPaywallManagerBridgeModule internal constructor(
     private var latestPaywallActivity: Activity? = null
 
     @ReactMethod
-    fun buySkuComplete(dict: ReadableMap, storeType: String) {
+    fun buySkuComplete(dict: ReadableMap) {
         val product = dict.getMap("product")
         val productId = product?.getString("id")
         val skuRefId = product?.getString("skuId")
         val typeString = product?.getString("type")
+        val storeType = dict.getString("storeType") ?: "GooglePlay"
         var purchaseSuccess: NamiPurchaseSuccess? = null
 
         if (productId != null && skuRefId != null) {

package/android/src/main/java/com/namiml/reactnative/NamiPurchaseManagerBridge.kt

@@ -42,13 +42,6 @@ class NamiPurchaseManagerBridgeModule internal constructor(
         promise.resolve(isPurchased)
     }
 
-    @ReactMethod
-    fun consumePurchasedSku(skuRefId: String) {
-        reactContext.runOnUiQueueThread {
-            NamiPurchaseManager.consumePurchasedSKU(skuRefId)
-        }
-    }
-
     @ReactMethod
     fun anySkuPurchased(skuIDs: ReadableArray, promise: Promise) {
         reactContext.runOnUiQueueThread {

package/android/src/main/java/com/namiml/reactnative/NamiUtil.kt

@@ -15,6 +15,41 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
+import com.namiml.paywall.model.NamiPaywallAction
+
+fun NamiPaywallAction.toRNActionString(): String {
+    return when (this) {
+        NamiPaywallAction.NAMI_BUY_SKU -> "BUY_SKU"
+        NamiPaywallAction.NAMI_SELECT_SKU -> "SELECT_SKU"
+        NamiPaywallAction.NAMI_RESTORE_PURCHASES -> "RESTORE_PURCHASES"
+        NamiPaywallAction.NAMI_SHOW_PAYWALL -> "SHOW_PAYWALL"
+        NamiPaywallAction.NAMI_CLOSE_PAYWALL -> "CLOSE_PAYWALL"
+        NamiPaywallAction.NAMI_SIGN_IN -> "SIGN_IN"
+        NamiPaywallAction.NAMI_PURCHASE_SELECTED_SKU -> "PURCHASE_SELECTED_SKU"
+        NamiPaywallAction.NAMI_PURCHASE_SUCCESS -> "PURCHASE_SUCCESS"
+        NamiPaywallAction.NAMI_PURCHASE_FAILED -> "PURCHASE_FAILED"
+        NamiPaywallAction.NAMI_PURCHASE_CANCELLED -> "PURCHASE_CANCELLED"
+        NamiPaywallAction.NAMI_PURCHASE_PENDING -> "PURCHASE_PENDING"
+        NamiPaywallAction.NAMI_PURCHASE_UNKNOWN -> "PURCHASE_UNKNOWN"
+        NamiPaywallAction.NAMI_DEEP_LINK -> "DEEPLINK"
+        NamiPaywallAction.NAMI_TOGGLE_CHANGE -> "TOGGLE_CHANGE"
+        NamiPaywallAction.NAMI_PAGE_CHANGE -> "PAGE_CHANGE"
+        NamiPaywallAction.NAMI_SLIDE_CHANGE -> "SLIDE_CHANGE"
+        NamiPaywallAction.NAMI_COLLAPSIBLE_DRAWER_OPEN -> "COLLAPSIBLE_DRAWER_OPEN"
+        NamiPaywallAction.NAMI_COLLAPSIBLE_DRAWER_CLOSE -> "COLLAPSIBLE_DRAWER_CLOSE"
+        NamiPaywallAction.NAMI_VIDEO_STARTED -> "VIDEO_STARTED"
+        NamiPaywallAction.NAMI_VIDEO_PAUSED -> "VIDEO_PAUSED"
+        NamiPaywallAction.NAMI_VIDEO_RESUMED -> "VIDEO_RESUMED"
+        NamiPaywallAction.NAMI_VIDEO_ENDED -> "VIDEO_ENDED"
+        NamiPaywallAction.NAMI_VIDEO_CHANGED -> "VIDEO_CHANGED"
+        NamiPaywallAction.NAMI_VIDEO_MUTED -> "VIDEO_MUTED"
+        NamiPaywallAction.NAMI_VIDEO_UNMUTED -> "VIDEO_UNMUTED"
+        else -> {
+            Log.w("NamiUtil", "Unhandled NamiPaywallAction: $this. This might indicate a new enum value added in the SDK.")
+            "UNKNOWN"
+        }
+    }
+}
 
 fun List<*>.toWritableArray(): WritableArray {
     val convertedArray = Arguments.createArray()

package/dist/specs/NativeNami.d.ts

@@ -10,6 +10,7 @@ export interface Spec extends TurboModule {
         success: boolean;
     }>;
     sdkConfigured(): Promise<boolean>;
+    sdkVersion(): Promise<string>;
 }
 declare const _default: Spec;
 export default _default;

package/dist/specs/NativeNamiFlowManager.d.ts

@@ -1,5 +1,7 @@
 import type { TurboModule } from 'react-native';
 export interface Spec extends TurboModule {
+    finish(): void;
+    isFlowOpen(): Promise<boolean>;
     registerStepHandoff(): void;
     resume(): void;
     registerEventHandler(): void;

package/dist/specs/NativeNamiPaywallManager.d.ts

@@ -17,6 +17,7 @@ export interface Spec extends TurboModule {
         marketplace?: string;
         price?: string;
         currencyCode?: string;
+        storeType?: string;
     }): void;
     buySkuCompleteApple(purchase: {
         product: {

package/dist/specs/NativeNamiPurchaseManager.d.ts

@@ -18,7 +18,6 @@ export interface Spec extends TurboModule {
     }>>;
     skuPurchased(skuId: string): Promise<boolean>;
     anySkuPurchased(skuIds: string[]): Promise<boolean>;
-    consumePurchasedSku(skuId: string): void;
     presentCodeRedemptionSheet(): void;
     restorePurchases(): void;
     registerPurchasesChangedHandler(): void;

package/dist/src/Nami.d.ts

@@ -2,4 +2,5 @@ import type { NamiConfiguration } from './types';
 export declare const Nami: {
     configure: (config: NamiConfiguration) => Promise<boolean>;
     sdkConfigured: () => Promise<boolean>;
+    sdkVersion: () => Promise<string>;
 };

package/dist/src/NamiFlowManager.d.ts

@@ -8,4 +8,6 @@ export declare const NamiFlowManager: {
     registerStepHandoff: (callback: (handoffTag: string, handoffData?: Record<string, unknown>) => void) => (() => void);
     resume: () => void;
     registerEventHandler: (callback: (payload: Record<string, unknown>) => void) => (() => void);
+    finish: () => void;
+    isFlowOpen: () => Promise<boolean>;
 };

package/dist/src/NamiPurchaseManager.d.ts

@@ -9,7 +9,6 @@ export declare const NamiPurchaseManager: {
     allPurchases: () => Promise<NamiPurchase[]>;
     skuPurchased: (skuId: string) => Promise<boolean>;
     anySkuPurchased: (skuIds: string[]) => Promise<boolean>;
-    consumePurchasedSku: (skuId: string) => void;
     presentCodeRedemptionSheet: () => void;
     restorePurchases: () => void;
     registerPurchasesChangedHandler: (callback: (state: NamiPurchasesState, purchases: NamiPurchase[], error: string) => void) => (() => void);

package/dist/src/types.d.ts

@@ -123,6 +123,7 @@ export type NamiPurchaseDetails = {
     currencyCode?: string;
     userId?: string;
     marketplace?: string;
+    storeType?: string;
 };
 export type NamiPurchaseSuccessApple = {
     product: NamiSKU;

package/dist/src/version.d.ts

@@ -2,4 +2,4 @@
  * Auto-generated file. Do not edit manually.
  * React Native Nami SDK version.
  */
-export declare const NAMI_REACT_NATIVE_VERSION = "3.3.0";
+export declare const NAMI_REACT_NATIVE_VERSION = "3.3.1";

package/ios/Nami.m

@@ -15,6 +15,8 @@ RCT_EXTERN_METHOD(configure:(NSDictionary *)configDict
 RCT_EXTERN_METHOD(sdkConfigured:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(sdkVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
 + (BOOL)requiresMainQueueSetup {
   return NO;
 }

package/ios/Nami.swift

@@ -8,11 +8,9 @@ import Foundation
 import NamiApple
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    import React_RCTTurboModule
-
-    extension RNNami: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//    extension RNNami: RCTTurboModule {}
+// #endif
 
 @objc(RNNami)
 class RNNami: NSObject {
@@ -75,6 +73,12 @@ class RNNami: NSObject {
         resolve(Nami.sdkConfigured())
     }
 
+    @objc(sdkVersion:rejecter:)
+    func sdkVersion(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
+        let version = Nami.sdkVersion
+        resolve(version)
+    }
+
     func isNewArchitectureEnabled() -> Bool {
         #if RCT_NEW_ARCH_ENABLED
             return true

package/ios/NamiCampaignManagerBridge.swift

@@ -10,11 +10,9 @@ import NamiApple
 import os
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    import React_RCTTurboModule
-
-    extension RNNamiCampaignManager: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//    extension RNNamiCampaignManager: RCTTurboModule {}
+// #endif
 
 @objc(RNNamiCampaignManager)
 class RNNamiCampaignManager: RCTEventEmitter {

package/ios/NamiCustomerManager.swift

@@ -9,11 +9,9 @@ import Foundation
 import NamiApple
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    import React_RCTTurboModule
-
-    extension RNNamiCustomerManager: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//    extension RNNamiCustomerManager: RCTTurboModule {}
+// #endif
 
 @objc(RNNamiCustomerManager)
 class RNNamiCustomerManager: RCTEventEmitter {

package/ios/NamiEntitlementManagerBridge.swift

@@ -9,10 +9,9 @@ import Foundation
 import NamiApple
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    import React_RCTTurboModule
-    extension RNNamiEntitlementManager: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//     extension RNNamiEntitlementManager: RCTTurboModule {}
+// #endif
 
 @objc(RNNamiEntitlementManager)
 class RNNamiEntitlementManager: RCTEventEmitter {

package/ios/NamiFlowManagerBridge.m

@@ -12,6 +12,8 @@
 RCT_EXTERN_METHOD(registerStepHandoff)
 RCT_EXTERN_METHOD(registerEventHandler)
 RCT_EXTERN_METHOD(resume)
+RCT_EXTERN_METHOD(finish)
+RCT_EXTERN_METHOD(isFlowOpen:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 + (BOOL)requiresMainQueueSetup {
   return NO;

package/ios/NamiFlowManagerBridge.swift

@@ -9,6 +9,10 @@ import Foundation
 import NamiApple
 import React
 
+// #if RCT_NEW_ARCH_ENABLED
+//     extension RNNamiFlowManager: RCTTurboModule {}
+// #endif
+
 @objc(RNNamiFlowManager)
 class RNNamiFlowManager: RCTEventEmitter {
     public static var shared: RNNamiFlowManager?
@@ -54,4 +58,17 @@ class RNNamiFlowManager: RCTEventEmitter {
             NamiFlowManager.resume()
         }
     }
+
+    @objc func finish() {
+        DispatchQueue.main.async {
+            NamiFlowManager.finish()
+        }
+    }
+
+    @objc func isFlowOpen(_ resolve: @escaping RCTPromiseResolveBlock, rejecter _: @escaping RCTPromiseRejectBlock) {
+        DispatchQueue.main.async {
+            let isFlowOpen = NamiFlowManager.isFlowOpen()
+            resolve(isFlowOpen)
+        }
+    }
 }

package/ios/NamiPaywallManagerBridge.swift

@@ -9,6 +9,10 @@ import Foundation
 import NamiApple
 import React
 
+// #if RCT_NEW_ARCH_ENABLED
+//     extension RNNamiPaywallManager: RCTTurboModule {}
+// #endif
+
 @objc(RNNamiPaywallManager)
 class RNNamiPaywallManager: RCTEventEmitter {
     public static var shared: RNNamiPaywallManager?
@@ -44,6 +48,10 @@ class RNNamiPaywallManager: RCTEventEmitter {
                 let namiSku = NamiSKU(namiId: namiId, storeId: storeId, skuType: namiSkuType)
                 let priceString = dict["price"] as? String ?? "0"
 
+                if let store = dict["storeType"] as? String, store != "Apple" {
+                    print("RNNamiPaywallManager - buySkuComplete called with the wrong store type \(dict)")
+                }
+
                 do {
                     if let transactionID = dict["transactionID"] as? String,
                        let originalTransactionID = dict["originalTransactionID"] as? String,

package/ios/NamiPurchaseManagerBridge.m

@@ -21,8 +21,6 @@ RCT_EXTERN_METHOD(skuPurchased:(NSString *)skuId resolver:(RCTPromiseResolveBloc
 
 RCT_EXTERN_METHOD(anySkuPurchased:(NSArray*)skuIds resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(consumePurchasedSku:(NSString *)skuId)
-
 RCT_EXTERN_METHOD(registerPurchasesChangedHandler)
 
 RCT_EXTERN_METHOD(registerRestorePurchasesHandler)

package/ios/NamiPurchaseManagerBridge.swift

@@ -9,10 +9,9 @@ import Foundation
 import NamiApple
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    import React_RCTTurboModule
-    extension RNNamiPurchaseManager: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//     extension RNNamiPurchaseManager: RCTTurboModule {}
+// #endif
 
 @objc(RNNamiPurchaseManager)
 class RNNamiPurchaseManager: RCTEventEmitter {
@@ -120,11 +119,6 @@ class RNNamiPurchaseManager: RCTEventEmitter {
         resolve(false)
     }
 
-    @objc(consumePurchasedSku:)
-    func consumePurchasedSku(skuId: String) {
-        NamiPurchaseManager.consumePurchasedSku(skuId: skuId)
-    }
-
     @objc(registerPurchasesChangedHandler)
     func registerPurchasesChangedHandler() {
         NamiPurchaseManager.registerPurchasesChangedHandler { purchases, purchaseState, error in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "React Native Module for Nami - Easy subscriptions & in-app purchases, with powerful built-in paywalls and A/B testing.",
   "main": "index.ts",
   "types": "dist/index.d.ts",

package/react-native-nami-sdk.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.requires_arc  = true
   s.swift_version = '5.0'  # or your supported version
 
-  s.dependency 'Nami', '3.3.0.1'
+  s.dependency 'Nami', '3.3.1.1'
   s.dependency 'React'
 
   s.pod_target_xcconfig = {
@@ -31,4 +31,10 @@ Pod::Spec.new do |s|
 
   install_modules_dependencies(s)
 
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.pod_target_xcconfig = {
+      'USE_HEADERMAP' => 'YES',
+    }
+   end
+
 end

package/specs/NativeNami.ts

@@ -11,6 +11,7 @@ export interface Spec extends TurboModule {
   }): Promise<{ success: boolean }>;
 
   sdkConfigured(): Promise<boolean>;
+  sdkVersion(): Promise<string>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('RNNami');

package/specs/NativeNamiFlowManager.ts

@@ -2,10 +2,11 @@ import type { TurboModule } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 export interface Spec extends TurboModule {
-  registerStepHandoff(): void;
+  finish(): void;
+  isFlowOpen(): Promise<boolean>;
 
+  registerStepHandoff(): void;
   resume(): void;
-
   registerEventHandler(): void;
 }
 

package/specs/NativeNamiPaywallManager.ts

@@ -20,6 +20,7 @@ export interface Spec extends TurboModule {
     marketplace?: string;
     price?: string;
     currencyCode?: string;
+    storeType?: string;
   }): void;
 
   // Backward compatibility methods

package/specs/NativeNamiPurchaseManager.ts

@@ -23,7 +23,6 @@ export interface Spec extends TurboModule {
 
   skuPurchased(skuId: string): Promise<boolean>;
   anySkuPurchased(skuIds: string[]): Promise<boolean>;
-  consumePurchasedSku(skuId: string): void;
   presentCodeRedemptionSheet(): void;
   restorePurchases(): void;
   registerPurchasesChangedHandler(): void;

package/src/Nami.ts

@@ -31,4 +31,7 @@ export const Nami = {
   sdkConfigured: async (): Promise<boolean> => {
     return await RNNami.sdkConfigured?.();
   },
+  sdkVersion: async (): Promise<string> => {
+    return await RNNami.sdkVersion();
+  },
 };

package/src/NamiFlowManager.ts

@@ -53,4 +53,12 @@ export const NamiFlowManager = {
     RNNamiFlowManager.registerEventHandler?.();
     return () => sub.remove();
   },
+
+  finish: (): void => {
+    RNNamiFlowManager.finish();
+  },
+
+  isFlowOpen: async (): Promise<boolean> => {
+    return RNNamiFlowManager.isFlowOpen();
+  },
 };

package/src/NamiPaywallManager.ts

@@ -35,15 +35,15 @@ export const NamiPaywallManager = {
 
   // Compatibility shims
   buySkuCompleteApple: (purchase: NamiPurchaseSuccessApple): void => {
-    RNNamiPaywallManager.buySkuCompleteApple(purchase);
+    RNNamiPaywallManager.buySkuComplete(purchase);
   },
 
   buySkuCompleteAmazon: (purchase: NamiPurchaseSuccessAmazon): void => {
-    RNNamiPaywallManager.buySkuCompleteAmazon(purchase);
+    RNNamiPaywallManager.buySkuComplete(purchase);
   },
 
   buySkuCompleteGooglePlay: (purchase: NamiPurchaseSuccessGooglePlay): void => {
-    RNNamiPaywallManager.buySkuCompleteGooglePlay(purchase);
+    RNNamiPaywallManager.buySkuComplete(purchase);
   },
 
   registerBuySkuHandler: (callback: (sku: NamiSKU) => void): (() => void) => {

package/src/NamiPurchaseManager.ts

@@ -47,9 +47,6 @@ export const NamiPurchaseManager = {
   anySkuPurchased: async (skuIds: string[]): Promise<boolean> =>
     await RNNamiPurchaseManager.anySkuPurchased(skuIds),
 
-  consumePurchasedSku: (skuId: string): void =>
-    RNNamiPurchaseManager.consumePurchasedSku(skuId),
-
   presentCodeRedemptionSheet: (): void =>
     RNNamiPurchaseManager.presentCodeRedemptionSheet(),
 

package/src/types.ts

@@ -255,6 +255,7 @@ export type NamiPurchaseDetails = {
   currencyCode?: string;
   userId?: string;
   marketplace?: string;
+  storeType?: string; // 'Apple', 'GooglePlay', 'Amazon'
 };
 
 export type NamiPurchaseSuccessApple = {

package/src/version.ts

@@ -2,4 +2,4 @@
  * Auto-generated file. Do not edit manually.
  * React Native Nami SDK version.
  */
-export const NAMI_REACT_NATIVE_VERSION = '3.3.0';
+export const NAMI_REACT_NATIVE_VERSION = '3.3.1';