@rnw-community/react-native-payments 0.83.1 → 1.2.0

package/dist/esm/expo-plugins/with-google-pay.d.ts

@@ -0,0 +1,4 @@
+import type { ReactNativePaymentsPluginProps } from './plugin.props';
+import type { ConfigPlugin } from '@expo/config-plugins';
+export declare const withGooglePay: ConfigPlugin<ReactNativePaymentsPluginProps>;
+//# sourceMappingURL=with-google-pay.d.ts.map

package/dist/esm/expo-plugins/with-google-pay.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"with-google-pay.d.ts","sourceRoot":"","sources":["../../../src/expo-plugins/with-google-pay.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,8BAA8B,CAyBjE,CAAC"}

package/dist/esm/expo-plugins/with-google-pay.js

@@ -0,0 +1,22 @@
+import { withAndroidManifest } from '@expo/config-plugins';
+export const withGooglePay = initialConfig => withAndroidManifest(initialConfig, config => {
+    const androidManifest = config.modResults;
+    const mainApplication = androidManifest.manifest.application?.[0];
+    if (mainApplication) {
+        const existingMetaData = mainApplication['meta-data']?.find(metadata => metadata.$['android:name'] === 'com.google.android.gms.wallet.api.enabled');
+        if (!existingMetaData) {
+            if (!mainApplication['meta-data']) {
+                mainApplication['meta-data'] = [];
+            }
+            mainApplication['meta-data'].push({
+                // eslint-disable-next-line id-length
+                $: {
+                    'android:name': 'com.google.android.gms.wallet.api.enabled',
+                    'android:value': 'true',
+                },
+            });
+        }
+    }
+    return config;
+});
+//# sourceMappingURL=with-google-pay.js.map

package/dist/esm/expo-plugins/with-google-pay.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"with-google-pay.js","sourceRoot":"","sources":["../../../src/expo-plugins/with-google-pay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAK3D,MAAM,CAAC,MAAM,aAAa,GAAiD,aAAa,CAAC,EAAE,CACvF,mBAAmB,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE;IACxC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC;IAC1C,MAAM,eAAe,GAAG,eAAe,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;IAElE,IAAI,eAAe,EAAE,CAAC;QAClB,MAAM,gBAAgB,GAAG,eAAe,CAAC,WAAW,CAAC,EAAE,IAAI,CACvD,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,2CAA2C,CACzF,CAAC;QAEF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;gBAChC,eAAe,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;YACtC,CAAC;YACD,eAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;gBAC9B,qCAAqC;gBACrC,CAAC,EAAE;oBACC,cAAc,EAAE,2CAA2C;oBAC3D,eAAe,EAAE,MAAM;iBAC1B;aACJ,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC,CAAC"}

package/dist/esm/expo-plugins/with-payments.d.ts

@@ -0,0 +1,4 @@
+import type { ReactNativePaymentsPluginProps } from './plugin.props';
+import type { ConfigPlugin } from '@expo/config-plugins';
+export declare const withPayments: ConfigPlugin<ReactNativePaymentsPluginProps>;
+//# sourceMappingURL=with-payments.d.ts.map

package/dist/esm/expo-plugins/with-payments.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"with-payments.d.ts","sourceRoot":"","sources":["../../../src/expo-plugins/with-payments.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,8BAA8B,CAIhE,CAAC"}

package/dist/esm/expo-plugins/with-payments.js

@@ -0,0 +1,8 @@
+import { withPlugins } from '@expo/config-plugins';
+import { withApplePay } from './with-apple-pay';
+import { withGooglePay } from './with-google-pay';
+export const withPayments = (config, props) => withPlugins(config, [
+    [withApplePay, props],
+    [withGooglePay, props],
+]);
+//# sourceMappingURL=with-payments.js.map

