@stripe/stripe-react-native 0.38.6 → 0.40.0

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 ## Unreleased
 
+## 0.40.0 - 2024-11-19
+
+**Breaking changes**
+
+- Removed support for FPX payments via the bank picker UI. If you'd like to accept FPX payments, we recommend using [Mobile Payment Element](https://docs.stripe.com/payments/accept-a-payment?platform=react-native). Also see the [FPX Payment guide](https://docs.stripe.com/payments/fpx/accept-a-payment?web-or-mobile=mobile) for more info on how to integrate FPX specifically.
+
+**Features**
+
+- `CustomerSheet` is now generally available!
+  - If you were using `CustomerSheetBeta`, change that to `CustomerSheet`.
+  - If you were using `CustomerSheetBeta.CustomerSheet`, change that to `CustomerSheet.Component`
+- Enabled vertical mode
+
+## 0.39.0 - 2024-10-15
+
+**Features**
+
+- Adds support for CustomerSession in private beta [1744](https://github.com/stripe/stripe-react-native/pull/1744)
+- Added `onBehalfOf` prop to CardField
+
+**Fixes**
+
+* Updated `stripe-ios` to 23.30.\*
+* Updated `stripe-android` to 20.52.\*
+
 ## 0.38.6 - 2024-09-04
 
 **Fixes**

package/android/.project

@@ -14,15 +14,4 @@
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
-	<filteredResources>
-		<filter>
-			<id>1725490136547</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
 </projectDescription>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,11 +1,11 @@
-arguments=--init-script /var/folders/qg/5wmspvx516145k8z2q01c8_m0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/qg/5wmspvx516145k8z2q01c8_m0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+arguments=
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home
+java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/gradle.properties

@@ -1,3 +1,3 @@
 StripeSdk_kotlinVersion=1.8.0
 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties
-StripeSdk_stripeVersion=20.48.+
+StripeSdk_stripeVersion=20.52.+

package/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt

@@ -219,6 +219,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

package/android/src/main/java/com/reactnativestripesdk/CardFieldViewManager.kt

@@ -51,6 +51,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)

package/android/src/main/java/com/reactnativestripesdk/PaymentSheetFragment.kt

@@ -55,6 +55,7 @@ class PaymentSheetFragment(
     }
   }
 
+  @OptIn(ExperimentalPaymentMethodLayoutApi::class)
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     val merchantDisplayName = arguments?.getString("merchantDisplayName").orEmpty()
@@ -63,8 +64,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 +85,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 +196,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)
@@ -209,6 +210,10 @@ class PaymentSheetFragment(
       configurationBuilder.paymentMethodOrder(it)
     }
 
+    configurationBuilder.paymentMethodLayout(
+      mapToPaymentMethodLayout(arguments?.getString("paymentMethodLayout"))
+    )
+
     paymentSheetConfiguration = configurationBuilder.build()
 
     if (arguments?.getBoolean("customFlow") == true) {
@@ -428,6 +433,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
+    }
   }
 }
 
@@ -468,6 +495,14 @@ fun mapToCollectionMode(str: String?): PaymentSheet.BillingDetailsCollectionConf
   }
 }
 
+fun mapToPaymentMethodLayout(str: String?): PaymentSheet.PaymentMethodLayout {
+  return when (str) {
+    "Horizontal" -> PaymentSheet.PaymentMethodLayout.Horizontal
+    "Vertical" -> PaymentSheet.PaymentMethodLayout.Vertical
+    else -> PaymentSheet.PaymentMethodLayout.Automatic
+  }
+}
+
 fun mapToAddressCollectionMode(str: String?): PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode {
   return when (str) {
     "automatic" -> PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Automatic

package/android/src/main/java/com/reactnativestripesdk/StripeSdkModule.kt

@@ -18,7 +18,6 @@ import com.stripe.android.googlepaylauncher.GooglePayLauncher
 import com.stripe.android.model.*
 import com.stripe.android.payments.bankaccount.CollectBankAccountConfiguration
 import com.stripe.android.paymentsheet.PaymentSheet
-import com.stripe.android.view.AddPaymentMethodActivityStarter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -77,14 +76,6 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
           }
           else -> {
             dispatchActivityResultsToFragments(requestCode, resultCode, data)
-            try {
-              val result = AddPaymentMethodActivityStarter.Result.fromIntent(data)
-              if (data?.getParcelableExtra<Parcelable>("extra_activity_result") != null) {
-                onFpxPaymentMethodResult(result)
-              }
-            } catch (e: java.lang.Exception) {
-              Log.d("StripeReactNative", e.localizedMessage ?: e.toString())
-            }
           }
         }
       }
@@ -219,48 +210,6 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     paymentSheetFragment?.paymentSheetIntentCreationCallback?.complete(params)
   }
 
