Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add brand and last4 properties to CardParams #3359

Merged
merged 1 commit into from
Feb 9, 2021
Merged

Add brand and last4 properties to CardParams #3359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions stripe/src/main/java/com/stripe/android/model/CardParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
package com.stripe.android.model

import com.stripe.android.CardUtils
import kotlinx.parcelize.Parcelize

/**
* [Create a card token](https://stripe.com/docs/api/tokens/create_card)
*/
@Parcelize
data class CardParams internal constructor(
/**
* The likely [CardBrand] based on the [number].
*/
val brand: CardBrand,

private val loggingTokens: Set<String> = emptySet(),

/**
Expand Down Expand Up @@ -79,6 +85,7 @@ data class CardParams internal constructor(
*/
var metadata: Map<String, String>? = null
) : TokenParams(Token.Type.Card, loggingTokens) {
val last4: String get() = number.takeLast(4)

@JvmOverloads
constructor(
Expand Down Expand Up @@ -152,6 +159,7 @@ data class CardParams internal constructor(
*/
metadata: Map<String, String>? = null
) : this(
brand = CardUtils.getPossibleCardBrand(number),
loggingTokens = emptySet(),
number = number,
expMonth = expMonth,
Expand Down
3 changes: 2 additions & 1 deletion stripe/src/main/java/com/stripe/android/view/CardInputWidget.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,8 @@ class CardInputWidget @JvmOverloads constructor(
else -> {
shouldShowErrorIcon = false
return CardParams(
setOf(LOGGING_TOKEN),
brand = brand,
loggingTokens = setOf(LOGGING_TOKEN),
number = cardNumber.value,
expMonth = expirationDate.month,
expYear = expirationDate.year,
Expand Down
3 changes: 2 additions & 1 deletion stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ class CardMultilineWidget @JvmOverloads constructor(
.takeIf { shouldShowPostalCode }

return CardParams(
setOf(CARD_MULTILINE_TOKEN),
brand = brand,
loggingTokens = setOf(CARD_MULTILINE_TOKEN),
number = validatedCardNumber?.value.orEmpty(),
expMonth = expirationDate.month,
expYear = expirationDate.year,
Expand Down
1 change: 1 addition & 0 deletions stripe/src/test/java/com/stripe/android/model/CardParamsFixtures.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ internal object CardParamsFixtures {
)

val WITH_ATTRIBUTION = CardParams(
brand = CardBrand.Visa,
loggingTokens = setOf(CardInputWidget.LOGGING_TOKEN),
number = CardNumberFixtures.VISA_NO_SPACES,
expMonth = 12,
Expand Down
12 changes: 12 additions & 0 deletions stripe/src/test/java/com/stripe/android/view/CardInputWidgetTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -185,6 +186,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -234,6 +236,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.AmericanExpress,
loggingTokens = ATTRIBUTION,
number = AMEX_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -279,6 +282,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.AmericanExpress,
loggingTokens = ATTRIBUTION,
number = AMEX_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -330,6 +334,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.DinersClub,
loggingTokens = ATTRIBUTION,
number = DINERS_CLUB_14_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -373,6 +378,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.DinersClub,
loggingTokens = ATTRIBUTION,
number = DINERS_CLUB_14_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -481,6 +487,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -511,6 +518,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.AmericanExpress,
loggingTokens = ATTRIBUTION,
number = AMEX_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -543,6 +551,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.AmericanExpress,
loggingTokens = ATTRIBUTION,
number = AMEX_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -1190,6 +1199,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.AmericanExpress,
loggingTokens = ATTRIBUTION,
number = AMEX_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -1232,6 +1242,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.AmericanExpress,
loggingTokens = ATTRIBUTION,
number = AMEX_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -1553,6 +1564,7 @@ internal class CardInputWidgetTest {
assertThat(cardInputWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down
10 changes: 10 additions & 0 deletions stripe/src/test/java/com/stripe/android/view/CardMultilineWidgetTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import com.stripe.android.cards.DefaultCardAccountRangeStore
import com.stripe.android.model.Address
import com.stripe.android.model.BinFixtures
import com.stripe.android.model.Card
import com.stripe.android.model.CardBrand
import com.stripe.android.model.CardParams
import com.stripe.android.model.PaymentMethod
import com.stripe.android.model.PaymentMethodCreateParams
Expand Down Expand Up @@ -181,6 +182,7 @@ internal class CardMultilineWidgetTest {
assertThat(cardMultilineWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -209,6 +211,7 @@ internal class CardMultilineWidgetTest {
assertThat(cardMultilineWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -236,6 +239,7 @@ internal class CardMultilineWidgetTest {
assertThat(noZipCardMultilineWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -263,6 +267,7 @@ internal class CardMultilineWidgetTest {
assertThat(noZipCardMultilineWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.AmericanExpress,
loggingTokens = ATTRIBUTION,
number = AMEX_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -290,6 +295,7 @@ internal class CardMultilineWidgetTest {
assertThat(noZipCardMultilineWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.AmericanExpress,
loggingTokens = ATTRIBUTION,
number = AMEX_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -746,6 +752,7 @@ internal class CardMultilineWidgetTest {
assertThat(cardMultilineWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -776,6 +783,7 @@ internal class CardMultilineWidgetTest {
assertThat(cardMultilineWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -849,6 +857,7 @@ internal class CardMultilineWidgetTest {
assertThat(cardMultilineWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down Expand Up @@ -902,6 +911,7 @@ internal class CardMultilineWidgetTest {
assertThat(cardMultilineWidget.cardParams)
.isEqualTo(
CardParams(
brand = CardBrand.Visa,
loggingTokens = ATTRIBUTION,
number = VISA_NO_SPACES,
expMonth = 12,
Expand Down