rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-29 17:19:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(mandate): add validation for currency in MIT recurring payments (#4308)

Browse Source
This commit is contained in:
Chethan Rao
2024-04-10 15:52:55 +05:30
committed by GitHub
parent 018c5b1064
commit 07c917c055
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/router/src/core/payments.rs
View File

@ -21,7 +21,7 @@ use api_models::{
use common_utils::{ext_traits::AsyncExt, pii, types::Surcharge}; use common_utils::{ext_traits::AsyncExt, pii, types::Surcharge};
use data_models::mandates::{CustomerAcceptance, MandateData}; use data_models::mandates::{CustomerAcceptance, MandateData};
use diesel_models::{ephemeral_key, fraud_check::FraudCheck}; use diesel_models::{ephemeral_key, fraud_check::FraudCheck};
use error_stack::ResultExt; use error_stack::{report, ResultExt};
use futures::future::join_all; use futures::future::join_all;
use helpers::ApplePayData; use helpers::ApplePayData;
use masking::Secret; use masking::Secret;
@ -3101,6 +3101,17 @@ pub async fn decide_multiplex_connector_for_normal_or_recurring_payment<F: Clone
.attach_printable("no eligible connector found for token-based MIT flow since there were no connector mandate details")? .attach_printable("no eligible connector found for token-based MIT flow since there were no connector mandate details")?
.get(merchant_connector_id) .get(merchant_connector_id)
{ {
common_utils::fp_utils::when(
mandate_reference_record
.original_payment_authorized_currency
.map(|mandate_currency| mandate_currency != payment_data.currency)
.unwrap_or(false),
|| {
Err(report!(errors::ApiErrorResponse::MandateValidationFailed {
reason: "cross currency mandates not supported".into()
}))
},
)?;
let mandate_reference_id = let mandate_reference_id =
Some(payments_api::MandateReferenceId::ConnectorMandateId( Some(payments_api::MandateReferenceId::ConnectorMandateId(
payments_api::ConnectorMandateReferenceId { payments_api::ConnectorMandateReferenceId {

16
crates/router/src/core/payments/operations/payment_create.rs
View File

@ -13,7 +13,7 @@ use diesel_models::{ephemeral_key, PaymentMethod};
use error_stack::{self, ResultExt}; use error_stack::{self, ResultExt};
use masking::{ExposeInterface, PeekInterface}; use masking::{ExposeInterface, PeekInterface};
use router_derive::PaymentOperation; use router_derive::PaymentOperation;
use router_env::{instrument, tracing}; use router_env::{instrument, logger, tracing};
use time::PrimitiveDateTime; use time::PrimitiveDateTime;
use super::{BoxedOperation, Domain, GetTracker, Operation, UpdateTracker, ValidateRequest}; use super::{BoxedOperation, Domain, GetTracker, Operation, UpdateTracker, ValidateRequest};
@ -782,12 +782,20 @@ impl PaymentCreate {
key_store.key.get_inner().peek(), key_store.key.get_inner().peek(),
) )
.await .await
.change_context(errors::StorageError::DecryptionError) .map_err(|err| logger::error!("Failed to decrypt card details: {:?}", err))
.attach_printable("unable to decrypt card details")
.ok() .ok()
.flatten() .flatten()
.map(|x| x.into_inner().expose()) .map(|x| x.into_inner().expose())
.and_then(|v| serde_json::from_value::<PaymentMethodsData>(v).ok()) .and_then(|v| {
serde_json::from_value::<PaymentMethodsData>(v)
.map_err(|err| {
logger::error!(
"Unable to deserialize payment methods data: {:?}",
err
)
})
.ok()
})
.and_then(|pmd| match pmd { .and_then(|pmd| match pmd {
PaymentMethodsData::Card(crd) => Some(api::CardDetailFromLocker::from(crd)), PaymentMethodsData::Card(crd) => Some(api::CardDetailFromLocker::from(crd)),
_ => None, _ => None,