@stripe/stripe-react-native 0.56.0 → 0.57.1

package/android/build.gradle

@@ -1,10 +1,10 @@
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion')
-    ? rootProject.ext.get('kotlinVersion')
-    : project.properties['StripeSdk_kotlinVersion']
+  def kotlinVersion = rootProject.ext.has("kotlinVersion")
+    ? rootProject.ext.get("kotlinVersion")
+    : project.properties["StripeSdk_kotlinVersion"]
 
-  def kotlinMajor = kotlin_version.tokenize('\\.')[0].toInteger()
+  def kotlinMajor = kotlinVersion.tokenize("\\.")[0].toInteger()
 
   repositories {
     google()
@@ -12,28 +12,28 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.2.2'
+    classpath "com.android.tools.build:gradle:7.2.2"
     // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+    classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
     // only use this old compose-compiler plugin when Kotlin >= 2.0
     if (kotlinMajor >= 2) {
-      classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlin_version"
+      classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion"
     }
   }
 }
 
 if (project == rootProject) {
-  apply from: 'spotless.gradle'
+  apply from: "spotless.gradle"
   return
 }
 
 def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['StripeSdk_' + name]
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["StripeSdk_" + name]
 }
 
 def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['StripeSdk_' + name]).toInteger()
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["StripeSdk_" + name]).toInteger()
 }
 
 def isNewArchitectureEnabled() {
@@ -44,6 +44,11 @@ def isNewArchitectureEnabled() {
   return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
 
+def isOnrampIncluded() {
+  return rootProject.ext.has("StripeSdk_includeOnramp") &&
+    rootProject.ext.StripeSdk_includeOnramp.toString().toLowerCase() == "true"
+}
+
 def reactNativeArchitectures() {
   def value = project.getProperties().get("reactNativeArchitectures")
   return value ? value.split(",") : [
@@ -54,22 +59,19 @@ def reactNativeArchitectures() {
   ]
 }
 
-def kotlin_version = rootProject.ext.has('kotlinVersion')
-    ? rootProject.ext.get('kotlinVersion')
-    : project.properties['StripeSdk_kotlinVersion']
-def kotlinMajor = kotlin_version.tokenize('\\.')[0].toInteger()
+def kotlinVersion = getExtOrDefault("kotlinVersion")
+def kotlinMajor = kotlinVersion.tokenize("\\.")[0].toInteger()
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+apply plugin: "kotlin-parcelize"
 // Only apply the compose plugin if we have the old compose-compiler on the classpath
 if (kotlinMajor >= 2) {
-  apply plugin: 'org.jetbrains.kotlin.plugin.compose'
+  apply plugin: "org.jetbrains.kotlin.plugin.compose"
 }
-//apply plugin: 'kotlin-android-extensions'
 
 if (isNewArchitectureEnabled()) {
-  apply plugin: 'com.facebook.react'
+  apply plugin: "com.facebook.react"
 }
 
 android {
@@ -78,7 +80,7 @@ android {
     buildConfig true
   }
 
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   // Used to override the NDK path/version on internal CI or by allowing
   // users to customize the NDK path/version from their root project (e.g. for M1 support)
@@ -90,28 +92,24 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion getExtOrIntegerDefault('minSdkVersion')
-    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     versionCode 1
     versionName "1.0"
     vectorDrawables.useSupportLibrary = true
-    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    consumerProguardFiles 'proguard-rules.txt'
+    consumerProguardFiles "proguard-rules.txt"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+    buildConfigField "boolean", "IS_ONRAMP_INCLUDED", isOnrampIncluded().toString()
 
     ndk {
       abiFilters(*reactNativeArchitectures())
     }
   }
 
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
-  }
-
   lintOptions {
-    disable 'GradleCompatible'
+    disable "GradleCompatible"
+    textReport true
+    textOutput "stdout"
   }
 
   compileOptions {
@@ -119,6 +117,10 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  kotlinOptions {
+    allWarningsAsErrors = System.getenv("RN_STRIPE_WARNINGS_AS_ERRORS") == "true"
+  }
+
   buildFeatures {
     viewBinding true
     compose true
@@ -129,6 +131,19 @@ android {
       if (!isNewArchitectureEnabled()) {
         srcDirs += ["src/oldarch/java"]
       }
+      if (isOnrampIncluded()) {
+        srcDirs += ["src/onramp/java"]
+      }
+    }
+  }
+
+  // When running tests on bitrise we need to make sure that the test artifacts are inside
+  // the root project directory (in that case example/android), or it won't be picked up.
+  testOptions {
+    unitTests.all { Test test ->
+      def outputRoot = rootProject.layout.buildDirectory.get().asFile
+      test.reports.junitXml.outputLocation.set(new File(outputRoot, "test-results/${test.name}"))
+      test.reports.html.outputLocation.set(new File(outputRoot, "reports/tests/${test.name}"))
     }
   }
 }
@@ -136,104 +151,47 @@ android {
 repositories {
   mavenCentral()
   google()
-
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-      projectDir,
-      '/../../../node_modules/react-native/android'
-    )
-  }
-
-  if (defaultDir.exists()) {
-    maven {
-      url defaultDir.toString()
-      name androidSourcesName
-    }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
-
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
-
-      def androidSourcesDir = new File(
-        parentDir,
-        'node_modules/react-native'
-      )
-
-      def androidPrebuiltBinaryDir = new File(
-        parentDir,
-        'node_modules/react-native/android'
-      )
-
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-        found = true
-      }
-    })
-  }
-
-  if (!found) {
-    throw new GradleException(
-      "${project.name}: unable to locate React Native android sources. " +
-        "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
-  }
 }
 
