Merge branch 'main' into feat/leverage-sdk-compability

# Conflicts: # examples/Basic/src/containers/EntitlementsScreen.tsx
namiml · Aug 30, 2023 · 0ac3066 · 0ac3066
2 parents c87eec8 + cba039f
commit 0ac3066
Show file tree

Hide file tree

Showing 22 changed files with 80 additions and 16 deletions.
diff --git a/android/build.gradle b/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.3"
+    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"

diff --git a/android/src/main/java/com/nami/reactlibrary/NamiBridgeModule.kt b/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.29")
+        val settingsList = mutableListOf("extendedClientInfo:react-native:3.0.30")
         namiCommandsReact?.toArrayList()?.filterIsInstance<String>()?.let { commandsFromReact ->
             settingsList.addAll(commandsFromReact)
         }

diff --git a/android/src/main/java/com/nami/reactlibrary/NamiEntitlementManagerBridgeModule.kt b/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?) {
     }

diff --git a/android/src/main/java/com/nami/reactlibrary/NamiPaywallManagerBridgeModule.kt b/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?) {
     }

diff --git a/examples/Basic/android/app/build.gradle b/examples/Basic/android/app/build.gradle
@@ -218,6 +218,8 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation 'com.github.jeziellago:compose-markdown:0.3.0'
+    implementation "com.namiml:sdk-android:3.1.5"
+
     implementation project(':react-native-screens')
 
     if (enableHermes) {

diff --git a/examples/Basic/android/app/src/main/res/xml/network_security_config.xml b/examples/Basic/android/app/src/main/res/xml/network_security_config.xml
@@ -4,4 +4,4 @@
         <domain includeSubdomains="true">10.0.2.2</domain>
         <domain includeSubdomains="true">localhost</domain>
     </domain-config>
-</network-security-config>
+</network-security-config>
diff --git a/examples/Basic/src/containers/CampaignScreen.tsx b/examples/Basic/src/containers/CampaignScreen.tsx
@@ -41,12 +41,12 @@ const HeaderRight = ({ onRefreshPress }: {onRefreshPress: () => void}) => (
 // For Nami testing purposes only
 const HeaderLeft = ({ onButtonPress }: {onButtonPress: () => void}) => (
   <TouchableOpacity
-    style={styles.headerButton}
+    style={styles.headerButtonLeft}
     onPress={onButtonPress}>
     <Text
       testID="show_paywall_button"
       style={styles.headerButtonText}>
-      Show Paywall
+      Show
     </Text>
   </TouchableOpacity>
 );
@@ -362,6 +362,12 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
+  headerButtonLeft: {
+    marginLeft: 15,
+    height: 30,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
   headerButtonText: {
     color: theme.links,
     fontSize: 16,

diff --git a/examples/Basic/src/containers/EntitlementsScreen.tsx b/examples/Basic/src/containers/EntitlementsScreen.tsx
@@ -36,6 +36,10 @@ const EntitlementsScreen: FC<EntitlementsScreenProps> = ({ navigation }) => {
     });
   };
 
+  const onClearPress = () => {
+    NamiEntitlementManager.clearProvisionalEntitlementGrants();
+  };
+
   useEffect(() => {
     getAllEntitlements();
     const subscriptionRemover =
@@ -65,6 +69,19 @@ const EntitlementsScreen: FC<EntitlementsScreenProps> = ({ navigation }) => {
           </TouchableOpacity>
         );
       },
+      headerLeft: () => {
+        return (
+          <TouchableOpacity
+            style={styles.headerLeftButton}
+            onPress={onClearPress}>
+            <Text
+              testID="clear_entitlements"
+              style={styles.headerButtonText}>
+              Clear
+            </Text>
+          </TouchableOpacity>
+        );
+      },
     });
   }, [navigation]);
 
