@stripe/stripe-react-native 0.16.0 → 0.18.1

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

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Parcelable
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import com.facebook.react.bridge.*
 import com.facebook.react.module.annotations.ReactModule
 import com.reactnativestripesdk.pushprovisioning.PushProvisioningProxy
@@ -36,21 +37,27 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
   private var stripeAccountId: String? = null
   private var urlScheme: String? = null
 
+  private var confirmPromise: Promise? = null
+  private var confirmPaymentClientSecret: String? = null
+
   private var paymentSheetFragment: PaymentSheetFragment? = null
   private var googlePayFragment: GooglePayFragment? = null
   private var paymentLauncherFragment: PaymentLauncherFragment? = null
-
-  private var confirmPromise: Promise? = null
-  private var confirmPaymentClientSecret: String? = null
+  private var collectBankAccountLauncherFragment: CollectBankAccountLauncherFragment? = null
+  private var financialConnectionsSheetFragment: FinancialConnectionsSheetFragment? = null
+  private val allFragments: List<Fragment?>
+    get() = listOf(
+      paymentSheetFragment,
+      googlePayFragment,
+      paymentLauncherFragment,
+      collectBankAccountLauncherFragment,
+      financialConnectionsSheetFragment
+    )
 
   private val mActivityEventListener = object : BaseActivityEventListener() {
     override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
       if (::stripe.isInitialized) {
-        // BEGIN - Necessary on older versions of React Native (~0.64 and below)
-        paymentSheetFragment?.activity?.activityResultRegistry?.dispatchResult(requestCode, resultCode, data)
-        googlePayFragment?.activity?.activityResultRegistry?.dispatchResult(requestCode, resultCode, data)
-        paymentLauncherFragment?.activity?.activityResultRegistry?.dispatchResult(requestCode, resultCode, data)
-        // END
+        dispatchActivityResultsToFragments(requestCode, resultCode, data)
         try {
           val result = AddPaymentMethodActivityStarter.Result.fromIntent(data)
           if (data?.getParcelableExtra<Parcelable>("extra_activity_result") != null) {
@@ -67,6 +74,13 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     reactContext.addActivityEventListener(mActivityEventListener)
   }
 
+  // Necessary on older versions of React Native (~0.65 and below)
+  private fun dispatchActivityResultsToFragments(requestCode: Int, resultCode: Int, data: Intent?) {
+    for (fragment in allFragments) {
+      fragment?.activity?.activityResultRegistry?.dispatchResult(requestCode, resultCode, data)
+    }
+  }
+
   private fun configure3dSecure(params: ReadableMap) {
     val stripe3dsConfigBuilder = PaymentAuthConfig.Stripe3ds2Config.Builder()
     if (params.hasKey("timeout")) stripe3dsConfigBuilder.setTimeout(params.getInt("timeout"))
@@ -121,17 +135,14 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
   @ReactMethod
   fun initPaymentSheet(params: ReadableMap, promise: Promise) {
     getCurrentActivityOrResolveWithError(promise)?.let { activity ->
-      paymentSheetFragment?.let {
-        // If a payment sheet was already initialized, we want to remove its fragment first
-        activity.supportFragmentManager.beginTransaction().remove(it).commitAllowingStateLoss()
-      }
+      paymentSheetFragment?.removeFragment(reactApplicationContext)
       paymentSheetFragment = PaymentSheetFragment(reactApplicationContext, promise).also {
         val bundle = toBundleObject(params)
         it.arguments = bundle
       }
       try {
         activity.supportFragmentManager.beginTransaction()
-          .add(paymentSheetFragment!!, "payment_sheet_launch_fragment")
+          .add(paymentSheetFragment!!, PaymentSheetFragment.TAG)
           .commit()
       } catch (error: IllegalStateException) {
         promise.resolve(createError(ErrorType.Failed.toString(), error.message))
@@ -368,12 +379,15 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
 //  }
 
   @ReactMethod
-  fun confirmPayment(paymentIntentClientSecret: String, params: ReadableMap, options: ReadableMap, promise: Promise) {
+  fun confirmPayment(paymentIntentClientSecret: String, params: ReadableMap?, options: ReadableMap, promise: Promise) {
     val paymentMethodData = getMapOrNull(params, "paymentMethodData")
-    val paymentMethodType = getValOr(params, "paymentMethodType")?.let { mapToPaymentMethodType(it) } ?: run {
-      promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), "You must provide paymentMethodType"))
-      return
-    }
+    val paymentMethodType = if (params != null)
+      mapToPaymentMethodType(params.getString("paymentMethodType")) ?: run {
+        promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), "You must provide paymentMethodType"))
+        return
+      }
+    else
+      null // Expect that payment method was attached on the server
 
     val testOfflineBank = getBooleanOrFalse(params, "testOfflineBank")
 
@@ -480,7 +494,7 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     getCurrentActivityOrResolveWithError(promise)?.let {
       try {
         it.supportFragmentManager.beginTransaction()
-          .add(fragment, "google_pay_support_fragment")
+          .add(fragment, GooglePayPaymentMethodLauncherFragment.TAG)
           .commit()
       } catch (error: IllegalStateException) {
         promise.resolve(createError(ErrorType.Failed.toString(), error.message))
@@ -498,7 +512,7 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     getCurrentActivityOrResolveWithError(promise)?.let {
       try {
         it.supportFragmentManager.beginTransaction()
-          .add(googlePayFragment!!, "google_pay_launch_fragment")
+          .add(googlePayFragment!!, GooglePayFragment.TAG)
           .commit()
       } catch (error: IllegalStateException) {
         promise.resolve(createError(ErrorType.Failed.toString(), error.message))
@@ -603,9 +617,10 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
       billingDetails.getString("email")
     )
 
-    val fragment = CollectBankAccountLauncherFragment(
+    collectBankAccountLauncherFragment = CollectBankAccountLauncherFragment(
       reactApplicationContext,
       publishableKey,
+      stripeAccountId,
       clientSecret,
       isPaymentIntent,
       collectParams,
@@ -614,7 +629,7 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     getCurrentActivityOrResolveWithError(promise)?.let {
       try {
         it.supportFragmentManager.beginTransaction()
-          .add(fragment, "collect_bank_account_launcher_fragment")
+          .add(collectBankAccountLauncherFragment!!, "collect_bank_account_launcher_fragment")
           .commit()
       } catch (error: IllegalStateException) {
         promise.resolve(createError(ErrorType.Failed.toString(), error.message))
@@ -690,6 +705,28 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     }
   }
 
+  @ReactMethod
+  fun collectBankAccountToken(clientSecret: String, promise: Promise) {
+    if (!::stripe.isInitialized) {
+      promise.resolve(createMissingInitError())
+      return
+    }
+    financialConnectionsSheetFragment = FinancialConnectionsSheetFragment().also {
+      it.presentFinancialConnectionsSheet(clientSecret, FinancialConnectionsSheetFragment.Mode.ForToken, publishableKey, stripeAccountId, promise, reactApplicationContext)
+    }
+  }
+
+  @ReactMethod
+  fun collectFinancialConnectionsAccounts(clientSecret: String, promise: Promise) {
+    if (!::stripe.isInitialized) {
+      promise.resolve(createMissingInitError())
+      return
+    }
+    financialConnectionsSheetFragment = FinancialConnectionsSheetFragment().also {
+      it.presentFinancialConnectionsSheet(clientSecret, FinancialConnectionsSheetFragment.Mode.ForSession, publishableKey, stripeAccountId, promise, reactApplicationContext)
+    }
+  }
+
   /**
    * Safely get and cast the current activity as an AppCompatActivity. If that fails, the promise
    * provided will be resolved with an error message instructing the user to retry the method.

package/android/src/main/java/com/reactnativestripesdk/utils/Errors.kt

@@ -111,3 +111,7 @@ internal fun createError(code: String, error: Throwable): WritableMap {
     null,
     null)
 }
+
+internal fun createMissingInitError(): WritableMap {
+  return createError(ErrorType.Failed.toString(), "Stripe has not been initialized. Initialize Stripe in your app with the StripeProvider component or the initStripe method.")
+}

package/android/src/main/java/com/reactnativestripesdk/utils/Extensions.kt

@@ -3,6 +3,9 @@ package com.reactnativestripesdk.utils
 import android.content.Context
 import android.view.View
 import android.view.inputmethod.InputMethodManager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import com.facebook.react.bridge.ReactApplicationContext
 
 fun View.showSoftKeyboard() {
   post {
@@ -19,3 +22,11 @@ fun View.hideSoftKeyboard() {
     imm?.hideSoftInputFromWindow(windowToken, 0)
   }
 }
+
+fun Fragment.removeFragment(context: ReactApplicationContext) {
+  (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.let {
+    if (it.findFragmentByTag(this.tag) != null) {
+      it.beginTransaction().remove(this).commitAllowingStateLoss()
+    }
+  }
+}

package/android/src/main/java/com/reactnativestripesdk/utils/Mappers.kt

@@ -217,12 +217,11 @@ internal fun mapFromBankAccountStatus(status: BankAccount.Status?): String {
 }
 
 internal fun mapFromBankAccount(bankAccount: BankAccount?): WritableMap? {
-  val bankAccountMap: WritableMap = WritableNativeMap()
-
   if (bankAccount == null) {
     return null
   }
 
+  val bankAccountMap: WritableMap = WritableNativeMap()
   bankAccountMap.putString("id", bankAccount.id)
   bankAccountMap.putString("bankName", bankAccount.bankName)
   bankAccountMap.putString("accountHolderName", bankAccount.accountHolderName)
@@ -231,6 +230,8 @@ internal fun mapFromBankAccount(bankAccount: BankAccount?): WritableMap? {
   bankAccountMap.putString("country", bankAccount.countryCode)
   bankAccountMap.putString("routingNumber", bankAccount.routingNumber)
   bankAccountMap.putString("status", mapFromBankAccountStatus(bankAccount.status))
+  bankAccountMap.putString("fingerprint", bankAccount.fingerprint)
+  bankAccountMap.putString("last4", bankAccount.last4)
 
   return bankAccountMap
 }
@@ -312,13 +313,13 @@ internal fun mapFromCard(card: Card?): WritableMap? {
 
 internal fun mapFromToken(token: Token): WritableMap {
   val tokenMap: WritableMap = WritableNativeMap()
-
   tokenMap.putString("id", token.id)
-  tokenMap.putString("created", token.created.time.toString())
+  tokenMap.putDouble("created", token.created.time.toDouble())
   tokenMap.putString("type", mapTokenType(token.type))
   tokenMap.putBoolean("livemode", token.livemode)
   tokenMap.putMap("bankAccount", mapFromBankAccount(token.bankAccount))
   tokenMap.putMap("card", mapFromCard(token.card))
+  tokenMap.putBoolean("used", token.used)
 
   return tokenMap
 }

package/ios/Errors.swift

@@ -1,4 +1,5 @@
 import Stripe
+@_spi(STP) import StripeCore
 
 enum ErrorType {
     static let Failed = "Failed"
@@ -50,7 +51,7 @@ class Errors {
     class func createError (_ code: String, _ error: NSError?) -> NSDictionary {
         let value: NSDictionary = [
             "code": code,
-            "message": error?.userInfo[STPError.errorMessageKey] ?? NSNull(),
+            "message": error?.userInfo[STPError.errorMessageKey] ?? error?.localizedDescription ?? NSNull(),
             "localizedMessage": error?.localizedDescription ?? NSNull(),
             "declineCode": error?.userInfo[STPError.stripeDeclineCodeKey] ?? NSNull(),
             "stripeErrorCode": error?.userInfo[STPError.stripeErrorCodeKey] ?? NSNull(),
@@ -84,5 +85,15 @@ class Errors {
         
         return ["error": value]
     }
+    
+    class func createError(_ code: String, _ error: Error) -> NSDictionary {
+        if let stripeError = error as? StripeError {
+            return createError(code, NSError.stp_error(from: stripeError))
+        }
+        
+        return createError(code, error as NSError)
+    }
+    
+    static let MISSING_INIT_ERROR = Errors.createError(ErrorType.Failed, "Stripe has not been initialized. Initialize Stripe in your app with the StripeProvider component or the initStripe method.")
 }
 

package/ios/FinancialConnections.swift

@@ -0,0 +1,258 @@
+//
+//  FinancialConnections.swift
+//  stripe-react-native
+//
+//  Created by Charles Cruzan on 7/12/22.
+//
+
+import Foundation
+import StripeFinancialConnections
+import Stripe
+
+class FinancialConnections {
+    
+    internal static func present(
+        withClientSecret: String,
+        resolve: @escaping RCTPromiseResolveBlock
+    ) -> Void {
+        DispatchQueue.main.async {
+            FinancialConnectionsSheet(financialConnectionsSessionClientSecret: withClientSecret).present(
+              from: findViewControllerPresenter(from: UIApplication.shared.delegate?.window??.rootViewController ?? UIViewController()),
+              completion: { result in
+                  switch result {
+                  case .completed(session: let session):
+                      resolve([ "session": mapFromSessionResult(session) ])
+                  case .canceled:
+                      resolve(Errors.createError(ErrorType.Canceled, "The flow has been canceled."))
+                  case .failed(let error):
+                      resolve(Errors.createError(ErrorType.Failed, error))
+                  }
+            })
+        }
+    }
+    
+    internal static func presentForToken(
+        withClientSecret: String,
+        resolve: @escaping RCTPromiseResolveBlock
+    ) -> Void {
+        DispatchQueue.main.async {
+            FinancialConnectionsSheet(financialConnectionsSessionClientSecret: withClientSecret).presentForToken(
+              from: findViewControllerPresenter(from: UIApplication.shared.delegate?.window??.rootViewController ?? UIViewController()),
+              completion: { result in
+                  switch result {
+                  case .completed(result: let result):
+                      resolve(
+                        [
+                            "session": mapFromSessionResult(result.session),
+                            "token"  : mapFromTokenResult(result.token)
+                        ]
+                      )
+                  case .canceled:
+                      resolve(Errors.createError(ErrorType.Canceled, "The flow has been canceled."))
+                  case .failed(let error):
+                      resolve(Errors.createError(ErrorType.Failed, error))
+                  }
+            })
+        }
+    }
+    
+    internal static func mapFromSessionResult(
+        _ session: StripeAPI.FinancialConnectionsSession
+    ) -> NSDictionary {
+        return [
+            "id": session.id,
+            "clientSecret": session.clientSecret,
+            "livemode": session.livemode,
+            "accounts": mapFromAccountsList(accounts: session.accounts)
+        ]
+    }
+    
+    internal static func mapFromTokenResult(
+        _ token: StripeAPI.BankAccountToken?
+    ) -> NSDictionary {
+        return [
+            "bankAccount": mapFromBankAccount(bankAccount: token?.bankAccount) ?? NSNull(),
+            "livemode": token?.livemode ?? false,
+            "id": token?.id ?? NSNull(),
+            "used": token?.used ?? false,
+            "type": Mappers.mapFromTokenType(STPTokenType.bankAccount) ?? NSNull(),
+            "created": NSNull(), // Doesn't exist on StripeAPI.BankAccountToken
+        ]
+    }
+    
+    internal static func mapFromBankAccount(
+        bankAccount: StripeAPI.BankAccountToken.BankAccount?
+    ) -> NSDictionary? {
+        guard let bankAccount = bankAccount else {
+            return nil
+        }
+        // return Mappers.mapFromBankAccount(bankAccount) Cannot use this since it expects an STPBankAccount
+        return [
+            "id": bankAccount.id,
+            "bankName": bankAccount.bankName ?? NSNull(),
+            "accountHolderName": bankAccount.accountHolderName ?? NSNull(),
+            "accountHolderType": NSNull(), // Doesn't exist on StripeAPI.BankAccountToken
+            "currency": bankAccount.currency,
+            "country": bankAccount.country,
+            "routingNumber": bankAccount.routingNumber ?? NSNull(),
+            "fingerprint": bankAccount.fingerprint ?? NSNull(),
+            "last4": bankAccount.last4,
+            "status": bankAccount.status.prefix(1).uppercased() + bankAccount.status.lowercased().dropFirst(), // stripe-ios returns a string, not STPBankAccountStatus
+        ]
+    }
+    
+    internal static func mapFromAccountsList(
+        accounts: StripeAPI.FinancialConnectionsSession.AccountList
+    ) -> [[String: Any]] {
+        var result = [[String: Any]]()
+        
+        for account in accounts.data {
+            result.append([
+                "id": account.id,
+                "livemode": account.livemode,
+                "displayName": account.displayName ?? NSNull(),
+                "status": mapFromStatus(account.status),
+                "institutionName": account.institutionName,
+                "last4": account.last4 ?? NSNull(),
+                "created": account.created * 1000,
+                "balance": mapFromAccountBalance(balance: account.balance) ?? NSNull(),
+                "balanceRefresh": mapFromAccountBalanceRefresh(balanceRefresh: account.balanceRefresh) ?? NSNull(),
+                "category": mapFromCategory(account.category),
+                "subcategory": mapFromSubcategory(account.subcategory),
+                "permissions": account.permissions?.map { mapFromPermission($0) } ?? NSNull(),
+                "supportedPaymentMethodTypes": account.supportedPaymentMethodTypes.map { mapFromSupportedPaymentMethodTypes($0) },
+            ])
+        }
+        
+        return result
+    }
+
+    internal static func mapFromAccountBalance(
+        balance: StripeAPI.FinancialConnectionsAccount.Balance?
+    ) -> NSDictionary? {
+        guard let balance = balance else {
+            return nil
+        }
+    
+        return [
+            "asOf": balance.asOf * 1000,
+            "type": mapFromBalanceType(balance.type),
+//             TODO: Protected by internal on iOS only. PR is out to fix
+            "cash": ["available": NSNull()],   // balance.cash?.available
+            "credit": ["used": NSNull()], // balance.credit?.used
+            "current": balance.current,
+        ]
+    }
+
+    internal static func mapFromAccountBalanceRefresh(
+        balanceRefresh: StripeAPI.FinancialConnectionsAccount.BalanceRefresh?
+    ) -> NSDictionary? {
+        guard let balanceRefresh = balanceRefresh else {
+            return nil
+        }
+    
+        return [
+            "status": mapFromBalanceRefreshStatus(balanceRefresh.status),
+            "lastAttemptedAt": balanceRefresh.lastAttemptedAt * 1000,
+        ]
+    }
+    
+    internal static func mapFromStatus( _ status: StripeAPI.FinancialConnectionsAccount.Status) -> String {
+        switch status {
+        case .active:
+            return "active"
+        case .inactive:
+            return "inactive"
+        case .disconnected:
+            return "disconnected"
+        case .unparsable:
+            return "unparsable"
+        }
+    }
+    
+    internal static func mapFromCategory( _ category: StripeAPI.FinancialConnectionsAccount.Category) -> String {
+        switch category {
+        case .cash:
+            return "cash"
+        case .credit:
+            return "credit"
+        case .investment:
+            return "investment"
+        case .other:
+            return "other"
+        case .unparsable:
+            return "unparsable"
+        }
+    }
+    
+    internal static func mapFromSubcategory( _ subcategory: StripeAPI.FinancialConnectionsAccount.Subcategory) -> String {
+        switch subcategory {
+        case .savings:
+            return "savings"
+        case .mortgage:
+            return "mortgage"
+        case .checking:
+            return "checking"
+        case .creditCard:
+            return "creditCard"
+        case .lineOfCredit:
+            return "lineOfCredit"
+        case .other:
+            return "other"
+        case .unparsable:
+            return "unparsable"
+        }
+    }
+    
+    internal static func mapFromPermission( _ permission: StripeAPI.FinancialConnectionsAccount.Permissions) -> String {
+        switch permission {
+        case .transactions:
+            return "transactions"
+        case .ownership:
+            return "ownership"
+        case .paymentMethod:
+            return "paymentMethod"
+        case .accountNumbers:
+            return "accountNumbers"
+        case .balances:
+            return "balances"
+        case .unparsable:
+            return "unparsable"
+        }
+    }
+    
+    internal static func mapFromSupportedPaymentMethodTypes( _ type: StripeAPI.FinancialConnectionsAccount.SupportedPaymentMethodTypes) -> String {
+        switch type {
+        case .usBankAccount:
+            return "usBankAccount"
+        case .link:
+            return "link"
+        case .unparsable:
+            return "unparsable"
+        }
+    }
+    
+    internal static func mapFromBalanceType( _ type: StripeAPI.FinancialConnectionsAccount.Balance.ModelType) -> String {
+        switch type {
+        case .cash:
+            return "cash"
+        case .credit:
+            return "credit"
+        case .unparsable:
+            return "unparsable"
+        }
+    }
+    
+    internal static func mapFromBalanceRefreshStatus( _ status: StripeAPI.FinancialConnectionsAccount.BalanceRefresh.Status) -> String {
+        switch status {
+        case .succeeded:
+            return "succeeded"
+        case .pending:
+            return "pending"
+        case .failed:
+            return "failed"
+        case .unparsable:
+            return "unparsable"
+        }
+    }
+}

package/ios/Mappers.swift

@@ -50,18 +50,21 @@ class Mappers {
     }
 
     class func mapFromBankAccount(_ bankAccount: STPBankAccount?) -> NSDictionary? {
-        if (bankAccount == nil) {
+        guard let bankAccount = bankAccount else {
             return nil
         }
+        
         let result: NSDictionary = [
-            "id": bankAccount?.stripeID ?? NSNull(),
-            "bankName": bankAccount?.bankName ?? NSNull(),
-            "accountHolderName": bankAccount?.accountHolderName ?? NSNull(),
-            "accountHolderType": mapFromBankAccountHolderType(bankAccount?.accountHolderType) ?? NSNull(),
-            "country": bankAccount?.country ?? NSNull(),
-            "currency": bankAccount?.currency ?? NSNull(),
-            "routingNumber": bankAccount?.routingNumber ?? NSNull(),
-            "status": mapFromBankAccountStatus(bankAccount?.status) ?? NSNull(),
+            "id": bankAccount.stripeID,
+            "bankName": bankAccount.bankName ?? NSNull(),
+            "accountHolderName": bankAccount.accountHolderName ?? NSNull(),
+            "accountHolderType": mapFromBankAccountHolderType(bankAccount.accountHolderType) ?? NSNull(),
+            "country": bankAccount.country ?? NSNull(),
+            "currency": bankAccount.currency ?? NSNull(),
+            "routingNumber": bankAccount.routingNumber ?? NSNull(),
+            "status": mapFromBankAccountStatus(bankAccount.status) ?? NSNull(),
+            "fingerprint": bankAccount.fingerprint ?? NSNull(),
+            "last4": bankAccount.last4 ?? NSNull()
         ]
         return result
     }

package/ios/StripeSdk.m

@@ -131,5 +131,14 @@ RCT_EXTERN_METHOD(
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject
                   )
-
+RCT_EXTERN_METHOD(
+                  collectBankAccountToken:(NSString *)clientSecret
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject
+                  )
+RCT_EXTERN_METHOD(
+                  collectFinancialConnectionsAccounts:(NSString *)clientSecret
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject
+                  )
 @end

package/ios/StripeSdk.swift

@@ -1,5 +1,6 @@
 import PassKit
 import Stripe
+import StripeFinancialConnections
 
 @objc(StripeSdk)
 class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionViewControllerDelegate, UIAdaptivePresentationControllerDelegate {
@@ -800,7 +801,7 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
     @objc(confirmPayment:data:options:resolver:rejecter:)
     func confirmPayment(
         paymentIntentClientSecret: String,
-        params: NSDictionary,
+        params: NSDictionary?,
         options: NSDictionary,
         resolver resolve: @escaping RCTPromiseResolveBlock,
         rejecter reject: @escaping RCTPromiseRejectBlock
@@ -808,13 +809,13 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
         self.confirmPaymentResolver = resolve
         self.confirmPaymentClientSecret = paymentIntentClientSecret
 
-        let paymentMethodData = params["paymentMethodData"] as? NSDictionary
-        let type = Mappers.mapToPaymentMethodType(type: params["paymentMethodType"] as? String)
-        guard let paymentMethodType = type else {
-            resolve(Errors.createError(ErrorType.Failed, "You must provide paymentMethodType"))
+        let paymentMethodData = params?["paymentMethodData"] as? NSDictionary
+        let (missingPaymentMethodError, paymentMethodType) = getPaymentMethodType(params: params)
+        if (missingPaymentMethodError != nil) {
+            resolve(missingPaymentMethodError)
             return
         }
-
+        
         if (paymentMethodType == .FPX) {
             let testOfflineBank = paymentMethodData?["testOfflineBank"] as? Bool
             if (testOfflineBank == false || testOfflineBank == nil) {
@@ -831,10 +832,24 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
             STPPaymentHandler.shared().confirmPayment(paymentIntentParams, with: self, completion: onCompleteConfirmPayment)
         }
     }
+    
+    func getPaymentMethodType(
+        params: NSDictionary?
+    ) -> (NSDictionary?, STPPaymentMethodType?) {
+        if let params = params {
+            guard let paymentMethodType = Mappers.mapToPaymentMethodType(type: params["paymentMethodType"] as? String) else {
+                return (Errors.createError(ErrorType.Failed, "You must provide paymentMethodType"), nil)
+            }
+            return (nil, paymentMethodType)
+        } else {
+            // If params aren't provided, it means we expect that the payment method was attached on the server side
+            return (nil, nil)
+        }
+    }
 
     func createPaymentIntentParams(
         paymentIntentClientSecret: String,
-        paymentMethodType: STPPaymentMethodType,
+        paymentMethodType: STPPaymentMethodType?,
         paymentMethodData: NSDictionary?,
         options: NSDictionary
     ) -> (NSDictionary?, STPPaymentIntentParams) {
@@ -846,6 +861,8 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
             if (paymentMethodType == .USBankAccount && paymentMethodData == nil) {
                 return STPPaymentIntentParams(clientSecret: paymentIntentClientSecret, paymentMethodType: .USBankAccount)
             } else {
+                guard let paymentMethodType = paymentMethodType else { return STPPaymentIntentParams(clientSecret: paymentIntentClientSecret) }
+                
                 let paymentMethodId = paymentMethodData?["paymentMethodId"] as? String
                 let parameters = STPPaymentIntentParams(clientSecret: paymentIntentClientSecret)
 
@@ -1023,7 +1040,33 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
         }
         resolve(["isInWallet": PushProvisioningUtils.passExistsWith(last4: last4)])
     }
-
+    
+    @objc(collectBankAccountToken:resolver:rejecter:)
+    func collectBankAccountToken(
+        clientSecret: String,
+        resolver resolve: @escaping RCTPromiseResolveBlock,
+        rejecter reject: @escaping RCTPromiseRejectBlock
+    ) -> Void {
+        if (STPAPIClient.shared.publishableKey == nil) {
+            resolve(Errors.MISSING_INIT_ERROR)
+            return
+        }
+        FinancialConnections.presentForToken(withClientSecret: clientSecret, resolve: resolve)
+    }
+    
+    @objc(collectFinancialConnectionsAccounts:resolver:rejecter:)
+    func collectFinancialConnectionsAccounts(
+        clientSecret: String,
+        resolver resolve: @escaping RCTPromiseResolveBlock,
+        rejecter reject: @escaping RCTPromiseRejectBlock
+    ) -> Void {
+        if (STPAPIClient.shared.publishableKey == nil) {
+            resolve(Errors.MISSING_INIT_ERROR)
+            return
+        }
+        FinancialConnections.present(withClientSecret: clientSecret, resolve: resolve)
+    }
+    
     func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
         confirmPaymentResolver?(Errors.createError(ErrorType.Canceled, "FPX Payment has been canceled"))
     }