Add buySKUComplete method

Author: cp-sumi-k

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

@@ -238,10 +238,6 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
     fun removeListeners(count: Int?) {
     }
 
-    @ReactMethod
-    fun removeAllListeners(eventName: String?) {
-    }
-
     override fun onActivityResult(
         activity: Activity?,
         requestCode: Int,

examples/Basic/App.tsx

@@ -103,13 +103,13 @@ const App = () => {
             }
 
             if (Platform.OS === 'ios' || Platform.isTV) {
-              console.log('Preparing to call buySkuCompleteApple');
+              console.log('Preparing to call buySkuComplete with Apple');
 
               console.log(namiSku);
               console.log(purchase.transactionId);
               console.log(purchase.originalTransactionIdentifierIOS);
 
-              NamiPaywallManager.buySkuCompleteApple({
+              NamiPaywallManager.buySkuComplete({
                 product: namiSku,
                 transactionID: purchase.transactionId ?? '',
                 originalTransactionID: purchase.originalTransactionIdentifierIOS ?? purchase.transactionId ?? '',
@@ -118,21 +118,21 @@ const App = () => {
               });
             } else if (Platform.OS === 'android') {
               if (Platform.constants.Manufacturer === 'Amazon') {
-                console.log('Preparing to call buySkuCompleteAmazon');
-                NamiPaywallManager.buySkuCompleteAmazon({
+                console.log('Preparing to call buySkuComplete with Amazon');
+                NamiPaywallManager.buySkuComplete({
                   product: namiSku,
                   receiptId: purchase.transactionId ?? '',
                   localizedPrice: price,
                   userId: purchase.userIdAmazon ?? '',
                   marketplace: purchase.userMarketplaceAmazon ?? '',
-                });
+                }, "Amazon");
               } else {
-                console.log('Preparing to call buySkuCompleteGooglePlay');
-                NamiPaywallManager.buySkuCompleteGooglePlay({
+                console.log('Preparing to call buySkuComplete with GooglePlay');
+                NamiPaywallManager.buySkuComplete({
                   product: namiSku,
                   purchaseToken: purchase.purchaseToken ?? '',
                   orderId: purchase.transactionId ?? '',
-                });
+                }, "GooglePlay");
               }
             }
 

examples/TestNamiTV/App.tsx

@@ -61,7 +61,7 @@ const App = () => {
         NamiPaywallManager.dismiss();
 
         if (Platform.OS === 'ios') {
-          NamiPaywallManager.buySkuCompleteApple({
+          NamiPaywallManager.buySkuComplete({
             product: sku,
             transactionID: '12345',
             originalTransactionID: '12345',
@@ -70,20 +70,20 @@ const App = () => {
           });
         } else if (Platform.OS === 'android') {
           if (Platform.constants.Manufacturer === 'Amazon') {
-            NamiPaywallManager.buySkuCompleteAmazon({
+            NamiPaywallManager.buySkuComplete({
               product: sku,
               receiptId: '12345',
               localizedPrice: '120',
               userId: '12345',
               marketplace: 'US',
-            });
+            }, "Amazon");
           } else {
-            NamiPaywallManager.buySkuCompleteGooglePlay({
+            NamiPaywallManager.buySkuComplete({
               product: sku,
               purchaseToken:
                 'jolbnkpmojnpnjecgmphbmkc.AO-J1OznE4AIzyUvKFe1RSVkxw4KEtv0WfyL_tkzozOqnlSvIPsyQJBphCN80gwIMaex4EMII95rFCZhMCbVPZDc-y_VVhQU5Ddua1dLn8zV7ms_tdwoDmE',
               orderId: 'GPA.3317-0284-9993-42221',
-            });
+            }, "GooglePlay");
           }
         }
       },

src/NamiPaywallManager.d.ts

@@ -11,11 +11,15 @@ export declare enum ServicesEnum {
     Amazon = "Amazon",
     GooglePlay = "GooglePlay"
 }
+
+export type Service = ServicesEnum.Amazon | ServicesEnum.GooglePlay
+
 export interface INamiPaywallManager {
     paywallEmitter: NativeEventEmitter;
     buySkuCompleteApple: (purchaseSuccess: NamiPurchaseSuccessApple) => void;
     buySkuCompleteAmazon: (purchaseSuccess: NamiPurchaseSuccessAmazon) => void;
     buySkuCompleteGooglePlay: (purchaseSuccess: NamiPurchaseSuccessGooglePlay) => void;
+    buySkuComplete: (purchaseSuccess: NamiPurchaseSuccessApple | NamiPurchaseSuccessAmazon | NamiPurchaseSuccessGooglePlay, platform?: Service) => void;
     buySkuCancel: () => void;
     registerBuySkuHandler: (callback: (sku: NamiSKU) => void) => EmitterSubscription['remove'];
     registerCloseHandler: (callback: () => void) => EmitterSubscription['remove'];

src/NamiPaywallManager.ts

@@ -23,13 +23,16 @@ export enum ServicesEnum {
   GooglePlay = 'GooglePlay',
 }
 
+export type Service = ServicesEnum.Amazon | ServicesEnum.GooglePlay
+
 export interface INamiPaywallManager {
   paywallEmitter: NativeEventEmitter;
   buySkuCompleteApple: (purchaseSuccess: NamiPurchaseSuccessApple) => void;
   buySkuCompleteAmazon: (purchaseSuccess: NamiPurchaseSuccessAmazon) => void;
   buySkuCompleteGooglePlay: (
     purchaseSuccess: NamiPurchaseSuccessGooglePlay,
   ) => void;
+  buySkuComplete: (purchaseSuccess: NamiPurchaseSuccessApple | NamiPurchaseSuccessAmazon | NamiPurchaseSuccessGooglePlay, platform?: Service) => void;
   buySkuCancel: () => void;
   registerBuySkuHandler: (
     callback: (sku: NamiSKU) => void,
@@ -59,6 +62,13 @@ export const NamiPaywallManager: INamiPaywallManager = {
   paywallEmitter: new NativeEventEmitter(RNNamiPaywallManager),
   ...RNNamiPaywallManager,
   ...NamiPaywallManagerBridge,
+  buySkuComplete: (purchaseSuccess: NamiPurchaseSuccessApple | NamiPurchaseSuccessAmazon | NamiPurchaseSuccessGooglePlay, platform?: Service) => {
+    if (!platform) {
+      RNNamiPaywallManager.buySkuComplete(purchaseSuccess);
+    } else {
+      RNNamiPaywallManager.buySkuComplete(purchaseSuccess, platform);
+    }
+  },
   buySkuCompleteApple: (purchaseSuccess: NamiPurchaseSuccessApple) => {
     RNNamiPaywallManager.buySkuComplete(purchaseSuccess);
   },