feat(core): populate UCS status_code in response headers

config/config.example.toml

@@ -1152,4 +1152,7 @@ allow_connected_merchants = false # Enable or disable connected merchant account
 
 [chat]
 enabled = false                                # Enable or disable chat features
-hyperswitch_ai_host = "http://0.0.0.0:8000"    # Hyperswitch ai workflow host
+hyperswitch_ai_host = "http://0.0.0.0:8000"    # Hyperswitch ai workflow host
+
+[proxy_status_mapping]
+proxy_connector_http_status_code = false    # If enabled, the http status code of the connector will be proxied in the response

config/deployments/env_specific.toml

@@ -386,3 +386,6 @@ connection_timeout = 10                 # Connection Timeout Duration in Seconds
 [chat]
 enabled = false                                # Enable or disable chat features
 hyperswitch_ai_host = "http://0.0.0.0:8000"    # Hyperswitch ai workflow host
+
+[proxy_status_mapping]
+proxy_connector_http_status_code = false    # If enabled, the http status code of the connector will be proxied in the response

config/development.toml

@@ -1245,4 +1245,7 @@ version = "HOSTNAME"
 
 [chat]
 enabled = false
-hyperswitch_ai_host = "http://0.0.0.0:8000"
+hyperswitch_ai_host = "http://0.0.0.0:8000"
+
+[proxy_status_mapping]
+proxy_connector_http_status_code = false    # If enabled, the http status code of the connector will be proxied in the response

config/docker_compose.toml

@@ -1142,4 +1142,6 @@ connector_names = "stripe, adyen"               # Comma-separated list of allowe
 
 [infra_values]
 cluster = "CLUSTER"         # value of CLUSTER from deployment
-version = "HOSTNAME"        # value of HOSTNAME from deployment which tells its version
+version = "HOSTNAME"        # value of HOSTNAME from deployment which tells its version
+[proxy_status_mapping]
+proxy_connector_http_status_code = false    # If enabled, the http status code of the connector will be proxied in the response

crates/external_services/Cargo.toml

@@ -53,7 +53,7 @@ reqwest = { version = "0.11.27", features = ["rustls-tls"] }
 http = "0.2.12"
 url = { version = "2.5.4", features = ["serde"] }
 quick-xml = { version = "0.31.0", features = ["serialize"] }
-unified-connector-service-client = { git = "https://github.com/juspay/connector-service", rev = "a9f7cd96693fa034ea69d8e21125ea0f76182fae", package = "rust-grpc-client" }
+unified-connector-service-client = { git = "https://github.com/juspay/connector-service", rev = "434690566b625262acbd10db56a23435c5bb1735", package = "rust-grpc-client" }
 
 
 # First party crates

crates/router/Cargo.toml

