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

refactor(RouterData): rename orca_return_url to router_return_url (#311)

Browse Source
This commit is contained in:
Sanchith Hegde
2023-01-06 16:39:12 +05:30
committed by GitHub
parent e5330528fa
commit d8d9c22970
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/router/src/connector/adyen/transformers.rs
View File

@ -386,9 +386,9 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for AdyenPaymentRequest {
merchant_account: auth_type.merchant_account, merchant_account: auth_type.merchant_account,
payment_method, payment_method,
reference, reference,
return_url: item.orca_return_url.clone().ok_or( return_url: item.router_return_url.clone().ok_or(
errors::ConnectorError::MissingRequiredField { errors::ConnectorError::MissingRequiredField {
field_name: "orca_return_url".into(), field_name: "router_return_url".into(),
}, },
)?, )?,
shopper_interaction, shopper_interaction,

4
crates/router/src/connector/checkout/transformers.rs
View File

@ -94,11 +94,11 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for PaymentsRequest {
let return_url = ReturnUrl { let return_url = ReturnUrl {
success_url: item success_url: item
.orca_return_url .router_return_url
.as_ref() .as_ref()
.map(|return_url| format!("{return_url}?status=success")), .map(|return_url| format!("{return_url}?status=success")),
failure_url: item failure_url: item
.orca_return_url .router_return_url
.as_ref() .as_ref()
.map(|return_url| format!("{return_url}?status=failure")), .map(|return_url| format!("{return_url}?status=failure")),
}; };

2
crates/router/src/connector/stripe/transformers.rs
View File

@ -240,7 +240,7 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for PaymentIntentRequest {
metadata_txn_id, metadata_txn_id,
metadata_txn_uuid, metadata_txn_uuid,
return_url: item return_url: item
.orca_return_url .router_return_url
.clone() .clone()
.unwrap_or_else(|| "https://juspay.in/".to_string()), .unwrap_or_else(|| "https://juspay.in/".to_string()),
confirm: true, // Stripe requires confirm to be true if return URL is present confirm: true, // Stripe requires confirm to be true if return URL is present

2
crates/router/src/core/payment_methods/transformers.rs
View File

@ -77,7 +77,7 @@ pub fn mk_add_card_request(
merchant_id: "m0010", // [#253]: Need mapping for application mid to lockeId merchant_id: "m0010", // [#253]: Need mapping for application mid to lockeId
email_address: Some("dummy@gmail.com".to_string().into()), // email_address: Some("dummy@gmail.com".to_string().into()), //
name_on_card: Some("juspay".to_string().into()), // [#256] name_on_card: Some("juspay".to_string().into()), // [#256]
nickname: Some("orca".to_string()), // nickname: Some("router".to_string()), //
}; };
let body = utils::Encode::<AddCardRequest<'_>>::encode(&add_card_req) let body = utils::Encode::<AddCardRequest<'_>>::encode(&add_card_req)
.change_context(errors::CardVaultError::RequestEncodingFailed)?; .change_context(errors::CardVaultError::RequestEncodingFailed)?;

4
crates/router/src/core/payments/transformers.rs
View File

@ -68,7 +68,7 @@ where
mandate_reference: None, mandate_reference: None,
}); });
let orca_return_url = Some(helpers::create_redirect_url( let router_return_url = Some(helpers::create_redirect_url(
&state.conf.server, &state.conf.server,
&payment_data.payment_attempt, &payment_data.payment_attempt,
&merchant_connector_account.connector_name, &merchant_connector_account.connector_name,
@ -84,7 +84,7 @@ where
connector_auth_type: auth_type, connector_auth_type: auth_type,
description: payment_data.payment_intent.description.clone(), description: payment_data.payment_intent.description.clone(),
return_url: payment_data.payment_intent.return_url.clone(), return_url: payment_data.payment_intent.return_url.clone(),
orca_return_url, router_return_url,
payment_method_id: payment_data.payment_attempt.payment_method_id.clone(), payment_method_id: payment_data.payment_attempt.payment_method_id.clone(),
address: payment_data.address.clone(), address: payment_data.address.clone(),
auth_type: payment_data auth_type: payment_data

2
crates/router/src/core/utils.rs
View File

@ -71,7 +71,7 @@ pub async fn construct_refund_router_data<'a, F>(
connector_auth_type: auth_type, connector_auth_type: auth_type,
description: None, description: None,
return_url: payment_intent.return_url.clone(), return_url: payment_intent.return_url.clone(),
orca_return_url: None, router_return_url: None,
payment_method_id: payment_attempt.payment_method_id.clone(), payment_method_id: payment_attempt.payment_method_id.clone(),
// Does refund need shipping/billing address ? // Does refund need shipping/billing address ?
address: PaymentAddress::default(), address: PaymentAddress::default(),

2
crates/router/src/types.rs
View File

@ -74,7 +74,7 @@ pub struct RouterData<Flow, Request, Response> {
pub connector_auth_type: ConnectorAuthType, pub connector_auth_type: ConnectorAuthType,
pub description: Option<String>, pub description: Option<String>,
pub return_url: Option<String>, pub return_url: Option<String>,
pub orca_return_url: Option<String>, pub router_return_url: Option<String>,
pub address: PaymentAddress, pub address: PaymentAddress,
pub auth_type: storage_enums::AuthenticationType, pub auth_type: storage_enums::AuthenticationType,
pub connector_meta_data: Option<serde_json::Value>, pub connector_meta_data: Option<serde_json::Value>,

4
crates/router/tests/connectors/aci.rs
View File

@ -27,7 +27,7 @@ fn construct_payment_router_data() -> types::PaymentsAuthorizeRouterData {
payment_method: enums::PaymentMethodType::Card, payment_method: enums::PaymentMethodType::Card,
connector_auth_type: auth.into(), connector_auth_type: auth.into(),
description: Some("This is a test".to_string()), description: Some("This is a test".to_string()),
orca_return_url: None, router_return_url: None,
return_url: None, return_url: None,
request: types::PaymentsAuthorizeData { request: types::PaymentsAuthorizeData {
amount: 1000, amount: 1000,
@ -69,7 +69,7 @@ fn construct_refund_router_data<F>() -> types::RefundsRouterData<F> {
connector: "aci".to_string(), connector: "aci".to_string(),
payment_id: uuid::Uuid::new_v4().to_string(), payment_id: uuid::Uuid::new_v4().to_string(),
status: enums::AttemptStatus::default(), status: enums::AttemptStatus::default(),
orca_return_url: None, router_return_url: None,
payment_method: enums::PaymentMethodType::Card, payment_method: enums::PaymentMethodType::Card,
auth_type: enums::AuthenticationType::NoThreeDs, auth_type: enums::AuthenticationType::NoThreeDs,
connector_auth_type: auth.into(), connector_auth_type: auth.into(),

4
crates/router/tests/connectors/authorizedotnet.rs
View File

@ -23,7 +23,7 @@ fn construct_payment_router_data() -> types::PaymentsAuthorizeRouterData {
connector: "authorizedotnet".to_string(), connector: "authorizedotnet".to_string(),
payment_id: uuid::Uuid::new_v4().to_string(), payment_id: uuid::Uuid::new_v4().to_string(),
status: enums::AttemptStatus::default(), status: enums::AttemptStatus::default(),
orca_return_url: None, router_return_url: None,
payment_method: enums::PaymentMethodType::Card, payment_method: enums::PaymentMethodType::Card,
connector_auth_type: auth.into(), connector_auth_type: auth.into(),
auth_type: enums::AuthenticationType::NoThreeDs, auth_type: enums::AuthenticationType::NoThreeDs,
@ -70,7 +70,7 @@ fn construct_refund_router_data<F>() -> types::RefundsRouterData<F> {
connector: "authorizedotnet".to_string(), connector: "authorizedotnet".to_string(),
payment_id: uuid::Uuid::new_v4().to_string(), payment_id: uuid::Uuid::new_v4().to_string(),
status: enums::AttemptStatus::default(), status: enums::AttemptStatus::default(),
orca_return_url: None, router_return_url: None,
auth_type: enums::AuthenticationType::NoThreeDs, auth_type: enums::AuthenticationType::NoThreeDs,
payment_method: enums::PaymentMethodType::Card, payment_method: enums::PaymentMethodType::Card,
connector_auth_type: auth.into(), connector_auth_type: auth.into(),

4
crates/router/tests/connectors/checkout.rs
View File

@ -20,7 +20,7 @@ fn construct_payment_router_data() -> types::PaymentsAuthorizeRouterData {
connector: "checkout".to_string(), connector: "checkout".to_string(),
payment_id: uuid::Uuid::new_v4().to_string(), payment_id: uuid::Uuid::new_v4().to_string(),
status: enums::AttemptStatus::default(), status: enums::AttemptStatus::default(),
orca_return_url: None, router_return_url: None,
auth_type: enums::AuthenticationType::NoThreeDs, auth_type: enums::AuthenticationType::NoThreeDs,
payment_method: enums::PaymentMethodType::Card, payment_method: enums::PaymentMethodType::Card,
connector_auth_type: auth.into(), connector_auth_type: auth.into(),
@ -67,7 +67,7 @@ fn construct_refund_router_data<F>() -> types::RefundsRouterData<F> {
connector: "checkout".to_string(), connector: "checkout".to_string(),
payment_id: uuid::Uuid::new_v4().to_string(), payment_id: uuid::Uuid::new_v4().to_string(),
status: enums::AttemptStatus::default(), status: enums::AttemptStatus::default(),
orca_return_url: None, router_return_url: None,
payment_method: enums::PaymentMethodType::Card, payment_method: enums::PaymentMethodType::Card,
auth_type: enums::AuthenticationType::NoThreeDs, auth_type: enums::AuthenticationType::NoThreeDs,
connector_auth_type: auth.into(), connector_auth_type: auth.into(),

2
crates/router/tests/connectors/utils.rs
View File

@ -179,7 +179,7 @@ fn generate_data<Flow, Req: From<Req>, Res>(
connector, connector,
payment_id: uuid::Uuid::new_v4().to_string(), payment_id: uuid::Uuid::new_v4().to_string(),
status: enums::AttemptStatus::default(), status: enums::AttemptStatus::default(),
orca_return_url: None, router_return_url: None,
auth_type: enums::AuthenticationType::NoThreeDs, auth_type: enums::AuthenticationType::NoThreeDs,
payment_method: enums::PaymentMethodType::Card, payment_method: enums::PaymentMethodType::Card,
connector_auth_type, connector_auth_type,