@stripe/stripe-react-native 0.2.3 → 0.4.0

package/android/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.s

@@ -1 +1 @@
-����
+��������������

package/android/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s

@@ -1 +1 @@
-ǥ
ؘ
М
�
ݔ
�
�
ԗ
�
�

+ޫ
ʒ
�w�l�j�j�l�l�j�j�j�j�j�j�k�j�o�n�n

package/android/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-62
-39
+67
+43

package/android/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +1 @@
-�r�K�A�5�5�=�1�+�3�%�#�3�&�(�/���:���0�J��<� �=�3�2�<
+�x�l�b�N�J�c�6�C�@�=�?�0�>�0�:�)�8��0�$�+�%�)��&���%� ��$�!��!�#��-��/��'�$�

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,25 +1,25 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml:1:1-3:12
+ADDED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml:1:1-3:12
+INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml:1:1-3:12
+INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml:1:1-3:12
 	package
-		ADDED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml:2:11-45
-		INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml:2:11-45
+		INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml:1:11-69
+		ADDED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml:1:11-69
 uses-sdk
-INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
-INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
-INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
-INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
-		ADDED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
-		ADDED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/michelleb/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/charliecruzan/stripe/stripe-react-native/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.2.1'
+    classpath 'com.android.tools.build:gradle:4.2.2'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -132,9 +132,9 @@ dependencies {
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
-  implementation 'com.stripe:stripe-android:18.1.0'
+  implementation 'com.stripe:stripe-android:19.2.+'
   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'
-  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
 }

package/android/gradle.properties

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

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

@@ -36,6 +36,9 @@ internal class CardChangedEvent constructor(viewTag: Int, private val cardDetail
     }
 
     eventData.putBoolean("complete", complete)
+    eventData.putString("validNumber", cardDetails["validNumber"]?.toString())
+    eventData.putString("validCVC", cardDetails["validCVC"]?.toString())
+    eventData.putString("validExpiryDate", cardDetails["validExpiryDate"]?.toString())
 
     if (postalCodeEnabled) {
       eventData.putString("postalCode", cardDetails["postalCode"]?.toString())

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

@@ -4,7 +4,6 @@ var ON_PAYMENT_RESULT_ACTION = "com.reactnativestripesdk.PAYMENT_RESULT_ACTION"
 var ON_PAYMENT_OPTION_ACTION = "com.reactnativestripesdk.PAYMENT_OPTION_ACTION"
 var ON_CONFIGURE_FLOW_CONTROLLER = "com.reactnativestripesdk.CONFIGURE_FLOW_CONTROLLER_ACTION"
 var ON_INIT_PAYMENT_SHEET = "com.reactnativestripesdk.INIT_PAYMENT_SHEET"
-var ON_FRAGMENT_CREATED = "com.reactnativestripesdk.FRAGMENT_CREATED_ACTION"
 
 var ON_GOOGLE_PAY_FRAGMENT_CREATED = "com.reactnativestripesdk.ON_GOOGLE_PAY_FRAGMENT_CREATED"
 var ON_INIT_GOOGLE_PAY = "com.reactnativestripesdk.ON_INIT_GOOGLE_PAY"

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

@@ -2,10 +2,10 @@ package com.reactnativestripesdk
 
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
-import com.stripe.android.exception.APIException
+import com.stripe.android.core.exception.APIException
 import com.stripe.android.exception.AuthenticationException
 import com.stripe.android.exception.CardException
-import com.stripe.android.exception.InvalidRequestException
+import com.stripe.android.core.exception.InvalidRequestException
 import com.stripe.android.model.PaymentIntent
 import com.stripe.android.model.SetupIntent
 

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

@@ -0,0 +1,44 @@
+package com.reactnativestripesdk
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import com.facebook.react.bridge.Promise
+import com.stripe.android.googlepaylauncher.GooglePayEnvironment
+import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
+
+class GooglePayPaymentMethodLauncherFragment(
+  private val activity: AppCompatActivity,
+  private val isTestEnv: Boolean,
+  private val paymentMethodRequired: Boolean,
+  private val promise: Promise
+  ) : Fragment() {
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                            savedInstanceState: Bundle?): View? {
+    return FrameLayout(requireActivity()).also {
+      it.visibility = View.GONE
+    }
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    GooglePayPaymentMethodLauncher(
+      this,
+      config = GooglePayPaymentMethodLauncher.Config(
+        environment = if (isTestEnv) GooglePayEnvironment.Test else GooglePayEnvironment.Production,
+        existingPaymentMethodRequired = paymentMethodRequired,
+        merchantCountryCode = "", // Unnecessary since all we are checking for is Google Pay availability
+        merchantName = "",        // Same as above
+      ),
+      readyCallback = {
+        promise.resolve(it)
+        activity.supportFragmentManager.beginTransaction().remove(this).commit()
+      },
+      resultCallback = {}
+    )
+  }
+}

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

