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

chore: added fork and headers

Browse Source
This commit is contained in:
Amitsingh Tanwar
2025-09-26 13:17:29 +05:30
parent acf816d046
commit 5e9b672a69
8 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/development.toml
View File

@ -1381,3 +1381,9 @@ encryption_key = ""
proxy_connector_http_status_code = false # If enabled, the http status code of the connector will be proxied in the response
[list_dispute_supported_connectors]
connector_list = "worldpayvantiv"
[proxy]
http_url = "http://127.0.0.1:8081" # Proxy all HTTP traffic via this proxy
https_url = "http://127.0.0.1:8081" # Proxy all HTTPS traffic via this proxy
idle_pool_connection_timeout = 90 # Timeout for idle pool connections (defaults to 90s)
bypass_proxy_urls = ""

6
crates/common_utils/src/consts.rs
View File

@ -157,6 +157,12 @@ pub const APPLEPAY_VALIDATION_URL: &str =
/// Request ID
pub const X_REQUEST_ID: &str = "x-request-id";
/// Flow name
pub const X_FLOW: &str = "x-flow";
/// Connector name
pub const X_CONNECTOR: &str = "x-connector";
/// Chat Session ID
pub const X_CHAT_SESSION_ID: &str = "x-chat-session-id";

6
crates/external_services/src/grpc_client.rs
View File

@ -162,16 +162,20 @@ pub struct GrpcHeadersUcs {
external_vault_proxy_metadata: Option<String>,
/// Merchant Reference Id
merchant_reference_id: Option<ucs_types::UcsReferenceId>,
request_id: Option<String>,
}
/// Type aliase for GrpcHeaders builder in initial stage
pub type GrpcHeadersUcsBuilderInitial = GrpcHeadersUcsBuilder<((String,), (), (), ())>;
pub type GrpcHeadersUcsBuilderInitial =
GrpcHeadersUcsBuilder<((String,), (), (), (), (Option<String>,))>;
/// Type aliase for GrpcHeaders builder in intermediate stage
pub type GrpcHeadersUcsBuilderIntermediate = GrpcHeadersUcsBuilder<(
(String,),
(),
(Option<String>,),
(Option<ucs_types::UcsReferenceId>,),
(Option<String>,),
)>;
/// struct to represent set of Lineage ids

7
crates/external_services/src/grpc_client/unified_connector_service.rs
View File

@ -456,6 +456,13 @@ pub fn build_unified_connector_service_grpc_headers(
);
};
if let Some(request_id) = grpc_headers.request_id {
metadata.append(
common_utils_consts::X_REQUEST_ID,
parse(common_utils_consts::X_REQUEST_ID, &request_id)?,
);
};
if let Err(err) = grpc_headers
.tenant_id
.parse()

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