@@ -88,7 +88,7 @@ reqwest = { version = "0.11.27", features = ["json", "rustls-tls", "gzip", "mult
 ring = "0.17.14"
 rust_decimal = { version = "1.37.1", features = ["serde-with-float", "serde-with-str"] }
 rust-i18n = { git = "https://github.com/kashif-m/rust-i18n", rev = "f2d8096aaaff7a87a847c35a5394c269f75e077a" }
-unified-connector-service-client = { git = "https://github.com/juspay/connector-service", rev = "a9f7cd96693fa034ea69d8e21125ea0f76182fae", package = "rust-grpc-client" }
+unified-connector-service-client = { git = "https://github.com/juspay/connector-service", rev = "434690566b625262acbd10db56a23435c5bb1735", package = "rust-grpc-client" }
 rustc-hash = "1.1.0"
 rustls = "0.22"
 rustls-pemfile = "2"

crates/router/src/compatibility/wrap.rs

@@ -87,7 +87,7 @@ where
             let response = S::try_from(response);
             match response {
                 Ok(response) => match serde_json::to_string(&response) {
-                    Ok(res) => api::http_response_json_with_headers(res, headers, None),
+                    Ok(res) => api::http_response_json_with_headers(res, headers, None, None),
                     Err(_) => api::http_response_err(
                         r#"{
                                 "error": {

crates/router/src/configs/secrets_transformers.rs

@@ -548,5 +548,6 @@ pub(crate) async fn fetch_raw_secrets(
         merchant_id_auth: conf.merchant_id_auth,
         infra_values: conf.infra_values,
         enhancement: conf.enhancement,
+        proxy_status_mapping: conf.proxy_status_mapping,
     }
 }

crates/router/src/configs/settings.rs

@@ -164,6 +164,7 @@ pub struct Settings<S: SecretState> {
     pub infra_values: Option<HashMap<String, String>>,
     #[serde(default)]
     pub enhancement: Option<HashMap<String, String>>,
+    pub proxy_status_mapping: ProxyStatusMapping,
 }
 
 #[derive(Debug, Deserialize, Clone, Default)]
@@ -844,6 +845,12 @@ pub struct MerchantIdAuthSettings {
     pub merchant_id_auth_enabled: bool,
 }
 
+#[derive(Debug, Clone, Default, Deserialize)]
+#[serde(default)]
+pub struct ProxyStatusMapping {
+    pub proxy_connector_http_status_code: bool,
+}
+
 #[derive(Debug, Clone, Default, Deserialize)]
 #[serde(default)]
 pub struct WebhooksSettings {

crates/router/src/core/payments.rs

@@ -214,6 +214,7 @@ where
         .perform_routing(&merchant_context, profile, state, &mut payment_data)
         .await?;
 
+    let mut connector_http_status_code = None;
     let (payment_data, connector_response_data) = match connector {
         ConnectorCallType::PreDetermined(connector_data) => {
             let (mca_type_details, updated_customer, router_data) =
@@ -265,6 +266,9 @@ where
 
             let payments_response_operation = Box::new(PaymentResponse);
 
+            connector_http_status_code = router_data.connector_http_status_code;
+            add_connector_http_status_code_metrics(connector_http_status_code);
+
             payments_response_operation
                 .to_post_update_tracker()?
                 .save_pm_and_mandate(
@@ -342,6 +346,9 @@ where
 
             let payments_response_operation = Box::new(PaymentResponse);
 
+            connector_http_status_code = router_data.connector_http_status_code;
+            add_connector_http_status_code_metrics(connector_http_status_code);
+
             payments_response_operation
                 .to_post_update_tracker()?
                 .save_pm_and_mandate(
@@ -395,7 +402,7 @@ where
         payment_data,
         req,
         customer,
-        None,
+        connector_http_status_code,
         None,
         connector_response_data,
     ))
@@ -492,6 +499,9 @@ where
 
     let payments_response_operation = Box::new(PaymentResponse);
 
+    let connector_http_status_code = router_data.connector_http_status_code;
+    add_connector_http_status_code_metrics(connector_http_status_code);
+
     let payment_data = payments_response_operation
         .to_post_update_tracker()?
         .update_tracker(
@@ -503,7 +513,13 @@ where
         )
         .await?;
 
-    Ok((payment_data, req, None, None, connector_response_data))
+    Ok((
+        payment_data,
+        req,
+        connector_http_status_code,
+        None,
+        connector_response_data,
+    ))
 }
 
 #[cfg(feature = "v1")]

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

@@ -860,7 +860,7 @@ async fn call_unified_connector_service_authorize(
 
     let payment_authorize_response = response.into_inner();
 
-    let (status, router_data_response) =
+    let (status, router_data_response, status_code) =
         handle_unified_connector_service_response_for_payment_authorize(
             payment_authorize_response.clone(),
         )
@@ -872,6 +872,7 @@ async fn call_unified_connector_service_authorize(
     router_data.raw_connector_response = payment_authorize_response
         .raw_connector_response
         .map(Secret::new);
+    router_data.connector_http_status_code = Some(status_code);
 
     Ok(())
 }
@@ -916,7 +917,7 @@ async fn call_unified_connector_service_repeat_payment(
 
     let payment_repeat_response = response.into_inner();
 
-    let (status, router_data_response) =
+    let (status, router_data_response, status_code) =
         handle_unified_connector_service_response_for_payment_repeat(
             payment_repeat_response.clone(),
         )
@@ -928,6 +929,7 @@ async fn call_unified_connector_service_repeat_payment(
     router_data.raw_connector_response = payment_repeat_response
         .raw_connector_response
         .map(Secret::new);
+    router_data.connector_http_status_code = Some(status_code);
 
     Ok(())
 }

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

@@ -250,14 +250,15 @@ impl Feature<api::PSync, types::PaymentsSyncData>
 
         let payment_get_response = response.into_inner();
 
-        let (status, router_data_response) =
+        let (status, router_data_response, status_code) =
             handle_unified_connector_service_response_for_payment_get(payment_get_response.clone())
                 .change_context(ApiErrorResponse::InternalServerError)
                 .attach_printable("Failed to deserialize UCS response")?;
 
         self.status = status;
         self.response = router_data_response;
         self.raw_connector_response = payment_get_response.raw_connector_response.map(Secret::new);
+        self.connector_http_status_code = Some(status_code);
 
         Ok(())
     }

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

@@ -246,7 +246,7 @@ impl Feature<api::SetupMandate, types::SetupMandateRequestData> for types::Setup
 
         let payment_register_response = response.into_inner();
 
-        let (status, router_data_response) =
+        let (status, router_data_response, status_code) =
             handle_unified_connector_service_response_for_payment_register(
                 payment_register_response.clone(),
             )
@@ -255,6 +255,7 @@ impl Feature<api::SetupMandate, types::SetupMandateRequestData> for types::Setup
 
         self.status = status;
         self.response = router_data_response;
+        self.connector_http_status_code = Some(status_code);
         // UCS does not return raw connector response for setup mandate right now
         // self.raw_connector_response = payment_register_response
         //     .raw_connector_response

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

@@ -36,7 +36,7 @@ use crate::{
         payments::{self, helpers},
         utils as core_utils,
     },
-    headers::X_PAYMENT_CONFIRM_SOURCE,
+    headers::{X_CONNECTOR_HTTP_STATUS_CODE, X_PAYMENT_CONFIRM_SOURCE},
     routes::{metrics, SessionState},
     services::{self, RedirectForm},
     types::{
@@ -1585,9 +1585,17 @@ where
             status: payment_intent.status,
         };
 
+        let headers = connector_http_status_code
+            .map(|status_code| {
+                vec![(
+                    X_CONNECTOR_HTTP_STATUS_CODE.to_string(),
+                    Maskable::new_normal(status_code.to_string()),
+                )]
+            })
+            .unwrap_or_default();
+
         Ok(services::ApplicationResponse::JsonWithHeaders((
-            response,
-            vec![],
+            response, headers,
         )))
     }
 }
@@ -1968,6 +1976,15 @@ where
             .clone()
             .or(profile.return_url.clone());
 
+        let headers = connector_http_status_code
+            .map(|status_code| {
+                vec![(
+                    X_CONNECTOR_HTTP_STATUS_CODE.to_string(),
+                    Maskable::new_normal(status_code.to_string()),
+                )]
+            })
+            .unwrap_or_default();
+
         let response = api_models::payments::PaymentsResponse {
             id: payment_intent.id.clone(),
             status: payment_intent.status,
@@ -1999,8 +2016,7 @@ where
         };
 
         Ok(services::ApplicationResponse::JsonWithHeaders((
-            response,
-            vec![],
+            response, headers,
         )))
     }
 }
@@ -2065,6 +2081,15 @@ where
 
         let return_url = payment_intent.return_url.or(profile.return_url.clone());
 
+        let headers = connector_http_status_code
+            .map(|status_code| {
+                vec![(
+                    X_CONNECTOR_HTTP_STATUS_CODE.to_string(),
+                    Maskable::new_normal(status_code.to_string()),
+                )]
+            })
+            .unwrap_or_default();
+
         let response = api_models::payments::PaymentsResponse {
             id: payment_intent.id.clone(),
             status: payment_intent.status,
@@ -2100,8 +2125,7 @@ where
         };
 
         Ok(services::ApplicationResponse::JsonWithHeaders((
-            response,
-            vec![],
+            response, headers,
         )))
     }
 }
@@ -2539,7 +2563,7 @@ where
     let mut headers = connector_http_status_code
         .map(|status_code| {
             vec![(
-                "connector_http_status_code".to_string(),
+                X_CONNECTOR_HTTP_STATUS_CODE.to_string(),
                 Maskable::new_normal(status_code.to_string()),
             )]
         })