react-native-nami-sdk 3.0.28 → 3.0.30

package/android/build.gradle

@@ -65,7 +65,7 @@ repositories {
     mavenCentral()
     // ref: https://www.baeldung.com/maven-local-repository
     mavenLocal()
-    maven { url("https://packages.namiml.com/NamiSDK/Android/") }
+    maven { url("https://packages.namiml.com/NamiSDK/Amazon/") }
     maven { url 'https://jitpack.io' }
     maven {
         // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -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.1.2"
+    compileOnly "com.namiml:sdk-amazon:3.1.5"
 
     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.28")
+        val settingsList = mutableListOf("extendedClientInfo:react-native:3.0.30")
         namiCommandsReact?.toArrayList()?.filterIsInstance<String>()?.let { commandsFromReact ->
             settingsList.addAll(commandsFromReact)
         }

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

@@ -61,6 +61,11 @@ class NamiEntitlementManagerBridgeModule(reactContext: ReactApplicationContext)
         }
     }
 
+    @ReactMethod
+    fun clearProvisionalEntitlementGrants() {
+        NamiEntitlementManager.clearProvisionalEntitlementGrants()
+    }
+
     @ReactMethod
     fun addListener(eventName: String?) {
     }

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

@@ -251,6 +251,11 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
         promise.resolve(false)
     }
 
+    @ReactMethod
+    fun buySkuCancel() {
+        NamiPaywallManager.buySkuCancel()
+    }
+
     @ReactMethod
     fun addListener(eventName: String?) {
     }

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

@@ -143,7 +143,6 @@ fun NamiEntitlement.toEntitlementDict(): WritableMap? {
         return null
     }
 
-    resultMap.putString("namiId", namiId.orEmpty())
     resultMap.putString("desc", desc.orEmpty())
     resultMap.putString("name", name.orEmpty())
 

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.28"]];
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.0.30"]];
 
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];

package/ios/NamiEntitlementManagerBridge.m

@@ -18,6 +18,8 @@ RCT_EXTERN_METHOD(refresh)
 
 RCT_EXTERN_METHOD(registerActiveEntitlementsHandler)
 
+RCT_EXTERN_METHOD(clearProvisionalEntitlementGrants)
+
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }

package/ios/NamiEntitlementManagerBridge.swift

@@ -36,10 +36,10 @@ class RNNamiEntitlementManager: RCTEventEmitter {
             let dictionary = RNNamiPurchaseManager.skuToSKUDict(sku)
             return dictionary
         }
+
         let dictionary: [String: Any?] = [
             "name": entitlement.name,
             "desc": entitlement.desc,
-            "namiId": entitlement.namiId,
             "referenceId": entitlement.referenceId,
             "activePurchases": activePurchasesDict,
             "relatedSkus": relatedSkusDict,
@@ -79,4 +79,9 @@ class RNNamiEntitlementManager: RCTEventEmitter {
             RNNamiEntitlementManager.shared?.sendEvent(withName: "EntitlementsChanged", body: dictionaries)
         }
     }
+
+    @objc(clearProvisionalEntitlementGrants)
+    func clearProvisionalEntitlementGrants() {
+        NamiEntitlementManager.clearProvisionalEntitlementGrants()
+    }
 }

package/ios/NamiPaywallManagerBridge.m

@@ -33,6 +33,8 @@ RCT_EXTERN_METHOD(hide)
 
 RCT_EXTERN_METHOD(isHidden:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(buySkuCancel)
+
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }

package/ios/NamiPaywallManagerBridge.swift

@@ -130,6 +130,13 @@ class RNNamiPaywallManager: RCTEventEmitter {
         }
     }
 
+    @objc(buySkuCancel)
+    func buySkuCancel() {
+        DispatchQueue.main.async {
+            NamiPaywallManager.buySkuCancel()
+        }
+    }
+
     @objc(isHidden:rejecter:)
     func isHidden(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
         DispatchQueue.main.async {

package/package.json

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

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.1.3'
+  s.dependency 'Nami', '3.1.6'
   s.dependency 'React'
 
 end

package/src/NamiEntitlementManager.d.ts

@@ -10,13 +10,13 @@ export const NamiEntitlementManager: {
   registerActiveEntitlementsHandler: (
     callback: (activeEntitlements: NamiEntitlement[]) => void,
   ) => EmitterSubscription['remove'];
+  clearProvisionalEntitlementGrants: () => void;
 };
 
 export type NamiEntitlement = {
   activePurchases: NamiPurchase[];
   desc: string;
   name: string;
-  namiId: string;
   purchasedSkus: NamiSKU[];
   referenceId: string;
   relatedSkus: NamiSKU[];

package/src/NamiEntitlementManager.ts

@@ -22,6 +22,7 @@ export interface INamiEntitlementManager {
   registerActiveEntitlementsHandler: (
     callback: (activeEntitlements: NamiEntitlement[]) => void,
   ) => EmitterSubscription['remove'];
+  clearProvisionalEntitlementGrants: () => void;
 }
 
 export const NamiEntitlementManager: INamiEntitlementManager = {

package/src/NamiPaywallManager.d.ts

@@ -20,6 +20,7 @@ export const NamiPaywallManager: {
   ) => EmitterSubscription['remove'];
   show: () => void;
   hide: () => void;
+  buySkuCancel: () => void;
   isHidden: () => Promise<boolean>;
 };
 

package/src/NamiPaywallManager.ts

@@ -65,6 +65,9 @@ export const NamiPaywallManager: INamiPaywallManager = {
       ServicesEnum.GooglePlay,
     );
   },
+  buySkuCancel: () => {
+    RNNamiPaywallManager.buySkuCancel();
+  },
   registerBuySkuHandler: (callback: (sku: NamiSKU) => void) => {
     let subscription;
     subscription = NamiPaywallManager.paywallEmitter.addListener(