@stripe/stripe-react-native 0.11.0 → 0.13.1

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

@@ -31,9 +31,9 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
   private var stripeAccountId: String? = null
   private var urlScheme: String? = null
 
-  private lateinit var paymentLauncherFragment: PaymentLauncherFragment
   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
@@ -44,7 +44,7 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
         // 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)
+        paymentLauncherFragment?.activity?.activityResultRegistry?.dispatchResult(requestCode, resultCode, data)
         // END
         try {
           val result = AddPaymentMethodActivityStarter.Result.fromIntent(data)
@@ -110,19 +110,7 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     stripe = Stripe(reactApplicationContext, publishableKey, stripeAccountId)
 
     PaymentConfiguration.init(reactApplicationContext, publishableKey, stripeAccountId)
-
-    paymentLauncherFragment = PaymentLauncherFragment(stripe, publishableKey, stripeAccountId)
-    getCurrentActivityOrResolveWithError(promise)?.let {
-      try {
-        it.supportFragmentManager.beginTransaction()
-          .add(paymentLauncherFragment, "payment_launcher_fragment")
-          .commit()
-      } catch (error: IllegalStateException) {
-        promise.resolve(createError(ErrorType.Failed.toString(), error.message))
-      }
-
-      promise.resolve(null)
-    }
+    promise.resolve(null)
   }
 
   @ReactMethod
@@ -166,13 +154,17 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     when (result) {
       is AddPaymentMethodActivityStarter.Result.Success -> {
         if (confirmPaymentClientSecret != null && confirmPromise != null) {
-          paymentLauncherFragment.confirm(
+          paymentLauncherFragment = PaymentLauncherFragment.forPayment(
+            context = reactApplicationContext,
+            stripe,
+            publishableKey,
+            stripeAccountId,
+            confirmPromise!!,
+            confirmPaymentClientSecret!!,
             ConfirmPaymentIntentParams.createWithPaymentMethodId(
               result.paymentMethod.id!!,
               confirmPaymentClientSecret!!
-            ),
-            confirmPaymentClientSecret!!,
-            confirmPromise!!
+            )
           )
         } else {
           Log.e("StripeReactNative", "FPX payment failed. Promise and/or client secret is not set.")
@@ -230,12 +222,30 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
       "Card" -> {
         createTokenFromCard(params, promise)
       }
+      "Pii" -> {
+        createTokenFromPii(params, promise)
+      }
       else -> {
         promise.resolve(createError(CreateTokenErrorType.Failed.toString(), "$type type is not supported yet"))
       }
     }
   }
 
+  private fun createTokenFromPii(params: ReadableMap, promise: Promise) {
+    getValOr(params, "personalId", null)?.let {
+      CoroutineScope(Dispatchers.IO).launch {
+        runCatching {
+          val token = stripe.createPiiToken(it, null, stripeAccountId)
+          promise.resolve(createResult("token", mapFromToken(token)))
+        }.onFailure {
+          promise.resolve(createError(CreateTokenErrorType.Failed.toString(), it.message))
+        }
+      }
+    } ?: run {
+      promise.resolve(createError(CreateTokenErrorType.Failed.toString(), "personalId parameter is required"))
+    }
+  }
+
   private fun createTokenFromBankAccount(params: ReadableMap, promise: Promise) {
     val accountHolderName = getValOr(params, "accountHolderName", null)
     val accountHolderType = getValOr(params, "accountHolderType", null)
@@ -316,9 +326,13 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
 
   @ReactMethod
   fun handleNextAction(paymentIntentClientSecret: String, promise: Promise) {
-    paymentLauncherFragment.handleNextActionForPaymentIntent(
-      paymentIntentClientSecret,
-      promise
+    paymentLauncherFragment = PaymentLauncherFragment.forNextAction(
+      context = reactApplicationContext,
+      stripe,
+      publishableKey,
+      stripeAccountId,
+      promise,
+      paymentIntentClientSecret
     )
   }
 
@@ -376,10 +390,14 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
         confirmParams.returnUrl = mapToReturnURL(urlScheme)
       }
       confirmParams.shipping = mapToShippingDetails(getMapOrNull(paymentMethodData, "shippingDetails"))
-      paymentLauncherFragment.confirm(
-        confirmParams,
+      paymentLauncherFragment = PaymentLauncherFragment.forPayment(
+        context = reactApplicationContext,
+        stripe,
+        publishableKey,
+        stripeAccountId,
+        promise,
         paymentIntentClientSecret,
-        promise
+        confirmParams
       )
     } catch (error: PaymentMethodCreateParamsException) {
       promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), error))
@@ -424,10 +442,14 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
       urlScheme?.let {
         confirmParams.returnUrl = mapToReturnURL(urlScheme)
       }
-      paymentLauncherFragment.confirm(
-        confirmParams,
+      paymentLauncherFragment = PaymentLauncherFragment.forSetup(
+        context = reactApplicationContext,
+        stripe,
+        publishableKey,
+        stripeAccountId,
+        promise,
         setupIntentClientSecret,
-        promise
+        confirmParams
       )
     } catch (error: PaymentMethodCreateParamsException) {
       promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), error))