@ -4075,12 +4075,13 @@ pub async fn call_connector_service_prerequisites<F, RouterDReq, ApiRequest, D>(
)>
where
F: Send + Clone + Sync,
RouterDReq: Send + Sync,
RouterDReq: Send + Clone + Sync,
// To create connector flow specific interface data
D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,
D: ConstructFlowSpecificData<F, RouterDReq, router_types::PaymentsResponseData>,
RouterData<F, RouterDReq, router_types::PaymentsResponseData>: Feature<F, RouterDReq> + Send,
RouterData<F, RouterDReq, router_types::PaymentsResponseData>:
Feature<F, RouterDReq> + Send + Clone,
// To construct connector flow specific api
dyn api::Connector:
services::api::ConnectorIntegration<F, RouterDReq, router_types::PaymentsResponseData>,
@ -4237,16 +4238,18 @@ pub async fn decide_unified_connector_service_call<F, RouterDReq, ApiRequest, D>
)>
where
F: Send + Clone + Sync,
RouterDReq: Send + Sync,
RouterDReq: Send + Sync + Clone,
// To create connector flow specific interface data
D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,
D: ConstructFlowSpecificData<F, RouterDReq, router_types::PaymentsResponseData>,
RouterData<F, RouterDReq, router_types::PaymentsResponseData>: Feature<F, RouterDReq> + Send,
RouterData<F, RouterDReq, router_types::PaymentsResponseData>:
Feature<F, RouterDReq> + Send + Clone,
// To construct connector flow specific api
dyn api::Connector:
services::api::ConnectorIntegration<F, RouterDReq, router_types::PaymentsResponseData>,
{
let mut rd = router_data.clone();
record_time_taken_with(|| async {
if !matches!(
call_connector_action,
@ -4326,6 +4329,13 @@ where
// Update feature metadata to track Direct routing usage for stickiness
update_gateway_system_in_feature_metadata(payment_data, GatewaySystem::Direct)?;
let _result = rd
.call_unified_connector_service(
state,
merchant_connector_account.clone(),
merchant_context,
)
.await?;
call_connector_service(
state,

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

@ -49,7 +49,7 @@ pub async fn do_gsm_actions<F, ApiRequest, FData, D>(
) -> RouterResult<types::RouterData<F, FData, types::PaymentsResponseData>>
where
F: Clone + Send + Sync,
FData: Send + Sync + types::Capturable,
FData: Send + Sync + types::Capturable + Clone,
payments::PaymentResponse: operations::Operation<F, FData>,
D: payments::OperationSessionGetters<F>
+ payments::OperationSessionSetters<F>
@ -357,7 +357,7 @@ pub async fn do_retry<F, ApiRequest, FData, D>(
) -> RouterResult<types::RouterData<F, FData, types::PaymentsResponseData>>
where
F: Clone + Send + Sync,
FData: Send + Sync + types::Capturable,
FData: Send + Sync + types::Capturable + Clone,
payments::PaymentResponse: operations::Operation<F, FData>,
D: payments::OperationSessionGetters<F>
+ payments::OperationSessionSetters<F>

5
crates/router/src/routes/app.rs
View File

@ -157,7 +157,10 @@ impl SessionState {
}
pub fn get_grpc_headers_ucs(&self) -> GrpcHeadersUcsBuilderInitial {
let tenant_id = self.tenant.tenant_id.get_string_repr().to_string();
GrpcHeadersUcs::builder().tenant_id(tenant_id)
let request_id = self.request_id.map(|req_id| (*req_id).to_string());
GrpcHeadersUcs::builder()
.tenant_id(tenant_id)
.request_id(request_id)
}
#[cfg(all(feature = "revenue_recovery", feature = "v2"))]
pub fn get_recovery_grpc_headers(&self) -> GrpcRecoveryHeaders {

27
crates/router/src/services/api.rs
View File

@ -20,7 +20,7 @@ pub use client::{ApiClient, MockApiClient, ProxyClient};
pub use common_enums::enums::PaymentAction;
pub use common_utils::request::{ContentType, Method, Request, RequestBuilder};
use common_utils::{
consts::{DEFAULT_TENANT, TENANT_HEADER, X_HS_LATENCY},
consts::{DEFAULT_TENANT, TENANT_HEADER, X_CONNECTOR, X_FLOW, X_HS_LATENCY, X_REQUEST_ID},
errors::{ErrorSwitch, ReportSwitchExt},
request::RequestContent,
};
@ -326,7 +326,7 @@ where
};
match connector_request {
Some(request) => {
Some(mut request) => {
let masked_request_body = match &request.body {
Some(request) => match request {
RequestContent::Json(i)
@ -339,6 +339,29 @@ where
},
None => serde_json::Value::Null,
};
let flow_name = std::any::type_name::<T>()
.split("::")
.last()
.unwrap_or_default();
request.headers.insert((
X_FLOW.to_string(),
Maskable::Masked(Secret::new(flow_name.clone().to_string())),
));
let connector_name = req.connector.clone();
request.headers.insert((
X_CONNECTOR.to_string(),
Maskable::Masked(Secret::new(connector_name.clone().to_string())),
));
state.request_id.as_ref().map(|id| {
let request_id = id.to_string();
request.headers.insert((
X_REQUEST_ID.to_string(),
Maskable::Masked(Secret::new(request_id.clone())),
));
request_id
});
let request_url = request.url.clone();
let request_method = request.method;
let current_time = Instant::now();