@@ -103,6 +103,7 @@ internal fun mapPaymentMethodType(type: PaymentMethod.Type?): String {
     PaymentMethod.Type.Sofort -> "Sofort"
     PaymentMethod.Type.Upi -> "Upi"
     PaymentMethod.Type.WeChatPay -> "WeChatPay"
+    PaymentMethod.Type.Klarna -> "Klarna"
     else -> "Unknown"
   }
 }
@@ -128,6 +129,7 @@ internal fun mapToPaymentMethodType(type: String?): PaymentMethod.Type? {
     "Sofort" -> PaymentMethod.Type.Sofort
     "Upi" -> PaymentMethod.Type.Upi
     "WeChatPay" -> PaymentMethod.Type.WeChatPay
+    "Klarna" -> PaymentMethod.Type.Klarna
     else -> null
   }
 }
@@ -171,6 +173,14 @@ internal fun mapFromBankAccountType(type: BankAccount.Type?): String {
   }
 }
 
+internal fun mapToBankAccountType(type: String?): BankAccountTokenParams.Type {
+  return when (type) {
+    "Company" -> BankAccountTokenParams.Type.Company
+    "Individual" -> BankAccountTokenParams.Type.Individual
+    else -> BankAccountTokenParams.Type.Individual
+  }
+}
+
 internal fun mapFromBankAccountStatus(status: BankAccount.Status?): String {
   return when (status) {
     BankAccount.Status.Errored -> "Errored"
@@ -419,32 +429,35 @@ internal fun mapToAddress(addressMap: ReadableMap?, cardAddress: Address?): Addr
 }
 
 internal fun mapToBillingDetails(billingDetails: ReadableMap?, cardAddress: Address?): PaymentMethod.BillingDetails? {
-  if (billingDetails == null) {
+  if (billingDetails == null && cardAddress == null) {
     return null
   }
-  val address = Address.Builder()
-    .setPostalCode(getValOr(billingDetails, "addressPostalCode"))
-    .setCity(getValOr(billingDetails, "addressCity"))
-    .setCountry(getValOr(billingDetails, "addressCountry"))
-    .setLine1(getValOr(billingDetails, "addressLine1"))
-    .setLine2(getValOr(billingDetails, "addressLine2"))
-    .setState(getValOr(billingDetails, "addressState"))
+  val addressBuilder = Address.Builder()
+  val paymentMethodBillingDetailsBuilder =  PaymentMethod.BillingDetails.Builder()
 
-    cardAddress?.let { ca ->
-      ca.postalCode?.let {
-        address.setPostalCode(it)
-      }
-      ca.country?.let {
-        address.setCountry(it)
-      }
-    }
+  if (billingDetails != null) {
+    addressBuilder
+      .setPostalCode(getValOr(billingDetails, "addressPostalCode"))
+      .setCity(getValOr(billingDetails, "addressCity"))
+      .setCountry(getValOr(billingDetails, "addressCountry"))
+      .setLine1(getValOr(billingDetails, "addressLine1"))
+      .setLine2(getValOr(billingDetails, "addressLine2"))
+      .setState(getValOr(billingDetails, "addressState"))
+    paymentMethodBillingDetailsBuilder
+      .setName(getValOr(billingDetails, "name"))
+      .setPhone(getValOr(billingDetails, "phone"))
+      .setEmail(getValOr(billingDetails, "email"))
+  }
+
+  if (cardAddress?.postalCode?.isNotEmpty() == true) {
+    addressBuilder.setPostalCode(cardAddress.postalCode)
+  }
+  if (cardAddress?.country?.isNotEmpty() == true) {
+    addressBuilder.setCountry(cardAddress.country)
+  }
 
-  return PaymentMethod.BillingDetails.Builder()
-    .setAddress(address.build())
-    .setName(getValOr(billingDetails, "name"))
-    .setPhone(getValOr(billingDetails, "phone"))
-    .setEmail(getValOr(billingDetails, "email"))
-    .build()
+  paymentMethodBillingDetailsBuilder.setAddress(addressBuilder.build())
+  return paymentMethodBillingDetailsBuilder.build()
 }
 
 internal fun mapToShippingDetails(shippingDetails: ReadableMap?): ConfirmPaymentIntentParams.Shipping? {