Link Cvc & Expiry recollection VM #9882
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package com.stripe.android.ui.core.elements | ||
|
|
||
| import androidx.annotation.RestrictTo | ||
| import com.stripe.android.uicore.elements.IdentifierSpec | ||
| import com.stripe.android.uicore.elements.convertTo4DigitDate | ||
| import com.stripe.android.uicore.forms.FormFieldEntry | ||
|
|
||
| @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) | ||
| object CardDetailsUtil { | ||
| @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) | ||
| fun createExpiryDateFormFieldValues(entry: FormFieldEntry): Map<IdentifierSpec, FormFieldEntry> { | ||
| return mapOf( | ||
| IdentifierSpec.CardExpMonth to getExpiryMonthFormFieldEntry(entry), | ||
| IdentifierSpec.CardExpYear to getExpiryYearFormFieldEntry(entry) | ||
| ) | ||
| } | ||
|
|
||
| @SuppressWarnings("MagicNumber") | ||
| internal fun getExpiryMonthFormFieldEntry(entry: FormFieldEntry): FormFieldEntry { | ||
| var month = -1 | ||
| entry.value?.let { date -> | ||
| val newString = convertTo4DigitDate(date) | ||
| if (newString.length == 4) { | ||
| month = requireNotNull(newString.take(2).toIntOrNull()) | ||
| } | ||
| } | ||
|
|
||
| return entry.copy( | ||
| value = month.toString().padStart(length = 2, padChar = '0') | ||
| ) | ||
| } | ||
|
|
||
| @SuppressWarnings("MagicNumber") | ||
| internal fun getExpiryYearFormFieldEntry(entry: FormFieldEntry): FormFieldEntry { | ||
| var year = -1 | ||
| entry.value?.let { date -> | ||
| val newString = convertTo4DigitDate(date) | ||
| if (newString.length == 4) { | ||
| year = requireNotNull(newString.takeLast(2).toIntOrNull()) + 2000 | ||
| } | ||
| } | ||
|
|
||
| return entry.copy( | ||
| value = year.toString() | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,31 +5,46 @@ import androidx.lifecycle.ViewModelProvider | |
| import androidx.lifecycle.viewModelScope | ||
| import androidx.lifecycle.viewmodel.initializer | ||
| import androidx.lifecycle.viewmodel.viewModelFactory | ||
| import com.stripe.android.common.exception.stripeErrorMessage | ||
| import com.stripe.android.core.Logger | ||
| import com.stripe.android.core.strings.resolvableString | ||
| import com.stripe.android.link.LinkActivityResult | ||
| import com.stripe.android.link.LinkConfiguration | ||
| import com.stripe.android.link.LinkScreen | ||
| import com.stripe.android.link.account.LinkAccountManager | ||
| import com.stripe.android.link.confirmation.LinkConfirmationHandler | ||
| import com.stripe.android.link.injection.NativeLinkComponent | ||
| import com.stripe.android.link.model.LinkAccount | ||
| import com.stripe.android.link.model.supportedPaymentMethodTypes | ||
| import com.stripe.android.model.CardBrand | ||
| import com.stripe.android.model.ConsumerPaymentDetails | ||
| import com.stripe.android.model.ConsumerPaymentDetailsUpdateParams | ||
| import com.stripe.android.model.PaymentIntent | ||
| import com.stripe.android.model.PaymentMethod | ||
| import com.stripe.android.model.PaymentMethodCreateParams | ||
| import com.stripe.android.model.SetupIntent | ||
| import com.stripe.android.model.StripeIntent | ||
| import com.stripe.android.ui.core.Amount | ||
| import com.stripe.android.ui.core.FieldValuesToParamsMapConverter | ||
| import com.stripe.android.ui.core.R | ||
| import com.stripe.android.ui.core.elements.CardDetailsUtil.createExpiryDateFormFieldValues | ||
| import com.stripe.android.ui.core.elements.CvcController | ||
| import com.stripe.android.uicore.elements.DateConfig | ||
| import com.stripe.android.uicore.elements.SimpleTextFieldController | ||
| import com.stripe.android.uicore.utils.mapAsStateFlow | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.flow.collectLatest | ||
| import kotlinx.coroutines.flow.update | ||
| import kotlinx.coroutines.launch | ||
| import javax.inject.Inject | ||
| import com.stripe.android.link.confirmation.Result as LinkConfirmationResult | ||
|
|
||
| internal class WalletViewModel @Inject constructor( | ||
| private val configuration: LinkConfiguration, | ||
| private val linkAccount: LinkAccount, | ||
| private val linkAccountManager: LinkAccountManager, | ||
| private val linkConfirmationHandler: LinkConfirmationHandler, | ||
| private val logger: Logger, | ||
| private val navigate: (route: LinkScreen) -> Unit, | ||
| private val navigateAndClearStack: (route: LinkScreen) -> Unit, | ||
|
|
@@ -49,8 +64,33 @@ internal class WalletViewModel @Inject constructor( | |
|
|
||
| val uiState: StateFlow<WalletUiState> = _uiState | ||
|
|
||
| val expiryDateController = SimpleTextFieldController( | ||
| textFieldConfig = DateConfig() | ||
| ) | ||
| val cvcController = CvcController( | ||
| cardBrandFlow = uiState.mapAsStateFlow { | ||
| (it.selectedItem as? ConsumerPaymentDetails.Card)?.brand ?: CardBrand.Unknown | ||
| } | ||
| ) | ||
|
|
||
| init { | ||
| loadPaymentDetails() | ||
|
|
||
| viewModelScope.launch { | ||
| expiryDateController.formFieldValue.collectLatest { input -> | ||
| _uiState.update { | ||
| it.copy(expiryDateInput = input) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| viewModelScope.launch { | ||
| cvcController.formFieldValue.collectLatest { input -> | ||
| _uiState.update { | ||
| it.copy(cvcInput = input) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun loadPaymentDetails() { | ||
|
|
@@ -85,12 +125,95 @@ internal class WalletViewModel @Inject constructor( | |
| fun onItemSelected(item: ConsumerPaymentDetails.PaymentDetails) { | ||
| if (item == uiState.value.selectedItem) return | ||
|
|
||
| expiryDateController.onRawValueChange("") | ||
| cvcController.onRawValueChange("") | ||
|
|
||
| _uiState.update { | ||
| it.copy(selectedItem = item) | ||
| } | ||
| } | ||
|
|
||
| fun onPrimaryButtonClicked() { | ||
| val paymentDetail = _uiState.value.selectedItem ?: return | ||
| _uiState.update { | ||
| it.copy(isProcessing = true) | ||
| } | ||
|
|
||
| viewModelScope.launch { | ||
| performPaymentConfirmation(paymentDetail) | ||
| } | ||
| } | ||
|
|
||
| private suspend fun performPaymentConfirmation( | ||
| selectedPaymentDetails: ConsumerPaymentDetails.PaymentDetails, | ||
| ) { | ||
| val card = selectedPaymentDetails as? ConsumerPaymentDetails.Card | ||
| val isExpired = card != null && card.isExpired | ||
|
|
||
| if (isExpired) { | ||
| performPaymentDetailsUpdate(selectedPaymentDetails).fold( | ||
| onSuccess = { result -> | ||
| val updatedPaymentDetails = result.paymentDetails.single { | ||
| it.id == selectedPaymentDetails.id | ||
| } | ||
| performPaymentConfirmation(updatedPaymentDetails) | ||
| }, | ||
| onFailure = { error -> | ||
| _uiState.update { | ||
| it.copy( | ||
| alertMessage = error.stripeErrorMessage(), | ||
| isProcessing = false | ||
| ) | ||
| } | ||
| } | ||
| ) | ||
|
Comment on lines
+154
to
+169
There was a problem hiding this comment. The Spotted by Graphite Reviewer |
||
| } else { | ||
| // Confirm payment with LinkConfirmationHandler | ||
| performPaymentConfirmationWithCvc( | ||
| selectedPaymentDetails = selectedPaymentDetails, | ||
| cvc = cvcController.formFieldValue.value.takeIf { it.isComplete }?.value | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private suspend fun performPaymentConfirmationWithCvc( | ||
| selectedPaymentDetails: ConsumerPaymentDetails.PaymentDetails, | ||
| cvc: String? | ||
| ) { | ||
| val result = linkConfirmationHandler.confirm( | ||
| paymentDetails = selectedPaymentDetails, | ||
| linkAccount = linkAccount, | ||
| cvc = cvc | ||
| ) | ||
| when (result) { | ||
| LinkConfirmationResult.Canceled -> Unit | ||
|
Comment on lines
+188
to
+189
There was a problem hiding this comment. The LinkConfirmationResult.Canceled -> _uiState.update { it.copy(isProcessing = false) }This maintains consistency with the error handling case and prevents the UI from being stuck in a processing state. Spotted by Graphite Reviewer |
||
| is LinkConfirmationResult.Failed -> { | ||
| _uiState.update { | ||
| it.copy( | ||
| errorMessage = result.message, | ||
| isProcessing = false | ||
| ) | ||
| } | ||
| } | ||
| LinkConfirmationResult.Succeeded -> { | ||
| dismissWithResult(LinkActivityResult.Completed) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private suspend fun performPaymentDetailsUpdate( | ||
| selectedPaymentDetails: ConsumerPaymentDetails.PaymentDetails | ||
| ): Result<ConsumerPaymentDetails> { | ||
| val paymentMethodCreateParams = uiState.value.toPaymentMethodCreateParams() | ||
|
|
||
| val updateParams = ConsumerPaymentDetailsUpdateParams( | ||
| id = selectedPaymentDetails.id, | ||
| isDefault = selectedPaymentDetails.isDefault, | ||
| cardPaymentMethodCreateParamsMap = paymentMethodCreateParams.toParamMap() | ||
| ) | ||
|
|
||
| return linkAccountManager.updatePaymentDetails(updateParams) | ||
| } | ||
|
|
||
| fun onPayAnotherWayClicked() { | ||
| dismissWithResult(LinkActivityResult.Canceled(LinkActivityResult.Canceled.Reason.PayAnotherWay)) | ||
|
|
@@ -130,6 +253,9 @@ internal class WalletViewModel @Inject constructor( | |
| WalletViewModel( | ||
| configuration = parentComponent.configuration, | ||
| linkAccountManager = parentComponent.linkAccountManager, | ||
| linkConfirmationHandler = parentComponent.linkConfirmationHandlerFactory.create( | ||
| confirmationHandler = parentComponent.viewModel.confirmationHandler | ||
| ), | ||
| logger = parentComponent.logger, | ||
| linkAccount = linkAccount, | ||
| navigate = navigate, | ||
|
|
@@ -141,3 +267,12 @@ internal class WalletViewModel @Inject constructor( | |
| } | ||
| } | ||
| } | ||
|
|
||
| private fun WalletUiState.toPaymentMethodCreateParams(): PaymentMethodCreateParams { | ||
| val expiryDateValues = createExpiryDateFormFieldValues(expiryDateInput) | ||
| return FieldValuesToParamsMapConverter.transformToPaymentMethodCreateParams( | ||
| fieldValuePairs = expiryDateValues, | ||
| code = PaymentMethod.Type.Card.code, | ||
| requiresMandate = false | ||
| ) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
isMissingExpiryDateInputcheck appears to have an unintended dependency oncvcInput.isComplete. For validating expiry date input, the condition should be simplified toexpiryDateInput.isComplete.not()since the CVC completion state is handled separately byisMissingCvcInput.Spotted by Graphite Reviewer
Is this helpful? React 👍 or 👎 to let us know.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
expired cards requires both updated expiryDate and cvc