react-native-nami-sdk 3.2.3 → 3.2.5

package/.eslintignore

@@ -1,3 +1,3 @@
 node_modules/
-.eslintrc
+.eslintrc.*
 *.d.ts

package/.github/workflows/CI.yaml

@@ -323,7 +323,7 @@ jobs:
           arch: x86
           channel: canary
           profile: pixel
-          avd-name: Pixel_4_API_30_AOSP
+          avd-name: Pixel_4_API_34
           script: yarn detox test --configuration ${{ env.DETOX_CONFIGURATION }} e2e/android --headless --record-logs all
           working-directory: source/examples/Basic
 

package/.github/workflows/app_prod.yaml

@@ -208,11 +208,6 @@ jobs:
             pod install --repo-update
           working-directory: source/examples/Basic/ios
 
-        - name: Apply Patches
-          run: |
-            patch -p0 < *.patch
-          working-directory: source/examples/Basic/patches
-
         - name: Build resolve Swift dependencies
           run: |
             xcodebuild -resolvePackageDependencies -workspace ios/Basic.xcworkspace -scheme BasicProduction -configuration Release

package/.github/workflows/app_stg.yaml

@@ -46,7 +46,7 @@ jobs:
           cache: gradle
           distribution: temurin
           java-version: 17
-          
+
       - name: Install Google API python client
         run: |
           pip install google-api-python-client

package/android/build.gradle

