react-native-nami-sdk 3.0.9 → 3.0.10

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

@@ -4,7 +4,6 @@ import android.util.Log
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.namiml.billing.NamiPurchaseManager
-import com.namiml.paywall.NamiPaywallManager
 
 class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
@@ -13,13 +12,6 @@ class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
         return "RNNamiPurchaseManager"
     }
 
-    @ReactMethod
-    fun clearBypassStorePurchases() {
-        reactApplicationContext.runOnUiQueueThread {
-            NamiPurchaseManager.clearBypassStorePurchases()
-        }
-    }
-
     @ReactMethod
     fun purchases(resultsCallback: Callback) {
         reactApplicationContext.runOnUiQueueThread {
@@ -76,7 +68,7 @@ class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
             putBoolean("success", false)
             putString(
                 "error",
-                "Google Play does not provide an API method to restore purchases.  Deep link users to Play app subscriptions to restore purchases."
+                "Google Play or Amazon Appstore on Android devices do not provide an API method to restore purchases.",
             )
         }
         resultsCallback.invoke(resultMap)
@@ -84,7 +76,7 @@ class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun registerPurchasesChangedHandler() {
-        NamiPurchaseManager.registerPurchasesChangedHandler{purchases, purchaseState, error ->
+        NamiPurchaseManager.registerPurchasesChangedHandler { purchases, purchaseState, error ->
             run {
                 val resultPurchases: WritableArray = WritableNativeArray()
 
@@ -100,11 +92,17 @@ class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
                 payload.putString("error", error)
 
                 reactApplicationContext
-                        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                        .emit("PurchasesChanged", payload)
-
-
+                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                    .emit("PurchasesChanged", payload)
             }
         }
     }
+
+    @ReactMethod
+    fun addListener(eventName: String?) {
+    }
+
+    @ReactMethod
+    fun removeListeners(count: Int?) {
+    }
 }

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

@@ -9,21 +9,13 @@ import com.facebook.react.bridge.WritableNativeMap
 import com.namiml.billing.NamiPurchase
 import com.namiml.customer.CustomerJourneyState
 import com.namiml.entitlement.NamiEntitlement
-import com.namiml.paywall.LegalCitations
-import com.namiml.paywall.NamiLocaleConfig
-import com.namiml.paywall.NamiPaywall
-import com.namiml.paywall.NamiPurchaseSource
 import com.namiml.paywall.NamiSKU
-import com.namiml.paywall.SubscriptionPeriod
-import com.namiml.util.extensions.getFormattedPrice
-import com.namiml.util.extensions.getSubscriptionPeriodEnum
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
 
-
 fun List<*>.toWritableArray(): WritableArray {
     val convertedArray = Arguments.createArray()
     for (value in this) {
@@ -84,45 +76,9 @@ fun Map<*, *>.toWritableMap(): WritableMap {
 fun NamiSKU.toSkuDict(): WritableMap {
     val productDict = Arguments.createMap()
 
-    productDict.putString("skuIdentifier", skuId)
-//    productDict.putString("localizedTitle", skuDetails.title)
-//    productDict.putString("localizedDescription", skuDetails.description)
-//    productDict.putString("localizedPrice", skuDetails.price)
-//    productDict.putString("localizedMultipliedPrice", skuDetails.price)
-    productDict.putBoolean("featured", featured)
-//    productDict.putString("displayText", displayText)
-//    productDict.putString("displaySubText", displaySubText)
-//    productDict.putString("price", skuDetails.getFormattedPrice().toString())
-    productDict.putString("priceLanguage", Locale.getDefault().language)
-    productDict.putString("priceCountry", Locale.getDefault().country)
-//    productDict.putString("priceCurrency", skuDetails.priceCurrencyCode)
-    productDict.putString("numberOfUnits", "1")
-//    val subscriptionPeriod = when (skuDetails.getSubscriptionPeriodEnum()) {
-//        SubscriptionPeriod.MONTHLY -> {
-//            "month"
-//        }
-//        SubscriptionPeriod.HALF_YEAR -> {
-//            "half_year"
-//        }
-//        SubscriptionPeriod.WEEKLY -> {
-//            "week"
-//        }
-//        SubscriptionPeriod.QUARTERLY -> {
-//            "quarter"
-//        }
-//        SubscriptionPeriod.ANNUAL -> {
-//            "year"
-//        }
-//        SubscriptionPeriod.FOUR_WEEKS -> {
-//            "four_weeks"
-//        }
-//        else -> {
-//            null
-//        }
-//    }
-//    if (subscriptionPeriod != null) {
-//        productDict.putString("periodUnit", subscriptionPeriod)
-//    }
+    productDict.putString("skuId", this.skuId)
+    productDict.putString("id", this.id)
+    productDict.putString("type", this.type.toString())
 
     return productDict
 }

package/ios/Nami.m

@@ -51,23 +51,8 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict completion: (RCTResponse
             }
         }
 
-        NSObject *bypassString = configDict[@"bypassStore"];
-        if ( bypassString != NULL )
-        {
-            NSLog(@"bypassStore from dictionary is %@", configDict[@"bypassStore"]);
-            if ([bypassString isKindOfClass:[NSNumber class]]) {
-                config.bypassStore = [((NSNumber *)bypassString) boolValue];
-            } else if ([bypassString isKindOfClass:[NSString class]] ) {
-                if ([[((NSString *)bypassString) lowercaseString] hasPrefix:@"t"] )
-                {
-                    // bypass is false by default, so we only worry about checking for enabling bypass
-                    config.bypassStore = true;
-                }
-            }
-        }
-
         // 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.9"]];
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.0.10"]];
 
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];
@@ -91,10 +76,6 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict completion: (RCTResponse
     }
 }
 
-RCT_EXPORT_METHOD(performNamiCommand: (NSString *)command) {
-    [NamiCommand performCommand:command];
-}
-
 @end
 
 @implementation NamiBridge
@@ -102,13 +83,10 @@ RCT_EXPORT_MODULE_NO_LOAD(NamiBridge, NamiBridge)
 
 - (dispatch_queue_t)methodQueue
 {
-  return dispatch_get_main_queue();
+    return dispatch_get_main_queue();
 }
 
 + (BOOL)requiresMainQueueSetup {
-  return YES;
+    return YES;
 }
-
-
-
 @end

package/ios/NamiCampaignManagerBridge.swift

@@ -11,8 +11,15 @@ import React
 
 @objc(RNNamiCampaignManager)
 class RNNamiCampaignManager: RCTEventEmitter {
+    public static var shared: RNNamiCampaignManager?
+
+    override init() {
+        super.init()
+        RNNamiCampaignManager.shared = self
+    }
+
     override func supportedEvents() -> [String]! {
-      return ["AvailableCampaignsChanged", "ResultCampaign"]
+        return ["AvailableCampaignsChanged", "ResultCampaign"]
     }
 
     private func campaignInToDictionary(_ campaign: NamiCampaign) -> NSDictionary {
@@ -58,14 +65,13 @@ class RNNamiCampaignManager: RCTEventEmitter {
                 actionString = "PURCHASE_CANCELLED"
             case .purchase_unknown:
                 actionString = "PURCHASE_UNKNOWN"
-            case .show_paywall:
-                actionString = "SHOW_PAYWALL"
             @unknown default:
                 actionString = "PURCHASE_UNKNOWN"
             }
             let skuId = sku?.skuId
             let errorSting = purchaseError?.localizedDescription
-            let dictionaries = purchases.map { purchase in NamiBridgeUtil.purchase(toPurchaseDict: purchase) }
+
+            let dictionaries = purchases.map { purchase in RNNamiPurchaseManager.purchaseToPurchaseDict(purchase) }
             let payload: [String: Any?] = [
                 "campaignId": campaignId,
                 "campaignLabel": campaignLabel,
@@ -73,9 +79,9 @@ class RNNamiCampaignManager: RCTEventEmitter {
                 "action": actionString,
                 "skuId": skuId,
                 "purchaseError": errorSting,
-                "purchases": dictionaries
+                "purchases": dictionaries,
             ]
-            self.sendEvent(withName: "ResultCampaign", body: payload)
+            RNNamiCampaignManager.shared?.sendEvent(withName: "ResultCampaign", body: payload)
         })
     }
 
@@ -106,7 +112,7 @@ class RNNamiCampaignManager: RCTEventEmitter {
     func registerForAvailableCampaigns() {
         NamiCampaignManager.registerAvailableCampaignsHandler { availableCampaigns in
             let dictionaries = availableCampaigns.map { campaign in self.campaignInToDictionary(campaign) }
-            self.sendEvent(withName: "AvailableCampaignsChanged", body: dictionaries)
+            RNNamiCampaignManager.shared?.sendEvent(withName: "AvailableCampaignsChanged", body: dictionaries)
         }
     }
 }

package/ios/NamiCustomerManager.swift

@@ -11,6 +11,13 @@ import React
 
 @objc(RNNamiCustomerManager)
 class RNNamiCustomerManager: RCTEventEmitter {
+    public static var shared: RNNamiCustomerManager?
+
+    override init() {
+        super.init()
+        RNNamiCustomerManager.shared = self
+    }
+
     override func supportedEvents() -> [String]! {
         return ["JourneyStateChanged", "AccountStateChanged"]
     }
@@ -53,12 +60,12 @@ class RNNamiCustomerManager: RCTEventEmitter {
     func setCustomerDataPlatformId(cdpId: String) {
         NamiCustomerManager.setCustomerDataPlatformId(with: cdpId)
     }
-    
+
     @objc(clearCustomerDataPlatformId)
     func clearCustomerDataPlatformId() {
         NamiCustomerManager.clearCustomerDataPlatformId()
     }
-    
+
     @objc(journeyState:rejecter:)
     func journeyState(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
         if let journeyState = NamiCustomerManager.journeyState() {
@@ -105,28 +112,40 @@ class RNNamiCustomerManager: RCTEventEmitter {
     func registerJourneyStateHandler() {
         NamiCustomerManager.registerJourneyStateHandler { journeyState in
             let dictionary = self.journeyStateToDictionary(journeyState)
-            self.sendEvent(withName: "JourneyStateChanged", body: dictionary)
+            RNNamiCustomerManager.shared?.sendEvent(withName: "JourneyStateChanged", body: dictionary)
         }
     }
 
     @objc(registerAccountStateHandler)
     func registerAccountStateHandler() {
-        NamiCustomerManager.registerAccountStateHandler({action, success, error in
+        NamiCustomerManager.registerAccountStateHandler { action, success, error in
             let actionString: String
             switch action {
             case .login:
                 actionString = "login"
             case .logout:
                 actionString = "logout"
+            case .customer_data_platform_id_set:
+                actionString = "customer_data_platform_id_set"
+            case .customer_data_platform_id_cleared:
+                actionString = "customer_data_platform_id_cleared"
+            case .advertising_id_set:
+                actionString = "advertising_id_set"
+            case .advertising_id_cleared:
+                actionString = "advertising_id_cleared"
+            case .vendor_id_set:
+                actionString = "vendor_id_set"
+            case .vendor_id_cleared:
+                actionString = "vendor_id_cleared"
             @unknown default:
                 actionString = "unknown"
             }
             let payload: [String: Any?] = [
                 "action": actionString,
                 "success": success,
-                "error": error?._code as Any
+                "error": error?._code as Any,
             ]
-            self.sendEvent(withName: "AccountStateChanged", body: payload)
-        })
+            RNNamiCustomerManager.shared?.sendEvent(withName: "AccountStateChanged", body: payload)
+        }
     }
 }

package/ios/NamiEntitlementManagerBridge.swift

@@ -11,6 +11,13 @@ import React
 
 @objc(RNNamiEntitlementManager)
 class RNNamiEntitlementManager: RCTEventEmitter {
+    public static var shared: RNNamiEntitlementManager?
+
+    override init() {
+        super.init()
+        RNNamiEntitlementManager.shared = self
+    }
+
     override func supportedEvents() -> [String]! {
         return ["EntitlementsChanged"]
     }
@@ -40,6 +47,7 @@ class RNNamiEntitlementManager: RCTEventEmitter {
         ]
         return NSDictionary(dictionary: dictionary.compactMapValues { $0 })
     }
+
     @objc(isEntitlementActive:resolver:rejecter:)
     func isEntitlementActive(referenceId: String, resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
         let isEntitlementActive = NamiEntitlementManager.isEntitlementActive(referenceId)
@@ -68,7 +76,7 @@ class RNNamiEntitlementManager: RCTEventEmitter {
                 let dictionary = self.entitlementInToDictionary(entitlement)
                 return dictionary
             }
-            self.sendEvent(withName: "EntitlementsChanged", body: dictionaries)
+            RNNamiEntitlementManager.shared?.sendEvent(withName: "EntitlementsChanged", body: dictionaries)
         }
     }
 }

package/ios/NamiMLManagerBridge.m

@@ -2,12 +2,10 @@
 //  NamiMLManagerBridge.m
 //  RNNami
 //
-//  Created by Kendall Gelner on 4/6/20.
 //  Copyright © 2020-2023 Nami ML Inc. All rights reserved.
 //
 #import <Foundation/Foundation.h>
 #import <NamiApple/NamiApple.h>
-#import "NamiBridgeUtil.h"
 
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>

package/ios/NamiPaywallManagerBridge.m

@@ -8,7 +8,6 @@
 
 #import <Foundation/Foundation.h>
 #import <NamiApple/NamiApple.h>
-#import "NamiBridgeUtil.h"
 
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
@@ -21,68 +20,12 @@ RCT_EXTERN_METHOD(buySkuComplete:(NSDictionary)dict)
 
 RCT_EXTERN_METHOD(registerBuySkuHandler)
 
-RCT_EXTERN_METHOD(registerCloseHandler:(BOOL)blockDismiss)
+RCT_EXTERN_METHOD(registerCloseHandler)
 
-RCT_EXTERN_METHOD(dismiss:(BOOL)animated completion:(RCTResponseSenderBlock)callback)
-
-RCT_EXTERN_METHOD(displayedViewController)
-
-+ (BOOL)requiresMainQueueSetup {
-  return YES;
-}
-
-@end
-
-@interface NamiEmitter : RCTEventEmitter
-- (void)sendEventPreparePaywallForDisplayFinishedWithResult:(BOOL)success developerPaywallID: (NSString * _Nullable) developerPaywallID error:(NSError * _Nullable) error;
-+ (NamiEmitter *) reactInstance;
-@end
-
-@interface NamiPaywallManagerBridge : NSObject <RCTBridgeModule>
-@property (atomic) BOOL blockPaywallRaise;
-@end
-
-
-@implementation NamiPaywallManagerBridge (RCTExternModule)
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        [self setBlockPaywallRaise:false];
-    }
-    return self;
-}
-
-RCT_EXTERN_METHOD(raisePaywall)
-- (void)raisePaywall {
-    [NamiCampaignManager launch];
-}
-
-RCT_EXPORT_METHOD(raisePaywallByDeveloperPaywallId)
-{
-    [NamiCampaignManager launch];
-}
-
-RCT_EXPORT_METHOD(blockPaywallRaise:(BOOL)blockRaise)
-{
-    [self setBlockPaywallRaise:blockRaise];
-}
-
-@end
-
-@implementation NamiPaywallManagerBridge
-RCT_EXPORT_MODULE_NO_LOAD(NamiPaywallManagerBridge, NamiPaywallManagerBridge)
-
-- (dispatch_queue_t)methodQueue
-{
-  return dispatch_get_main_queue();
-}
+RCT_EXTERN_METHOD(dismiss:(BOOL)animated)
 
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }
 
