Sync (#1987)

* Sync with Stripe React Native 0.39.0 * fix #1949 * feat: add customer session client secret to payment sheet * feat: add onbehalfof to cardfield * fix formatting * update changelog, version --------- Co-authored-by: Jonas Bark <[email protected]> Co-authored-by: Remon <[email protected]>
flutter-stripe · Nov 19, 2024 · 9c2e704 · 9c2e704
1 parent 7a5bb7e
commit 9c2e704
Show file tree

Hide file tree

Showing 28 changed files with 206 additions and 71 deletions.
diff --git a/example/ios/Runner/AppDelegate.swift b/example/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

diff --git a/packages/stripe/CHANGELOG.md b/packages/stripe/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 11.3.0
+Align with Stripe React Native [0.39.0](https://github.com/stripe/stripe-react-native/releases/tag/v0.39.0):
+**Features**
+- Adds support for CustomerSession in private beta 1744
+- Added onBehalfOf prop to CardField
+
+**Fixes**
+- Updated stripe-ios to 23.30.*
+- Updated stripe-android to 20.52.*
+
 ## 11.2.0
 
 **Features**

diff --git a/packages/stripe/lib/src/widgets/card_field.dart b/packages/stripe/lib/src/widgets/card_field.dart
@@ -31,6 +31,7 @@ class CardField extends StatefulWidget {
     this.postalCodeHintText,
     this.controller,
     this.preferredNetworks,
+    this.onBehalfOf,
     this.androidPlatformViewRenderType =
         AndroidPlatformViewRenderType.expensiveAndroidView,
   });
@@ -50,6 +51,9 @@ class CardField extends StatefulWidget {
   /// Color of the cursor when a field gets focus.
   final Color? cursorColor;
 
+  /// The account (if any) for which the funds of the intent are intended.
+  final String? onBehalfOf;
+
   /// Whether or not to show the postalcode field in the form.
   ///
   /// Defaults is `false`. If your configuration in Stripe requires a postalcode
@@ -197,6 +201,7 @@ class _CardFieldState extends State<CardField> {
               focusNode: _node,
               style: style,
               placeholder: placeholder,
+              onBehalfOf: widget.onBehalfOf,
               enablePostalCode: widget.enablePostalCode,
               countryCode: widget.countryCode,
               dangerouslyGetFullCardDetails:
@@ -295,6 +300,7 @@ class _MethodChannelCardField extends StatefulWidget {
     this.preferredNetworks,
     this.dangerouslyGetFullCardDetails = false,
     this.dangerouslyUpdateFullCardDetails = false,
+    this.onBehalfOf,
     this.autofocus = false,
   })  : assert(constraints == null || constraints.debugAssertIsValid()),
         constraints = (width != null || height != null)
@@ -317,6 +323,7 @@ class _MethodChannelCardField extends StatefulWidget {
   final bool dangerouslyUpdateFullCardDetails;
   final AndroidPlatformViewRenderType androidPlatformViewRenderType;
   final List<CardBrand>? preferredNetworks;
+  final String? onBehalfOf;
 
   // This is used in the platform side to register the view.
   static const _viewType = 'flutter.stripe/card_field';
@@ -405,6 +412,7 @@ class _MethodChannelCardFieldState extends State<_MethodChannelCardField>
       'placeholder': placeholder.toJson(),
       'postalCodeEnabled': widget.enablePostalCode,
       'countryCode': widget.countryCode,
+      if (widget.onBehalfOf != null) 'onBehalfOf': widget.onBehalfOf,
       if (widget.preferredNetworks != null)
         'preferredNetworks':
             widget.preferredNetworks?.map((e) => e.brandValue).toList(),

diff --git a/packages/stripe/pubspec.yaml b/packages/stripe/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_stripe
 description: Flutter library for Stripe. Supports PaymentSheets, Apple & Google Pay, SCA, PSD2 and much more.
-version: 11.2.0
+version: 11.3.0
 homepage: https://github.com/flutter-stripe/flutter_stripe
 repository: https://github.com/flutter-stripe/flutter_stripe
 
@@ -22,9 +22,9 @@ dependencies:
   flutter:
     sdk: flutter
   meta: ^1.8.0
-  stripe_android: ^11.2.0
-  stripe_ios: ^11.2.0
-  stripe_platform_interface: ^11.2.0
+  stripe_android: ^11.3.0
+  stripe_ios: ^11.3.0
+  stripe_platform_interface: ^11.3.0
 dev_dependencies:
   flutter_test:
     sdk: flutter

diff --git a/packages/stripe_android/CHANGELOG.md b/packages/stripe_android/CHANGELOG.md
@@ -1,8 +1,20 @@
-## 11.2.1
-- Remove com.android.application gradle plugin version check
+## 11.3.0
+Align with Stripe React Native [0.39.0](https://github.com/stripe/stripe-react-native/releases/tag/v0.39.0):
+**Features**
+- Adds support for CustomerSession in private beta 1744
+- Added onBehalfOf prop to CardField
+
+**Fixes**
+- Updated stripe-ios to 23.30.*
+- Updated stripe-android to 20.52.*
 
 ## 11.2.0
-- Minor fixes and improvements
+
+**Features**
+- Add basic support for Expresscheckout on the web
+
+**Fixes** 
+- Export elementappearance and element theme
 
 ## 11.1.0
 - Sync with Stripe [0.38.6](https://github.com/stripe/stripe-react-native/releases/tag/v0.38.6). 
@@ -19,10 +31,7 @@
 **Fixes** 
 - #1729 parse unknown error.
 - #1837 fix for deferred payment methods.
-
-## 10.2.1
-**Fixes**
-- Run method channel messages on UI Thread to prevent crash (#1831)
+- #1630 handle next action setup for ios.
 
 ## 10.2.0
 

diff --git a/packages/stripe_android/android/build.gradle b/packages/stripe_android/android/build.gradle
@@ -3,7 +3,7 @@ version '1.0-SNAPSHOT'
 
 buildscript {
     ext.kotlin_version = '1.8.0'
-    ext.stripe_version = '20.48.+'
+    ext.stripe_version = '20.52.+'
 
     repositories {
         google()

diff --git a/...es/stripe_android/android/src/main/kotlin/com/flutter/stripe/StripeSdkCardPlatformView.kt b/...es/stripe_android/android/src/main/kotlin/com/flutter/stripe/StripeSdkCardPlatformView.kt
@@ -38,6 +38,9 @@ class StripeSdkCardPlatformView(
         if (creationParams?.containsKey("postalCodeEnabled") == true) {
             stripeSdkCardViewManager.setPostalCodeEnabled(cardView, creationParams["postalCodeEnabled"] as Boolean)
         }
+        if (creationParams?.containsKey("onBehalfOf") == true){
+            stripeSdkCardViewManager.setOnBehalfOf(cardView, creationParams["onBehalfOf"] as String)
+        }
         if (creationParams?.containsKey("countryCode") == true) {
             stripeSdkCardViewManager.setCountryCode(cardView, creationParams["countryCode"] as? String)
         }
@@ -152,4 +155,4 @@ class StripeSdkCardPlatformView(
     override fun onFlutterViewAttached(flutterView: View) {
         stripeSdkCardViewManager.onAfterUpdateTransaction(cardView)
     }
-}
+}
diff --git a/packages/stripe_android/android/src/main/kotlin/com/reactnativestripesdk/CardFieldView.kt b/packages/stripe_android/android/src/main/kotlin/com/reactnativestripesdk/CardFieldView.kt
@@ -220,6 +220,10 @@ class CardFieldView(context: ThemedReactContext) : FrameLayout(context) {
     mCardWidget.setPreferredNetworks(mapToPreferredNetworks(preferredNetworks))
   }
 
+  fun setOnBehalfOf(onBehalfOf: String?) {
+    mCardWidget.onBehalfOf = onBehalfOf
+  }
+
   /**
    * We can reliable assume that setPostalCodeEnabled is called before
    * setCountryCode because of the order of the props in CardField.tsx

diff --git a/...s/stripe_android/android/src/main/kotlin/com/reactnativestripesdk/CardFieldViewManager.kt b/...s/stripe_android/android/src/main/kotlin/com/reactnativestripesdk/CardFieldViewManager.kt
@@ -54,6 +54,11 @@ class CardFieldViewManager : SimpleViewManager<CardFieldView>() {
     view.setCountryCode(countryCode)
   }
 
+  @ReactProp(name = "onBehalfOf")
+  fun setOnBehalfOf(view: CardFieldView, onBehalfOf: String?) {
+    view.setOnBehalfOf(onBehalfOf)
+  }
+
   @ReactProp(name = "placeholders")
   fun setPlaceHolders(view: CardFieldView, placeholders: ReadableMap) {
     view.setPlaceHolders(placeholders)

diff --git a/...stripe_android/android/src/main/kotlin/com/reactnativestripesdk/GooglePayButtonManager.kt b/...stripe_android/android/src/main/kotlin/com/reactnativestripesdk/GooglePayButtonManager.kt
@@ -4,7 +4,7 @@ import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 
-class GooglePayButtonManager : SimpleViewManager<GooglePayButtonView?>() {
+class GooglePayButtonManager : SimpleViewManager<GooglePayButtonView>() {
   override fun getName(): String {
     return REACT_CLASS
   }

diff --git a/...s/stripe_android/android/src/main/kotlin/com/reactnativestripesdk/PaymentSheetFragment.kt b/...s/stripe_android/android/src/main/kotlin/com/reactnativestripesdk/PaymentSheetFragment.kt
@@ -63,8 +63,6 @@ class PaymentSheetFragment(
       return
     }
     val primaryButtonLabel = arguments?.getString("primaryButtonLabel")
-    val customerId = arguments?.getString("customerId").orEmpty()
-    val customerEphemeralKeySecret = arguments?.getString("customerEphemeralKeySecret").orEmpty()
     val googlePayConfig = buildGooglePayConfig(arguments?.getBundle("googlePay"))
     val allowsDelayedPaymentMethods = arguments?.getBoolean("allowsDelayedPaymentMethods")
     val billingDetailsBundle = arguments?.getBundle("defaultBillingDetails")
@@ -86,6 +84,13 @@ class PaymentSheetFragment(
       return
     }
 
+    val customerConfiguration = try {
+      buildCustomerConfiguration(arguments)
+    } catch (error: PaymentSheetException) {
+      initPromise.resolve(createError(ErrorType.Failed.toString(), error))
+      return
+    }
+
     val shippingDetails = arguments?.getBundle("defaultShippingDetails")?.let {
       AddressSheetView.buildAddressDetails(it)
     }
@@ -190,12 +195,7 @@ class PaymentSheetFragment(
     val configurationBuilder = PaymentSheet.Configuration.Builder(merchantDisplayName)
       .allowsDelayedPaymentMethods(allowsDelayedPaymentMethods ?: false)
       .defaultBillingDetails(defaultBillingDetails)
-      .customer(
-        if (customerId.isNotEmpty() && customerEphemeralKeySecret.isNotEmpty()) PaymentSheet.CustomerConfiguration(
-          id = customerId,
-          ephemeralKeySecret = customerEphemeralKeySecret
-        ) else null
-      )
+      .customer(customerConfiguration)
       .googlePay(googlePayConfig)
       .appearance(appearance)
       .shippingDetails(shippingDetails)
@@ -428,6 +428,28 @@ class PaymentSheetFragment(
         )
       }
     }
+
+    @OptIn(ExperimentalCustomerSessionApi::class)
+    @Throws(PaymentSheetException::class)
+    private fun buildCustomerConfiguration(bundle: Bundle?): PaymentSheet.CustomerConfiguration? {
+      val customerId = bundle?.getString("customerId").orEmpty()
+      val customerEphemeralKeySecret = bundle?.getString("customerEphemeralKeySecret").orEmpty()
+      val customerSessionClientSecret = bundle?.getString("customerSessionClientSecret").orEmpty()
+      return if (customerSessionClientSecret.isNotEmpty() && customerEphemeralKeySecret.isNotEmpty()) {
+        throw PaymentSheetException("`customerEphemeralKeySecret` and `customerSessionClientSecret` cannot both be set")
+      } else if (customerId.isNotEmpty() && customerSessionClientSecret.isNotEmpty()) {
+        PaymentSheet.CustomerConfiguration.createWithCustomerSession(
+          id = customerId,
+          clientSecret = customerSessionClientSecret
+        )
+      }
+      else if (customerId.isNotEmpty() && customerEphemeralKeySecret.isNotEmpty()) {
+        PaymentSheet.CustomerConfiguration(
+          id = customerId,
+          ephemeralKeySecret = customerEphemeralKeySecret
+        )
+      } else null
+    }
   }
 }
 

diff --git a/packages/stripe_android/android/src/main/kotlin/com/reactnativestripesdk/StripeSdkModule.kt b/packages/stripe_android/android/src/main/kotlin/com/reactnativestripesdk/StripeSdkModule.kt
@@ -219,6 +219,7 @@ class StripeSdkModule(val reactContext: ReactApplicationContext) : ReactContextB
     }
 
     paymentSheetFragment?.paymentSheetIntentCreationCallback?.complete(params)
+    promise.resolve(null)
   }
 
   private fun payWithFpx() {
@@ -883,7 +884,7 @@ class StripeSdkModule(val reactContext: ReactApplicationContext) : ReactContextB
   @ReactMethod
   fun customerAdapterAttachPaymentMethodCallback(paymentMethodJson: ReadableMap, promise: Promise) {
     customerSheetFragment?.let {
-      val paymentMethod = PaymentMethod.fromJson(JSONObject(paymentMethodJson.toHashMap()))
+      val paymentMethod = PaymentMethod.fromJson(JSONObject(paymentMethodJson.toHashMap() as HashMap<*, *>))
       if (paymentMethod == null) {
         Log.e("StripeReactNative", "There was an error converting Payment Method JSON to a Stripe Payment Method")
         return
@@ -898,7 +899,7 @@ class StripeSdkModule(val reactContext: ReactApplicationContext) : ReactContextB
   @ReactMethod
   fun customerAdapterDetachPaymentMethodCallback(paymentMethodJson: ReadableMap, promise: Promise) {
     customerSheetFragment?.let {
-      val paymentMethod = PaymentMethod.fromJson(JSONObject(paymentMethodJson.toHashMap()))
+      val paymentMethod = PaymentMethod.fromJson(JSONObject(paymentMethodJson.toHashMap() as HashMap<*, *>))
       if (paymentMethod == null) {
         Log.e("StripeReactNative", "There was an error converting Payment Method JSON to a Stripe Payment Method")
         return

diff --git a/...d/android/src/main/kotlin/com/reactnativestripesdk/customersheet/CustomerSheetFragment.kt b/...d/android/src/main/kotlin/com/reactnativestripesdk/customersheet/CustomerSheetFragment.kt
@@ -20,7 +20,6 @@ import com.stripe.android.customersheet.CustomerAdapter
 import com.stripe.android.customersheet.CustomerEphemeralKey
 import com.stripe.android.customersheet.CustomerSheet
 import com.stripe.android.customersheet.CustomerSheetResult
-import com.stripe.android.customersheet.ExperimentalCustomerSheetApi
 import com.stripe.android.customersheet.PaymentOptionSelection
 import com.stripe.android.model.PaymentMethod
 import com.stripe.android.paymentsheet.*
@@ -29,7 +28,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 
-@OptIn(ExperimentalCustomerSheetApi::class, ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class)
+@OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class)
 class CustomerSheetFragment : Fragment() {
   private var customerSheet: CustomerSheet? = null
   internal var customerAdapter: ReactNativeCustomerAdapter? = null
@@ -111,11 +110,12 @@ class CustomerSheetFragment : Fragment() {
 
     customerSheet = CustomerSheet.create(
       fragment = this,
-      configuration = configuration.build(),
       customerAdapter = customerAdapter,
       callback = ::handleResult
     )
 
+    customerSheet?.configure(configuration.build())
+
     initPromise.resolve(WritableNativeMap())
   }
 

diff --git a/...roid/src/main/kotlin/com/reactnativestripesdk/customersheet/ReactNativeCustomerAdapter.kt b/...roid/src/main/kotlin/com/reactnativestripesdk/customersheet/ReactNativeCustomerAdapter.kt
@@ -7,11 +7,9 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.reactnativestripesdk.StripeSdkModule
 import com.stripe.android.customersheet.CustomerAdapter
-import com.stripe.android.customersheet.ExperimentalCustomerSheetApi
 import com.stripe.android.model.PaymentMethod
 import kotlinx.coroutines.CompletableDeferred
 
-@OptIn(ExperimentalCustomerSheetApi::class)
 class ReactNativeCustomerAdapter (
   private val context: ReactApplicationContext,
   private val adapter: CustomerAdapter,

diff --git a/...oid/src/main/kotlin/com/reactnativestripesdk/pushprovisioning/AddToWalletButtonManager.kt b/...oid/src/main/kotlin/com/reactnativestripesdk/pushprovisioning/AddToWalletButtonManager.kt
@@ -9,7 +9,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 
 
-class AddToWalletButtonManager(applicationContext: Context) : SimpleViewManager<AddToWalletButtonView?>() {
+class AddToWalletButtonManager(applicationContext: Context) : SimpleViewManager<AddToWalletButtonView>() {
   private val requestManager = Glide.with(applicationContext)
   override fun getName() = "AddToWalletButton"
 

diff --git a/packages/stripe_android/pubspec.yaml b/packages/stripe_android/pubspec.yaml
@@ -1,6 +1,6 @@
 name: stripe_android
 description: Stripe platform implementation for Android
-version: 11.2.1
+version: 11.3.0
 repository: https://github.com/flutter-stripe/flutter_stripe
 homepage: https://pub.dev/packages/flutter_stripe
 

diff --git a/packages/stripe_ios/CHANGELOG.md b/packages/stripe_ios/CHANGELOG.md
@@ -1,5 +1,20 @@
+## 11.3.0
+Align with Stripe React Native [0.39.0](https://github.com/stripe/stripe-react-native/releases/tag/v0.39.0):
+**Features**
+- Adds support for CustomerSession in private beta 1744
+- Added onBehalfOf prop to CardField
+
+**Fixes**
+- Updated stripe-ios to 23.30.*
+- Updated stripe-android to 20.52.*
+
 ## 11.2.0
-- Minor fixes and improvements
+
+**Features**
+- Add basic support for Expresscheckout on the web
+
+**Fixes** 
+- Export elementappearance and element theme
 
 ## 11.1.0
 - Sync with Stripe [0.38.6](https://github.com/stripe/stripe-react-native/releases/tag/v0.38.6). 

diff --git a/packages/stripe_ios/ios/Classes/CardFieldFactory.swift b/packages/stripe_ios/ios/Classes/CardFieldFactory.swift
@@ -137,6 +137,10 @@ class CardFieldPlatformView: NSObject, FlutterPlatformView, STPPaymentCardTextFi
             cardField.disabled = disabled
         }
 
+        if let onBehalfOf = arguments["onBehalfOf"] as? String{
+            cardField.onBehalfOf = onBehalfOf
+        }
+
         if let preferredNetworks = arguments["preferredNetworks"] as? Array<Int>{
             cardField.preferredNetworks = preferredNetworks
         }