-  private fun payWithFpx() {
-    getCurrentActivityOrResolveWithError(confirmPromise)?.let {
-      AddPaymentMethodActivityStarter(it)
-        .startForResult(AddPaymentMethodActivityStarter.Args.Builder()
-                          .setPaymentMethodType(PaymentMethod.Type.Fpx)
-                          .build()
-        )
-    }
-  }
-
-  private fun onFpxPaymentMethodResult(result: AddPaymentMethodActivityStarter.Result) {
-    when (result) {
-      is AddPaymentMethodActivityStarter.Result.Success -> {
-        if (confirmPaymentClientSecret != null && confirmPromise != null) {
-          paymentLauncherFragment = PaymentLauncherFragment.forPayment(
-            context = reactApplicationContext,
-            stripe,
-            publishableKey,
-            stripeAccountId,
-            confirmPromise!!,
-            confirmPaymentClientSecret!!,
-            ConfirmPaymentIntentParams.createWithPaymentMethodId(
-              result.paymentMethod.id!!,
-              confirmPaymentClientSecret!!
-            )
-          )
-        } else {
-          Log.e("StripeReactNative", "FPX payment failed. Promise and/or client secret is not set.")
-          confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), "FPX payment failed. Client secret is not set."))
-        }
-      }
-      is AddPaymentMethodActivityStarter.Result.Failure -> {
-        confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), result.exception))
-      }
-      is AddPaymentMethodActivityStarter.Result.Canceled -> {
-        confirmPromise?.resolve(createError(ConfirmPaymentErrorType.Canceled.toString(), "The payment has been canceled"))
-      }
-    }
-    this.confirmPaymentClientSecret = null
-    this.confirmPromise = null
-  }
-
   @ReactMethod
   fun createPaymentMethod(data: ReadableMap, options: ReadableMap, promise: Promise) {
     val paymentMethodType = getValOr(data, "paymentMethodType")?.let { mapToPaymentMethodType(it) } ?: run {
@@ -460,15 +409,6 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     else
       null // Expect that payment method was attached on the server
 
-    val testOfflineBank = getBooleanOrFalse(params, "testOfflineBank")
-
-    if (paymentMethodType == PaymentMethod.Type.Fpx && !testOfflineBank) {
-      confirmPaymentClientSecret = paymentIntentClientSecret
-      confirmPromise = promise
-      payWithFpx()
-      return
-    }
-
 //    if (paymentMethodType == PaymentMethod.Type.WeChatPay) {
 //      val appId = getValOr(params, "appId") ?: run {
 //        promise.resolve(createError("Failed", "You must provide appId"))

package/android/src/main/java/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())
   }
 

package/android/src/main/java/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,

package/ios/CardFieldManager.m

@@ -12,6 +12,7 @@ RCT_EXPORT_VIEW_PROPERTY(placeholders, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(autofocus, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(disabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(dangerouslyGetFullCardDetails, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(onBehalfOf, NSString)
 RCT_EXPORT_VIEW_PROPERTY(preferredNetworks, NSArray)
 RCT_EXTERN_METHOD(focus:(nonnull NSNumber*) reactTag)
 RCT_EXTERN_METHOD(blur:(nonnull NSNumber*) reactTag)

package/ios/CardFieldView.swift

@@ -6,9 +6,9 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
     @objc var onCardChange: RCTDirectEventBlock?
     @objc var onFocusChange: RCTDirectEventBlock?
     @objc var dangerouslyGetFullCardDetails: Bool = false
-    
+
     private var cardField = STPPaymentCardTextField()
-    
+
     public var cardParams: STPPaymentMethodParams? = nil
     public var cardPostalCode: String? = nil
 
@@ -17,19 +17,25 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
             cardField.isUserInteractionEnabled = !disabled
         }
     }
-    
+
     @objc var postalCodeEnabled: Bool = true {
         didSet {
             cardField.postalCodeEntryEnabled = postalCodeEnabled
         }
     }
-    
+
     @objc var countryCode: String? {
         didSet {
             cardField.countryCode = countryCode
         }
     }
-    
+
+    @objc var onBehalfOf: String? {
+        didSet {
+            cardField.onBehalfOf = onBehalfOf
+        }
+    }
+
     @objc var preferredNetworks: Array<Int>? {
         didSet {
             if let preferredNetworks = preferredNetworks {
@@ -37,7 +43,7 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
             }
         }
     }
-    
+
     @objc var placeholders: NSDictionary = NSDictionary() {
         didSet {
             if let numberPlaceholder = placeholders["number"] as? String {
@@ -56,7 +62,7 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
             }
         }
     }
-    
+
     @objc var autofocus: Bool = false {
         didSet {
             if autofocus == true {
@@ -64,7 +70,7 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
             }
         }
     }
-    
+
     @objc var cardStyle: NSDictionary = NSDictionary() {
         didSet {
             if let borderWidth = cardStyle["borderWidth"] as? Int {
@@ -91,7 +97,7 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
                 cardField.textErrorColor = UIColor(hexString: textErrorColor)
             }
             let fontSize = cardStyle["fontSize"] as? Int ?? 14
-            
+
             if let fontFamily = cardStyle["fontFamily"] as? String {
                 cardField.font = UIFont(name: fontFamily, size: CGFloat(fontSize)) ?? UIFont.systemFont(ofSize: CGFloat(fontSize))
             } else {
@@ -104,46 +110,46 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
             }
         }
     }
-    
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         cardField.delegate = self
-        
+
         self.addSubview(cardField)
     }
-    
+
     func focus() {
         cardField.becomeFirstResponder()
     }
-    
+
     func blur() {
         cardField.resignFirstResponder()
     }
-    
+
     func clear() {
         cardField.clear()
     }
-    
+
     func paymentCardTextFieldDidEndEditing(_ textField: STPPaymentCardTextField) {
         onFocusChange?(["focusedField": NSNull()])
     }
-    
+
     func paymentCardTextFieldDidBeginEditingNumber(_ textField: STPPaymentCardTextField) {
         onFocusChange?(["focusedField": "CardNumber"])
     }
-    
+
     func paymentCardTextFieldDidBeginEditingCVC(_ textField: STPPaymentCardTextField) {
         onFocusChange?(["focusedField": "Cvc"])
     }
-    
+
     func paymentCardTextFieldDidBeginEditingExpiration(_ textField: STPPaymentCardTextField) {
         onFocusChange?(["focusedField": "ExpiryDate"])
     }
-    
+
     func paymentCardTextFieldDidBeginEditingPostalCode(_ textField: STPPaymentCardTextField) {
         onFocusChange?(["focusedField": "PostalCode"])
     }
-    
+
     func paymentCardTextFieldDidChange(_ textField: STPPaymentCardTextField) {
         if onCardChange != nil {
             let brand = STPCardValidator.brand(forNumber: textField.cardNumber ?? "")
@@ -180,29 +186,12 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
             self.cardPostalCode = nil
         }
     }
-    
+
     override func layoutSubviews() {
         cardField.frame = self.bounds
     }
-    
+
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
-    func paymentContext(_ paymentContext: STPPaymentContext, didFailToLoadWithError error: Error) {
-        //
-    }
-    
-    func paymentContextDidChange(_ paymentContext: STPPaymentContext) {
-        //
-    }
-    
-    func paymentContext(_ paymentContext: STPPaymentContext, didCreatePaymentResult paymentResult: STPPaymentResult, completion: @escaping STPPaymentStatusBlock) {
-        //
-    }
-    
-    func paymentContext(_ paymentContext: STPPaymentContext, didFinishWith status: STPPaymentStatus, error: Error?) {
-        //
-    }
-    
 }