-
-
 @end

package/ios/NamiPaywallManagerBridge.swift

@@ -2,8 +2,7 @@
 //  NamiPaywallManagerBridge.swift
 //  RNNami
 //
-//  Created by macbook on 07.04.2023.
-//  Copyright © 2023 Nami ML INc.. All rights reserved.
+//  Copyright © 2023 Nami ML Inc. All rights reserved.
 //
 
 import Foundation
@@ -12,50 +11,71 @@ import React
 
 @objc(RNNamiPaywallManager)
 class RNNamiPaywallManager: RCTEventEmitter {
+    public static var shared: RNNamiPaywallManager?
+
+    override init() {
+        super.init()
+        RNNamiPaywallManager.shared = self
+    }
+
     override func supportedEvents() -> [String]! {
-      return ["RegisterBuySKU", "BlockingPaywallClosed"]
+        return ["RegisterBuySKU", "PaywallCloseRequested"]
     }
 
     @objc(buySkuComplete:)
     func buySkuComplete(dict: NSDictionary) {
-        guard let jsonData = try? JSONSerialization.data(withJSONObject: dict["product"] as Any, options: []) else {
-            print("Error converting dictionary to JSON data")
-            return
-        }
-        do {
-            let decoder = JSONDecoder()
-            let product = try decoder.decode(NamiSKU.self, from: jsonData)
- 
-            let dateFormatter = DateFormatter()
-            dateFormatter.locale = .init(identifier: "en_US_POSIX")
-            dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-            
-            if
-            let transactionID = dict["transactionID"] as? String,
-            let originalTransactionID = dict["originalTransactionID"] as? String,
-            let priceDecimal = Decimal(string: dict["price"] as! String),
-            let currencyCode = dict["currencyCode"] as? String,
-            let localeString = dict["locale"] as? String
+        if let product = dict["product"] as? [String: Any] {
+            if let storeId = product["skuId"] as? String,
+               let namiId = product["id"] as? String,
+               let skuType = product["type"] as? String
             {
-                let expiresDate = Date(timeIntervalSince1970: dict["purchaseDate"] as! Double? ?? 0)
-                let originalPurchaseDate =  Date(timeIntervalSince1970: dict["originalPurchaseDate"] as! Double)
-                let purchaseDate = Date(timeIntervalSince1970: dict["purchaseDate"] as! Double)
-                let locale = Locale(identifier: localeString)
-                let purchaseSuccess = NamiPurchaseSuccess(
-                    product: product,
-                    transactionID: transactionID,
-                    originalTransactionID: originalTransactionID,
-                    originalPurchaseDate: originalPurchaseDate,
-                    purchaseDate: purchaseDate,
-                    expiresDate: expiresDate,
-                    price: priceDecimal,
-                    currencyCode: currencyCode,
-                    locale: locale
-                )
-                NamiPaywallManager.buySkuComplete(purchaseSuccess: purchaseSuccess)
+                let namiSkuType: NamiSKUType
+                switch skuType {
+                case "unknown":
+                    namiSkuType = .unknown
+                case "one_time_purchase":
+                    namiSkuType = .one_time_purchase
+                case "subscription":
+                    namiSkuType = .subscription
+                default:
+                    namiSkuType = .unknown
+                }
+
+                let namiSku = NamiSKU(namiId: namiId, storeId: storeId, skuType: namiSkuType)
+
+                do {
+                    let dateFormatter = DateFormatter()
+                    dateFormatter.locale = .init(identifier: "en_US_POSIX")
+                    dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+
+                    if
+                        let transactionID = dict["transactionID"] as? String,
+                        let originalTransactionID = dict["originalTransactionID"] as? String,
+                        let priceDecimal = Decimal(string: dict["price"] as! String),
+                        let currencyCode = dict["currencyCode"] as? String,
+                        let localeString = dict["locale"] as? String
+                    {
+                        let expiresDate = Date(timeIntervalSince1970: dict["purchaseDate"] as! Double? ?? 0)
+                        let originalPurchaseDate = Date(timeIntervalSince1970: dict["originalPurchaseDate"] as! Double)
+                        let purchaseDate = Date(timeIntervalSince1970: dict["purchaseDate"] as! Double)
+                        let locale = Locale(identifier: localeString)
+                        let purchaseSuccess = NamiPurchaseSuccess(
+                            product: namiSku,
+                            transactionID: transactionID,
+                            originalTransactionID: originalTransactionID,
+                            originalPurchaseDate: originalPurchaseDate,
+                            purchaseDate: purchaseDate,
+                            expiresDate: expiresDate,
+                            price: priceDecimal,
+                            currencyCode: currencyCode,
+                            locale: locale
+                        )
+                        NamiPaywallManager.buySkuComplete(purchaseSuccess: purchaseSuccess)
+                    }
+                } catch {
+                    print("RNNamiPaywallManager - buySkuComplete error - decoding JSON: \(error)")
+                }
             }
-        } catch {
-            print("Error decoding JSON: \(error)")
         }
     }
 
@@ -63,31 +83,20 @@ class RNNamiPaywallManager: RCTEventEmitter {
     func registerBuySkuHandler() {
         NamiPaywallManager.registerBuySkuHandler { sku in
             let dictionary = RNNamiPurchaseManager.skuToSKUDict(sku)
-            self.sendEvent(withName: "RegisterBuySKU", body: dictionary)
+            RNNamiPaywallManager.shared?.sendEvent(withName: "RegisterBuySKU", body: dictionary)
         }
     }
 
-    @objc(registerCloseHandler:)
-    func registerCloseHandler(blockDismiss: Bool) {
+    @objc(registerCloseHandler)
+    func registerCloseHandler() {
         NamiPaywallManager.registerCloseHandler { _ in
-            let dictionary = NSDictionary(dictionary: ["blockingPaywallClosed": true].compactMapValues { $0 })
-            self.sendEvent(withName: "BlockingPaywallClosed", body: dictionary)
-            if (blockDismiss) {
-                return
-            }
-            NamiPaywallManager.dismiss(animated: true, completion: {})
-        }
-    }
-    
-    @objc(dismiss:callback:)
-    func dismiss(animated: Bool, callback: @escaping RCTResponseSenderBlock) {
-        NamiPaywallManager.dismiss(animated: animated) {
-            callback([])
+            let dictionary = NSDictionary(dictionary: ["PaywallCloseRequested": true].compactMapValues { $0 })
+            RNNamiPaywallManager.shared?.sendEvent(withName: "PaywallCloseRequested", body: dictionary)
         }
     }
 
-    @objc(displayedViewController)
-    func displayedViewController() {
-        _ = NamiPaywallManager.displayedViewController()
+    @objc(dismiss:)
+    func dismiss(animated: Bool) {
+        NamiPaywallManager.dismiss(animated: animated) {}
     }
 }