diff --git "a/diffs/pr_10076/a825dc6/diff.json" "b/diffs/pr_10076/a825dc6/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_10076/a825dc6/diff.json" @@ -0,0 +1,1106 @@ +{ + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "pr_number": 10076, + "rust_files": [ + "crates/router/src/core/unified_connector_service.rs" + ], + "diffs": [ + { + "id": "crates/router/src/core/unified_connector_service.rs::function::check_ucs_availability", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn check_ucs_availability(state: &SessionState) -> UcsAvailability {\n let is_client_available = state.grpc_client.unified_connector_service_client.is_some();\n\n let is_enabled = is_ucs_enabled(state, consts::UCS_ENABLED).await;\n\n match (is_client_available, is_enabled) {\n (true, true) => {\n router_env::logger::debug!(\"UCS is available and enabled\");\n UcsAvailability::Enabled\n }\n _ => {\n router_env::logger::debug!(\n \"UCS client is {} and UCS is {} in configuration\",\n if is_client_available {\n \"available\"\n } else {\n \"not available\"\n },\n if is_enabled { \"enabled\" } else { \"not enabled\" }\n );\n UcsAvailability::Disabled\n }\n }\n}", + "after_code": "async fn check_ucs_availability(state: &SessionState) -> UcsAvailability {\n let is_client_available = state.grpc_client.unified_connector_service_client.is_some();\n\n let is_enabled = is_ucs_enabled(state, consts::UCS_ENABLED).await;\n\n match (is_client_available, is_enabled) {\n (true, true) => {\n router_env::logger::debug!(\"UCS is available and enabled\");\n UcsAvailability::Enabled\n }\n _ => {\n router_env::logger::debug!(\n \"UCS client is {} and UCS is {} in configuration\",\n if is_client_available {\n \"available\"\n } else {\n \"not available\"\n },\n if is_enabled { \"enabled\" } else { \"not enabled\" }\n );\n UcsAvailability::Disabled\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::build_unified_connector_service_payment_method", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub fn build_unified_connector_service_payment_method(\n payment_method_data: hyperswitch_domain_models::payment_method_data::PaymentMethodData,\n payment_method_type: PaymentMethodType,\n) -> CustomResult {\n match payment_method_data {\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Card(card) => {\n let card_exp_month = card\n .get_card_expiry_month_2_digit()\n .attach_printable(\"Failed to extract 2-digit expiry month from card\")\n .change_context(UnifiedConnectorServiceError::InvalidDataFormat {\n field_name: \"card_exp_month\",\n })?\n .peek()\n .to_string();\n\n let card_network = card\n .card_network\n .clone()\n .map(payments_grpc::CardNetwork::foreign_try_from)\n .transpose()?;\n\n let card_details = CardDetails {\n card_number: Some(\n CardNumber::from_str(&card.card_number.get_card_no()).change_context(\n UnifiedConnectorServiceError::RequestEncodingFailedWithReason(\n \"Failed to parse card number\".to_string(),\n ),\n )?,\n ),\n card_exp_month: Some(card_exp_month.into()),\n card_exp_year: Some(card.get_expiry_year_4_digit().expose().into()),\n card_cvc: Some(card.card_cvc.expose().into()),\n card_holder_name: card.card_holder_name.map(|name| name.expose().into()),\n card_issuer: card.card_issuer.clone(),\n card_network: card_network.map(|card_network| card_network.into()),\n card_type: card.card_type.clone(),\n bank_code: card.bank_code.clone(),\n nick_name: card.nick_name.map(|n| n.expose()),\n card_issuing_country_alpha2: card.card_issuing_country.clone(),\n };\n\n let grpc_card_type = match payment_method_type {\n PaymentMethodType::Credit => {\n payments_grpc::card_payment_method_type::CardType::Credit(card_details)\n }\n PaymentMethodType::Debit => {\n payments_grpc::card_payment_method_type::CardType::Debit(card_details)\n }\n _ => {\n return Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into());\n }\n };\n\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Card(CardPaymentMethodType {\n card_type: Some(grpc_card_type),\n })),\n })\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Upi(upi_data) => {\n let upi_type = match upi_data {\n hyperswitch_domain_models::payment_method_data::UpiData::UpiCollect(\n upi_collect_data,\n ) => {\n let upi_details = payments_grpc::UpiCollect {\n vpa_id: upi_collect_data.vpa_id.map(|vpa| vpa.expose().into()),\n };\n PaymentMethod::UpiCollect(upi_details)\n }\n hyperswitch_domain_models::payment_method_data::UpiData::UpiIntent(_) => {\n let upi_details = payments_grpc::UpiIntent { app_name: None };\n PaymentMethod::UpiIntent(upi_details)\n }\n hyperswitch_domain_models::payment_method_data::UpiData::UpiQr(_) => {\n let upi_details = payments_grpc::UpiQr {};\n PaymentMethod::UpiQr(upi_details)\n }\n };\n\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(upi_type),\n })\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Reward => {\n match payment_method_type {\n PaymentMethodType::ClassicReward => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Reward(RewardPaymentMethodType {\n reward_type: 1,\n })),\n }),\n PaymentMethodType::Evoucher => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Reward(RewardPaymentMethodType {\n reward_type: 2,\n })),\n }),\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into()),\n }\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Wallet(wallet_data) => {\n match wallet_data {\n WalletData::Mifinity(mifinity_data) => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Wallet(WalletPaymentMethodType {\n wallet_type: Some(WalletType::Mifinity(payments_grpc::MifinityWallet {\n date_of_birth: Some(\n mifinity_data.date_of_birth.peek().to_string().into(),\n ),\n language_preference: mifinity_data.language_preference,\n })),\n })),\n }),\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into()),\n }\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Crypto(crypto_data) => {\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Crypto(CryptoCurrencyPaymentMethodType {\n crypto_currency: Some(CryptoCurrency {\n pay_currency: crypto_data.pay_currency.clone(),\n network: crypto_data.network.clone(),\n }),\n })),\n })\n }\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method: {payment_method_data:?}\"\n ))\n .into()),\n }\n}", + "after_code": "pub fn build_unified_connector_service_payment_method(\n payment_method_data: hyperswitch_domain_models::payment_method_data::PaymentMethodData,\n payment_method_type: PaymentMethodType,\n) -> CustomResult {\n match payment_method_data {\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Card(card) => {\n let card_exp_month = card\n .get_card_expiry_month_2_digit()\n .attach_printable(\"Failed to extract 2-digit expiry month from card\")\n .change_context(UnifiedConnectorServiceError::InvalidDataFormat {\n field_name: \"card_exp_month\",\n })?\n .peek()\n .to_string();\n\n let card_network = card\n .card_network\n .clone()\n .map(payments_grpc::CardNetwork::foreign_try_from)\n .transpose()?;\n\n let card_details = CardDetails {\n card_number: Some(\n CardNumber::from_str(&card.card_number.get_card_no()).change_context(\n UnifiedConnectorServiceError::RequestEncodingFailedWithReason(\n \"Failed to parse card number\".to_string(),\n ),\n )?,\n ),\n card_exp_month: Some(card_exp_month.into()),\n card_exp_year: Some(card.get_expiry_year_4_digit().expose().into()),\n card_cvc: Some(card.card_cvc.expose().into()),\n card_holder_name: card.card_holder_name.map(|name| name.expose().into()),\n card_issuer: card.card_issuer.clone(),\n card_network: card_network.map(|card_network| card_network.into()),\n card_type: card.card_type.clone(),\n bank_code: card.bank_code.clone(),\n nick_name: card.nick_name.map(|n| n.expose()),\n card_issuing_country_alpha2: card.card_issuing_country.clone(),\n };\n\n let grpc_card_type = match payment_method_type {\n PaymentMethodType::Credit => {\n payments_grpc::card_payment_method_type::CardType::Credit(card_details)\n }\n PaymentMethodType::Debit => {\n payments_grpc::card_payment_method_type::CardType::Debit(card_details)\n }\n _ => {\n return Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into());\n }\n };\n\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Card(CardPaymentMethodType {\n card_type: Some(grpc_card_type),\n })),\n })\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Upi(upi_data) => {\n let upi_type = match upi_data {\n hyperswitch_domain_models::payment_method_data::UpiData::UpiCollect(\n upi_collect_data,\n ) => {\n let upi_details = payments_grpc::UpiCollect {\n vpa_id: upi_collect_data.vpa_id.map(|vpa| vpa.expose().into()),\n };\n PaymentMethod::UpiCollect(upi_details)\n }\n hyperswitch_domain_models::payment_method_data::UpiData::UpiIntent(_) => {\n let upi_details = payments_grpc::UpiIntent { app_name: None };\n PaymentMethod::UpiIntent(upi_details)\n }\n hyperswitch_domain_models::payment_method_data::UpiData::UpiQr(_) => {\n let upi_details = payments_grpc::UpiQr {};\n PaymentMethod::UpiQr(upi_details)\n }\n };\n\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(upi_type),\n })\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Reward => {\n match payment_method_type {\n PaymentMethodType::ClassicReward => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Reward(RewardPaymentMethodType {\n reward_type: 1,\n })),\n }),\n PaymentMethodType::Evoucher => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Reward(RewardPaymentMethodType {\n reward_type: 2,\n })),\n }),\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into()),\n }\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Wallet(wallet_data) => {\n match wallet_data {\n hyperswitch_domain_models::payment_method_data::WalletData::Mifinity(mifinity_data) => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Wallet(WalletPaymentMethodType {\n wallet_type: Some(WalletType::Mifinity(payments_grpc::MifinityWallet {\n date_of_birth: Some(\n mifinity_data.date_of_birth.peek().to_string().into(),\n ),\n language_preference: mifinity_data.language_preference,\n })),\n })),\n }),\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into()),\n }\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Crypto(crypto_data) => {\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Crypto(CryptoCurrencyPaymentMethodType {\n crypto_currency: Some(CryptoCurrency {\n pay_currency: crypto_data.pay_currency.clone(),\n network: crypto_data.network.clone(),\n }),\n })),\n })\n }\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method: {payment_method_data:?}\"\n ))\n .into()),\n }\n}", + "diff_span": { + "before": " hyperswitch_domain_models::payment_method_data::PaymentMethodData::Wallet(wallet_data) => {\n match wallet_data {\n WalletData::Mifinity(mifinity_data) => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Wallet(WalletPaymentMethodType {\n wallet_type: Some(WalletType::Mifinity(payments_grpc::MifinityWallet {", + "after": " hyperswitch_domain_models::payment_method_data::PaymentMethodData::Wallet(wallet_data) => {\n match wallet_data {\n hyperswitch_domain_models::payment_method_data::WalletData::Mifinity(mifinity_data) => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Wallet(WalletPaymentMethodType {\n wallet_type: Some(WalletType::Mifinity(payments_grpc::MifinityWallet {" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use unified_connector_service_cards::CardNumber;" + ], + "after_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use unified_connector_service_cards::CardNumber;" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::handle_unified_connector_service_response_for_payment_register", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn handle_unified_connector_service_response_for_payment_register(\n response: payments_grpc::PaymentServiceRegisterResponse,\n) -> CustomResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(\n response.clone(),\n )?;\n\n let connector_customer_id =\n extract_connector_customer_id_from_ucs_state(response.state.as_ref());\n\n Ok(UcsSetupMandateResponseData {\n router_data_response,\n status_code,\n connector_customer_id,\n })\n}", + "after_code": "pub fn handle_unified_connector_service_response_for_payment_register(\n response: payments_grpc::PaymentServiceRegisterResponse,\n) -> CustomResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(\n response.clone(),\n )?;\n\n let connector_customer_id =\n extract_connector_customer_id_from_ucs_state(response.state.as_ref());\n\n Ok(UcsSetupMandateResponseData {\n router_data_response,\n status_code,\n connector_customer_id,\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::build_webhook_secrets_from_merchant_connector_account", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn build_webhook_secrets_from_merchant_connector_account(\n #[cfg(feature = \"v1\")] merchant_connector_account: &MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")] merchant_connector_account: &MerchantConnectorAccountTypeDetails,\n) -> CustomResult, UnifiedConnectorServiceError> {\n // Extract webhook credentials from merchant connector account\n // This depends on how webhook secrets are stored in the merchant connector account\n\n #[cfg(feature = \"v1\")]\n let webhook_details = merchant_connector_account\n .get_webhook_details()\n .map_err(|_| UnifiedConnectorServiceError::FailedToObtainAuthType)?;\n\n #[cfg(feature = \"v2\")]\n let webhook_details = match merchant_connector_account {\n MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(mca) => {\n mca.connector_webhook_details.as_ref()\n }\n MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(_) => None,\n };\n\n match webhook_details {\n Some(details) => {\n // Parse the webhook details JSON to extract secrets\n let webhook_details: admin::MerchantConnectorWebhookDetails = details\n .clone()\n .parse_value(\"MerchantConnectorWebhookDetails\")\n .change_context(UnifiedConnectorServiceError::FailedToObtainAuthType)\n .attach_printable(\"Failed to parse MerchantConnectorWebhookDetails\")?;\n\n // Build gRPC WebhookSecrets from parsed details\n Ok(Some(payments_grpc::WebhookSecrets {\n secret: webhook_details.merchant_secret.expose().to_string(),\n additional_secret: webhook_details\n .additional_secret\n .map(|secret| secret.expose().to_string()),\n }))\n }\n None => Ok(None),\n }\n}", + "after_code": "pub fn build_webhook_secrets_from_merchant_connector_account(\n #[cfg(feature = \"v1\")] merchant_connector_account: &MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")] merchant_connector_account: &MerchantConnectorAccountTypeDetails,\n) -> CustomResult, UnifiedConnectorServiceError> {\n // Extract webhook credentials from merchant connector account\n // This depends on how webhook secrets are stored in the merchant connector account\n\n #[cfg(feature = \"v1\")]\n let webhook_details = merchant_connector_account\n .get_webhook_details()\n .map_err(|_| UnifiedConnectorServiceError::FailedToObtainAuthType)?;\n\n #[cfg(feature = \"v2\")]\n let webhook_details = match merchant_connector_account {\n MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(mca) => {\n mca.connector_webhook_details.as_ref()\n }\n MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(_) => None,\n };\n\n match webhook_details {\n Some(details) => {\n // Parse the webhook details JSON to extract secrets\n let webhook_details: admin::MerchantConnectorWebhookDetails = details\n .clone()\n .parse_value(\"MerchantConnectorWebhookDetails\")\n .change_context(UnifiedConnectorServiceError::FailedToObtainAuthType)\n .attach_printable(\"Failed to parse MerchantConnectorWebhookDetails\")?;\n\n // Build gRPC WebhookSecrets from parsed details\n Ok(Some(payments_grpc::WebhookSecrets {\n secret: webhook_details.merchant_secret.expose().to_string(),\n additional_secret: webhook_details\n .additional_secret\n .map(|secret| secret.expose().to_string()),\n }))\n }\n None => Ok(None),\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use masking::{ExposeInterface, PeekInterface, Secret};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use api_models::admin;" + ], + "after_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use masking::{ExposeInterface, PeekInterface, Secret};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use api_models::admin;" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::handle_unified_connector_service_response_for_payment_capture", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn handle_unified_connector_service_response_for_payment_capture(\n response: payments_grpc::PaymentServiceCaptureResponse,\n) -> UnifiedConnectorServiceResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "after_code": "pub fn handle_unified_connector_service_response_for_payment_capture(\n response: payments_grpc::PaymentServiceCaptureResponse,\n) -> UnifiedConnectorServiceResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::extract_webhook_content_from_ucs_response", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn extract_webhook_content_from_ucs_response(\n transform_data: &WebhookTransformData,\n) -> Option<&unified_connector_service_client::payments::WebhookResponseContent> {\n transform_data.webhook_content.as_ref()\n}", + "after_code": "pub fn extract_webhook_content_from_ucs_response(\n transform_data: &WebhookTransformData,\n) -> Option<&unified_connector_service_client::payments::WebhookResponseContent> {\n transform_data.webhook_content.as_ref()\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "pub use transformers::{WebhookTransformData, WebhookTransformationStatus};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "pub use transformers::{WebhookTransformData, WebhookTransformationStatus};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::handle_unified_connector_service_response_for_payment_authenticate", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn handle_unified_connector_service_response_for_payment_authenticate(\n response: payments_grpc::PaymentServiceAuthenticateResponse,\n) -> UnifiedConnectorServiceResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "after_code": "pub fn handle_unified_connector_service_response_for_payment_authenticate(\n response: payments_grpc::PaymentServiceAuthenticateResponse,\n) -> UnifiedConnectorServiceResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::extract_gateway_system_from_payment_intent", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn extract_gateway_system_from_payment_intent(\n payment_data: &D,\n) -> Option\nwhere\n D: OperationSessionGetters,\n{\n #[cfg(feature = \"v1\")]\n {\n payment_data\n .get_payment_intent()\n .feature_metadata\n .as_ref()\n .and_then(|metadata| {\n // Try to parse the JSON value as FeatureMetadata\n // Log errors but don't fail the flow for corrupted metadata\n match serde_json::from_value::(metadata.clone()) {\n Ok(feature_metadata) => feature_metadata.gateway_system,\n Err(err) => {\n router_env::logger::warn!(\n \"Failed to parse feature_metadata for gateway_system extraction: {}\",\n err\n );\n None\n }\n }\n })\n }\n #[cfg(feature = \"v2\")]\n {\n None // V2 does not use feature metadata for gateway system tracking\n }\n}", + "after_code": "fn extract_gateway_system_from_payment_intent(\n payment_data: &D,\n) -> Option\nwhere\n D: OperationSessionGetters,\n{\n #[cfg(feature = \"v1\")]\n {\n payment_data\n .get_payment_intent()\n .feature_metadata\n .as_ref()\n .and_then(|metadata| {\n // Try to parse the JSON value as FeatureMetadata\n // Log errors but don't fail the flow for corrupted metadata\n match serde_json::from_value::(metadata.clone()) {\n Ok(feature_metadata) => feature_metadata.gateway_system,\n Err(err) => {\n router_env::logger::warn!(\n \"Failed to parse feature_metadata for gateway_system extraction: {}\",\n err\n );\n None\n }\n }\n })\n }\n #[cfg(feature = \"v2\")]\n {\n None // V2 does not use feature metadata for gateway system tracking\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use diesel_models::types::FeatureMetadata;", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use diesel_models::types::FeatureMetadata;", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::type::UnifiedConnectorServiceResult", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "type_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "type UnifiedConnectorServiceResult = CustomResult<\n (\n Result<(PaymentsResponseData, AttemptStatus), ErrorResponse>,\n u16,\n ),\n UnifiedConnectorServiceError,\n>;", + "after_code": "type UnifiedConnectorServiceResult = CustomResult<\n (\n Result<(PaymentsResponseData, AttemptStatus), ErrorResponse>,\n u16,\n ),\n UnifiedConnectorServiceError,\n>;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::get_ucs_client", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn get_ucs_client(\n state: &SessionState,\n) -> RouterResult<\n &external_services::grpc_client::unified_connector_service::UnifiedConnectorServiceClient,\n> {\n state\n .grpc_client\n .unified_connector_service_client\n .as_ref()\n .ok_or_else(|| {\n error_stack::report!(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"UCS client is not available\")\n })\n}", + "after_code": "fn get_ucs_client(\n state: &SessionState,\n) -> RouterResult<\n &external_services::grpc_client::unified_connector_service::UnifiedConnectorServiceClient,\n> {\n state\n .grpc_client\n .unified_connector_service_client\n .as_ref()\n .ok_or_else(|| {\n error_stack::report!(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"UCS client is not available\")\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::handle_unified_connector_service_response_for_payment_authorize", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn handle_unified_connector_service_response_for_payment_authorize(\n response: PaymentServiceAuthorizeResponse,\n) -> CustomResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(\n response.clone(),\n )?;\n\n let connector_customer_id =\n extract_connector_customer_id_from_ucs_state(response.state.as_ref());\n let connector_response =\n extract_connector_response_from_ucs(response.connector_response.as_ref());\n\n Ok(UcsAuthorizeResponseData {\n router_data_response,\n status_code,\n connector_customer_id,\n connector_response,\n })\n}", + "after_code": "pub fn handle_unified_connector_service_response_for_payment_authorize(\n response: PaymentServiceAuthorizeResponse,\n) -> CustomResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(\n response.clone(),\n )?;\n\n let connector_customer_id =\n extract_connector_customer_id_from_ucs_state(response.state.as_ref());\n let connector_response =\n extract_connector_response_from_ucs(response.connector_response.as_ref());\n\n Ok(UcsAuthorizeResponseData {\n router_data_response,\n status_code,\n connector_customer_id,\n connector_response,\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::send_comparison_data", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn send_comparison_data(\n state: &SessionState,\n comparison_data: ComparisonData,\n) -> RouterResult<()> {\n // Check if comparison service is enabled\n let comparison_config = match state.conf.comparison_service.as_ref() {\n Some(comparison_config) => comparison_config,\n None => {\n tracing::warn!(\n \"Comparison service configuration missing, skipping comparison data send\"\n );\n return Ok(());\n }\n };\n\n let mut request = RequestBuilder::new()\n .method(Method::Post)\n .url(comparison_config.url.get_string_repr())\n .header(CONTENT_TYPE, \"application/json\")\n .header(X_FLOW_NAME, \"router-data\")\n .set_body(RequestContent::Json(Box::new(comparison_data)))\n .build();\n if let Some(req_id) = &state.request_id {\n request.add_header(X_REQUEST_ID, masking::Maskable::Normal(req_id.to_string()));\n }\n\n let _ = http_client::send_request(&state.conf.proxy, request, comparison_config.timeout_secs)\n .await\n .map_err(|e| {\n tracing::debug!(\"Error sending comparison data: {:?}\", e);\n });\n\n Ok(())\n}", + "after_code": "pub async fn send_comparison_data(\n state: &SessionState,\n comparison_data: ComparisonData,\n) -> RouterResult<()> {\n // Check if comparison service is enabled\n let comparison_config = match state.conf.comparison_service.as_ref() {\n Some(comparison_config) => comparison_config,\n None => {\n tracing::warn!(\n \"Comparison service configuration missing, skipping comparison data send\"\n );\n return Ok(());\n }\n };\n\n let mut request = RequestBuilder::new()\n .method(Method::Post)\n .url(comparison_config.url.get_string_repr())\n .header(CONTENT_TYPE, \"application/json\")\n .header(X_FLOW_NAME, \"router-data\")\n .set_body(RequestContent::Json(Box::new(comparison_data)))\n .build();\n if let Some(req_id) = &state.request_id {\n request.add_header(X_REQUEST_ID, masking::Maskable::Normal(req_id.to_string()));\n }\n\n let _ = http_client::send_request(&state.conf.proxy, request, comparison_config.timeout_secs)\n .await\n .map_err(|e| {\n tracing::debug!(\"Error sending comparison data: {:?}\", e);\n });\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::build_unified_connector_service_payment_method_for_external_proxy", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn build_unified_connector_service_payment_method_for_external_proxy(\n payment_method_data: hyperswitch_domain_models::payment_method_data::ExternalVaultPaymentMethodData,\n payment_method_type: PaymentMethodType,\n) -> CustomResult {\n match payment_method_data {\n hyperswitch_domain_models::payment_method_data::ExternalVaultPaymentMethodData::Card(\n external_vault_card,\n ) => {\n let card_network = external_vault_card\n .card_network\n .clone()\n .map(payments_grpc::CardNetwork::foreign_try_from)\n .transpose()?;\n let card_details = CardDetails {\n card_number: Some(CardNumber::from_str(external_vault_card.card_number.peek()).change_context(\n UnifiedConnectorServiceError::RequestEncodingFailedWithReason(\"Failed to parse card number\".to_string())\n )?),\n card_exp_month: Some(external_vault_card.card_exp_month.expose().into()),\n card_exp_year: Some(external_vault_card.card_exp_year.expose().into()),\n card_cvc: Some(external_vault_card.card_cvc.expose().into()),\n card_holder_name: external_vault_card.card_holder_name.map(|name| name.expose().into()),\n card_issuer: external_vault_card.card_issuer.clone(),\n card_network: card_network.map(|card_network| card_network.into()),\n card_type: external_vault_card.card_type.clone(),\n bank_code: external_vault_card.bank_code.clone(),\n nick_name: external_vault_card.nick_name.map(|n| n.expose()),\n card_issuing_country_alpha2: external_vault_card.card_issuing_country.clone(),\n };\n let grpc_card_type = match payment_method_type {\n PaymentMethodType::Credit => {\n payments_grpc::card_payment_method_type::CardType::CreditProxy(card_details)\n }\n PaymentMethodType::Debit => {\n payments_grpc::card_payment_method_type::CardType::DebitProxy(card_details)\n }\n _ => {\n return Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into());\n }\n };\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Card(CardPaymentMethodType {\n card_type: Some(grpc_card_type),\n })),\n })\n }\n hyperswitch_domain_models::payment_method_data::ExternalVaultPaymentMethodData::VaultToken(_) => {\n Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into())\n }\n }\n}", + "after_code": "pub fn build_unified_connector_service_payment_method_for_external_proxy(\n payment_method_data: hyperswitch_domain_models::payment_method_data::ExternalVaultPaymentMethodData,\n payment_method_type: PaymentMethodType,\n) -> CustomResult {\n match payment_method_data {\n hyperswitch_domain_models::payment_method_data::ExternalVaultPaymentMethodData::Card(\n external_vault_card,\n ) => {\n let card_network = external_vault_card\n .card_network\n .clone()\n .map(payments_grpc::CardNetwork::foreign_try_from)\n .transpose()?;\n let card_details = CardDetails {\n card_number: Some(CardNumber::from_str(external_vault_card.card_number.peek()).change_context(\n UnifiedConnectorServiceError::RequestEncodingFailedWithReason(\"Failed to parse card number\".to_string())\n )?),\n card_exp_month: Some(external_vault_card.card_exp_month.expose().into()),\n card_exp_year: Some(external_vault_card.card_exp_year.expose().into()),\n card_cvc: Some(external_vault_card.card_cvc.expose().into()),\n card_holder_name: external_vault_card.card_holder_name.map(|name| name.expose().into()),\n card_issuer: external_vault_card.card_issuer.clone(),\n card_network: card_network.map(|card_network| card_network.into()),\n card_type: external_vault_card.card_type.clone(),\n bank_code: external_vault_card.bank_code.clone(),\n nick_name: external_vault_card.nick_name.map(|n| n.expose()),\n card_issuing_country_alpha2: external_vault_card.card_issuing_country.clone(),\n };\n let grpc_card_type = match payment_method_type {\n PaymentMethodType::Credit => {\n payments_grpc::card_payment_method_type::CardType::CreditProxy(card_details)\n }\n PaymentMethodType::Debit => {\n payments_grpc::card_payment_method_type::CardType::DebitProxy(card_details)\n }\n _ => {\n return Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into());\n }\n };\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Card(CardPaymentMethodType {\n card_type: Some(grpc_card_type),\n })),\n })\n }\n hyperswitch_domain_models::payment_method_data::ExternalVaultPaymentMethodData::VaultToken(_) => {\n Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into())\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use unified_connector_service_cards::CardNumber;" + ], + "after_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use unified_connector_service_cards::CardNumber;" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::serialize_router_data_and_send_to_comparison_service", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn serialize_router_data_and_send_to_comparison_service(\n state: &SessionState,\n hyperswitch_router_data: RouterData,\n unified_connector_service_router_data: RouterData,\n) -> RouterResult<()>\nwhere\n F: Send + Clone + Sync + 'static,\n RouterDReq: Send + Sync + Clone + 'static + serde::Serialize,\n RouterDResp: Send + Sync + Clone + 'static + serde::Serialize,\n{\n logger::info!(\"Simulating UCS call for shadow mode comparison\");\n\n let [hyperswitch_data, unified_connector_service_data] = [\n (hyperswitch_router_data, \"hyperswitch\"),\n (unified_connector_service_router_data, \"ucs\"),\n ]\n .map(|(data, source)| {\n serde_json::to_value(data)\n .map(Secret::new)\n .unwrap_or_else(|e| {\n Secret::new(serde_json::json!({\n \"error\": e.to_string(),\n \"source\": source\n }))\n })\n });\n\n let comparison_data = ComparisonData {\n hyperswitch_data,\n unified_connector_service_data,\n };\n let _ = send_comparison_data(state, comparison_data)\n .await\n .map_err(|e| {\n logger::debug!(\"Failed to send comparison data: {:?}\", e);\n });\n Ok(())\n}", + "after_code": "pub async fn serialize_router_data_and_send_to_comparison_service(\n state: &SessionState,\n hyperswitch_router_data: RouterData,\n unified_connector_service_router_data: RouterData,\n) -> RouterResult<()>\nwhere\n F: Send + Clone + Sync + 'static,\n RouterDReq: Send + Sync + Clone + 'static + serde::Serialize,\n RouterDResp: Send + Sync + Clone + 'static + serde::Serialize,\n{\n logger::info!(\"Simulating UCS call for shadow mode comparison\");\n\n let [hyperswitch_data, unified_connector_service_data] = [\n (hyperswitch_router_data, \"hyperswitch\"),\n (unified_connector_service_router_data, \"ucs\"),\n ]\n .map(|(data, source)| {\n serde_json::to_value(data)\n .map(Secret::new)\n .unwrap_or_else(|e| {\n Secret::new(serde_json::json!({\n \"error\": e.to_string(),\n \"source\": source\n }))\n })\n });\n\n let comparison_data = ComparisonData {\n hyperswitch_data,\n unified_connector_service_data,\n };\n let _ = send_comparison_data(state, comparison_data)\n .await\n .map_err(|e| {\n logger::debug!(\"Failed to send comparison data: {:?}\", e);\n });\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use masking::{ExposeInterface, PeekInterface, Secret};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use masking::{ExposeInterface, PeekInterface, Secret};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_config_info", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_rollout_config_info(state: &SessionState, config_key: &str) -> (bool, Option) {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage =\n match serde_json::from_str::(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::().ok()\n }\n };\n (true, percentage)\n }\n Err(_) => (false, None), // Key doesn't exist\n }\n}", + "after_code": "async fn get_rollout_config_info(state: &SessionState, config_key: &str) -> (bool, Option) {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage =\n match serde_json::from_str::(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::().ok()\n }\n };\n (true, percentage)\n }\n Err(_) => (false, None), // Key doesn't exist\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::update_gateway_system_in_feature_metadata", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn update_gateway_system_in_feature_metadata(\n payment_data: &mut D,\n gateway_system: GatewaySystem,\n) -> RouterResult<()>\nwhere\n D: OperationSessionGetters + OperationSessionSetters,\n{\n let mut payment_intent = payment_data.get_payment_intent().clone();\n\n let existing_metadata = payment_intent.feature_metadata.as_ref();\n\n let mut feature_metadata = existing_metadata\n .and_then(|metadata| serde_json::from_value::(metadata.clone()).ok())\n .unwrap_or_default();\n\n feature_metadata.gateway_system = Some(gateway_system);\n\n let updated_metadata = serde_json::to_value(feature_metadata)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to serialize feature metadata\")?;\n\n payment_intent.feature_metadata = Some(updated_metadata.clone());\n payment_data.set_payment_intent(payment_intent);\n\n Ok(())\n}", + "after_code": "pub fn update_gateway_system_in_feature_metadata(\n payment_data: &mut D,\n gateway_system: GatewaySystem,\n) -> RouterResult<()>\nwhere\n D: OperationSessionGetters + OperationSessionSetters,\n{\n let mut payment_intent = payment_data.get_payment_intent().clone();\n\n let existing_metadata = payment_intent.feature_metadata.as_ref();\n\n let mut feature_metadata = existing_metadata\n .and_then(|metadata| serde_json::from_value::(metadata.clone()).ok())\n .unwrap_or_default();\n\n feature_metadata.gateway_system = Some(gateway_system);\n\n let updated_metadata = serde_json::to_value(feature_metadata)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to serialize feature metadata\")?;\n\n payment_intent.feature_metadata = Some(updated_metadata.clone());\n payment_data.set_payment_intent(payment_intent);\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use diesel_models::types::FeatureMetadata;", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use diesel_models::types::FeatureMetadata;", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::handle_unified_connector_service_response_for_refund_sync", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn handle_unified_connector_service_response_for_refund_sync(\n response: payments_grpc::RefundResponse,\n) -> UnifiedConnectorServiceRefundResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "after_code": "pub fn handle_unified_connector_service_response_for_refund_sync(\n response: payments_grpc::RefundResponse,\n) -> UnifiedConnectorServiceRefundResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::type::UnifiedConnectorServiceRefundResult", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "type_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "type UnifiedConnectorServiceRefundResult =\n CustomResult<(Result, u16), UnifiedConnectorServiceError>;", + "after_code": "type UnifiedConnectorServiceRefundResult =\n CustomResult<(Result, u16), UnifiedConnectorServiceError>;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::mod::transformers", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "mod_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub mod transformers;", + "after_code": "pub mod transformers;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::decide_execution_path", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn decide_execution_path(\n connector_type: ConnectorIntegrationType,\n previous_gateway: Option,\n shadow_rollout_enabled: ShadowRolloutAvailability,\n) -> RouterResult<(GatewaySystem, ExecutionPath)> {\n match (connector_type, previous_gateway, shadow_rollout_enabled) {\n // Case 1: DirectConnector with no previous gateway and no shadow rollout\n // This is a fresh payment request for a direct connector - use direct gateway\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 2: DirectConnector previously used Direct gateway, no shadow rollout\n // Continue using the same direct gateway for consistency\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 3: DirectConnector previously used UCS, but now switching back to Direct (no shadow)\n // Migration scenario: UCS was used before, but now we're reverting to Direct\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 4: UcsConnector configuration, but previously used Direct gateway (no shadow)\n // Maintain Direct for backward compatibility - don't switch mid-transaction\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 5: DirectConnector with no previous gateway, shadow rollout enabled\n // Use Direct as primary, but also execute UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 6: DirectConnector previously used Direct, shadow rollout enabled\n // Continue with Direct as primary, execute UCS in shadow mode for testing\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 7: DirectConnector previously used UCS, shadow rollout enabled\n // Revert to Direct as primary, but keep UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 8: UcsConnector configuration, previously used Direct, shadow rollout enabled\n // Maintain Direct as primary for transaction consistency, shadow UCS for testing\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 9a: UcsConnector with no previous gateway and shadow rollout enabled\n // Fresh payment for UCS-enabled connector with shadow mode - use shadow UCS\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n ))\n }\n\n // Case 9b: UcsConnector with no previous gateway and no shadow rollout\n // Fresh payment for a UCS-enabled connector - use UCS as primary\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::NotAvailable) => {\n Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n ))\n }\n\n // Case 10: UcsConnector previously used UCS (regardless of shadow rollout)\n // Continue using UCS for consistency in the payment flow\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n _,\n ) => Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )),\n }\n}", + "after_code": "fn decide_execution_path(\n connector_type: ConnectorIntegrationType,\n previous_gateway: Option,\n shadow_rollout_enabled: ShadowRolloutAvailability,\n) -> RouterResult<(GatewaySystem, ExecutionPath)> {\n match (connector_type, previous_gateway, shadow_rollout_enabled) {\n // Case 1: DirectConnector with no previous gateway and no shadow rollout\n // This is a fresh payment request for a direct connector - use direct gateway\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 2: DirectConnector previously used Direct gateway, no shadow rollout\n // Continue using the same direct gateway for consistency\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 3: DirectConnector previously used UCS, but now switching back to Direct (no shadow)\n // Migration scenario: UCS was used before, but now we're reverting to Direct\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 4: UcsConnector configuration, but previously used Direct gateway (no shadow)\n // Maintain Direct for backward compatibility - don't switch mid-transaction\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 5: DirectConnector with no previous gateway, shadow rollout enabled\n // Use Direct as primary, but also execute UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 6: DirectConnector previously used Direct, shadow rollout enabled\n // Continue with Direct as primary, execute UCS in shadow mode for testing\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 7: DirectConnector previously used UCS, shadow rollout enabled\n // Revert to Direct as primary, but keep UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 8: UcsConnector configuration, previously used Direct, shadow rollout enabled\n // Maintain Direct as primary for transaction consistency, shadow UCS for testing\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 9a: UcsConnector with no previous gateway and shadow rollout enabled\n // Fresh payment for UCS-enabled connector with shadow mode - use shadow UCS\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n ))\n }\n\n // Case 9b: UcsConnector with no previous gateway and no shadow rollout\n // Fresh payment for a UCS-enabled connector - use UCS as primary\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::NotAvailable) => {\n Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n ))\n }\n\n // Case 10: UcsConnector previously used UCS (regardless of shadow rollout)\n // Continue using UCS for consistency in the payment flow\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n _,\n ) => Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )),\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::handle_unified_connector_service_response_for_payment_repeat", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn handle_unified_connector_service_response_for_payment_repeat(\n response: payments_grpc::PaymentServiceRepeatEverythingResponse,\n) -> CustomResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(\n response.clone(),\n )?;\n\n let connector_customer_id =\n extract_connector_customer_id_from_ucs_state(response.state.as_ref());\n let connector_response =\n extract_connector_response_from_ucs(response.connector_response.as_ref());\n\n Ok(UcsRepeatPaymentResponseData {\n router_data_response,\n status_code,\n connector_customer_id,\n connector_response,\n })\n}", + "after_code": "pub fn handle_unified_connector_service_response_for_payment_repeat(\n response: payments_grpc::PaymentServiceRepeatEverythingResponse,\n) -> CustomResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(\n response.clone(),\n )?;\n\n let connector_customer_id =\n extract_connector_customer_id_from_ucs_state(response.state.as_ref());\n let connector_response =\n extract_connector_response_from_ucs(response.connector_response.as_ref());\n\n Ok(UcsRepeatPaymentResponseData {\n router_data_response,\n status_code,\n connector_customer_id,\n connector_response,\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::handle_unified_connector_service_response_for_payment_pre_authenticate", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn handle_unified_connector_service_response_for_payment_pre_authenticate(\n response: payments_grpc::PaymentServicePreAuthenticateResponse,\n) -> UnifiedConnectorServiceResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "after_code": "pub fn handle_unified_connector_service_response_for_payment_pre_authenticate(\n response: payments_grpc::PaymentServicePreAuthenticateResponse,\n) -> UnifiedConnectorServiceResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::build_rollout_keys", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn build_rollout_keys(\n merchant_id: &str,\n connector_name: &str,\n flow_name: &str,\n payment_method: common_enums::PaymentMethod,\n) -> (String, String) {\n // Detect if this is a refund flow based on flow name\n let is_refund_flow = matches!(flow_name, \"Execute\" | \"RSync\");\n\n let rollout_key = if is_refund_flow {\n // Refund flows: UCS_merchant_connector_flow (e.g., UCS_merchant123_stripe_Execute)\n format!(\n \"{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n flow_name\n )\n } else {\n // Payment flows: UCS_merchant_connector_paymentmethod_flow (e.g., UCS_merchant123_stripe_card_Authorize)\n let payment_method_str = payment_method.to_string();\n format!(\n \"{}_{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n payment_method_str,\n flow_name\n )\n };\n\n let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n (rollout_key, shadow_rollout_key)\n}", + "after_code": "fn build_rollout_keys(\n merchant_id: &str,\n connector_name: &str,\n flow_name: &str,\n payment_method: common_enums::PaymentMethod,\n) -> (String, String) {\n // Detect if this is a refund flow based on flow name\n let is_refund_flow = matches!(flow_name, \"Execute\" | \"RSync\");\n\n let rollout_key = if is_refund_flow {\n // Refund flows: UCS_merchant_connector_flow (e.g., UCS_merchant123_stripe_Execute)\n format!(\n \"{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n flow_name\n )\n } else {\n // Payment flows: UCS_merchant_connector_paymentmethod_flow (e.g., UCS_merchant123_stripe_card_Authorize)\n let payment_method_str = payment_method.to_string();\n format!(\n \"{}_{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n payment_method_str,\n flow_name\n )\n };\n\n let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n (rollout_key, shadow_rollout_key)\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service_for_webhooks", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn should_call_unified_connector_service_for_webhooks(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n) -> RouterResult {\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n let flow_name = \"Webhooks\";\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n // Build rollout keys - webhooks don't use payment method, so use a simplified key format\n let rollout_key = format!(\n \"{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n flow_name\n );\n let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // For webhooks, there is no previous gateway system to consider (webhooks are stateless)\n let previous_gateway = None;\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let (_shadow_key_exists, shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Use the same decision logic as payments, with no call_connector_action to consider\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n router_env::logger::debug!(\"UCS is disabled for webhooks, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n } else {\n // UCS is enabled, use decide function with no previous gateway for webhooks\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n };\n\n router_env::logger::info!(\n \"Webhook gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n Ok(execution_path)\n}", + "after_code": "pub async fn should_call_unified_connector_service_for_webhooks(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n) -> RouterResult {\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n let flow_name = \"Webhooks\";\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n // Build rollout keys - webhooks don't use payment method, so use a simplified key format\n let rollout_key = format!(\n \"{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n flow_name\n );\n let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // For webhooks, there is no previous gateway system to consider (webhooks are stateless)\n let previous_gateway = None;\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let (_shadow_key_exists, shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Use the same decision logic as payments, with no call_connector_action to consider\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n router_env::logger::debug!(\"UCS is disabled for webhooks, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n } else {\n // UCS is enabled, use decide function with no previous gateway for webhooks\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n };\n\n router_env::logger::info!(\n \"Webhook gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n Ok(execution_path)\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::build_unified_connector_service_auth_metadata", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn build_unified_connector_service_auth_metadata(\n #[cfg(feature = \"v1\")] merchant_connector_account: MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")] merchant_connector_account: MerchantConnectorAccountTypeDetails,\n merchant_context: &MerchantContext,\n) -> CustomResult {\n #[cfg(feature = \"v1\")]\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(UnifiedConnectorServiceError::FailedToObtainAuthType)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n #[cfg(feature = \"v2\")]\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .change_context(UnifiedConnectorServiceError::FailedToObtainAuthType)\n .attach_printable(\"Failed to obtain ConnectorAuthType\")?;\n\n let connector_name = {\n #[cfg(feature = \"v1\")]\n {\n merchant_connector_account\n .get_connector_name()\n .ok_or(UnifiedConnectorServiceError::MissingConnectorName)\n .attach_printable(\"Missing connector name\")?\n }\n\n #[cfg(feature = \"v2\")]\n {\n merchant_connector_account\n .get_connector_name()\n .map(|connector| connector.to_string())\n .ok_or(UnifiedConnectorServiceError::MissingConnectorName)\n .attach_printable(\"Missing connector name\")?\n }\n };\n\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n match &auth_type {\n ConnectorAuthType::SignatureKey {\n api_key,\n key1,\n api_secret,\n } => Ok(ConnectorAuthMetadata {\n connector_name,\n auth_type: consts::UCS_AUTH_SIGNATURE_KEY.to_string(),\n api_key: Some(api_key.clone()),\n key1: Some(key1.clone()),\n api_secret: Some(api_secret.clone()),\n auth_key_map: None,\n merchant_id: Secret::new(merchant_id.to_string()),\n }),\n ConnectorAuthType::BodyKey { api_key, key1 } => Ok(ConnectorAuthMetadata {\n connector_name,\n auth_type: consts::UCS_AUTH_BODY_KEY.to_string(),\n api_key: Some(api_key.clone()),\n key1: Some(key1.clone()),\n api_secret: None,\n auth_key_map: None,\n merchant_id: Secret::new(merchant_id.to_string()),\n }),\n ConnectorAuthType::HeaderKey { api_key } => Ok(ConnectorAuthMetadata {\n connector_name,\n auth_type: consts::UCS_AUTH_HEADER_KEY.to_string(),\n api_key: Some(api_key.clone()),\n key1: None,\n api_secret: None,\n auth_key_map: None,\n merchant_id: Secret::new(merchant_id.to_string()),\n }),\n ConnectorAuthType::CurrencyAuthKey { auth_key_map } => Ok(ConnectorAuthMetadata {\n connector_name,\n auth_type: consts::UCS_AUTH_CURRENCY_AUTH_KEY.to_string(),\n api_key: None,\n key1: None,\n api_secret: None,\n auth_key_map: Some(auth_key_map.clone()),\n merchant_id: Secret::new(merchant_id.to_string()),\n }),\n _ => Err(UnifiedConnectorServiceError::FailedToObtainAuthType)\n .attach_printable(\"Unsupported ConnectorAuthType for header injection\"),\n }\n}", + "after_code": "pub fn build_unified_connector_service_auth_metadata(\n #[cfg(feature = \"v1\")] merchant_connector_account: MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")] merchant_connector_account: MerchantConnectorAccountTypeDetails,\n merchant_context: &MerchantContext,\n) -> CustomResult {\n #[cfg(feature = \"v1\")]\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(UnifiedConnectorServiceError::FailedToObtainAuthType)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n #[cfg(feature = \"v2\")]\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .change_context(UnifiedConnectorServiceError::FailedToObtainAuthType)\n .attach_printable(\"Failed to obtain ConnectorAuthType\")?;\n\n let connector_name = {\n #[cfg(feature = \"v1\")]\n {\n merchant_connector_account\n .get_connector_name()\n .ok_or(UnifiedConnectorServiceError::MissingConnectorName)\n .attach_printable(\"Missing connector name\")?\n }\n\n #[cfg(feature = \"v2\")]\n {\n merchant_connector_account\n .get_connector_name()\n .map(|connector| connector.to_string())\n .ok_or(UnifiedConnectorServiceError::MissingConnectorName)\n .attach_printable(\"Missing connector name\")?\n }\n };\n\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n match &auth_type {\n ConnectorAuthType::SignatureKey {\n api_key,\n key1,\n api_secret,\n } => Ok(ConnectorAuthMetadata {\n connector_name,\n auth_type: consts::UCS_AUTH_SIGNATURE_KEY.to_string(),\n api_key: Some(api_key.clone()),\n key1: Some(key1.clone()),\n api_secret: Some(api_secret.clone()),\n auth_key_map: None,\n merchant_id: Secret::new(merchant_id.to_string()),\n }),\n ConnectorAuthType::BodyKey { api_key, key1 } => Ok(ConnectorAuthMetadata {\n connector_name,\n auth_type: consts::UCS_AUTH_BODY_KEY.to_string(),\n api_key: Some(api_key.clone()),\n key1: Some(key1.clone()),\n api_secret: None,\n auth_key_map: None,\n merchant_id: Secret::new(merchant_id.to_string()),\n }),\n ConnectorAuthType::HeaderKey { api_key } => Ok(ConnectorAuthMetadata {\n connector_name,\n auth_type: consts::UCS_AUTH_HEADER_KEY.to_string(),\n api_key: Some(api_key.clone()),\n key1: None,\n api_secret: None,\n auth_key_map: None,\n merchant_id: Secret::new(merchant_id.to_string()),\n }),\n ConnectorAuthType::CurrencyAuthKey { auth_key_map } => Ok(ConnectorAuthMetadata {\n connector_name,\n auth_type: consts::UCS_AUTH_CURRENCY_AUTH_KEY.to_string(),\n api_key: None,\n key1: None,\n api_secret: None,\n auth_key_map: Some(auth_key_map.clone()),\n merchant_id: Secret::new(merchant_id.to_string()),\n }),\n _ => Err(UnifiedConnectorServiceError::FailedToObtainAuthType)\n .attach_printable(\"Unsupported ConnectorAuthType for header injection\"),\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use masking::{ExposeInterface, PeekInterface, Secret};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use masking::{ExposeInterface, PeekInterface, Secret};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::extract_connector_customer_id_from_ucs_state", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn extract_connector_customer_id_from_ucs_state(\n ucs_state: Option<&payments_grpc::ConnectorState>,\n) -> Option {\n ucs_state.and_then(|state| {\n state\n .connector_customer_id\n .as_ref()\n .map(|id| id.to_string())\n })\n}", + "after_code": "pub fn extract_connector_customer_id_from_ucs_state(\n ucs_state: Option<&payments_grpc::ConnectorState>,\n) -> Option {\n ucs_state.and_then(|state| {\n state\n .connector_customer_id\n .as_ref()\n .map(|id| id.to_string())\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::build_unified_connector_service_external_vault_proxy_metadata", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn build_unified_connector_service_external_vault_proxy_metadata(\n external_vault_merchant_connector_account: MerchantConnectorAccountTypeDetails,\n) -> CustomResult {\n let external_vault_metadata = external_vault_merchant_connector_account\n .get_metadata()\n .ok_or(UnifiedConnectorServiceError::ParsingFailed)\n .attach_printable(\"Failed to obtain ConnectorMetadata\")?;\n\n let connector_name = external_vault_merchant_connector_account\n .get_connector_name()\n .map(|connector| connector.to_string())\n .ok_or(UnifiedConnectorServiceError::MissingConnectorName)\n .attach_printable(\"Missing connector name\")?; // always get the connector name from this call\n\n let external_vault_connector = api_enums::VaultConnectors::from_str(&connector_name)\n .change_context(UnifiedConnectorServiceError::InvalidConnectorName)\n .attach_printable(\"Failed to parse Vault connector\")?;\n\n let unified_service_vault_metdata = match external_vault_connector {\n api_enums::VaultConnectors::Vgs => {\n let vgs_metadata: ExternalVaultConnectorMetadata = external_vault_metadata\n .expose()\n .parse_value(\"ExternalVaultConnectorMetadata\")\n .change_context(UnifiedConnectorServiceError::ParsingFailed)\n .attach_printable(\"Failed to parse Vgs connector metadata\")?;\n\n Some(external_services::grpc_client::unified_connector_service::ExternalVaultProxyMetadata::VgsMetadata(\n external_services::grpc_client::unified_connector_service::VgsMetadata {\n proxy_url: vgs_metadata.proxy_url,\n certificate: vgs_metadata.certificate,\n }\n ))\n }\n api_enums::VaultConnectors::HyperswitchVault | api_enums::VaultConnectors::Tokenex => None,\n };\n\n match unified_service_vault_metdata {\n Some(metdata) => {\n let external_vault_metadata_bytes = serde_json::to_vec(&metdata)\n .change_context(UnifiedConnectorServiceError::ParsingFailed)\n .attach_printable(\"Failed to convert External vault metadata to bytes\")?;\n\n Ok(BASE64_ENGINE.encode(&external_vault_metadata_bytes))\n }\n None => Err(UnifiedConnectorServiceError::NotImplemented(\n \"External vault proxy metadata is not supported for {connector_name}\".to_string(),\n )\n .into()),\n }\n}", + "after_code": "pub fn build_unified_connector_service_external_vault_proxy_metadata(\n external_vault_merchant_connector_account: MerchantConnectorAccountTypeDetails,\n) -> CustomResult {\n let external_vault_metadata = external_vault_merchant_connector_account\n .get_metadata()\n .ok_or(UnifiedConnectorServiceError::ParsingFailed)\n .attach_printable(\"Failed to obtain ConnectorMetadata\")?;\n\n let connector_name = external_vault_merchant_connector_account\n .get_connector_name()\n .map(|connector| connector.to_string())\n .ok_or(UnifiedConnectorServiceError::MissingConnectorName)\n .attach_printable(\"Missing connector name\")?; // always get the connector name from this call\n\n let external_vault_connector = api_enums::VaultConnectors::from_str(&connector_name)\n .change_context(UnifiedConnectorServiceError::InvalidConnectorName)\n .attach_printable(\"Failed to parse Vault connector\")?;\n\n let unified_service_vault_metdata = match external_vault_connector {\n api_enums::VaultConnectors::Vgs => {\n let vgs_metadata: ExternalVaultConnectorMetadata = external_vault_metadata\n .expose()\n .parse_value(\"ExternalVaultConnectorMetadata\")\n .change_context(UnifiedConnectorServiceError::ParsingFailed)\n .attach_printable(\"Failed to parse Vgs connector metadata\")?;\n\n Some(external_services::grpc_client::unified_connector_service::ExternalVaultProxyMetadata::VgsMetadata(\n external_services::grpc_client::unified_connector_service::VgsMetadata {\n proxy_url: vgs_metadata.proxy_url,\n certificate: vgs_metadata.certificate,\n }\n ))\n }\n api_enums::VaultConnectors::HyperswitchVault | api_enums::VaultConnectors::Tokenex => None,\n };\n\n match unified_service_vault_metdata {\n Some(metdata) => {\n let external_vault_metadata_bytes = serde_json::to_vec(&metdata)\n .change_context(UnifiedConnectorServiceError::ParsingFailed)\n .attach_printable(\"Failed to convert External vault metadata to bytes\")?;\n\n Ok(BASE64_ENGINE.encode(&external_vault_metadata_bytes))\n }\n None => Err(UnifiedConnectorServiceError::NotImplemented(\n \"External vault proxy metadata is not supported for {connector_name}\".to_string(),\n )\n .into()),\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::consts::BASE64_ENGINE;" + ], + "after_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::consts::BASE64_ENGINE;" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::ucs_logging_wrapper", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn ucs_logging_wrapper(\n router_data: RouterData,\n state: &SessionState,\n grpc_request: GrpcReq,\n grpc_header_builder: external_services::grpc_client::GrpcHeadersUcsBuilderFinal,\n handler: F,\n) -> RouterResult>\nwhere\n T: std::fmt::Debug + Clone + Send + 'static,\n Req: std::fmt::Debug + Clone + Send + Sync + 'static,\n Resp: std::fmt::Debug + Clone + Send + Sync + 'static,\n GrpcReq: serde::Serialize,\n GrpcResp: serde::Serialize,\n F: FnOnce(\n RouterData,\n GrpcReq,\n external_services::grpc_client::GrpcHeadersUcs,\n ) -> Fut\n + Send,\n Fut: std::future::Future, GrpcResp)>> + Send,\n{\n tracing::Span::current().record(\"connector_name\", &router_data.connector);\n tracing::Span::current().record(\"flow_type\", std::any::type_name::());\n tracing::Span::current().record(\"payment_id\", &router_data.payment_id);\n\n // Capture request data for logging\n let connector_name = router_data.connector.clone();\n let payment_id = router_data.payment_id.clone();\n let merchant_id = router_data.merchant_id.clone();\n let refund_id = router_data.refund_id.clone();\n let dispute_id = router_data.dispute_id.clone();\n let grpc_header = grpc_header_builder.build();\n // Log the actual gRPC request with masking\n let grpc_request_body = masking::masked_serialize(&grpc_request)\n .unwrap_or_else(|_| serde_json::json!({\"error\": \"failed_to_serialize_grpc_request\"}));\n\n // Update connector call count metrics for UCS operations\n crate::routes::metrics::CONNECTOR_CALL_COUNT.add(\n 1,\n router_env::metric_attributes!(\n (\"connector\", connector_name.clone()),\n (\n \"flow\",\n std::any::type_name::()\n .split(\"::\")\n .last()\n .unwrap_or_default()\n ),\n ),\n );\n\n // Execute UCS function and measure timing\n let start_time = Instant::now();\n let result = handler(router_data, grpc_request, grpc_header).await;\n let external_latency = start_time.elapsed().as_millis();\n\n // Create and emit connector event after UCS call\n let (status_code, response_body, router_result) = match result {\n Ok((updated_router_data, grpc_response)) => {\n let status = updated_router_data\n .connector_http_status_code\n .unwrap_or(200);\n\n // Log the actual gRPC response\n let grpc_response_body = serde_json::to_value(&grpc_response).unwrap_or_else(\n |_| serde_json::json!({\"error\": \"failed_to_serialize_grpc_response\"}),\n );\n\n (status, Some(grpc_response_body), Ok(updated_router_data))\n }\n Err(error) => {\n // Update error metrics for UCS calls\n crate::routes::metrics::CONNECTOR_ERROR_RESPONSE_COUNT.add(\n 1,\n router_env::metric_attributes!((\"connector\", connector_name.clone(),)),\n );\n\n let error_body = serde_json::json!({\n \"error\": error.to_string(),\n \"error_type\": \"ucs_call_failed\"\n });\n (500, Some(error_body), Err(error))\n }\n };\n\n let mut connector_event = ConnectorEvent::new(\n state.tenant.tenant_id.clone(),\n connector_name,\n std::any::type_name::(),\n grpc_request_body,\n \"grpc://unified-connector-service\".to_string(),\n Method::Post,\n payment_id,\n merchant_id,\n state.request_id.as_ref(),\n external_latency,\n refund_id,\n dispute_id,\n status_code,\n );\n\n // Set response body based on status code\n if let Some(body) = response_body {\n match status_code {\n 400..=599 => {\n connector_event.set_error_response_body(&body);\n }\n _ => {\n connector_event.set_response_body(&body);\n }\n }\n }\n\n // Emit event\n state.event_handler.log_event(&connector_event);\n\n // Set external latency on router data\n router_result.map(|mut router_data| {\n router_data.external_latency =\n Some(router_data.external_latency.unwrap_or(0) + external_latency);\n router_data\n })\n}", + "after_code": "pub async fn ucs_logging_wrapper(\n router_data: RouterData,\n state: &SessionState,\n grpc_request: GrpcReq,\n grpc_header_builder: external_services::grpc_client::GrpcHeadersUcsBuilderFinal,\n handler: F,\n) -> RouterResult>\nwhere\n T: std::fmt::Debug + Clone + Send + 'static,\n Req: std::fmt::Debug + Clone + Send + Sync + 'static,\n Resp: std::fmt::Debug + Clone + Send + Sync + 'static,\n GrpcReq: serde::Serialize,\n GrpcResp: serde::Serialize,\n F: FnOnce(\n RouterData,\n GrpcReq,\n external_services::grpc_client::GrpcHeadersUcs,\n ) -> Fut\n + Send,\n Fut: std::future::Future, GrpcResp)>> + Send,\n{\n tracing::Span::current().record(\"connector_name\", &router_data.connector);\n tracing::Span::current().record(\"flow_type\", std::any::type_name::());\n tracing::Span::current().record(\"payment_id\", &router_data.payment_id);\n\n // Capture request data for logging\n let connector_name = router_data.connector.clone();\n let payment_id = router_data.payment_id.clone();\n let merchant_id = router_data.merchant_id.clone();\n let refund_id = router_data.refund_id.clone();\n let dispute_id = router_data.dispute_id.clone();\n let grpc_header = grpc_header_builder.build();\n // Log the actual gRPC request with masking\n let grpc_request_body = masking::masked_serialize(&grpc_request)\n .unwrap_or_else(|_| serde_json::json!({\"error\": \"failed_to_serialize_grpc_request\"}));\n\n // Update connector call count metrics for UCS operations\n crate::routes::metrics::CONNECTOR_CALL_COUNT.add(\n 1,\n router_env::metric_attributes!(\n (\"connector\", connector_name.clone()),\n (\n \"flow\",\n std::any::type_name::()\n .split(\"::\")\n .last()\n .unwrap_or_default()\n ),\n ),\n );\n\n // Execute UCS function and measure timing\n let start_time = Instant::now();\n let result = handler(router_data, grpc_request, grpc_header).await;\n let external_latency = start_time.elapsed().as_millis();\n\n // Create and emit connector event after UCS call\n let (status_code, response_body, router_result) = match result {\n Ok((updated_router_data, grpc_response)) => {\n let status = updated_router_data\n .connector_http_status_code\n .unwrap_or(200);\n\n // Log the actual gRPC response\n let grpc_response_body = serde_json::to_value(&grpc_response).unwrap_or_else(\n |_| serde_json::json!({\"error\": \"failed_to_serialize_grpc_response\"}),\n );\n\n (status, Some(grpc_response_body), Ok(updated_router_data))\n }\n Err(error) => {\n // Update error metrics for UCS calls\n crate::routes::metrics::CONNECTOR_ERROR_RESPONSE_COUNT.add(\n 1,\n router_env::metric_attributes!((\"connector\", connector_name.clone(),)),\n );\n\n let error_body = serde_json::json!({\n \"error\": error.to_string(),\n \"error_type\": \"ucs_call_failed\"\n });\n (500, Some(error_body), Err(error))\n }\n };\n\n let mut connector_event = ConnectorEvent::new(\n state.tenant.tenant_id.clone(),\n connector_name,\n std::any::type_name::(),\n grpc_request_body,\n \"grpc://unified-connector-service\".to_string(),\n Method::Post,\n payment_id,\n merchant_id,\n state.request_id.as_ref(),\n external_latency,\n refund_id,\n dispute_id,\n status_code,\n );\n\n // Set response body based on status code\n if let Some(body) = response_body {\n match status_code {\n 400..=599 => {\n connector_event.set_error_response_body(&body);\n }\n _ => {\n connector_event.set_response_body(&body);\n }\n }\n }\n\n // Emit event\n state.event_handler.log_event(&connector_event);\n\n // Set external latency on router data\n router_result.map(|mut router_data| {\n router_data.external_latency =\n Some(router_data.external_latency.unwrap_or(0) + external_latency);\n router_data\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::handle_unified_connector_service_response_for_payment_cancel", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn handle_unified_connector_service_response_for_payment_cancel(\n response: payments_grpc::PaymentServiceVoidResponse,\n) -> UnifiedConnectorServiceResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "after_code": "pub fn handle_unified_connector_service_response_for_payment_cancel(\n response: payments_grpc::PaymentServiceVoidResponse,\n) -> UnifiedConnectorServiceResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::call_unified_connector_service_for_webhook", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn call_unified_connector_service_for_webhook(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n body: &actix_web::web::Bytes,\n request_details: &hyperswitch_interfaces::webhooks::IncomingWebhookRequestDetails<'_>,\n merchant_connector_account: Option<\n &hyperswitch_domain_models::merchant_connector_account::MerchantConnectorAccount,\n >,\n) -> RouterResult<(\n api_models::webhooks::IncomingWebhookEvent,\n bool,\n WebhookTransformData,\n)> {\n let ucs_client = state\n .grpc_client\n .unified_connector_service_client\n .as_ref()\n .ok_or_else(|| {\n error_stack::report!(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"UCS client is not available for webhook processing\")\n })?;\n\n // Build webhook secrets from merchant connector account\n let webhook_secrets = merchant_connector_account.and_then(|mca| {\n #[cfg(feature = \"v1\")]\n let mca_type = MerchantConnectorAccountType::DbVal(Box::new(mca.clone()));\n #[cfg(feature = \"v2\")]\n let mca_type =\n MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(mca.clone()));\n\n build_webhook_secrets_from_merchant_connector_account(&mca_type)\n .map_err(|e| {\n logger::warn!(\n build_error=?e,\n connector_name=connector_name,\n \"Failed to build webhook secrets from merchant connector account in call_unified_connector_service_for_webhook\"\n );\n e\n })\n .ok()\n .flatten()\n });\n\n // Build UCS transform request using new webhook transformers\n let transform_request = transformers::build_webhook_transform_request(\n body,\n request_details,\n webhook_secrets,\n merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr(),\n connector_name,\n )?;\n\n // Build connector auth metadata\n let connector_auth_metadata = merchant_connector_account\n .map(|mca| {\n #[cfg(feature = \"v1\")]\n let mca_type = MerchantConnectorAccountType::DbVal(Box::new(mca.clone()));\n #[cfg(feature = \"v2\")]\n let mca_type = MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n mca.clone(),\n ));\n\n build_unified_connector_service_auth_metadata(mca_type, merchant_context)\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to build UCS auth metadata\")?\n .ok_or_else(|| {\n error_stack::report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n \"Missing merchant connector account for UCS webhook transformation\",\n )\n })?;\n let profile_id = merchant_connector_account\n .as_ref()\n .map(|mca| mca.profile_id.clone())\n .unwrap_or(consts::PROFILE_ID_UNAVAILABLE.clone());\n // Build gRPC headers\n let grpc_headers = state\n .get_grpc_headers_ucs(ExecutionMode::Primary)\n .lineage_ids(LineageIds::new(\n merchant_context.get_merchant_account().get_id().clone(),\n profile_id,\n ))\n .external_vault_proxy_metadata(None)\n .merchant_reference_id(None)\n .build();\n\n // Make UCS call - client availability already verified\n match ucs_client\n .transform_incoming_webhook(transform_request, connector_auth_metadata, grpc_headers)\n .await\n {\n Ok(response) => {\n let transform_response = response.into_inner();\n let transform_data = transformers::transform_ucs_webhook_response(transform_response)?;\n\n // UCS handles everything internally - event type, source verification, decoding\n Ok((\n transform_data.event_type,\n transform_data.source_verified,\n transform_data,\n ))\n }\n Err(err) => {\n // When UCS is configured, we don't fall back to direct connector processing\n Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(format!(\"UCS webhook processing failed: {err}\"))\n }\n }\n}", + "after_code": "pub async fn call_unified_connector_service_for_webhook(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n body: &actix_web::web::Bytes,\n request_details: &hyperswitch_interfaces::webhooks::IncomingWebhookRequestDetails<'_>,\n merchant_connector_account: Option<\n &hyperswitch_domain_models::merchant_connector_account::MerchantConnectorAccount,\n >,\n) -> RouterResult<(\n api_models::webhooks::IncomingWebhookEvent,\n bool,\n WebhookTransformData,\n)> {\n let ucs_client = state\n .grpc_client\n .unified_connector_service_client\n .as_ref()\n .ok_or_else(|| {\n error_stack::report!(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"UCS client is not available for webhook processing\")\n })?;\n\n // Build webhook secrets from merchant connector account\n let webhook_secrets = merchant_connector_account.and_then(|mca| {\n #[cfg(feature = \"v1\")]\n let mca_type = MerchantConnectorAccountType::DbVal(Box::new(mca.clone()));\n #[cfg(feature = \"v2\")]\n let mca_type =\n MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(mca.clone()));\n\n build_webhook_secrets_from_merchant_connector_account(&mca_type)\n .map_err(|e| {\n logger::warn!(\n build_error=?e,\n connector_name=connector_name,\n \"Failed to build webhook secrets from merchant connector account in call_unified_connector_service_for_webhook\"\n );\n e\n })\n .ok()\n .flatten()\n });\n\n // Build UCS transform request using new webhook transformers\n let transform_request = transformers::build_webhook_transform_request(\n body,\n request_details,\n webhook_secrets,\n merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr(),\n connector_name,\n )?;\n\n // Build connector auth metadata\n let connector_auth_metadata = merchant_connector_account\n .map(|mca| {\n #[cfg(feature = \"v1\")]\n let mca_type = MerchantConnectorAccountType::DbVal(Box::new(mca.clone()));\n #[cfg(feature = \"v2\")]\n let mca_type = MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n mca.clone(),\n ));\n\n build_unified_connector_service_auth_metadata(mca_type, merchant_context)\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to build UCS auth metadata\")?\n .ok_or_else(|| {\n error_stack::report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n \"Missing merchant connector account for UCS webhook transformation\",\n )\n })?;\n let profile_id = merchant_connector_account\n .as_ref()\n .map(|mca| mca.profile_id.clone())\n .unwrap_or(consts::PROFILE_ID_UNAVAILABLE.clone());\n // Build gRPC headers\n let grpc_headers = state\n .get_grpc_headers_ucs(ExecutionMode::Primary)\n .lineage_ids(LineageIds::new(\n merchant_context.get_merchant_account().get_id().clone(),\n profile_id,\n ))\n .external_vault_proxy_metadata(None)\n .merchant_reference_id(None)\n .build();\n\n // Make UCS call - client availability already verified\n match ucs_client\n .transform_incoming_webhook(transform_request, connector_auth_metadata, grpc_headers)\n .await\n {\n Ok(response) => {\n let transform_response = response.into_inner();\n let transform_data = transformers::transform_ucs_webhook_response(transform_response)?;\n\n // UCS handles everything internally - event type, source verification, decoding\n Ok((\n transform_data.event_type,\n transform_data.source_verified,\n transform_data,\n ))\n }\n Err(err) => {\n // When UCS is configured, we don't fall back to direct connector processing\n Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(format!(\"UCS webhook processing failed: {err}\"))\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use router_env::{instrument, logger, tracing};", + "pub use transformers::{WebhookTransformData, WebhookTransformationStatus};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use router_env::{instrument, logger, tracing};", + "pub use transformers::{WebhookTransformData, WebhookTransformationStatus};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn should_call_unified_connector_service(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n shadow_ucs_call_connector_action: Option,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!(\n shadow_key = %shadow_rollout_key,\n shadow_percentage = shadow_percentage,\n rollout_enabled = rollout_result.should_execute,\n \"Shadow key exists but disabled (0.0%), falling back to rollout or direct\"\n );\n // Shadow disabled, result is the same regardless of rollout status\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute {\n // Block 2: No shadow key, but rollout is enabled - use primary UCS\n router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else {\n // Block 3: Neither shadow nor rollout enabled - use direct\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n if shadow_ucs_call_connector_action.is_some() {\n (\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )\n } else {\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}", + "after_code": "pub async fn should_call_unified_connector_service(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n shadow_ucs_call_connector_action: Option,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!(\n shadow_key = %shadow_rollout_key,\n shadow_percentage = shadow_percentage,\n rollout_enabled = rollout_result.should_execute,\n \"Shadow key exists but disabled (0.0%), falling back to rollout or direct\"\n );\n // Shadow disabled, result is the same regardless of rollout status\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute {\n // Block 2: No shadow key, but rollout is enabled - use primary UCS\n router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else {\n // Block 3: Neither shadow nor rollout enabled - use direct\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n if shadow_ucs_call_connector_action.is_some() {\n (\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )\n } else {\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::extract_connector_response_from_ucs", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn extract_connector_response_from_ucs(\n connector_response: Option<&payments_grpc::ConnectorResponseData>,\n) -> Option {\n connector_response.and_then(|data| {\n >::foreign_try_from(data.clone())\n .map_err(|e| {\n logger::warn!(\n error=?e,\n \"Failed to deserialize connector_response from UCS\"\n );\n e\n })\n .ok()\n })\n}", + "after_code": "pub fn extract_connector_response_from_ucs(\n connector_response: Option<&payments_grpc::ConnectorResponseData>,\n) -> Option {\n connector_response.and_then(|data| {\n >::foreign_try_from(data.clone())\n .map_err(|e| {\n logger::warn!(\n error=?e,\n \"Failed to deserialize connector_response from UCS\"\n );\n e\n })\n .ok()\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::create_updated_session_state_with_proxy", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn create_updated_session_state_with_proxy(\n state: SessionState,\n proxy_override: &ProxyOverride,\n) -> SessionState {\n let mut updated_state = state;\n\n // Create updated configuration with proxy overrides\n let mut updated_conf = (*updated_state.conf).clone();\n\n // Update proxy URLs with overrides, falling back to existing values\n if let Some(ref http_url) = proxy_override.http_url {\n updated_conf.proxy.http_url = Some(http_url.clone());\n }\n if let Some(ref https_url) = proxy_override.https_url {\n updated_conf.proxy.https_url = Some(https_url.clone());\n }\n\n updated_state.conf = std::sync::Arc::new(updated_conf);\n\n updated_state\n}", + "after_code": "fn create_updated_session_state_with_proxy(\n state: SessionState,\n proxy_override: &ProxyOverride,\n) -> SessionState {\n let mut updated_state = state;\n\n // Create updated configuration with proxy overrides\n let mut updated_conf = (*updated_state.conf).clone();\n\n // Update proxy URLs with overrides, falling back to existing values\n if let Some(ref http_url) = proxy_override.http_url {\n updated_conf.proxy.http_url = Some(http_url.clone());\n }\n if let Some(ref https_url) = proxy_override.https_url {\n updated_conf.proxy.https_url = Some(https_url.clone());\n }\n\n updated_state.conf = std::sync::Arc::new(updated_conf);\n\n updated_state\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::handle_unified_connector_service_response_for_payment_post_authenticate", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn handle_unified_connector_service_response_for_payment_post_authenticate(\n response: payments_grpc::PaymentServicePostAuthenticateResponse,\n) -> UnifiedConnectorServiceResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "after_code": "pub fn handle_unified_connector_service_response_for_payment_post_authenticate(\n response: payments_grpc::PaymentServicePostAuthenticateResponse,\n) -> UnifiedConnectorServiceResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response =\n Result::<(PaymentsResponseData, AttemptStatus), ErrorResponse>::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::call_unified_connector_service_for_refund_execute", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn call_unified_connector_service_for_refund_execute(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: RouterData,\n execution_mode: ExecutionMode,\n #[cfg(feature = \"v1\")] merchant_connector_account: MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")] merchant_connector_account: MerchantConnectorAccountTypeDetails,\n) -> RouterResult> {\n // Get UCS client\n let ucs_client = get_ucs_client(state)?;\n\n // Build auth metadata using standard UCS function\n let connector_auth_metadata =\n build_unified_connector_service_auth_metadata(merchant_connector_account, merchant_context)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to build UCS auth metadata for refund execute\")?;\n\n // Transform router data to UCS refund request\n let ucs_refund_request =\n payments_grpc::PaymentServiceRefundRequest::foreign_try_from(&router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to transform router data to UCS refund request\")?;\n\n // Build gRPC headers\n // Use merchant_id as profile_id fallback since RouterData doesn't have profile_id field\n let merchant_id = merchant_context.get_merchant_account().get_id().clone();\n let profile_id = id_type::ProfileId::from_str(merchant_id.get_string_repr())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to convert merchant_id to profile_id for UCS refund\")?;\n let lineage_ids = LineageIds::new(merchant_id, profile_id);\n let grpc_header_builder = state\n .get_grpc_headers_ucs(execution_mode)\n .lineage_ids(lineage_ids)\n .external_vault_proxy_metadata(None)\n .merchant_reference_id(None);\n\n // Make UCS refund call with logging wrapper\n Box::pin(ucs_logging_wrapper(\n router_data,\n state,\n ucs_refund_request,\n grpc_header_builder,\n |router_data, grpc_request, grpc_headers| async move {\n // Call UCS payment_refund method\n let response = ucs_client\n .payment_refund(grpc_request, connector_auth_metadata, grpc_headers)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"UCS refund execution failed\")?;\n\n let grpc_response = response.into_inner();\n\n // Transform UCS response back to RouterData\n let (refund_response_data, status_code) =\n handle_unified_connector_service_response_for_refund_execute(grpc_response.clone())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to transform UCS refund response\")?;\n\n let mut updated_router_data = router_data;\n updated_router_data.response = refund_response_data;\n updated_router_data.connector_http_status_code = Some(status_code);\n\n Ok((updated_router_data, grpc_response))\n },\n ))\n .await\n}", + "after_code": "pub async fn call_unified_connector_service_for_refund_execute(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: RouterData,\n execution_mode: ExecutionMode,\n #[cfg(feature = \"v1\")] merchant_connector_account: MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")] merchant_connector_account: MerchantConnectorAccountTypeDetails,\n) -> RouterResult> {\n // Get UCS client\n let ucs_client = get_ucs_client(state)?;\n\n // Build auth metadata using standard UCS function\n let connector_auth_metadata =\n build_unified_connector_service_auth_metadata(merchant_connector_account, merchant_context)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to build UCS auth metadata for refund execute\")?;\n\n // Transform router data to UCS refund request\n let ucs_refund_request =\n payments_grpc::PaymentServiceRefundRequest::foreign_try_from(&router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to transform router data to UCS refund request\")?;\n\n // Build gRPC headers\n // Use merchant_id as profile_id fallback since RouterData doesn't have profile_id field\n let merchant_id = merchant_context.get_merchant_account().get_id().clone();\n let profile_id = id_type::ProfileId::from_str(merchant_id.get_string_repr())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to convert merchant_id to profile_id for UCS refund\")?;\n let lineage_ids = LineageIds::new(merchant_id, profile_id);\n let grpc_header_builder = state\n .get_grpc_headers_ucs(execution_mode)\n .lineage_ids(lineage_ids)\n .external_vault_proxy_metadata(None)\n .merchant_reference_id(None);\n\n // Make UCS refund call with logging wrapper\n Box::pin(ucs_logging_wrapper(\n router_data,\n state,\n ucs_refund_request,\n grpc_header_builder,\n |router_data, grpc_request, grpc_headers| async move {\n // Call UCS payment_refund method\n let response = ucs_client\n .payment_refund(grpc_request, connector_auth_metadata, grpc_headers)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"UCS refund execution failed\")?;\n\n let grpc_response = response.into_inner();\n\n // Transform UCS response back to RouterData\n let (refund_response_data, status_code) =\n handle_unified_connector_service_response_for_refund_execute(grpc_response.clone())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to transform UCS refund response\")?;\n\n let mut updated_router_data = router_data;\n updated_router_data.response = refund_response_data;\n updated_router_data.connector_http_status_code = Some(status_code);\n\n Ok((updated_router_data, grpc_response))\n },\n ))\n .await\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::struct::ComparisonData", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct ComparisonData {\n pub hyperswitch_data: Secret,\n pub unified_connector_service_data: Secret,\n}", + "after_code": "pub struct ComparisonData {\n pub hyperswitch_data: Secret,\n pub unified_connector_service_data: Secret,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use masking::{ExposeInterface, PeekInterface, Secret};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use masking::{ExposeInterface, PeekInterface, Secret};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::handle_unified_connector_service_response_for_refund_execute", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn handle_unified_connector_service_response_for_refund_execute(\n response: payments_grpc::RefundResponse,\n) -> UnifiedConnectorServiceRefundResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response: Result =\n Result::::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "after_code": "pub fn handle_unified_connector_service_response_for_refund_execute(\n response: payments_grpc::RefundResponse,\n) -> UnifiedConnectorServiceRefundResult {\n let status_code = transformers::convert_connector_service_status_code(response.status_code)?;\n\n let router_data_response: Result =\n Result::::foreign_try_from(response)?;\n\n Ok((router_data_response, status_code))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::determine_connector_integration_type", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn determine_connector_integration_type(\n state: &SessionState,\n connector: Connector,\n config_key: &str,\n) -> RouterResult {\n match state.conf.grpc_client.unified_connector_service.as_ref() {\n Some(ucs_config) => {\n let is_ucs_only = ucs_config.ucs_only_connectors.contains(&connector);\n let rollout_result = should_execute_based_on_rollout(state, config_key).await?;\n\n if is_ucs_only || rollout_result.should_execute {\n router_env::logger::debug!(\n connector = ?connector,\n ucs_only_list = is_ucs_only,\n rollout_enabled = rollout_result.should_execute,\n \"Using UcsConnector\"\n );\n Ok(ConnectorIntegrationType::UcsConnector)\n } else {\n router_env::logger::debug!(\n connector = ?connector,\n \"Using DirectConnector - not in ucs_only_list and rollout not enabled\"\n );\n Ok(ConnectorIntegrationType::DirectConnector)\n }\n }\n None => {\n router_env::logger::debug!(\n connector = ?connector,\n \"UCS config not present, using DirectConnector\"\n );\n Ok(ConnectorIntegrationType::DirectConnector)\n }\n }\n}", + "after_code": "async fn determine_connector_integration_type(\n state: &SessionState,\n connector: Connector,\n config_key: &str,\n) -> RouterResult {\n match state.conf.grpc_client.unified_connector_service.as_ref() {\n Some(ucs_config) => {\n let is_ucs_only = ucs_config.ucs_only_connectors.contains(&connector);\n let rollout_result = should_execute_based_on_rollout(state, config_key).await?;\n\n if is_ucs_only || rollout_result.should_execute {\n router_env::logger::debug!(\n connector = ?connector,\n ucs_only_list = is_ucs_only,\n rollout_enabled = rollout_result.should_execute,\n \"Using UcsConnector\"\n );\n Ok(ConnectorIntegrationType::UcsConnector)\n } else {\n router_env::logger::debug!(\n connector = ?connector,\n \"Using DirectConnector - not in ucs_only_list and rollout not enabled\"\n );\n Ok(ConnectorIntegrationType::DirectConnector)\n }\n }\n None => {\n router_env::logger::debug!(\n connector = ?connector,\n \"UCS config not present, using DirectConnector\"\n );\n Ok(ConnectorIntegrationType::DirectConnector)\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ], + "after_imports": [ + "use router_env::{instrument, logger, tracing};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};" + ] + }, + { + "id": "crates/router/src/core/unified_connector_service.rs::function::call_unified_connector_service_for_refund_sync", + "file": "crates/router/src/core/unified_connector_service.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn call_unified_connector_service_for_refund_sync(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: RouterData,\n execution_mode: ExecutionMode,\n #[cfg(feature = \"v1\")] merchant_connector_account: MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")] merchant_connector_account: MerchantConnectorAccountTypeDetails,\n) -> RouterResult> {\n // Get UCS client\n let ucs_client = get_ucs_client(state)?;\n\n // Build auth metadata using standard UCS function\n let connector_auth_metadata =\n build_unified_connector_service_auth_metadata(merchant_connector_account, merchant_context)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to build UCS auth metadata for refund sync\")?;\n\n // Transform router data to UCS refund sync request\n let ucs_refund_sync_request =\n payments_grpc::RefundServiceGetRequest::foreign_try_from(&router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to transform router data to UCS refund sync request\")?;\n\n // Build gRPC headers\n // Use merchant_id as profile_id fallback since RouterData doesn't have profile_id field\n let merchant_id = merchant_context.get_merchant_account().get_id().clone();\n let profile_id = id_type::ProfileId::from_str(merchant_id.get_string_repr())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to convert merchant_id to profile_id for UCS refund\")?;\n let lineage_ids = LineageIds::new(merchant_id, profile_id);\n\n let grpc_header_builder = state\n .get_grpc_headers_ucs(execution_mode)\n .lineage_ids(lineage_ids)\n .external_vault_proxy_metadata(None)\n .merchant_reference_id(None);\n\n // Make UCS refund sync call with logging wrapper\n Box::pin(ucs_logging_wrapper(\n router_data,\n state,\n ucs_refund_sync_request,\n grpc_header_builder,\n |router_data, grpc_request, grpc_headers| async move {\n // Call UCS refund_sync method\n let response = ucs_client\n .refund_sync(grpc_request, connector_auth_metadata, grpc_headers)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"UCS refund sync execution failed\")?;\n\n let grpc_response = response.into_inner();\n\n // Transform UCS response back to RouterData\n let (refund_response_data, status_code) =\n handle_unified_connector_service_response_for_refund_sync(grpc_response.clone())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to transform UCS refund sync response\")?;\n\n let mut updated_router_data = router_data;\n updated_router_data.response = refund_response_data;\n updated_router_data.connector_http_status_code = Some(status_code);\n\n Ok((updated_router_data, grpc_response))\n },\n ))\n .await\n}", + "after_code": "pub async fn call_unified_connector_service_for_refund_sync(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: RouterData,\n execution_mode: ExecutionMode,\n #[cfg(feature = \"v1\")] merchant_connector_account: MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")] merchant_connector_account: MerchantConnectorAccountTypeDetails,\n) -> RouterResult> {\n // Get UCS client\n let ucs_client = get_ucs_client(state)?;\n\n // Build auth metadata using standard UCS function\n let connector_auth_metadata =\n build_unified_connector_service_auth_metadata(merchant_connector_account, merchant_context)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to build UCS auth metadata for refund sync\")?;\n\n // Transform router data to UCS refund sync request\n let ucs_refund_sync_request =\n payments_grpc::RefundServiceGetRequest::foreign_try_from(&router_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to transform router data to UCS refund sync request\")?;\n\n // Build gRPC headers\n // Use merchant_id as profile_id fallback since RouterData doesn't have profile_id field\n let merchant_id = merchant_context.get_merchant_account().get_id().clone();\n let profile_id = id_type::ProfileId::from_str(merchant_id.get_string_repr())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to convert merchant_id to profile_id for UCS refund\")?;\n let lineage_ids = LineageIds::new(merchant_id, profile_id);\n\n let grpc_header_builder = state\n .get_grpc_headers_ucs(execution_mode)\n .lineage_ids(lineage_ids)\n .external_vault_proxy_metadata(None)\n .merchant_reference_id(None);\n\n // Make UCS refund sync call with logging wrapper\n Box::pin(ucs_logging_wrapper(\n router_data,\n state,\n ucs_refund_sync_request,\n grpc_header_builder,\n |router_data, grpc_request, grpc_headers| async move {\n // Call UCS refund_sync method\n let response = ucs_client\n .refund_sync(grpc_request, connector_auth_metadata, grpc_headers)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"UCS refund sync execution failed\")?;\n\n let grpc_response = response.into_inner();\n\n // Transform UCS response back to RouterData\n let (refund_response_data, status_code) =\n handle_unified_connector_service_response_for_refund_sync(grpc_response.clone())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to transform UCS refund sync response\")?;\n\n let mut updated_router_data = router_data;\n updated_router_data.response = refund_response_data;\n updated_router_data.connector_http_status_code = Some(status_code);\n\n Ok((updated_router_data, grpc_response))\n },\n ))\n .await\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "a825dc62f2cabc1d1c140e6e23f866433a1b1c1a", + "before_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n payment_method_data::WalletData,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n merchant_context::MerchantContext,\n router_data::{ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::refunds,\n router_request_types::RefundsData,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};", + "use external_services::{\n grpc_client::{\n unified_connector_service::{ConnectorAuthMetadata, UnifiedConnectorServiceError},\n LineageIds,\n },\n http_client,\n};", + "use common_utils::{\n consts::X_FLOW_NAME,\n errors::CustomResult,\n ext_traits::ValueExt,\n id_type,\n request::{Method, RequestBuilder, RequestContent},\n};", + "use hyperswitch_domain_models::merchant_connector_account::{\n ExternalVaultConnectorMetadata, MerchantConnectorAccountTypeDetails,\n};" + ] + } + ] +} \ No newline at end of file