react-native-nami-sdk 3.1.10 → 3.1.12

package/.github/workflows/app_prod.yaml

@@ -77,6 +77,12 @@ jobs:
         env:
           BASIC_ANDROID_PROD_APP_PLATFORM_ID: '${{ secrets.ANDROID_PROD_APP_PLATFORM_ID }}'
 
+      - name: Manually create the bundle
+        run: |
+          mkdir -p  android/app/src/main/assets/
+          npx react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle
+        working-directory: source/examples/Basic
+
       - name: Build Android App Bundle
         run: |
           ./gradlew clean bundleProductionRelease

package/.github/workflows/app_stg.yaml

@@ -77,6 +77,12 @@ jobs:
           yarn install
         working-directory: source/examples/Basic
 
+      - name: Manually create the bundle
+        run: |
+          mkdir -p  android/app/src/main/assets/
+          npx react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle
+        working-directory: source/examples/Basic
+
       - name: Build Android App Bundle
         run: |
           ./gradlew clean bundleStagingRelease

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'
-    compileOnly "com.namiml:sdk-amazon:3.1.10"
+    compileOnly "com.namiml:sdk-amazon:3.1.14"
 
     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

@@ -10,6 +10,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Promise
 import com.namiml.Nami
 import com.namiml.NamiConfiguration
 import com.namiml.NamiLanguageCode
@@ -44,15 +45,7 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
         }
 
         val appContext: Context = reactApplicationContext.applicationContext
-        Log.i(LOG_TAG, "Configure called with appID $appPlatformID")
-        Log.i(LOG_TAG, "Configure called with context $reactApplicationContext")
-        Log.i(LOG_TAG, "Nami Configure called with context.applicationContext $appContext")
-
-        val isApplication: Boolean = (appContext is Application)
-        Log.i(LOG_TAG, "Configure called with (context as Application) $isApplication.")
-        Log.i(LOG_TAG, "End Application check ")
-
-        // Application fred = (reactContext as Application);
+        Log.d(LOG_TAG, "NAMI: RN Bridge - Configure called with appPlatformID $appPlatformID")
 
         val builder: NamiConfiguration.Builder =
             NamiConfiguration.Builder(appContext, appPlatformID)
@@ -78,15 +71,15 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
                 builder.logLevel(NamiLogLevel.DEBUG)
             }
         }
-        Log.i(LOG_TAG, "Nami Configuration log level passed in is $logLevelString")
+        Log.d(LOG_TAG, "NAMI: RN Bridge - configuration log level is $logLevelString")
 
         val developmentMode = if (configDict.hasKey(CONFIG_MAP_DEVELOPMENT_MODE_KEY)) {
             configDict.getBoolean(CONFIG_MAP_DEVELOPMENT_MODE_KEY)
         } else {
             false
         }
-        Log.i(LOG_TAG, "Nami Configuration developmentMode is $developmentMode")
         if (developmentMode) {
+                    Log.d(LOG_TAG, "NAMI: RN Bridge - development mode is $developmentMode")
             builder.developmentMode = true
         }
 
@@ -115,11 +108,11 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
             } else {
                 Arguments.createArray()
             }
-        val settingsList = mutableListOf("extendedClientInfo:react-native:3.1.10")
+        val settingsList = mutableListOf("extendedClientInfo:react-native:3.1.12")
         namiCommandsReact?.toArrayList()?.filterIsInstance<String>()?.let { commandsFromReact ->
             settingsList.addAll(commandsFromReact)
         }
