Skip to content

Commit 1265ebe

Browse files
ShankarSinghChyperswitch-bot[bot]
authored andcommitted
fix(router): get apple pay certificates only from metadata during the session call (#6514)
Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
1 parent 2530fa7 commit 1265ebe

File tree

2 files changed

+11
-40
lines changed

2 files changed

+11
-40
lines changed

crates/router/src/core/payments/flows/session_flow.rs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -189,20 +189,11 @@ async fn create_applepay_session_token(
189189
)
190190
} else {
191191
// Get the apple pay metadata
192-
let connector_apple_pay_wallet_details =
193-
helpers::get_applepay_metadata(router_data.connector_wallets_details.clone())
194-
.map_err(|error| {
195-
logger::debug!(
196-
"Apple pay connector wallets details parsing failed in create_applepay_session_token {:?}",
197-
error
198-
)
199-
})
200-
.ok();
201-
202-
let apple_pay_metadata = match connector_apple_pay_wallet_details {
203-
Some(apple_pay_wallet_details) => apple_pay_wallet_details,
204-
None => helpers::get_applepay_metadata(router_data.connector_meta_data.clone())?,
205-
};
192+
let apple_pay_metadata =
193+
helpers::get_applepay_metadata(router_data.connector_meta_data.clone())
194+
.attach_printable(
195+
"Failed to to fetch apple pay certificates during session call",
196+
)?;
206197

207198
// Get payment request data , apple pay session request and merchant keys
208199
let (

crates/router/src/core/payments/helpers.rs

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4788,32 +4788,17 @@ pub fn validate_customer_access(
47884788

47894789
pub fn is_apple_pay_simplified_flow(
47904790
connector_metadata: Option<pii::SecretSerdeValue>,
4791-
connector_wallets_details: Option<pii::SecretSerdeValue>,
47924791
connector_name: Option<&String>,
47934792
) -> CustomResult<bool, errors::ApiErrorResponse> {
4794-
let connector_apple_pay_wallet_details =
4795-
get_applepay_metadata(connector_wallets_details)
4796-
.map_err(|error| {
4797-
logger::debug!(
4798-
"Apple pay connector wallets details parsing failed for {:?} in is_apple_pay_simplified_flow {:?}",
4799-
connector_name,
4800-
error
4801-
)
4802-
})
4803-
.ok();
4804-
4805-
let option_apple_pay_metadata = match connector_apple_pay_wallet_details {
4806-
Some(apple_pay_wallet_details) => Some(apple_pay_wallet_details),
4807-
None => get_applepay_metadata(connector_metadata)
4808-
.map_err(|error| {
4809-
logger::debug!(
4810-
"Apple pay metadata parsing failed for {:?} in is_apple_pay_simplified_flow {:?}",
4793+
let option_apple_pay_metadata = get_applepay_metadata(connector_metadata)
4794+
.map_err(|error| {
4795+
logger::info!(
4796+
"Apple pay metadata parsing for {:?} in is_apple_pay_simplified_flow {:?}",
48114797
connector_name,
48124798
error
48134799
)
4814-
})
4815-
.ok(),
4816-
};
4800+
})
4801+
.ok();
48174802

48184803
// return true only if the apple flow type is simplified
48194804
Ok(matches!(
@@ -4999,7 +4984,6 @@ where
49994984

50004985
let connector_data_list = if is_apple_pay_simplified_flow(
50014986
merchant_connector_account_type.get_metadata(),
5002-
merchant_connector_account_type.get_connector_wallets_details(),
50034987
merchant_connector_account_type
50044988
.get_connector_name()
50054989
.as_ref(),
@@ -5027,10 +5011,6 @@ where
50275011
for merchant_connector_account in profile_specific_merchant_connector_account_list {
50285012
if is_apple_pay_simplified_flow(
50295013
merchant_connector_account.metadata.clone(),
5030-
merchant_connector_account
5031-
.connector_wallets_details
5032-
.as_deref()
5033-
.cloned(),
50345014
Some(&merchant_connector_account.connector_name),
50355015
)? {
50365016
let connector_data = api::ConnectorData::get_connector_by_name(

0 commit comments

Comments
 (0)