@@ -136,6 +153,12 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
+  headerLeftButton: {
+    marginLeft: 15,
+    height: 30,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
   headerButtonText: {
     color: theme.links,
     fontSize: 16,

diff --git a/examples/TestNamiTV/android/app/build.gradle b/examples/TestNamiTV/android/app/build.gradle
@@ -200,15 +200,9 @@ android {
     productFlavors {
         amazon {
             dimension "store"
-            repositories {
-                maven { url "https://packages.namiml.com/NamiSDK/Amazon/"}
-            }
         }
         play {
             dimension "store"
-            repositories {
-                maven { url "https://packages.namiml.com/NamiSDK/Android/"}
-            }
         }
     }
 
@@ -233,6 +227,9 @@ dependencies {
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation 'com.github.jeziellago:compose-markdown:0.3.0'
 
+    amazonImplementation "com.namiml:sdk-amazon:3.1.5"
+    playImplementation "com.namiml:sdk-android:3.1.5"
+
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";
         debugImplementation files(hermesPath + "hermes-debug.aar")

diff --git a/examples/TestNamiTV/android/build.gradle b/examples/TestNamiTV/android/build.gradle
@@ -46,5 +46,8 @@ allprojects {
         google()
         jcenter()
         maven { url 'https://jitpack.io' }
+        maven { url "https://packages.namiml.com/NamiSDK/Amazon/"}
+        maven { url "https://packages.namiml.com/NamiSDK/Android/"}
+
     }
 }
diff --git a/examples/TestNamiTV/index.tsx → examples/TestNamiTV/index.js b/examples/TestNamiTV/index.tsx → examples/TestNamiTV/index.js
@@ -15,7 +15,7 @@ console.log('configDict', configDict);
 const Root = () => {
   const [isConfigurationComplete, setIsConfigurationComplete] = useState();
   useEffect(() => {
-    Nami.configure(configDict, (resultObject: any) => {
+    Nami.configure(configDict, (resultObject) => {
       setIsConfigurationComplete(resultObject.success);
     });
     // eslint-disable-next-line @typescript-eslint/no-empty-function

diff --git a/ios/Nami.m b/ios/Nami.m
@@ -52,7 +52,7 @@ @implementation NamiBridge (RCTExternModule)
         }
 
         // 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.29"]];
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.0.30"]];
 
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];

diff --git a/ios/NamiEntitlementManagerBridge.m b/ios/NamiEntitlementManagerBridge.m
@@ -18,6 +18,8 @@ @interface RCT_EXTERN_MODULE(RNNamiEntitlementManager, NSObject)
 
 RCT_EXTERN_METHOD(registerActiveEntitlementsHandler)
 
+RCT_EXTERN_METHOD(clearProvisionalEntitlementGrants)
+
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }

diff --git a/ios/NamiEntitlementManagerBridge.swift b/ios/NamiEntitlementManagerBridge.swift
@@ -36,6 +36,7 @@ class RNNamiEntitlementManager: RCTEventEmitter {
             let dictionary = RNNamiPurchaseManager.skuToSKUDict(sku)
             return dictionary
         }
+
         let dictionary: [String: Any?] = [
             "name": entitlement.name,
             "desc": entitlement.desc,
@@ -78,4 +79,9 @@ class RNNamiEntitlementManager: RCTEventEmitter {
             RNNamiEntitlementManager.shared?.sendEvent(withName: "EntitlementsChanged", body: dictionaries)
         }
     }
+
+    @objc(clearProvisionalEntitlementGrants)
+    func clearProvisionalEntitlementGrants() {
+        NamiEntitlementManager.clearProvisionalEntitlementGrants()
+    }
 }
diff --git a/ios/NamiPaywallManagerBridge.m b/ios/NamiPaywallManagerBridge.m
@@ -33,6 +33,8 @@ @interface RCT_EXTERN_MODULE(RNNamiPaywallManager, NSObject)
 
 RCT_EXTERN_METHOD(isHidden:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(buySkuCancel)
+
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }

diff --git a/ios/NamiPaywallManagerBridge.swift b/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 {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.0.29",
+  "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": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

diff --git a/react-native-nami-sdk.podspec b/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.4'
+  s.dependency 'Nami', '3.1.6'
   s.dependency 'React'
 
 end
diff --git a/src/core/NamiEntitlementManager.d.ts b/src/core/NamiEntitlementManager.d.ts
@@ -11,6 +11,7 @@ export type NamiEntitlementManager = {
   registerActiveEntitlementsHandler: (
     callback: (activeEntitlements: NamiEntitlement[]) => void
   ) => EmitterSubscription['remove'];
+  clearProvisionalEntitlementGrants: () => void;
 };
 
 export type NamiEntitlement = {

diff --git a/src/core/NamiEntitlementManager.ts b/src/core/NamiEntitlementManager.ts
@@ -23,6 +23,7 @@ export interface INamiEntitlementManager {
   registerActiveEntitlementsHandler: (
     callback: (activeEntitlements: NamiEntitlement[]) => void
   ) => EmitterSubscription['remove'];
+  clearProvisionalEntitlementGrants: () => void;
 }
 
 export const NamiEntitlementManager: INamiEntitlementManager = {

diff --git a/src/core/NamiPaywallManager.d.ts b/src/core/NamiPaywallManager.d.ts
@@ -21,6 +21,7 @@ export type NamiPaywallManager = {
   ) => EmitterSubscription['remove'];
   show: () => void;
   hide: () => void;
+  buySkuCancel: () => void;
   isHidden: () => Promise<boolean>;
 };
 

diff --git a/src/core/NamiPaywallManager.ts b/src/core/NamiPaywallManager.ts
@@ -66,6 +66,9 @@ export const NamiPaywallManager: INamiPaywallManager = {
       ServicesEnum.GooglePlay
     );
   },
+  buySkuCancel: () => {
+    RNNamiPaywallManager.buySkuCancel();
+  },
   registerBuySkuHandler: (callback: (sku: NamiSKU) => void) => {
     let subscription: EmitterSubscription;
     subscription = NamiPaywallManager.paywallEmitter.addListener(