-        Log.i(LOG_TAG, "Nami Configuration command settings are $settingsList")
+        Log.d(LOG_TAG, "Nami Configuration command settings are $settingsList")
         builder.settingsList = settingsList
 
         val initialConfig = if (configDict.hasKey(CONFIG_MAP_INITIAL_CONFIG_KEY)) {
@@ -128,7 +121,7 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
             null
         }
         initialConfig?.let { initialConfigString ->
-            Log.i(
+            Log.d(
                 LOG_TAG,
                 "Nami Configuration initialConfig found.",
             )
@@ -136,14 +129,16 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
         }
 
         val builtConfig: NamiConfiguration = builder.build()
-        Log.i(LOG_TAG, "Nami Configuration object is $builtConfig")
+        Log.d(LOG_TAG, "Nami Configuration object is $builtConfig")
 
         reactApplicationContext.runOnUiQueueThread {
+
             // Configure must be called on main thread
-            Nami.configure(builtConfig)
-            val resultMap = Arguments.createMap()
-            resultMap.putBoolean("success", true)
-            completion.invoke(resultMap)
+            Nami.configure(builtConfig) { result ->
+                val resultMap = Arguments.createMap()
+                resultMap.putBoolean("success", result)
+                completion.invoke(resultMap)
+            }
         }
     }
 }

package/android/src/main/java/com/nami/reactlibrary/NamiBridgePackage.java

@@ -24,6 +24,7 @@ public class NamiBridgePackage implements ReactPackage {
         moduleList.add(new NamiPurchaseManagerBridgeModule(reactContext));
         moduleList.add(new NamiEntitlementManagerBridgeModule(reactContext));
         moduleList.add(new NamiMLManagerBridgeModule(reactContext));
+        moduleList.add(new NamiManagerBridgeModule(reactContext));
         moduleList.add(new NamiCustomerManagerBridgeModule(reactContext));
         moduleList.add(new NamiCampaignManagerBridgeModule(reactContext));
 

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

@@ -156,7 +156,6 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
             putString(EXTERNAL_SEGMENT_ID, paywallEvent.externalSegmentId ?: "")
             putString(DEEP_LINK_URL, paywallEvent.deeplinkUrl ?: "")
         }
-
         emitEvent(_RESULT_CAMPAIGN, resultMap)
     }
 

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

@@ -0,0 +1,28 @@
+package com.nami.reactlibrary
+
+import android.util.Log
+import com.facebook.react.bridge.*
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.namiml.Nami
+
+class NamiManagerBridgeModule(reactContext: ReactApplicationContext) :
+    ReactContextBaseJavaModule(reactContext) {
+
+    override fun getName(): String {
+        return "RNNamiManager"
+    }
+
+    @ReactMethod
+    fun sdkConfigured(promise: Promise) {
+        val sdkConfigured = Nami.isInitialized()
+        promise.resolve(sdkConfigured)
+    }
+
+    @ReactMethod
+    fun addListener(eventName: String?) {
+    }
+
+    @ReactMethod
+    fun removeListeners(count: Int?) {
+    }
+}

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

@@ -239,6 +239,12 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
         promise.resolve(false)
     }
 