-def stripe_version = getExtOrDefault('stripeVersion')
+def stripeVersion = getExtOrDefault("stripeVersion")
 
 dependencies {
   // noinspection GradleDynamicVersion
-  api 'com.facebook.react:react-native:+'
-  implementation 'com.github.bumptech.glide:glide:4.12.0'
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  api "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
   implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
-  implementation("com.stripe:stripe-android:$stripe_version") {
-    exclude group: 'androidx.emoji2', module: 'emoji2'
-  }
-  implementation("com.stripe:financial-connections:$stripe_version") {
-    exclude group: 'androidx.emoji2', module: 'emoji2'
-  }
-  implementation('androidx.emoji2:emoji2:1.3.0').force // Avoid using 1.4.0 since that requires targetSdkVersion 34
-  implementation 'com.google.android.material:material:1.3.0'
-  implementation 'androidx.appcompat:appcompat:1.4.1'
-  implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
+  implementation("com.stripe:stripe-android:$stripeVersion")
+  implementation("com.stripe:financial-connections:$stripeVersion")
+  
+  if (isOnrampIncluded()) {
+    implementation("com.stripe:crypto-onramp:$stripeVersion")
+  }
+  
+  implementation "com.google.android.material:material:1.3.0"
+  implementation "androidx.appcompat:appcompat:1.4.1"
+  implementation "androidx.legacy:legacy-support-v4:1.0.0"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"
+  implementation "androidx.browser:browser:1.8.0"
 
   // play-services-wallet is already included in stripe-android
   compileOnly "com.google.android.gms:play-services-wallet:19.3.0"
 
   // Users need to declare this dependency on their own, otherwise all methods are a no-op
-  compileOnly 'com.stripe:stripe-android-issuing-push-provisioning:1.1.0'
+  compileOnly "com.stripe:stripe-android-issuing-push-provisioning:1.1.0"
 
-  androidTestImplementation "junit:junit:4.13"
-  androidTestImplementation "androidx.test:core:1.4.0"
-  androidTestImplementation 'androidx.test:runner:1.1.0'
-  androidTestImplementation "org.mockito:mockito-core:3.+"
+  testImplementation "junit:junit:4.13"
+  testImplementation "org.mockito:mockito-core:3.+"
+  testImplementation "org.robolectric:robolectric:4.10"
+  testImplementation "androidx.test:core:1.4.0"
 
   implementation "androidx.compose.ui:ui:1.7.8"
   implementation "androidx.compose.foundation:foundation-layout:1.7.8"
 }
+
+def lintRulesJar = file("$projectDir/lint-rules/build/libs/lint-rules-1.0.0.jar")
+if (lintRulesJar.exists()) {
+  dependencies {
+    lintChecks files(lintRulesJar)
+  }
+}
+

package/android/gradle.properties

@@ -3,4 +3,4 @@ StripeSdk_compileSdkVersion=30
 StripeSdk_targetSdkVersion=28
 StripeSdk_minSdkVersion=21
 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties
-StripeSdk_stripeVersion=21.29.+
+StripeSdk_stripeVersion=22.2.+

package/android/settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = 'stripe-react-native'
+include ':lint-rules'

package/android/spotless.gradle