package/dist/esm/expo-plugins/with-payments.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"with-payments.js","sourceRoot":"","sources":["../../../src/expo-plugins/with-payments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAKlD,MAAM,CAAC,MAAM,YAAY,GAAiD,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CACxF,WAAW,CAAC,MAAM,EAAE;IAChB,CAAC,YAAY,EAAE,KAAK,CAAC;IACrB,CAAC,aAAa,EAAE,KAAK,CAAC;CACzB,CAAC,CAAC"}

package/dist/esm/util/is-valid-decimal-monetary-value.util.js

@@ -1,10 +1,10 @@
-import isDecimal from 'validator/es/lib/isDecimal';
+import validator from 'validator';
 import { isNumber, isString } from '@rnw-community/shared';
 const isValidStringAmount = (stringAmount) => {
     if (stringAmount.endsWith('.')) {
         return false;
     }
-    return isDecimal(stringAmount);
+    return validator.isDecimal(stringAmount);
 };
 export const isValidDecimalMonetaryValue = (amountValue) => {
     if (!isNumber(amountValue) && !isString(amountValue)) {

package/dist/esm/util/is-valid-decimal-monetary-value.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-valid-decimal-monetary-value.util.js","sourceRoot":"","sources":["../../../src/util/is-valid-decimal-monetary-value.util.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,4BAA4B,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAI3D,MAAM,mBAAmB,GAAG,CAAC,YAAoB,EAAW,EAAE;IAC1D,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,SAAS,CAAC,YAAY,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,WAAwB,EAAW,EAAE;IAC7E,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC;AACrE,CAAC,CAAC"}
+{"version":3,"file":"is-valid-decimal-monetary-value.util.js","sourceRoot":"","sources":["../../../src/util/is-valid-decimal-monetary-value.util.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAI3D,MAAM,mBAAmB,GAAG,CAAC,YAAoB,EAAW,EAAE;IAC1D,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,WAAwB,EAAW,EAAE;IAC7E,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC;AACrE,CAAC,CAAC"}

package/dist/esm/util/validate-payment-methods.util.js

@@ -1,9 +1,9 @@
-import { isDefined } from '@rnw-community/shared';
+import { isDefined, isNotEmptyArray } from '@rnw-community/shared';
 import { ConstructorError } from '../error/constructor.error';
 /** @deprecated Move to PaymentRequest */
 export const validatePaymentMethods = (methodData) => {
     // Check that at least one payment method is passed in
-    if (methodData.length < 1) {
+    if (!isNotEmptyArray(methodData)) {
         throw new ConstructorError(`At least one payment method is required`);
     }
     // Check that each payment method has at least one payment method identifier

package/dist/esm/util/validate-payment-methods.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-payment-methods.util.js","sourceRoot":"","sources":["../../../src/util/validate-payment-methods.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAI9D,yCAAyC;AACzC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,UAA+B,EAAQ,EAAE;IAC5E,sDAAsD;IACtD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,gBAAgB,CAAC,yCAAyC,CAAC,CAAC;IAC1E,CAAC;IAED,4EAA4E;IAC5E,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAC/B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,gBAAgB,CAAC,gDAAgD,CAAC,CAAC;QACjF,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}
+{"version":3,"file":"validate-payment-methods.util.js","sourceRoot":"","sources":["../../../src/util/validate-payment-methods.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAI9D,yCAAyC;AACzC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,UAA+B,EAAQ,EAAE;IAC5E,sDAAsD;IACtD,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,gBAAgB,CAAC,yCAAyC,CAAC,CAAC;IAC1E,CAAC;IAED,4EAA4E;IAC5E,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAC/B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,gBAAgB,CAAC,gDAAgD,CAAC,CAAC;QACjF,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}

package/ios/Payments.mm

@@ -170,7 +170,15 @@ RCT_EXPORT_METHOD(complete: (NSString *)paymentStatus
 
     self.completion([[PKPaymentAuthorizationResult alloc] initWithStatus:status errors:nil]);
 
-    resolve(nil);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.viewController.presentingViewController) {
+            [self.viewController dismissViewControllerAnimated:YES completion:^{
+                resolve(nil);
+            }];
+        } else {
+            resolve(nil);
+        }
+    });
 }
 
 RCT_EXPORT_METHOD(canMakePayments: (NSString *)methodDataString

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rnw-community/react-native-payments",
-    "version": "0.83.1",
-    "description": "React Native Payments",
+    "version": "1.2.0",
+    "description": "Accept Payments with Apple Pay and Android Pay using the Payment Request API.",
     "keywords": [
         "react",
         "react-native",
@@ -31,7 +31,10 @@
             "import": "./dist/esm/index.js",
             "require": "./dist/cjs/index.js"
         },
-        "./app.plugin": "./app.plugin.js",
+        "./app.plugin": {
+            "import": "./dist/esm/app.plugin.js",
+            "require": "./dist/cjs/app.plugin.js"
+        },
         "./package.json": "./package.json"
     },
     "react-native": "src/index.ts",
@@ -45,8 +48,6 @@
         "ios",
         "cpp",
         "*.podspec",
-        "plugins",
-        "app.plugin.js",
         "!ios/build",
         "!android/build",
         "!android/gradle",
@@ -72,17 +73,14 @@
         "test": "run -T jest --passWithNoTests",
         "test:coverage": "run -T jest --coverage --passWithNoTests",
         "format": "run -T prettier --write \"./src/**/*.{ts,tsx}\"",
-        "clear": "rm -rf coverage && rm -rf dist && rm -f *.tsbuildinfo && yarn run clear:native",
+        "clear": "rm -rf coverage && rm -rf dist && rm -f *.tsbuildinfo",
         "clear:deps": "rm -rf ./node_modules && rm -rf ./dist",
-        "clear:native": "rm -rf android/build example/android/build example/android/app/build example/ios/build",
-        "example": "yarn --cwd example",
-        "build:android": "cd example/android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
-        "build:ios": "cd example/ios && xcodebuild -workspace PaymentsExample.xcworkspace -scheme PaymentsExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO"
+        "example": "yarn --cwd example"
     },
-    "gitHead": "53579cfd92900eecdf1237fe27974a2fd8198b7e",
+    "gitHead": "028837fd8d39e79797438f41eeff1128a9ad5652",
     "dependencies": {
-        "@expo/config-plugins": "8.0.10",
-        "@rnw-community/shared": "0.83.0",
+        "@expo/config-plugins": "^9.0.14",
+        "@rnw-community/shared": "1.1.0",
         "react-native-uuid": "^2.0.1",
         "validator": "^13.9.0"
     },

package/react-native-payments.podspec

@@ -11,31 +11,34 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => "11.0" }
+  s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/vitalyiegorov/react-native-payments.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm}"
+  s.source_files = "ios/**/*.{h,m,mm,cpp}"
+  s.private_header_files = "ios/generated/**/*.h"
+
+  s.frameworks = "PassKit"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
   if respond_to?(:install_modules_dependencies, true)
     install_modules_dependencies(s)
   else