+    @ReactMethod
+    fun isPaywallOpen(promise: Promise) {
+        val paywallOpen = NamiPaywallManager.isPaywallOpen()
+        promise.resolve(paywallOpen)
+    }
+
     @ReactMethod
     fun buySkuCancel() {
         NamiPaywallManager.buySkuCancel()

package/index.d.ts

@@ -3,6 +3,7 @@ export { NamiMLManager } from './src/NamiMLManager';
 export { NamiCampaignManager } from './src/NamiCampaignManager';
 export { NamiCustomerManager } from './src/NamiCustomerManager';
 export { NamiEntitlementManager } from './src/NamiEntitlementManager';
+export { NamiManager } from './src/NamiManager';
 export { NamiPurchaseManager } from './src/NamiPurchaseManager';
 export { NamiPaywallManager } from './src/NamiPaywallManager';
 export * from './src/types';

package/index.ts

@@ -3,6 +3,7 @@ export { NamiMLManager } from './src/NamiMLManager';
 export { NamiCampaignManager } from './src/NamiCampaignManager';
 export { NamiCustomerManager } from './src/NamiCustomerManager';
 export { NamiEntitlementManager } from './src/NamiEntitlementManager';
+export { NamiManager } from './src/NamiManager';
 export { NamiPurchaseManager } from './src/NamiPurchaseManager';
 export { NamiPaywallManager } from './src/NamiPaywallManager';
 export * from './src/types';

package/ios/Nami.m

@@ -20,13 +20,11 @@
 @implementation NamiBridge (RCTExternModule)
 
 RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict completion: (RCTResponseSenderBlock) completion) {
-    if ([configDict count] == 0 || [configDict[@"logLevel"] isEqual: @"DEBUG"] ) {
-        NSLog(@"Configure dictionary is %@", configDict);
-    }
     NSString *appID = configDict[@"appPlatformID-apple"];
 
     if ([appID length] > 0 ) {
         NamiConfiguration *config = [NamiConfiguration configurationForAppPlatformId:appID];
+            NSLog(@"NAMI: RN Bridge - appPlatformId: %@", appID);
 
         NSString *logLevelString = configDict[@"logLevel"];
         if ([logLevelString isEqualToString:@"ERROR" ]) {
@@ -42,7 +40,7 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict completion: (RCTResponse
 
         NSString *languageString = configDict[@"namiLanguageCode"];
         if ([languageString length] > 0) {
-            NSLog(@"Nami language code from config dictionary is %@", languageString);
+            NSLog(@"NAMI: RN Bridge - language code: %@", languageString);
             if  ([[NamiLanguageCodes allAvailableNamiLanguageCodes]
                   containsObject:[languageString lowercaseString]] ) {
               config.namiLanguageCode = languageString;
@@ -52,12 +50,12 @@ 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.1.10"]];
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.1.12"]];
 
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];
         if ( appCommandStrings != NULL ) {
-            NSLog(@"NamiCommand from dictionary is %@", configDict[@"namiCommands"]);
+            NSLog(@"NAMI: RN Bridge - additional config settings %@", configDict[@"namiCommands"]);
             if ([appCommandStrings isKindOfClass:[NSArray class]] ) {
                 for (NSObject *commandObj in ((NSArray *)appCommandStrings)){
                     if ([commandObj isKindOfClass:[NSString class]]) {
@@ -71,13 +69,19 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict completion: (RCTResponse
 
         NSString *initialConfigString = configDict[@"initialConfig"];
         if ([initialConfigString length] > 0) {
-              NSLog(@"Found an initialConfig file to use for Nami SDK setup.");
+              NSLog(@"NAMI: RN Bridge - Found an initialConfig file to use for Nami SDK setup.");
               config.initialConfig = initialConfigString;
         }
 
-        [Nami configureWith:config];
-        NSDictionary *dict = @{@"success": @YES};
-        completion(@[dict]);
+        [Nami configureWith:config :^(BOOL sdkConfigured) {
+            if ( sdkConfigured == YES ) {
+                NSDictionary *dict = @{@"success": @YES};
+                completion(@[dict]);
+            } else {
+                NSDictionary *dict = @{@"success": @NO};
+                completion(@[dict]);
+            }
+        }];
     }
 }
 

package/ios/NamiManager.m

@@ -0,0 +1,18 @@
+//
+//  NamiManager.m
+//  RNNami
+//
+//  Copyright © 2020-2023 Nami ML Inc. All rights reserved.
+//
+
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(RNNamiManager, NSObject)
+
+RCT_EXTERN_METHOD(sdkConfigured:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
++ (BOOL)requiresMainQueueSetup {
+  return YES;
+}
+
+@end

package/ios/NamiManager.swift

@@ -0,0 +1,30 @@
+//
+//  NamiManager.swift
+//  RNNami
+//
+//  Copyright © 2023 Nami ML INc.. All rights reserved.
+//
+
+import Foundation
+import NamiApple
+import React
+
+@objc(RNNamiManager)
+class RNNamiManager: RCTEventEmitter {
+    public static var shared: RNNamiManager?
+
+    override init() {
+        super.init()
+        RNNamiManager.shared = self
+    }
+
+    override func supportedEvents() -> [String]! {
+        return []
+    }
+
+    @objc(sdkConfigured:rejecter:)
+    func sdkConfigured(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
+        let sdkConfigured = Nami.sdkConfigured()
+        resolve(sdkConfigured)
+    }
+}

package/ios/NamiPaywallManagerBridge.m

@@ -35,6 +35,8 @@ RCT_EXTERN_METHOD(hide)
 
 RCT_EXTERN_METHOD(isHidden:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(isPaywallOpen:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(buySkuCancel)
 
 + (BOOL)requiresMainQueueSetup {

package/ios/NamiPaywallManagerBridge.swift

@@ -151,4 +151,12 @@ class RNNamiPaywallManager: RCTEventEmitter {
             resolve(isHidden)
         }
     }
+
+    @objc(isPaywallOpen:rejecter:)
+    func isPaywallOpen(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
+        DispatchQueue.main.async {
+            let isPaywallOpen = NamiPaywallManager.isPaywallOpen()
+            resolve(isPaywallOpen)
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.1.10",
+  "version": "3.1.12",
   "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.10'
+  s.dependency 'Nami', '3.1.13'
   s.dependency 'React'
 
 end

package/src/Nami.ts

@@ -1,7 +1,7 @@
 import { NativeModules } from 'react-native';
 import { NamiConfiguration } from './types';
 
-export const { NamiBridge } = NativeModules;
+export const { NamiBridge, NamiManager } = NativeModules;
 
 export interface INami {
   configure: (

package/src/NamiCustomerManager.d.ts

@@ -1,4 +1,5 @@
 import { EmitterSubscription } from 'react-native';
+import { AccountStateAction } from './types';
 
 export const NamiCustomerManager: {
   setCustomerAttribute: (key: string, value: string) => void;
@@ -36,17 +37,3 @@ export type CustomerJourneyState = {
   inPause: boolean;
   inAccountHold: boolean;
 };
-
-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';

package/src/NamiManager.d.ts

@@ -0,0 +1,3 @@
+export const NamiManager: {
+  sdkConfigured: () => Promise<boolean>;
+};

package/src/NamiManager.ts

@@ -0,0 +1,14 @@
+import { NativeModules } from 'react-native';
+
+export const { RNNamiManager } = NativeModules;
+
+export interface INamiManager {
+  sdkConfigured: () => Promise<boolean>;
+}
+
+export const NamiManager: INamiManager = {
+  ...RNNamiManager,
+  sdkConfigured: () => {
+    return RNNamiManager.sdkConfigured();
+  },
+};

package/src/NamiPaywallManager.d.ts

@@ -25,6 +25,7 @@ export const NamiPaywallManager: {
   hide: () => void;
   buySkuCancel: () => void;
   isHidden: () => Promise<boolean>;
+  isPaywallOpen: () => Promise<boolean>;
 };
 
 export type NamiPurchaseSuccessApple = {

package/src/NamiPaywallManager.ts

@@ -48,6 +48,7 @@ export interface INamiPaywallManager {
   show: () => void;
   hide: () => void;
   isHidden: () => Promise<boolean>;
+  isPaywallOpen: () => Promise<boolean>;
 }
 
 const { NamiPaywallManagerBridge, RNNamiPaywallManager } = NativeModules;
@@ -156,4 +157,7 @@ export const NamiPaywallManager: INamiPaywallManager = {
   isHidden: () => {
     return RNNamiPaywallManager.isHidden();
   },
+  isPaywallOpen: () => {
+    return RNNamiPaywallManager.isPaywallOpen();
+  },
 };

package/src/types.ts

@@ -193,7 +193,6 @@ export type PaywallLaunchContext = {
   };
 };
 
-// NamiCustomerManager
 export type CustomerJourneyState = {
   formerSubscriber: boolean;
   inGracePeriod: boolean;
@@ -204,7 +203,19 @@ 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';
 
 // NamiEntitlementManager
 export type NamiEntitlement = {