WIP: Wechat Pay (#422)

* chore: wechat ios implementation

* chore: use different keys

* fix: confirming payment

* chore: android binding, upgrade kotlin, upgrade gradle

* chore: move wechat deps the the example app

* chore: add tests, refactor android implementation

* chore: clean up

Co-authored-by: Arkadiusz Kubaczkowski <arek.kubaczkowski@callstak.com>

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.2'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -131,7 +131,8 @@ dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation 'com.stripe:stripe-android:16.10.2'
+  implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
+  implementation 'com.stripe:stripe-android:17.1.0'
   implementation 'com.google.android.material:material:1.3.0'
   implementation 'androidx.appcompat:appcompat:1.2.0'
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'

android/gradle.properties

@@ -1,4 +1,4 @@
-StripeSdk_kotlinVersion=1.4.32
+StripeSdk_kotlinVersion=1.5.10
 StripeSdk_compileSdkVersion=28
 StripeSdk_buildToolsVersion=28.0.3
 StripeSdk_targetSdkVersion=28

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

@@ -100,6 +100,7 @@ internal fun mapPaymentMethodType(type: PaymentMethod.Type?): String {
     PaymentMethod.Type.SepaDebit -> "SepaDebit"
     PaymentMethod.Type.Sofort -> "Sofort"
     PaymentMethod.Type.Upi -> "Upi"
+    PaymentMethod.Type.WeChatPay -> "WeChatPay"
     else -> "Unknown"
   }
 }
@@ -124,6 +125,7 @@ internal fun mapToPaymentMethodType(type: String?): PaymentMethod.Type? {
     "SepaDebit" -> PaymentMethod.Type.SepaDebit
     "Sofort" -> PaymentMethod.Type.Sofort
     "Upi" -> PaymentMethod.Type.Upi
+    "WeChatPay" -> PaymentMethod.Type.WeChatPay
     else -> null
   }
 }

android/src/main/java/com/reactnativestripesdk/PaymentMethodCreateParamsFactory.kt

@@ -3,7 +3,11 @@ package com.reactnativestripesdk
 import com.facebook.react.bridge.ReadableMap
 import com.stripe.android.model.*
 
-class PaymentMethodCreateParamsFactory(private val clientSecret: String, private val params: ReadableMap, private val urlScheme: String?, cardParams: PaymentMethodCreateParams.Card?) {
+class PaymentMethodCreateParamsFactory(
+  private val clientSecret: String,
+  private val params: ReadableMap,
+  cardParams: PaymentMethodCreateParams.Card?
+) {
   private val billingDetailsParams = mapToBillingDetails(getMapOrNull(params, "billingDetails"))
   private val cardParams = cardParams
 
@@ -58,15 +62,15 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
     val bankName = getValOr(params, "bankName", null)
 
     val idealParams = PaymentMethodCreateParams.Ideal(bankName)
-    val createParams = PaymentMethodCreateParams.create(ideal = idealParams, billingDetails = billingDetailsParams)
+    val createParams =
+      PaymentMethodCreateParams.create(ideal = idealParams, billingDetails = billingDetailsParams)
     val setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(params, "setupFutureUsage"))
 
     return ConfirmPaymentIntentParams
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = createParams,
         clientSecret = clientSecret,
         setupFutureUsage = setupFutureUsage,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -82,7 +86,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -99,14 +102,14 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
 
     if (paymentMethodId != null) {
       val cvc = getValOr(params, "cvc", null)
-      val paymentMethodOptionParams = if (cvc != null) PaymentMethodOptionsParams.Card(cvc) else null
+      val paymentMethodOptionParams =
+        if (cvc != null) PaymentMethodOptionsParams.Card(cvc) else null
 
       return ConfirmPaymentIntentParams.createWithPaymentMethodId(
         paymentMethodId = paymentMethodId,
         paymentMethodOptions = paymentMethodOptionParams,
         clientSecret = clientSecret,
         setupFutureUsage = setupFutureUsage,
-        returnUrl = mapToReturnURL(urlScheme)
       )
     } else {
       var card = cardParams
@@ -119,7 +122,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
           paymentMethodCreateParams = paymentMethodCreateParams,
           clientSecret = clientSecret,
           setupFutureUsage = setupFutureUsage,
-          returnUrl = mapToReturnURL(urlScheme)
         )
     }
   }
@@ -129,12 +131,12 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
     val bankName = getValOr(params, "bankName", null)
 
     val idealParams = PaymentMethodCreateParams.Ideal(bankName)
-    val createParams = PaymentMethodCreateParams.create(ideal = idealParams, billingDetails = billingDetailsParams)
+    val createParams =
+      PaymentMethodCreateParams.create(ideal = idealParams, billingDetails = billingDetailsParams)
 
     return ConfirmSetupIntentParams.create(
       paymentMethodCreateParams = createParams,
       clientSecret = clientSecret,
-      returnUrl = mapToReturnURL(urlScheme)
     )
   }
 
@@ -148,7 +150,8 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
     }
 
     val sepaParams = PaymentMethodCreateParams.SepaDebit(iban)
-    val createParams = PaymentMethodCreateParams.create(sepaDebit = sepaParams, billingDetails = billingDetails)
+    val createParams =
+      PaymentMethodCreateParams.create(sepaDebit = sepaParams, billingDetails = billingDetails)
 
     return ConfirmSetupIntentParams.create(
       paymentMethodCreateParams = createParams,
@@ -158,7 +161,8 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createCardPaymentSetupParams(): ConfirmSetupIntentParams {
-    val paymentMethodCreateParams = PaymentMethodCreateParams.create(cardParams!!, billingDetailsParams)
+    val paymentMethodCreateParams =
+      PaymentMethodCreateParams.create(cardParams!!, billingDetailsParams)
     return ConfirmSetupIntentParams
       .create(paymentMethodCreateParams, clientSecret)
   }
@@ -185,7 +189,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
         setupFutureUsage = setupFutureUsage,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -202,7 +205,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
     return ConfirmSetupIntentParams.create(
       paymentMethodCreateParams = params,
       clientSecret = clientSecret,
-      returnUrl = mapToReturnURL(urlScheme)
     )
   }
 
@@ -215,7 +217,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -233,7 +234,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
         setupFutureUsage = setupFutureUsage,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -248,7 +248,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
       .create(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -264,7 +263,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -280,7 +278,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -296,7 +293,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -333,7 +329,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -349,7 +344,6 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -370,15 +364,17 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
       .build()
 
     val params = PaymentMethodCreateParams.create(
-      auBecsDebit = PaymentMethodCreateParams.AuBecsDebit(bsbNumber = bsbNumber, accountNumber = accountNumber),
+      auBecsDebit = PaymentMethodCreateParams.AuBecsDebit(
+        bsbNumber = bsbNumber,
+        accountNumber = accountNumber
+      ),
       billingDetails = billingDetails
     )
 
     return ConfirmPaymentIntentParams
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 
@@ -399,15 +395,17 @@ class PaymentMethodCreateParamsFactory(private val clientSecret: String, private
       .build()
 
     val params = PaymentMethodCreateParams.create(
-      auBecsDebit = PaymentMethodCreateParams.AuBecsDebit(bsbNumber = bsbNumber, accountNumber = accountNumber),
+      auBecsDebit = PaymentMethodCreateParams.AuBecsDebit(
+        bsbNumber = bsbNumber,
+        accountNumber = accountNumber
+      ),
       billingDetails = billingDetails
     )
 
     return ConfirmSetupIntentParams
       .create(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        returnUrl = mapToReturnURL(urlScheme)
       )
   }
 }