@@ -11,7 +11,7 @@ allprojects {
 spotless {
     kotlin {
         target 'src/**/*.kt'
-        ktlint("1.5.0")
+        ktlint("1.5.0").setEditorConfigPath("$projectDir/../.editorconfig")
         trimTrailingWhitespace()
         indentWithSpaces()
         endWithNewline()

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

@@ -2,14 +2,15 @@ package com.reactnativestripesdk
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
-import android.graphics.Color
 import android.widget.FrameLayout
+import androidx.core.graphics.toColorInt
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
+import com.reactnativestripesdk.utils.getIntOr
 import com.reactnativestripesdk.utils.getIntOrNull
 import com.reactnativestripesdk.utils.getValOr
 import com.stripe.android.databinding.StripeBecsDebitWidgetBinding
@@ -41,31 +42,34 @@ class AuBECSDebitFormView(
     val textColor = getValOr(value, "textColor", null)
     val textErrorColor = getValOr(value, "textErrorColor", null)
     val placeholderColor = getValOr(value, "placeholderColor", null)
-    val fontSize = getIntOrNull(value, "fontSize")
-    val borderWidth = getIntOrNull(value, "borderWidth")
+    val fontSize = value.getIntOrNull("fontSize")
+    val borderWidth = value.getIntOrNull("borderWidth")
     val backgroundColor = getValOr(value, "backgroundColor", null)
     val borderColor = getValOr(value, "borderColor", null)
-    val borderRadius = getIntOrNull(value, "borderRadius") ?: 0
+    val borderRadius = value.getIntOr("borderRadius", 0)
 
     textColor?.let {
-      (binding.accountNumberEditText as StripeEditText).setTextColor(Color.parseColor(it))
-      (binding.bsbEditText as StripeEditText).setTextColor(Color.parseColor(it))
-      (binding.emailEditText as StripeEditText).setTextColor(Color.parseColor(it))
-      (binding.nameEditText).setTextColor(Color.parseColor(it))
+      val color = it.toColorInt()
+      (binding.accountNumberEditText as StripeEditText).setTextColor(color)
+      (binding.bsbEditText as StripeEditText).setTextColor(color)
+      (binding.emailEditText as StripeEditText).setTextColor(color)
+      (binding.nameEditText).setTextColor(color)
     }
 
     textErrorColor?.let {
-      (binding.accountNumberEditText as StripeEditText).setErrorColor(Color.parseColor(it))
-      (binding.bsbEditText as StripeEditText).setErrorColor(Color.parseColor(it))
-      (binding.emailEditText as StripeEditText).setErrorColor(Color.parseColor(it))
-      (binding.nameEditText).setErrorColor(Color.parseColor(it))
+      val color = it.toColorInt()
+      (binding.accountNumberEditText as StripeEditText).setErrorColor(color)
+      (binding.bsbEditText as StripeEditText).setErrorColor(color)
+      (binding.emailEditText as StripeEditText).setErrorColor(color)
+      (binding.nameEditText).setErrorColor(color)
     }
 
     placeholderColor?.let {
-      (binding.accountNumberEditText as StripeEditText).setHintTextColor(Color.parseColor(it))
-      (binding.bsbEditText as StripeEditText).setHintTextColor(Color.parseColor(it))
-      (binding.emailEditText as StripeEditText).setHintTextColor(Color.parseColor(it))
-      (binding.nameEditText).setHintTextColor(Color.parseColor(it))
+      val color = it.toColorInt()
+      (binding.accountNumberEditText as StripeEditText).setHintTextColor(color)
+      (binding.bsbEditText as StripeEditText).setHintTextColor(color)
+      (binding.emailEditText as StripeEditText).setHintTextColor(color)
+      (binding.nameEditText).setHintTextColor(color)
     }
 
     fontSize?.let {
@@ -83,12 +87,12 @@ class AuBECSDebitFormView(
           .build(),
       ).also { shape ->
         shape.strokeWidth = 0.0f
-        shape.strokeColor = ColorStateList.valueOf(Color.parseColor("#000000"))
-        shape.fillColor = ColorStateList.valueOf(Color.parseColor("#FFFFFF"))
+        shape.strokeColor = ColorStateList.valueOf("#000000".toColorInt())
+        shape.fillColor = ColorStateList.valueOf("#FFFFFF".toColorInt())
         borderWidth?.let { shape.strokeWidth = (it * 2).toFloat() }
-        borderColor?.let { shape.strokeColor = ColorStateList.valueOf(Color.parseColor(it)) }
+        borderColor?.let { shape.strokeColor = ColorStateList.valueOf(it.toColorInt()) }
         backgroundColor?.let {
-          shape.fillColor = ColorStateList.valueOf(Color.parseColor(it))
+          shape.fillColor = ColorStateList.valueOf(it.toColorInt())
         }
       }
   }

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

@@ -2,13 +2,13 @@ package com.reactnativestripesdk
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
-import android.graphics.Color
 import android.os.Build
 import android.text.Editable
 import android.text.InputFilter
 import android.text.TextWatcher
 import android.util.Log
 import android.widget.FrameLayout
+import androidx.core.graphics.toColorInt
 import androidx.core.os.LocaleListCompat
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.PixelUtil
@@ -19,6 +19,7 @@ import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import com.reactnativestripesdk.utils.PostalCodeUtilities
+import com.reactnativestripesdk.utils.getIntOr
 import com.reactnativestripesdk.utils.getIntOrNull
 import com.reactnativestripesdk.utils.getValOr
 import com.reactnativestripesdk.utils.hideSoftKeyboard
@@ -103,12 +104,12 @@ class CardFieldView(
   }
 
   fun setCardStyle(value: ReadableMap?) {
-    val borderWidth = getIntOrNull(value, "borderWidth")
+    val borderWidth = value.getIntOrNull("borderWidth")
     val backgroundColor = getValOr(value, "backgroundColor", null)
     val borderColor = getValOr(value, "borderColor", null)
-    val borderRadius = getIntOrNull(value, "borderRadius") ?: 0
+    val borderRadius = value.getIntOr("borderRadius", 0)
     val textColor = getValOr(value, "textColor", null)
-    val fontSize = getIntOrNull(value, "fontSize")
+    val fontSize = value.getIntOrNull("fontSize")
     val fontFamily = getValOr(value, "fontFamily")
     val placeholderColor = getValOr(value, "placeholderColor", null)
     val textErrorColor = getValOr(value, "textErrorColor", null)
@@ -123,19 +124,19 @@ class CardFieldView(
 
     textColor?.let {
       for (editTextBinding in bindings) {
-        editTextBinding.setTextColor(Color.parseColor(it))
+        editTextBinding.setTextColor(it.toColorInt())
       }
     }
     textErrorColor?.let {
       for (editTextBinding in bindings) {
-        editTextBinding.setErrorColor(Color.parseColor(it))
+        editTextBinding.setErrorColor(it.toColorInt())
       }
     }
     placeholderColor?.let {
       for (editTextBinding in bindings) {
-        editTextBinding.setHintTextColor(Color.parseColor(it))
+        editTextBinding.setHintTextColor(it.toColorInt())
       }
-      setCardBrandTint(Color.parseColor(it))
+      setCardBrandTint(it.toColorInt())
     }
     fontSize?.let {
       for (editTextBinding in bindings) {
@@ -157,7 +158,7 @@ class CardFieldView(
     }
     cursorColor?.let {
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        val color = Color.parseColor(it)
+        val color = it.toColorInt()
         for (editTextBinding in bindings) {
           editTextBinding.textCursorDrawable?.setTint(color)
           editTextBinding.textSelectHandle?.setTint(color)
@@ -177,16 +178,16 @@ class CardFieldView(
           .build(),
       ).also { shape ->
         shape.strokeWidth = 0.0f
-        shape.strokeColor = ColorStateList.valueOf(Color.parseColor("#000000"))
-        shape.fillColor = ColorStateList.valueOf(Color.parseColor("#FFFFFF"))
+        shape.strokeColor = ColorStateList.valueOf("#000000".toColorInt())
+        shape.fillColor = ColorStateList.valueOf("#FFFFFF".toColorInt())
         borderWidth?.let {
           shape.strokeWidth = PixelUtil.toPixelFromDIP(it.toDouble())
         }
         borderColor?.let {
-          shape.strokeColor = ColorStateList.valueOf(Color.parseColor(it))
+          shape.strokeColor = ColorStateList.valueOf(it.toColorInt())
         }
         backgroundColor?.let {
-          shape.fillColor = ColorStateList.valueOf(Color.parseColor(it))
+          shape.fillColor = ColorStateList.valueOf(it.toColorInt())
         }
       }
   }
@@ -233,7 +234,7 @@ class CardFieldView(
   fun setPostalCodeEnabled(isEnabled: Boolean) {
     mCardWidget.postalCodeEnabled = isEnabled
 
-    if (isEnabled == false) {
+    if (!isEnabled) {
       mCardWidget.postalCodeRequired = false
     }
   }
@@ -281,9 +282,10 @@ class CardFieldView(
       cardAddress = null
     }
 
-    mCardWidget.cardParams?.let {
-      cardDetails["brand"] = mapCardBrand(it.brand)
-      cardDetails["last4"] = it.last4
+    mCardWidget.paymentMethodCreateParams?.let {
+      cardDetails["brand"] = mapCardBrand(mCardWidget.brand)
+      @SuppressLint("RestrictedApi")
+      cardDetails["last4"] = it.cardLast4()
     } ?: run {
       cardDetails["brand"] = null
       cardDetails["last4"] = null
@@ -353,6 +355,7 @@ class CardFieldView(
           CardValidCallback.Fields.Expiry,
           cardInputWidgetBinding.expiryDateEditText,
         )
+      @SuppressLint("VisibleForTests")
       cardDetails["brand"] = mapCardBrand(cardInputWidgetBinding.cardNumberEditText.cardBrand)
 
       if (isValid) {