rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-11-03 21:37:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: redis deserialization issue in tokenization call (#878)

Browse Source
This commit is contained in:
Sangamesh Kulkarni
2023-04-14 12:40:09 +05:30
committed by GitHub
parent cf902f19e5
commit 5e9d7d6b53
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,7 +319,7 @@ impl PaymentRedirectFlow for PaymentRedirectCompleteAuthorize {
metadata: Some(Metadata {
order_details: None,
data: masking::Secret::new("{}".into()),
payload: Some(req.json_payload.unwrap_or("{}".into()).into()),
payload: Some(req.json_payload.unwrap_or(serde_json::json!({})).into()),
}),
..Default::default()
};
@ -597,13 +597,13 @@ async fn decide_payment_method_tokenize_action(
payment_method: &storage::enums::PaymentMethod,
pm_parent_token: Option<&String>,
is_connector_tokenization_enabled: bool,
) -> TokenizationAction {
) -> RouterResult<TokenizationAction> {
match pm_parent_token {
None => {
if is_connector_tokenization_enabled {
TokenizationAction::TokenizeInConnectorAndRouter
Ok(TokenizationAction::TokenizeInConnectorAndRouter)
} else {
TokenizationAction::TokenizeInRouter
Ok(TokenizationAction::TokenizeInRouter)
}
}
Some(token) => {
@ -615,14 +615,19 @@ async fn decide_payment_method_tokenize_action(
connector_name
);
match redis_conn.get_key::<String>(&key).await {
Ok(connector_token) => TokenizationAction::ConnectorToken(connector_token),
Err(error) => {
logger::debug!(connector_token_redis_error=?error);
let connector_token_option = redis_conn
.get_key::<Option<String>>(&key)
.await
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed to fetch the token from redis")?;
match connector_token_option {
Some(connector_token) => Ok(TokenizationAction::ConnectorToken(connector_token)),
None => {
if is_connector_tokenization_enabled {
TokenizationAction::TokenizeInConnector
Ok(TokenizationAction::TokenizeInConnector)
} else {
TokenizationAction::SkipConnectorTokenization
Ok(TokenizationAction::TokenizeInRouter)
}
}
}
@ -671,7 +676,7 @@ where
payment_data.token.as_ref(),
is_connector_tokenization_enabled,
)
.await;
.await?;
let connector_tokenization_action = match payment_method_action {
TokenizationAction::TokenizeInRouter => {

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

@ -691,7 +691,14 @@ pub async fn make_pm_data<'a, F: Clone, R>(
.to_owned()
.get_required_value("payment_method")?,
);
redis_conn.get_key::<String>(&key).await.ok()
let hyperswitch_token_option = redis_conn
.get_key::<Option<String>>(&key)
.await
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed to fetch the token from redis")?;
hyperswitch_token_option.or(Some(token))
} else {
None
};
@ -1307,10 +1314,10 @@ pub fn get_business_details(
},
)?;
(
business_country.unwrap_or(primary_business_details.country.to_owned()),
business_country.unwrap_or_else(|| primary_business_details.country.to_owned()),
business_label
.map(ToString::to_string)
.unwrap_or(primary_business_details.business.to_owned()),
.unwrap_or_else(|| primary_business_details.business.to_owned()),
)
} else {
// If primary business details are not present or more than one