Add common NamiPurchaseSuccess Type

namiml · Nov 18, 2024 · 10452b0 · 10452b0
1 parent b876f7c
commit 10452b0
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 12 deletions.
diff --git a/examples/Basic/App.tsx b/examples/Basic/App.tsx
@@ -53,7 +53,7 @@ const Tab = createBottomTabNavigator<ViewerTabNavigatorParams>();
 const App = () => {
   const [subscriptions, setSubscriptions] = useState<Subscription[]>([]);
   const [products, setProducts] = useState<Product[]>([]);
-  const [namiSku, setNamiSku] = useState<NamiSKU>(undefined);
+  const [namiSku, setNamiSku] = useState<NamiSKU>({} as NamiSKU);
 
   useEffect(() => {
     Linking.addEventListener('url', handleDeepLink);
@@ -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,17 +118,17 @@ 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 ?? '',
                 });
               } 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 ?? '',

diff --git a/examples/TestNamiTV/App.tsx b/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,15 +70,15 @@ 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',
             });
           } else {
-            NamiPaywallManager.buySkuCompleteGooglePlay({
+            NamiPaywallManager.buySkuComplete({
               product: sku,
               purchaseToken:
                 'jolbnkpmojnpnjecgmphbmkc.AO-J1OznE4AIzyUvKFe1RSVkxw4KEtv0WfyL_tkzozOqnlSvIPsyQJBphCN80gwIMaex4EMII95rFCZhMCbVPZDc-y_VVhQU5Ddua1dLn8zV7ms_tdwoDmE',

diff --git a/src/NamiEntitlementManager.d.ts b/src/NamiEntitlementManager.d.ts
@@ -7,7 +7,7 @@ export declare enum NamiEntitlementManagerEvents {
 export interface INamiEntitlementManager {
     emitter: NativeEventEmitter;
     active: () => Promise<Array<NamiEntitlement>>;
-    isEntitlementActive: (label?: string) => boolean;
+    isEntitlementActive: (label: string) => boolean;
     refresh: (resultCallback?: (entitlements?: NamiEntitlement[]) => void) => void;
     registerActiveEntitlementsHandler: (callback: (activeEntitlements: NamiEntitlement[]) => void) => EmitterSubscription['remove'];
     clearProvisionalEntitlementGrants: () => void;

diff --git a/src/NamiEntitlementManager.ts b/src/NamiEntitlementManager.ts
@@ -15,7 +15,7 @@ export enum NamiEntitlementManagerEvents {
 export interface INamiEntitlementManager {
   emitter: NativeEventEmitter;
   active: () => Promise<Array<NamiEntitlement>>;
-  isEntitlementActive: (label?: string) => boolean;
+  isEntitlementActive: (label: string) => boolean;
   refresh: (
     resultCallback?: (entitlements?: NamiEntitlement[]) => void,
   ) => void;

diff --git a/src/NamiPaywallManager.d.ts b/src/NamiPaywallManager.d.ts
@@ -1,5 +1,6 @@
 import { NativeEventEmitter, EmitterSubscription } from 'react-native';
 import { NamiPurchaseSuccessAmazon, NamiPurchaseSuccessApple, NamiPurchaseSuccessGooglePlay, NamiSKU } from './types';
+import { NamiPurchaseSuccess } from './types';
 export declare enum NamiPaywallManagerEvents {
     RegisterBuySKU = "RegisterBuySKU",
     PaywallCloseRequested = "PaywallCloseRequested",
@@ -16,6 +17,7 @@ export interface INamiPaywallManager {
     buySkuCompleteApple: (purchaseSuccess: NamiPurchaseSuccessApple) => void;
     buySkuCompleteAmazon: (purchaseSuccess: NamiPurchaseSuccessAmazon) => void;
     buySkuCompleteGooglePlay: (purchaseSuccess: NamiPurchaseSuccessGooglePlay) => void;
+    buySkuComplete: (purchaseSuccess: NamiPurchaseSuccess) => void;
     buySkuCancel: () => void;
     registerBuySkuHandler: (callback: (sku: NamiSKU) => void) => EmitterSubscription['remove'];
     registerCloseHandler: (callback: () => void) => EmitterSubscription['remove'];

diff --git a/src/NamiPaywallManager.ts b/src/NamiPaywallManager.ts
@@ -4,6 +4,7 @@ import {
   EmitterSubscription,
 } from 'react-native';
 import {
+  NamiPurchaseSuccess,
   NamiPurchaseSuccessAmazon,
   NamiPurchaseSuccessApple,
   NamiPurchaseSuccessGooglePlay,
@@ -30,6 +31,7 @@ export interface INamiPaywallManager {
   buySkuCompleteGooglePlay: (
     purchaseSuccess: NamiPurchaseSuccessGooglePlay,
   ) => void;
+  buySkuComplete: (purchaseSuccess: NamiPurchaseSuccess) => void;
   buySkuCancel: () => void;
   registerBuySkuHandler: (
     callback: (sku: NamiSKU) => void,
@@ -59,6 +61,9 @@ export const NamiPaywallManager: INamiPaywallManager = {
   paywallEmitter: new NativeEventEmitter(RNNamiPaywallManager),
   ...RNNamiPaywallManager,
   ...NamiPaywallManagerBridge,
+  buySkuComplete: (purchaseSuccess: NamiPurchaseSuccess) => {
+    RNNamiPaywallManager.buySkuComplete(purchaseSuccess);
+  },
   buySkuCompleteApple: (purchaseSuccess: NamiPurchaseSuccessApple) => {
     RNNamiPaywallManager.buySkuComplete(purchaseSuccess);
   },

diff --git a/src/types.d.ts b/src/types.d.ts
@@ -132,6 +132,19 @@ export type NamiPurchaseSuccessAmazon = {
     userId: string;
     marketplace: string;
 };
+export type NamiPurchaseSuccess = {
+    product: NamiSKU;
+    transactionID?: string;
+    originalTransactionID?: string;
+    price?: string;
+    currencyCode?: string;
+    orderId?: string;
+    purchaseToken?: string;
+    receiptId?: string;
+    localizedPrice?: string;
+    userId?: string;
+    marketplace?: string;
+}
 export declare enum NamiPaywallAction {
     BUY_SKU = "BUY_SKU",
     SELECT_SKU = "SELECT_SKU",

diff --git a/src/types.ts b/src/types.ts
@@ -268,6 +268,20 @@ export type NamiPurchaseSuccessAmazon = {
   marketplace: string;
 };
 
+export type NamiPurchaseSuccess = {
+  product: NamiSKU;
+  transactionID?: string;
+  originalTransactionID?: string;
+  price?: string;
+  currencyCode?: string;
+  orderId?: string;
+  purchaseToken?: string;
+  receiptId?: string;
+  localizedPrice?: string;
+  userId?: string;
+  marketplace?: string;
+}
+
 export enum NamiPaywallAction {
   BUY_SKU = 'BUY_SKU',
   SELECT_SKU = 'SELECT_SKU',