package/ios/CardFieldManager.m

@@ -4,6 +4,7 @@
 
 @interface RCT_EXTERN_MODULE(CardFieldManager, RCTViewManager)
 RCT_EXPORT_VIEW_PROPERTY(postalCodeEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(countryCode, NSString)
 RCT_EXPORT_VIEW_PROPERTY(onCardChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onFocusChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(cardStyle, NSDictionary)

package/ios/CardFieldView.swift

@@ -18,6 +18,12 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
         }
     }
     
+    @objc var countryCode: String? {
+        didSet {
+            cardField.countryCode = countryCode
+        }
+    }
+    
     @objc var placeholders: NSDictionary = NSDictionary() {
         didSet {
             if let numberPlaceholder = placeholders["number"] as? String {

package/ios/Mappers.swift

@@ -157,7 +157,6 @@ class Mappers {
             "card": mapFromCard(token.card) ?? NSNull(),
             "livemode": token.livemode,
             "type": mapFromTokenType(token.type) ?? NSNull(),
-
         ]
 
         return tokenMap
@@ -498,7 +497,7 @@ class Mappers {
         billing.name = RCTConvert.nsString(billingDetails["name"])
 
         let address = STPPaymentMethodAddress()
-        
+
         if let addressMap = billingDetails["address"] as? NSDictionary {
             address.city = RCTConvert.nsString(addressMap["city"])
             address.postalCode = RCTConvert.nsString(addressMap["postalCode"])
@@ -507,7 +506,7 @@ class Mappers {
             address.line2 = RCTConvert.nsString(addressMap["line2"])
             address.state = RCTConvert.nsString(addressMap["state"])
         }
-        
+
         billing.address = address
 
         return billing
@@ -517,7 +516,7 @@ class Mappers {
         guard let shippingDetails = shippingDetails else {
             return nil
         }
-        
+
         let shippingAddress = STPPaymentIntentShippingDetailsAddressParams(line1: "")
 
         if let addressMap = shippingDetails["address"] as? NSDictionary {
@@ -528,7 +527,7 @@ class Mappers {
             shippingAddress.line2 = addressMap["line2"] as? String
             shippingAddress.state = addressMap["state"] as? String
         }
-        
+
         let shipping = STPPaymentIntentShippingDetailsParams(address: shippingAddress, name: shippingDetails["name"] as? String ?? "")
 
         return shipping
@@ -568,7 +567,7 @@ class Mappers {
         }
         return nil
     }
-    
+
     class func mapToCardBrand(_ brand: String?) -> STPCardBrand {
         if let brand = brand {
             switch brand {
@@ -722,7 +721,7 @@ class Mappers {
         if let lastSetupError = setupIntent.lastSetupError {
             let setupError: NSMutableDictionary = [
                 "code": lastSetupError.code ?? NSNull(),
-                "message": lastSetupError.description,
+                "message": lastSetupError.message ?? NSNull(),
                 "type": mapFromSetupIntentLastPaymentErrorType(lastSetupError.type) ?? NSNull(),
                 "declineCode": lastSetupError.declineCode ?? NSNull(),
                 "paymentMethod": mapFromPaymentMethod(lastSetupError.paymentMethod) ?? NSNull()
@@ -962,7 +961,7 @@ class Mappers {
         }
         return "Unknown"
     }
-    
+
     class func mapToUSBankAccountHolderType(type: String?) -> STPPaymentMethodUSBankAccountHolderType {
         switch type {
             case "Company": return STPPaymentMethodUSBankAccountHolderType.company
@@ -981,7 +980,7 @@ class Mappers {
         }
         return "Unknown"
     }
-    
+
     class func mapToUSBankAccountType(type: String?) -> STPPaymentMethodUSBankAccountType {
         switch type {
             case "Savings": return STPPaymentMethodUSBankAccountType.savings

package/ios/PaymentSheetAppearance.swift

@@ -77,12 +77,12 @@ extension StripeSdk {
         if let opacity = params[PaymentSheetAppearanceKeys.OPACITY] as? CGFloat {
             shadow.opacity = opacity
         }
-        if let radius = params[PaymentSheetAppearanceKeys.BORDER_RADIUS] as? CGFloat {
+        if let radius = params[PaymentSheetAppearanceKeys.BLUR_RADIUS] as? CGFloat {
             shadow.radius = radius
         }
         if let offsetParams = params[PaymentSheetAppearanceKeys.OFFSET] as? NSDictionary {
             if let x = offsetParams[PaymentSheetAppearanceKeys.X] as? CGFloat, let y = offsetParams[PaymentSheetAppearanceKeys.Y] as? CGFloat {
-                shadow.offset = CGSize(width: x, height:y)
+                shadow.offset = CGSize(width: x, height:-y)
             }
         }
 
@@ -199,6 +199,7 @@ private struct PaymentSheetAppearanceKeys {
     static let SHADOW_COLOR = "color"
     static let OPACITY = "opacity"
     static let OFFSET = "offset"
+    static let BLUR_RADIUS = "blurRadius"
     static let X = "x"
     static let Y = "y"