react-native-iap 9.0.0-beta4 → 9.0.0-beta7

package/.prettierignore

@@ -0,0 +1,6 @@
+IapExample/vendor
+IapExample/ios
+IapExample/android
+lib
+ios
+android

package/README.md

@@ -1,7 +1,8 @@
 # ![image](https://user-images.githubusercontent.com/27461460/75094417-20321b00-55ce-11ea-8de7-a1df42a4b7df.png)
 
 [![Version](http://img.shields.io/npm/v/react-native-iap.svg?style=flat-square)](https://npmjs.org/package/react-native-iap)
-<!-- [![Next](https://img.shields.io/npm/v/react-native-iap/next.svg?style=flat-square)](https://npmjs.org/package/react-native-iap) -->
+[![Next Version](https://img.shields.io/npm/v/react-native-iap/next)](https://npmjs.org/package/react-native-iap)
+
 [![Download](http://img.shields.io/npm/dm/react-native-iap.svg?style=flat-square)](https://npmjs.org/package/react-native-iap)
 [![CI](https://github.com/dooboolab/react-native-iap/actions/workflows/ci.yml/badge.svg)](https://github.com/dooboolab/react-native-iap/actions/workflows/ci.yml)
 [![document](https://github.com/dooboolab/react-native-iap/actions/workflows/deploy-document.yml/badge.svg)](https://github.com/dooboolab/react-native-iap/actions/workflows/deploy-document.yml)
@@ -20,7 +21,11 @@ Published in [website](https://react-native-iap.dooboolab.com).
 
 ## Announcement
 
-- Current module is ported to [expo-iap](https://www.npmjs.com/package/expo-iap) which share the same codebase but different environment. This is currently experimental but you can use it in expo managed workflow. The source code is maintained in branch [expo](https://github.com/dooboolab/react-native-iap/tree/expo).
+- Version `9.0.0` is currently in release candidate. The module migrates android sdk to [play billing library v5](https://qonversion.io/blog/google-play-billing-library-5-0) and iOS sdk to [storekit2](https://developer.apple.com/videos/play/wwdc2021/10114). Our core maintainer [andresesfm](https://github.com/andresesfm) is working hard on this. Please [fund the project](https://opencollective.com/react-native-iap) if you wish to support his effort. The fund goes to maintainers. To try the earlier version please use the `next` package.
+
+  ```
+  yarn add react-native-iap@next
+  ```
 
 - Version `8.0.0` has finally landed in Jan 28th. Since this is early release, please use it with caution 🚧. We recommend user to use `>=8.0.0` with react-native `>=0.65.1`. The `next` package is no longer updated until we organize the roadmap for `9.0.0`.
 

package/android/src/play/java/com/dooboolab/RNIap/RNIapModule.kt

@@ -321,7 +321,10 @@ class RNIapModule(
                     for (i in purchases.indices) {
                         val purchase = purchases[i]
                         val item = WritableNativeMap()
-                        item.putString("productId", purchase.products[0]) // TODO: should be a list
+                        item.putString("productId", purchase.products[0])// kept for convenience/backward-compatibility. productIds has the complete list
+                        val products = Arguments.createArray()
+                        purchase.products.forEach { products.pushString(it) }
+                        item.putArray("productIds", products)
                         item.putString("transactionId", purchase.orderId)
                         item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                         item.putString("transactionReceipt", purchase.originalJson)
@@ -370,6 +373,9 @@ class RNIapModule(
                 purchaseHistoryRecordList?.forEach { purchase ->
                     val item = Arguments.createMap()
                     item.putString("productId", purchase.products[0])
+                    val products = Arguments.createArray()
+                    purchase.products.forEach { products.pushString(it) }
+                    item.putArray("productIds", products)
                     item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                     item.putString("transactionReceipt", purchase.originalJson)
                     item.putString("purchaseToken", purchase.purchaseToken)
@@ -442,14 +448,14 @@ class RNIapModule(
             if (obfuscatedProfileId != null) {
                 builder.setObfuscatedProfileId(obfuscatedProfileId)
             }
-            if (prorationMode != null && prorationMode != -1) {
+            if (prorationMode != -1) {
                 if (prorationMode
                     == BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_PRORATED_PRICE
                 ) {
                     subscriptionUpdateParamsBuilder.setReplaceProrationMode(
                         BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_PRORATED_PRICE
                     )
-                    if (type != BillingClient.SkuType.SUBS) {
+                    if (type != BillingClient.ProductType.SUBS) {
                         val debugMessage =
                             (
                                 "IMMEDIATE_AND_CHARGE_PRORATED_PRICE for proration mode only works in" +
@@ -561,6 +567,7 @@ class RNIapModule(
                     .getBillingResponseData(billingResult.responseCode)
                 map.putString("code", errorData[0])
                 map.putString("message", errorData[1])
+                map.putString("purchaseToken",purchaseToken)
                 promise.safeResolve(map)
             }
         }
@@ -586,6 +593,9 @@ class RNIapModule(
                 val item = Arguments.createMap()
                 val purchase = purchases[i]
                 item.putString("productId", purchase.products[0])
+                val products = Arguments.createArray()
+                purchase.products.forEach { products.pushString(it) }
+                item.putArray("productIds", products)
                 item.putString("transactionId", purchase.orderId)
                 item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                 item.putString("transactionReceipt", purchase.originalJson)

package/babel.config.js

@@ -1,8 +1,10 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset',
-  '@babel/preset-typescript',
-  "@babel/preset-env",
-  '@babel/preset-react',],
+  presets: [
+    'module:metro-react-native-babel-preset',
+    '@babel/preset-typescript',
+    '@babel/preset-env',
+    '@babel/preset-react',
+  ],
   plugins: [
     '@babel/plugin-proposal-class-properties',
     '@babel/plugin-proposal-private-methods',

package/ios/RNIapIos.m

@@ -18,7 +18,6 @@ RCT_EXTERN_METHOD(getAvailableItems:
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(buyProduct:
                   (NSString*)sku
-                  appAccountToken:(NSString*)appAccountToken
                   andDangerouslyFinishTransactionAutomatically:(BOOL)andDangerouslyFinishTransactionAutomatically
                   applicationUsername:(NSString)applicationUsername
                   resolve:(RCTPromiseResolveBlock)resolve

package/jest.config.js

@@ -21,7 +21,7 @@ module.exports = {
   // collectCoverageFrom: undefined,
 
   // The directory where Jest should output its coverage files
-  coverageDirectory: "coverage",
+  coverageDirectory: 'coverage',
 
   // An array of regexp pattern strings used to skip coverage collection
   // coveragePathIgnorePatterns: [
@@ -64,9 +64,7 @@ module.exports = {
   // maxWorkers: "50%",
 
   // An array of directory names to be searched recursively up from the requiring module's location
-  moduleDirectories: [
-    "node_modules","src"
-  ],
+  moduleDirectories: ['node_modules', 'src'],
 
   // An array of file extensions your modules use
   // moduleFileExtensions: [
@@ -82,7 +80,7 @@ module.exports = {
   // moduleNameMapper: {},
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
-  modulePathIgnorePatterns: ["IapExample"],
+  modulePathIgnorePatterns: ['IapExample'],
 
   // Activates notifications for test results
   // notify: false,
@@ -123,7 +121,7 @@ module.exports = {
   // runner: "jest-runner",
 
   // The paths to modules that run some code to configure or set up the testing environment before each test
-  setupFiles: ["<rootDir>/test/mocks/react-native-modules.js",],
+  setupFiles: ['<rootDir>/test/mocks/react-native-modules.js'],
 
   // A list of paths to modules that run some code to configure or set up the testing framework before each test
   setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect'],
@@ -170,15 +168,13 @@ module.exports = {
   // timers: "real",
 
   // A map from regular expressions to paths to transformers
-   transform: {
-    "^.+\\.(js|jsx|ts|tsx)$": "babel-jest",
-    "\\.(ts|tsx)$": "ts-jest"
+  transform: {
+    '^.+\\.(js|jsx|ts|tsx)$': 'babel-jest',
+    '\\.(ts|tsx)$': 'ts-jest',
   },
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  transformIgnorePatterns: [
-    'node_modules/(?!@react-native|react-native)'
-  ],
+  transformIgnorePatterns: ['node_modules/(?!@react-native|react-native)'],
 
   // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
   // unmockedModulePathPatterns: undefined,

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "9.0.0-beta4",
-  "packageManager": "yarn@3.2.0",
+  "version": "9.0.0-beta7",
   "description": "React Native In App Purchase Module.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -16,7 +15,8 @@
     "test:typescript": "tsc --noEmit",
     "tsc:sync": "npx typesync",
     "tsc": "tsc",
-    "validate": "yarn lint && yarn test:typescript && yarn test:flow && yarn test"
+    "validate": "yarn lint && yarn test:typescript && yarn test:flow && yarn test",
+    "lint:prettier": "prettier --write \"**/*.{md,js,jsx,ts,tsx}\""
   },
   "repository": {
     "type": "git",
@@ -66,9 +66,12 @@
     "jest": "28.1.0",
     "metro-react-native-babel-preset": "0.71.0",
     "monolinter": "1.0.4",
-    "prettier": "2.6.2",
+    "prettier": "2.7.1",
     "react-native": "0.66.4",
     "ts-jest": "28.0.3",
     "typescript": "4.7.2"
+  },
+  "resolutions": {
+    "@react-native-community/eslint-config": "3.0.1"
   }
 }

package/src/types/index.d.ts

@@ -37,6 +37,7 @@ export declare enum InstallSourceAndroid {
 export interface ProductCommon {
     type: 'subs' | 'sub' | 'inapp' | 'iap';
     productId: string;
+    productIds?: string[];
     title: string;
     description: string;
     price: string;
@@ -46,6 +47,7 @@ export interface ProductCommon {
 }
 export interface ProductPurchase {
     productId: string;
+    productIds?: string[];
     transactionId?: string;
     transactionDate: number;
     transactionReceipt: string;
@@ -142,12 +144,8 @@ export interface RequestPurchase {
     obfuscatedAccountIdAndroid: string | undefined;
     obfuscatedProfileIdAndroid: string | undefined;
 }
-export interface RequestSubscription {
-    sku: string;
-    andDangerouslyFinishTransactionAutomaticallyIOS: boolean;
+export interface RequestSubscription extends RequestPurchase {
     purchaseTokenAndroid: string | undefined;
     prorationModeAndroid: ProrationModesAndroid;
-    obfuscatedAccountIdAndroid: string | undefined;
-    obfuscatedProfileIdAndroid: string | undefined;
-    selectedOfferIndex?: number | undefined;
+    selectedOfferIndex: number | undefined;
 }