@@ -37,7 +37,7 @@ android {
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
     defaultConfig {
         minSdkVersion 22
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
     }
@@ -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.2.3"
-    amazonImplementation "com.namiml:sdk-amazon:3.2.3"
+    playImplementation "com.namiml:sdk-android:3.2.5"
+    amazonImplementation "com.namiml:sdk-amazon:3.2.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

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

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

@@ -294,8 +294,14 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun refresh() {
-        NamiCampaignManager.refresh { }
+     fun refresh(promise: Promise) {
+        NamiCampaignManager.refresh { campaigns ->
+            val array = WritableNativeArray()
+            campaigns?.forEach { campaign ->
+                array.pushMap(campaignToReadableMap(campaign))
+            }
+            promise.resolve(array)
+        }
     }
 
     @ReactMethod

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

@@ -222,7 +222,7 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun setProductDetails(productDetails: String, allowOffers: Boolean) {
-        NamiPaywallManager.setProductDetails(productDetails, allowOffers = false)
+        NamiPaywallManager.setProductDetails(productDetails, allowOffers = allowOffers)
     }
 
     @ReactMethod

package/index.ts

@@ -6,5 +6,4 @@ export { NamiEntitlementManager } from './src/NamiEntitlementManager';
 export { NamiManager } from './src/NamiManager';
 export { NamiPurchaseManager } from './src/NamiPurchaseManager';
 export { NamiPaywallManager } from './src/NamiPaywallManager';
-export { NamiSKU } from './src/types';
 export * from './src/types';

package/ios/Nami.m

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

package/ios/NamiCampaignManagerBridge.m

@@ -15,7 +15,7 @@ RCT_EXTERN_METHOD(allCampaigns:(RCTPromiseResolveBlock)resolve rejecter:(RCTProm
 
 RCT_EXTERN_METHOD(isCampaignAvailable:(nullable NSString *)campaignSource resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(refresh)
+RCT_EXTERN_METHOD(refresh:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(registerAvailableCampaignsHandler)
 

package/ios/NamiCampaignManagerBridge.swift

@@ -82,9 +82,9 @@ class RNNamiCampaignManager: RCTEventEmitter {
         case .slide_change:
             actionString = "SLIDE_CHANGE"
         case .nami_collapsible_drawer_open:
-          actionString = "COLLAPSIBLE_DRAWER_OPEN"
+            actionString = "COLLAPSIBLE_DRAWER_OPEN"
         case .nami_collapsible_drawer_close:
-          actionString = "COLLAPSIBLE_DRAWER_CLOSE"
+            actionString = "COLLAPSIBLE_DRAWER_CLOSE"
         case .video_play:
             actionString = "VIDEO_STARTED"
         case .video_pause:
@@ -270,9 +270,12 @@ class RNNamiCampaignManager: RCTEventEmitter {
         resolve(isCampaignAvailable)
     }
 
-    @objc(refresh)
-    func refresh() {
-        NamiCampaignManager.refresh()
+    @objc(refresh:rejecter:)
+    func refresh(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
+        NamiCampaignManager.refresh { campaigns in
+            let dictionaries = campaigns.map { campaign in self.campaignInToDictionary(campaign) }
+            resolve(dictionaries)
+        }
     }
 
     @objc(registerAvailableCampaignsHandler)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "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.2.3'
+  s.dependency 'Nami', '3.2.6'
   s.dependency 'React'
 
 end

package/src/NamiCampaignManager.d.ts

@@ -11,7 +11,7 @@ interface ICampaignManager {
     allCampaigns: () => Promise<Array<NamiCampaign>>;
     isCampaignAvailable(campaignSource: string | null): Promise<boolean>;
     launch: (label?: string, withUrl?: string, context?: PaywallLaunchContext, resultCallback?: (success: boolean, error?: LaunchCampaignError) => void, actionCallback?: NamiPaywallActionHandler) => void;
-    refresh: () => void;
+    refresh: () => Promise<Array<NamiCampaign>>;
     registerAvailableCampaignsHandler: (callback: (availableCampaigns: NamiCampaign[]) => void) => EmitterSubscription['remove'];
 }
 export declare const NamiCampaignManager: ICampaignManager;

package/src/NamiCampaignManager.ts

@@ -32,7 +32,7 @@ interface ICampaignManager {
     resultCallback?: (success: boolean, error?: LaunchCampaignError) => void,
     actionCallback?: NamiPaywallActionHandler,
   ) => void;
-  refresh: () => void;
+  refresh: () => Promise<Array<NamiCampaign>>;
   registerAvailableCampaignsHandler: (
     callback: (availableCampaigns: NamiCampaign[]) => void,
   ) => EmitterSubscription['remove'];

package/src/types.d.ts

@@ -47,13 +47,20 @@ export type AppleProduct = {
 export type GoogleProduct = {};
 export type AmazonProduct = {};
 export type NamiCampaign = {
-    id: string;
+    name: string;
     rule: string;
     segment: string;
     paywall: string;
     type: NamiCampaignRuleType;
     value?: string | null;
+    form_factors: NamiFormFactor[];
+    external_segment: string | null;
 };
+type NamiFormFactor = {
+    form_factor: string;
+    supports_portrait?: boolean;
+    supports_landscape?: boolean;
+}
 export declare enum NamiCampaignRuleType {
     DEFAULT = "default",
     LABEL = "label",
@@ -158,6 +165,7 @@ export type NamiPurchase = {
     sku?: NamiSKU;
     skuId: string;
     transactionIdentifier?: string;
+    purchaseToken?: string;
     expires?: Date;
     purchaseInitiatedTimestamp: Date;
     purchaseSource?: 'CAMPAIGN' | 'MARKETPLACE' | 'UNKNOWN';

package/src/types.ts

@@ -153,12 +153,14 @@ export type AmazonProduct = {};
 
 // NamiCampaignManager
 export type NamiCampaign = {
-  id: string;
+  name: string;
   rule: string;
   segment: string;
   paywall: string;
   type: NamiCampaignRuleType;
   value?: string | null;
+  form_factors: NamiFormFactor[];
+  external_segment: string | null;
 };
 
 export enum NamiCampaignRuleType {
@@ -168,6 +170,12 @@ export enum NamiCampaignRuleType {
   URL = 'url',
 }
 
+type NamiFormFactor = {
+  form_factor?: string;
+  supports_portrait?: boolean;
+  supports_landscape?: boolean;
+};
+
 export enum LaunchCampaignError {
   DEFAULT_CAMPAIGN_NOT_FOUND = 0,
   LABELED_CAMPAIGN_NOT_FOUND = 1,
@@ -295,6 +303,7 @@ export type NamiPurchase = {
   sku?: NamiSKU;
   skuId: string;
   transactionIdentifier?: string;
+  purchaseToken?: string;
   expires?: Date;
   purchaseInitiatedTimestamp: Date;
   purchaseSource?: 'CAMPAIGN' | 'MARKETPLACE' | 'UNKNOWN';