package/ios/CardFormManager.m

@@ -9,6 +9,7 @@ RCT_EXPORT_VIEW_PROPERTY(autofocus, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(cardStyle, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(disabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(preferredNetworks, NSArray)
+RCT_EXPORT_VIEW_PROPERTY(onBehalfOf, NSString)
 RCT_EXTERN_METHOD(focus:(nonnull NSNumber*) reactTag)
 RCT_EXTERN_METHOD(blur:(nonnull NSNumber*) reactTag)
 @end

package/ios/StripeSdk+PaymentSheet.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-@_spi(ExperimentalAllowsRemovalOfLastSavedPaymentMethodAPI) @_spi(STP) import StripePaymentSheet
+@_spi(ExperimentalAllowsRemovalOfLastSavedPaymentMethodAPI) @_spi(CustomerSessionBetaAccess) @_spi(STP) import StripePaymentSheet
 
 extension StripeSdk {
     internal func buildPaymentSheetConfiguration(
@@ -91,11 +91,17 @@ extension StripeSdk {
         }
         
         if let customerId = params["customerId"] as? String {
-            if let customerEphemeralKeySecret = params["customerEphemeralKeySecret"] as? String {
+            var customerEphemeralKeySecret = params["customerEphemeralKeySecret"] as? String
+            var customerClientSecret = params["customerSessionClientSecret"] as? String
+            if let customerEphemeralKeySecret, let customerClientSecret {
+                return(error: Errors.createError(ErrorType.Failed, "`customerEphemeralKeySecret` and `customerSessionClientSecret cannot both be set"), configuration: nil)
+            } else if let customerEphemeralKeySecret {
                 if (!Errors.isEKClientSecretValid(clientSecret: customerEphemeralKeySecret)) {
                     return(error: Errors.createError(ErrorType.Failed, "`customerEphemeralKeySecret` format does not match expected client secret formatting."), configuration: nil)
                 }
                 configuration.customer = .init(id: customerId, ephemeralKeySecret: customerEphemeralKeySecret)
+            } else if let customerClientSecret {
+                configuration.customer = .init(id: customerId, customerSessionClientSecret: customerClientSecret)
             }
         }
         
@@ -110,6 +116,15 @@ extension StripeSdk {
         if let paymentMethodOrder = params["paymentMethodOrder"] as? Array<String> {
             configuration.paymentMethodOrder = paymentMethodOrder
         }
+      
+        switch params["paymentMethodLayout"] as? String? {
+          case "Horizontal":
+            configuration.paymentMethodLayout = .horizontal
+          case "Vertical":
+            configuration.paymentMethodLayout = .vertical
+          default:
+            configuration.paymentMethodLayout = .automatic
+        }
                 
         return (nil, configuration)
     }