-  s.dependency "React-Core"
+    s.dependency "React-Core"
 
-  # Don't install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
-   end
-  end    
+    # Don't install the dependencies when we run `pod install` in the old architecture.
+    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+      s.pod_target_xcconfig    = {
+          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      }
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    end
+  end
 end

package/readme.md

@@ -52,6 +52,7 @@ integration experience for your applications.
 - Follow [this guide](https://developer.apple.com/library/archive/ApplePay_Guide/Configuration.html) to setup ApplePay in
   your application.
 - [Payment token reference](https://developer.apple.com/documentation/passkit/apple_pay/payment_token_format_reference?language=objc)
+#### Objective-C setup
 - Add following code to your `AppDelegate.h`:
 ```objc
 #import <RCTAppDelegate.h>
@@ -59,7 +60,15 @@ integration experience for your applications.
 #import <PassKit/PassKit.h> // Add this import
 
 @interface AppDelegate : RCTAppDelegate
-
+```
+#### Swift setup
+- Add following code to your `AppDelegate.swift`:
+```swift
+import UIKit
+import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
+import PassKit // Add this import
 ```
 
 ### AndroidPay setup
@@ -83,30 +92,27 @@ dependencies {
 
 ### Expo setup
 
-To integrate with Expo custom builds, you need to add the payment plugin from the package into your `app.config.js`:
+To integrate with Expo [custom builds](https://docs.expo.dev/custom-builds/get-started/), you need to add the `@rnw-community/react-native-payments` plugin into your `app.config.js`:
 
 1. Update your `app.config.js` configuration:
 ```js
 export default {
-  expo: {
-    ...
-    ios: {
-      ...
-      infoPlist: {
-        merchant_id: [your_merchant_id],
-      },
-      entitlements: {
-        "com.apple.developer.in-app-payments": [your_merchant_id],
-      },
-      ...
-    },
     plugins: [
       ...
-      "@rnw-community/react-native-payments",
+      [
+          "@rnw-community/react-native-payments/app.plugin",
+          {
+              "merchantIdentifier": "merchant.react-native-payments"
+          }
+      ],
     ],
   },
 };
 ```
+2. Prebuild your project:
+```bash
+npx expo prebuild --clean
+```
 
 ## Usage
 
@@ -181,7 +187,7 @@ Depending on the platform and payment method, you can provide additional data to
 
 - `environment`: This property represents the Android environment for the payment.
 - `requestPayerName`: "An optional boolean field that, when present and set to true, indicates that the `PaymentResponse` will include the name of the payer.
-- `requestPayerPhone`: "An optional boolean field that, when present and set to true, indicates that the `PaymentResponse` will include the phone of the payer. 
+- `requestPayerPhone`: "An optional boolean field that, when present and set to true, indicates that the `PaymentResponse` will include the phone of the payer.
 - `requestBillingAddress`: An optional boolean field that, when present and set to true, indicates that the `PaymentResponse` will
   include the billing address of the payer.
 - `requestPayerEmail`: An optional boolean field that, when present and set to true, indicates that the `PaymentResponse` will
@@ -305,8 +311,16 @@ export function setupJestTurboModuleMock(): void {
 
 ## Example
 
-You can find working example in the `App` component of
-the [react-native-payments-example](../react-native-payments-example/README.md) package.
+### Expo
+You can find working example in the `App` component of the [react-native-payments-expo-example](../react-native-payments-expo-example/README.md) package.
+
+#### Web(react-native-web)
+On web the library will fallback to [W3C implementation](https://developer.mozilla.org/en-US/docs/Web/API/Payment_Request_API)
+
+### Bare React Native CLI
+You can find working example in the `App` component of the [react-native-payments-example](../react-native-payments-example/README.md) package.
+
+
 
 ## TODO
 
@@ -335,16 +349,8 @@ the [react-native-payments-example](../react-native-payments-example/README.md)
 
 ### Other
 
-- [ ] Add [EXPO support](https://docs.expo.dev/modules/existing-library/)
-- [ ] Add unit tests
 - [ ] Refactor `utils`
-- [ ] Add web support
-- [ ] Merge react-native-payments-example into this package, and setup it properly
-- [ ] CI/CD:
-    - [ ] check/setup pull request
-    - [ ] check/setup push to master and release to NPM
-    - [ ] add e2e via maestro for IOS
-    - [ ] add e2e via maestro for Android
+  - [ ] Find alternative/suctom implementation for the `validator` library
 
 ## License
 

package/src/app.plugin.ts

@@ -0,0 +1,3 @@
+import { withPayments } from './expo-plugins/with-payments';
+
+export default withPayments;