diff --git "a/diffs/pr_10192/12d9ca6/diff.json" "b/diffs/pr_10192/12d9ca6/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_10192/12d9ca6/diff.json" @@ -0,0 +1,227 @@ +{ + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822", + "pr_number": 10192, + "rust_files": [ + "crates/common_enums/src/enums.rs", + "crates/router/src/core/payments.rs", + "crates/router/src/core/payments/flows.rs", + "crates/router/src/core/payments/flows/authorize_flow.rs", + "crates/router/src/core/payments/flows/complete_authorize_flow.rs", + "crates/router/src/core/payments/flows/external_proxy_flow.rs", + "crates/router/src/core/payments/gateway/psync_gateway.rs", + "crates/router/src/core/payments/helpers.rs", + "crates/router/src/routes/app.rs" + ], + "diffs": [ + { + "id": "crates/router/src/routes/app.rs::SessionState::function::get_grpc_headers_ucs", + "file": "crates/router/src/routes/app.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn get_grpc_headers_ucs(\n &self,\n unified_connector_service_execution_mode: ExecutionMode,\n ) -> GrpcHeadersUcsBuilderInitial {\n let tenant_id = self.tenant.tenant_id.get_string_repr().to_string();\n let request_id = self.request_id.map(|req_id| (*req_id).to_string());\n let shadow_mode = match unified_connector_service_execution_mode {\n ExecutionMode::Primary => false,\n ExecutionMode::Shadow => true,\n };\n GrpcHeadersUcs::builder()\n .tenant_id(tenant_id)\n .request_id(request_id)\n .shadow_mode(Some(shadow_mode))\n }", + "after_code": "pub fn get_grpc_headers_ucs(\n &self,\n unified_connector_service_execution_mode: ExecutionMode,\n ) -> GrpcHeadersUcsBuilderInitial {\n let tenant_id = self.tenant.tenant_id.get_string_repr().to_string();\n let request_id = self.request_id.map(|req_id| (*req_id).to_string());\n let shadow_mode = match unified_connector_service_execution_mode {\n ExecutionMode::Primary => Some(false),\n ExecutionMode::Shadow => Some(true),\n ExecutionMode::NotApplicable => None,\n };\n GrpcHeadersUcs::builder()\n .tenant_id(tenant_id)\n .request_id(request_id)\n .shadow_mode(shadow_mode)\n }", + "diff_span": { + "before": " let request_id = self.request_id.map(|req_id| (*req_id).to_string());\n let shadow_mode = match unified_connector_service_execution_mode {\n ExecutionMode::Primary => false,\n ExecutionMode::Shadow => true,\n };\n GrpcHeadersUcs::builder()\n .tenant_id(tenant_id)\n .request_id(request_id)\n .shadow_mode(Some(shadow_mode))\n }", + "after": " let request_id = self.request_id.map(|req_id| (*req_id).to_string());\n let shadow_mode = match unified_connector_service_execution_mode {\n ExecutionMode::Primary => Some(false),\n ExecutionMode::Shadow => Some(true),\n ExecutionMode::NotApplicable => None,\n };\n GrpcHeadersUcs::builder()\n .tenant_id(tenant_id)\n .request_id(request_id)\n .shadow_mode(shadow_mode)\n }" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments/helpers.rs::function::process_through_direct", + "file": "crates/router/src/core/payments/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn process_through_direct<'a, F, RouterDReq, ApiRequest, D>(\n state: &'a SessionState,\n req_state: routes::app::ReqState,\n merchant_context: &'a domain::MerchantContext,\n connector: api::ConnectorData,\n operation: &'a BoxedOperation<'a, F, ApiRequest, D>,\n payment_data: &'a mut D,\n customer: &Option,\n call_connector_action: CallConnectorAction,\n validate_result: &'a OperationsValidateResult,\n schedule_time: Option,\n header_payload: domain_payments::HeaderPayload,\n frm_suggestion: Option,\n business_profile: &'a domain::Profile,\n is_retry_payment: bool,\n all_keys_required: Option,\n merchant_connector_account: MerchantConnectorAccountType,\n router_data: RouterData,\n tokenization_action: TokenizationAction,\n) -> RouterResult<(\n RouterData,\n MerchantConnectorAccountType,\n)>\nwhere\n F: Send + Clone + Sync + 'static,\n RouterDReq: Send + Sync + Clone + 'static + Serialize,\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData:\n Feature + Send + Clone + Serialize,\n dyn api::Connector: services::api::ConnectorIntegration,\n{\n router_env::logger::info!(\n \"Processing payment through Direct gateway system - payment_id={}, attempt_id={}\",\n payment_data\n .get_payment_intent()\n .payment_id\n .get_string_repr(),\n payment_data.get_payment_attempt().attempt_id\n );\n\n // Update feature metadata to track Direct routing usage for stickiness\n update_gateway_system_in_feature_metadata(payment_data, GatewaySystem::Direct)?;\n\n let lineage_ids = grpc_client::LineageIds::new(\n business_profile.merchant_id.clone(),\n business_profile.get_id().clone(),\n );\n\n let execution_path = ExecutionPath::Direct;\n // Execution mode is irrelevant for Direct execution path\n let execution_mode = ExecutionMode::Shadow;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path,\n execution_mode,\n };\n\n call_connector_service(\n state,\n req_state,\n merchant_context,\n connector,\n operation,\n payment_data,\n customer,\n call_connector_action,\n validate_result,\n schedule_time,\n header_payload,\n frm_suggestion,\n business_profile,\n is_retry_payment,\n all_keys_required,\n merchant_connector_account,\n router_data,\n tokenization_action,\n gateway_context,\n )\n .await\n}", + "after_code": "pub async fn process_through_direct<'a, F, RouterDReq, ApiRequest, D>(\n state: &'a SessionState,\n req_state: routes::app::ReqState,\n merchant_context: &'a domain::MerchantContext,\n connector: api::ConnectorData,\n operation: &'a BoxedOperation<'a, F, ApiRequest, D>,\n payment_data: &'a mut D,\n customer: &Option,\n call_connector_action: CallConnectorAction,\n validate_result: &'a OperationsValidateResult,\n schedule_time: Option,\n header_payload: domain_payments::HeaderPayload,\n frm_suggestion: Option,\n business_profile: &'a domain::Profile,\n is_retry_payment: bool,\n all_keys_required: Option,\n merchant_connector_account: MerchantConnectorAccountType,\n router_data: RouterData,\n tokenization_action: TokenizationAction,\n) -> RouterResult<(\n RouterData,\n MerchantConnectorAccountType,\n)>\nwhere\n F: Send + Clone + Sync + 'static,\n RouterDReq: Send + Sync + Clone + 'static + Serialize,\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData:\n Feature + Send + Clone + Serialize,\n dyn api::Connector: services::api::ConnectorIntegration,\n{\n router_env::logger::info!(\n \"Processing payment through Direct gateway system - payment_id={}, attempt_id={}\",\n payment_data\n .get_payment_intent()\n .payment_id\n .get_string_repr(),\n payment_data.get_payment_attempt().attempt_id\n );\n\n // Update feature metadata to track Direct routing usage for stickiness\n update_gateway_system_in_feature_metadata(payment_data, GatewaySystem::Direct)?;\n let lineage_ids = grpc_client::LineageIds::new(\n business_profile.merchant_id.clone(),\n business_profile.get_id().clone(),\n );\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: None,\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path: ExecutionPath::Direct,\n execution_mode: ExecutionMode::NotApplicable,\n };\n\n call_connector_service(\n state,\n req_state,\n merchant_context,\n connector,\n operation,\n payment_data,\n customer,\n call_connector_action,\n validate_result,\n schedule_time,\n header_payload,\n frm_suggestion,\n business_profile,\n is_retry_payment,\n all_keys_required,\n merchant_connector_account,\n router_data,\n tokenization_action,\n gateway_context,\n )\n .await\n}", + "diff_span": { + "before": " // Update feature metadata to track Direct routing usage for stickiness\n update_gateway_system_in_feature_metadata(payment_data, GatewaySystem::Direct)?;\n\n let lineage_ids = grpc_client::LineageIds::new(\n business_profile.merchant_id.clone(),\n business_profile.get_id().clone(),\n );\n\n let execution_path = ExecutionPath::Direct;\n // Execution mode is irrelevant for Direct execution path\n let execution_mode = ExecutionMode::Shadow;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path,\n execution_mode,\n };\n", + "after": " );\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: None,\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path: ExecutionPath::Direct,\n execution_mode: ExecutionMode::NotApplicable,\n };\n" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments.rs::function::proxy_for_call_connector_service", + "file": "crates/router/src/core/payments.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn proxy_for_call_connector_service(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: api::ConnectorData,\n operation: &BoxedOperation<'_, F, ApiRequest, D>,\n payment_data: &mut D,\n call_connector_action: CallConnectorAction,\n header_payload: HeaderPayload,\n business_profile: &domain::Profile,\n return_raw_connector_response: Option,\n) -> RouterResult>\nwhere\n F: Send + Clone + Sync,\n RouterDReq: Send + Sync,\n\n // To create connector flow specific interface data\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData: Feature + Send,\n // To construct connector flow specific api\n dyn api::Connector:\n services::api::ConnectorIntegration,\n{\n let stime_connector = Instant::now();\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n state,\n merchant_context.get_merchant_key_store(),\n connector.merchant_connector_id.as_ref(),\n )\n .await?,\n ));\n operation\n .to_domain()?\n .populate_payment_data(\n state,\n payment_data,\n merchant_context,\n business_profile,\n &connector,\n )\n .await?;\n\n let mut router_data = payment_data\n .construct_router_data(\n state,\n connector.connector.id(),\n merchant_context,\n &None,\n &merchant_connector_account,\n None,\n Some(header_payload.clone()),\n )\n .await?;\n\n let add_access_token_result = router_data\n .add_access_token(\n state,\n &connector,\n merchant_context,\n payment_data.get_creds_identifier(),\n )\n .await?;\n\n router_data = router_data.add_session_token(state, &connector).await?;\n\n let mut should_continue_further = access_token::update_router_data_with_access_token_result(\n &add_access_token_result,\n &mut router_data,\n &call_connector_action,\n );\n\n let (connector_request, should_continue_further) = if should_continue_further {\n router_data\n .build_flow_specific_connector_request(state, &connector, call_connector_action.clone())\n .await?\n } else {\n (None, false)\n };\n\n (_, *payment_data) = operation\n .to_update_tracker()?\n .update_trackers(\n state,\n req_state,\n payment_data.clone(),\n None,\n merchant_context.get_merchant_account().storage_scheme,\n None,\n merchant_context.get_merchant_key_store(),\n None,\n header_payload.clone(),\n )\n .await?;\n\n let router_data = if should_continue_further {\n router_data\n .decide_flows(\n state,\n &connector,\n call_connector_action,\n connector_request,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n None,\n )\n .await\n } else {\n Ok(router_data)\n }?;\n\n let etime_connector = Instant::now();\n let duration_connector = etime_connector.saturating_duration_since(stime_connector);\n tracing::info!(duration = format!(\"Duration taken: {}\", duration_connector.as_millis()));\n\n Ok(router_data)\n}", + "after_code": "pub async fn proxy_for_call_connector_service(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: api::ConnectorData,\n operation: &BoxedOperation<'_, F, ApiRequest, D>,\n payment_data: &mut D,\n call_connector_action: CallConnectorAction,\n header_payload: HeaderPayload,\n business_profile: &domain::Profile,\n return_raw_connector_response: Option,\n) -> RouterResult>\nwhere\n F: Send + Clone + Sync,\n RouterDReq: Send + Sync,\n\n // To create connector flow specific interface data\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData: Feature + Send,\n // To construct connector flow specific api\n dyn api::Connector:\n services::api::ConnectorIntegration,\n{\n let stime_connector = Instant::now();\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n state,\n merchant_context.get_merchant_key_store(),\n connector.merchant_connector_id.as_ref(),\n )\n .await?,\n ));\n operation\n .to_domain()?\n .populate_payment_data(\n state,\n payment_data,\n merchant_context,\n business_profile,\n &connector,\n )\n .await?;\n\n let mut router_data = payment_data\n .construct_router_data(\n state,\n connector.connector.id(),\n merchant_context,\n &None,\n &merchant_connector_account,\n None,\n Some(header_payload.clone()),\n )\n .await?;\n\n let add_access_token_result = router_data\n .add_access_token(\n state,\n &connector,\n merchant_context,\n payment_data.get_creds_identifier(),\n )\n .await?;\n\n router_data = router_data.add_session_token(state, &connector).await?;\n\n let mut should_continue_further = access_token::update_router_data_with_access_token_result(\n &add_access_token_result,\n &mut router_data,\n &call_connector_action,\n );\n\n let (connector_request, should_continue_further) = if should_continue_further {\n router_data\n .build_flow_specific_connector_request(state, &connector, call_connector_action.clone())\n .await?\n } else {\n (None, false)\n };\n\n (_, *payment_data) = operation\n .to_update_tracker()?\n .update_trackers(\n state,\n req_state,\n payment_data.clone(),\n None,\n merchant_context.get_merchant_account().storage_scheme,\n None,\n merchant_context.get_merchant_key_store(),\n None,\n header_payload.clone(),\n )\n .await?;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path: ExecutionPath::Direct,\n execution_mode: ExecutionMode::NotApplicable,\n };\n\n let router_data = if should_continue_further {\n router_data\n .decide_flows(\n state,\n &connector,\n call_connector_action,\n connector_request,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n gateway_context,\n )\n .await\n } else {\n Ok(router_data)\n }?;\n\n let etime_connector = Instant::now();\n let duration_connector = etime_connector.saturating_duration_since(stime_connector);\n tracing::info!(duration = format!(\"Duration taken: {}\", duration_connector.as_millis()));\n\n Ok(router_data)\n}", + "diff_span": { + "before": " header_payload.clone(),\n return_raw_connector_response,\n None,\n )\n .await", + "after": " .await?;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path: ExecutionPath::Direct,\n execution_mode: ExecutionMode::NotApplicable,\n };\n\n let router_data = if should_continue_further {\n router_data\n .decide_flows(\n state,\n &connector,\n call_connector_action,\n connector_request,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n gateway_context,\n )\n .await" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments.rs::function::call_connector_service_for_external_vault_proxy", + "file": "crates/router/src/core/payments.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn call_connector_service_for_external_vault_proxy(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: api::ConnectorData,\n operation: &BoxedOperation<'_, F, ApiRequest, D>,\n payment_data: &mut D,\n call_connector_action: CallConnectorAction,\n header_payload: HeaderPayload,\n business_profile: &domain::Profile,\n return_raw_connector_response: Option,\n) -> RouterResult>\nwhere\n F: Send + Clone + Sync,\n RouterDReq: Send + Sync,\n\n // To create connector flow specific interface data\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData: Feature + Send,\n // To construct connector flow specific api\n dyn api::Connector:\n services::api::ConnectorIntegration,\n{\n let stime_connector = Instant::now();\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n state,\n merchant_context.get_merchant_key_store(),\n connector.merchant_connector_id.as_ref(),\n )\n .await?,\n ));\n operation\n .to_domain()?\n .populate_payment_data(\n state,\n payment_data,\n merchant_context,\n business_profile,\n &connector,\n )\n .await?;\n\n let mut router_data = payment_data\n .construct_router_data(\n state,\n connector.connector.id(),\n merchant_context,\n &None,\n &merchant_connector_account,\n None,\n Some(header_payload.clone()),\n )\n .await?;\n\n // let add_access_token_result = router_data\n // .add_access_token(\n // state,\n // &connector,\n // merchant_context,\n // payment_data.get_creds_identifier(),\n // )\n // .await?;\n\n // router_data = router_data.add_session_token(state, &connector).await?;\n\n // let mut should_continue_further = access_token::update_router_data_with_access_token_result(\n // &add_access_token_result,\n // &mut router_data,\n // &call_connector_action,\n // );\n let should_continue_further = true;\n\n let (connector_request, should_continue_further) = if should_continue_further {\n router_data\n .build_flow_specific_connector_request(state, &connector, call_connector_action.clone())\n .await?\n } else {\n (None, false)\n };\n\n (_, *payment_data) = operation\n .to_update_tracker()?\n .update_trackers(\n state,\n req_state,\n payment_data.clone(),\n None,\n merchant_context.get_merchant_account().storage_scheme,\n None,\n merchant_context.get_merchant_key_store(),\n None,\n header_payload.clone(),\n )\n .await?;\n\n let router_data = if should_continue_further {\n router_data\n .decide_flows(\n state,\n &connector,\n call_connector_action,\n connector_request,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n None,\n )\n .await\n } else {\n Ok(router_data)\n }?;\n\n let etime_connector = Instant::now();\n let duration_connector = etime_connector.saturating_duration_since(stime_connector);\n tracing::info!(duration = format!(\"Duration taken: {}\", duration_connector.as_millis()));\n\n Ok(router_data)\n}", + "after_code": "pub async fn call_connector_service_for_external_vault_proxy(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: api::ConnectorData,\n operation: &BoxedOperation<'_, F, ApiRequest, D>,\n payment_data: &mut D,\n call_connector_action: CallConnectorAction,\n header_payload: HeaderPayload,\n business_profile: &domain::Profile,\n return_raw_connector_response: Option,\n) -> RouterResult>\nwhere\n F: Send + Clone + Sync,\n RouterDReq: Send + Sync,\n\n // To create connector flow specific interface data\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData: Feature + Send,\n // To construct connector flow specific api\n dyn api::Connector:\n services::api::ConnectorIntegration,\n{\n let stime_connector = Instant::now();\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(Box::new(\n helpers::get_merchant_connector_account_v2(\n state,\n merchant_context.get_merchant_key_store(),\n connector.merchant_connector_id.as_ref(),\n )\n .await?,\n ));\n operation\n .to_domain()?\n .populate_payment_data(\n state,\n payment_data,\n merchant_context,\n business_profile,\n &connector,\n )\n .await?;\n\n let mut router_data = payment_data\n .construct_router_data(\n state,\n connector.connector.id(),\n merchant_context,\n &None,\n &merchant_connector_account,\n None,\n Some(header_payload.clone()),\n )\n .await?;\n\n // let add_access_token_result = router_data\n // .add_access_token(\n // state,\n // &connector,\n // merchant_context,\n // payment_data.get_creds_identifier(),\n // )\n // .await?;\n\n // router_data = router_data.add_session_token(state, &connector).await?;\n\n // let mut should_continue_further = access_token::update_router_data_with_access_token_result(\n // &add_access_token_result,\n // &mut router_data,\n // &call_connector_action,\n // );\n let should_continue_further = true;\n\n let (connector_request, should_continue_further) = if should_continue_further {\n router_data\n .build_flow_specific_connector_request(state, &connector, call_connector_action.clone())\n .await?\n } else {\n (None, false)\n };\n\n (_, *payment_data) = operation\n .to_update_tracker()?\n .update_trackers(\n state,\n req_state,\n payment_data.clone(),\n None,\n merchant_context.get_merchant_account().storage_scheme,\n None,\n merchant_context.get_merchant_key_store(),\n None,\n header_payload.clone(),\n )\n .await?;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path: ExecutionPath::Direct,\n execution_mode: ExecutionMode::NotApplicable,\n };\n\n let router_data = if should_continue_further {\n router_data\n .decide_flows(\n state,\n &connector,\n call_connector_action,\n connector_request,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n gateway_context,\n )\n .await\n } else {\n Ok(router_data)\n }?;\n\n let etime_connector = Instant::now();\n let duration_connector = etime_connector.saturating_duration_since(stime_connector);\n tracing::info!(duration = format!(\"Duration taken: {}\", duration_connector.as_millis()));\n\n Ok(router_data)\n}", + "diff_span": { + "before": " header_payload.clone(),\n return_raw_connector_response,\n None,\n )\n .await", + "after": " .await?;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path: ExecutionPath::Direct,\n execution_mode: ExecutionMode::NotApplicable,\n };\n\n let router_data = if should_continue_further {\n router_data\n .decide_flows(\n state,\n &connector,\n call_connector_action,\n connector_request,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n gateway_context,\n )\n .await" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments/gateway/psync_gateway.rs::impl::domain::PSync", + "file": "crates/router/src/core/payments/gateway/psync_gateway.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl\n payment_gateway::FlowGateway<\n SessionState,\n RCD,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n RouterGatewayContext,\n > for domain::PSync\nwhere\n RCD: Clone\n + Send\n + Sync\n + 'static\n + RouterDataConversion,\n{\n fn get_gateway(\n execution_path: ExecutionPath,\n ) -> Box<\n dyn payment_gateway::PaymentGateway<\n SessionState,\n RCD,\n Self,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n RouterGatewayContext,\n >,\n > {\n match execution_path {\n ExecutionPath::Direct => Box::new(payment_gateway::DirectGateway),\n ExecutionPath::UnifiedConnectorService\n | ExecutionPath::ShadowUnifiedConnectorService => Box::new(domain::PSync),\n }\n }\n}", + "after_code": "impl\n payment_gateway::FlowGateway<\n SessionState,\n RCD,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n RouterGatewayContext,\n > for domain::PSync\nwhere\n RCD: Clone\n + Send\n + Sync\n + 'static\n + RouterDataConversion,\n{\n fn get_gateway(\n execution_path: ExecutionPath,\n ) -> Box<\n dyn payment_gateway::PaymentGateway<\n SessionState,\n RCD,\n Self,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n RouterGatewayContext,\n >,\n > {\n match execution_path {\n ExecutionPath::Direct => Box::new(payment_gateway::DirectGateway),\n ExecutionPath::UnifiedConnectorService\n | ExecutionPath::ShadowUnifiedConnectorService => Box::new(Self),\n }\n }\n}", + "diff_span": { + "before": " + Sync\n + 'static\n + RouterDataConversion,\n{\n fn get_gateway(\n execution_path: ExecutionPath,\n ) -> Box<\n dyn payment_gateway::PaymentGateway<\n SessionState,\n RCD,\n Self,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n RouterGatewayContext,\n >,\n > {\n match execution_path {\n ExecutionPath::Direct => Box::new(payment_gateway::DirectGateway),\n ExecutionPath::UnifiedConnectorService\n | ExecutionPath::ShadowUnifiedConnectorService => Box::new(domain::PSync),\n }\n }", + "after": " + Sync\n + 'static\n + RouterDataConversion,\n{\n fn get_gateway(\n execution_path: ExecutionPath,\n ) -> Box<\n dyn payment_gateway::PaymentGateway<\n SessionState,\n RCD,\n Self,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n RouterGatewayContext,\n >,\n > {\n match execution_path {\n ExecutionPath::Direct => Box::new(payment_gateway::DirectGateway),\n ExecutionPath::UnifiedConnectorService\n | ExecutionPath::ShadowUnifiedConnectorService => Box::new(Self),\n }\n }" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments.rs::function::call_multiple_connectors_service", + "file": "crates/router/src/core/payments.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn call_multiple_connectors_service(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n connectors: api::SessionConnectorDatas,\n _operation: &Op,\n mut payment_data: D,\n customer: &Option,\n session_surcharge_details: Option,\n business_profile: &domain::Profile,\n header_payload: HeaderPayload,\n return_raw_connector_response: Option,\n) -> RouterResult\nwhere\n Op: Debug,\n F: Send + Clone,\n\n // To create connector flow specific interface data\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData: Feature,\n\n // To construct connector flow specific api\n dyn api::Connector:\n services::api::ConnectorIntegration,\n{\n let call_connectors_start_time = Instant::now();\n let mut join_handlers = Vec::with_capacity(connectors.len());\n for session_connector_data in connectors.iter() {\n let connector_id = session_connector_data.connector.connector.id();\n\n let merchant_connector_account = construct_profile_id_and_get_mca(\n state,\n merchant_context,\n &payment_data,\n &session_connector_data.connector.connector_name.to_string(),\n session_connector_data\n .connector\n .merchant_connector_id\n .as_ref(),\n false,\n )\n .await?;\n\n payment_data.set_surcharge_details(session_surcharge_details.as_ref().and_then(\n |session_surcharge_details| {\n session_surcharge_details.fetch_surcharge_details(\n session_connector_data.payment_method_sub_type.into(),\n session_connector_data.payment_method_sub_type,\n None,\n )\n },\n ));\n\n let router_data = payment_data\n .construct_router_data(\n state,\n connector_id,\n merchant_context,\n customer,\n &merchant_connector_account,\n None,\n Some(header_payload.clone()),\n Some(session_connector_data.payment_method_type),\n Some(session_connector_data.payment_method_sub_type),\n )\n .await?;\n\n let lineage_ids = grpc_client::LineageIds::new(\n business_profile.merchant_id.clone(),\n business_profile.get_id().clone(),\n );\n\n // TODO: determine execution path for SDK session token call.\n let execution_path = ExecutionPath::Direct;\n // Execution mode is irrelevant for Direct execution path\n let execution_mode = ExecutionMode::Shadow;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path,\n execution_mode,\n };\n\n let res = router_data.decide_flows(\n state,\n &session_connector_data.connector,\n CallConnectorAction::Trigger,\n None,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n gateway_context,\n );\n\n join_handlers.push(res);\n }\n\n let result = join_all(join_handlers).await;\n\n for (connector_res, session_connector) in result.into_iter().zip(connectors) {\n let connector_name = session_connector.connector.connector_name.to_string();\n match connector_res {\n Ok(connector_response) => {\n if let Ok(router_types::PaymentsResponseData::SessionResponse {\n session_token,\n ..\n }) = connector_response.response.clone()\n {\n // If session token is NoSessionTokenReceived, it is not pushed into the sessions_token as there is no response or there can be some error\n // In case of error, that error is already logged\n if !matches!(\n session_token,\n api_models::payments::SessionToken::NoSessionTokenReceived,\n ) {\n payment_data.push_sessions_token(session_token);\n }\n }\n if let Err(connector_error_response) = connector_response.response {\n logger::error!(\n \"sessions_connector_error {} {:?}\",\n connector_name,\n connector_error_response\n );\n }\n }\n Err(api_error) => {\n logger::error!(\"sessions_api_error {} {:?}\", connector_name, api_error);\n }\n }\n }\n\n // If click_to_pay is enabled and authentication_product_ids is configured in profile, we need to attach click_to_pay block in the session response for invoking click_to_pay SDK\n if business_profile.is_click_to_pay_enabled {\n if let Some(value) = business_profile.authentication_product_ids.clone() {\n let session_token = get_session_token_for_click_to_pay(\n state,\n merchant_context.get_merchant_account().get_id(),\n merchant_context,\n value,\n payment_data.get_payment_intent(),\n business_profile.get_id(),\n )\n .await?;\n payment_data.push_sessions_token(session_token);\n }\n }\n\n let call_connectors_end_time = Instant::now();\n let call_connectors_duration =\n call_connectors_end_time.saturating_duration_since(call_connectors_start_time);\n tracing::info!(duration = format!(\"Duration taken: {}\", call_connectors_duration.as_millis()));\n\n Ok(payment_data)\n}", + "after_code": "pub async fn call_multiple_connectors_service(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n connectors: api::SessionConnectorDatas,\n _operation: &Op,\n mut payment_data: D,\n customer: &Option,\n session_surcharge_details: Option,\n business_profile: &domain::Profile,\n header_payload: HeaderPayload,\n return_raw_connector_response: Option,\n) -> RouterResult\nwhere\n Op: Debug,\n F: Send + Clone,\n\n // To create connector flow specific interface data\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData: Feature,\n\n // To construct connector flow specific api\n dyn api::Connector:\n services::api::ConnectorIntegration,\n{\n let call_connectors_start_time = Instant::now();\n let mut join_handlers = Vec::with_capacity(connectors.len());\n for session_connector_data in connectors.iter() {\n let connector_id = session_connector_data.connector.connector.id();\n\n let merchant_connector_account = construct_profile_id_and_get_mca(\n state,\n merchant_context,\n &payment_data,\n &session_connector_data.connector.connector_name.to_string(),\n session_connector_data\n .connector\n .merchant_connector_id\n .as_ref(),\n false,\n )\n .await?;\n\n payment_data.set_surcharge_details(session_surcharge_details.as_ref().and_then(\n |session_surcharge_details| {\n session_surcharge_details.fetch_surcharge_details(\n session_connector_data.payment_method_sub_type.into(),\n session_connector_data.payment_method_sub_type,\n None,\n )\n },\n ));\n\n let router_data = payment_data\n .construct_router_data(\n state,\n connector_id,\n merchant_context,\n customer,\n &merchant_connector_account,\n None,\n Some(header_payload.clone()),\n Some(session_connector_data.payment_method_type),\n Some(session_connector_data.payment_method_sub_type),\n )\n .await?;\n\n let lineage_ids = grpc_client::LineageIds::new(\n business_profile.merchant_id.clone(),\n business_profile.get_id().clone(),\n );\n\n // TODO: determine execution path for SDK session token call.\n let execution_path = ExecutionPath::Direct;\n let execution_mode = ExecutionMode::NotApplicable;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path,\n execution_mode,\n };\n\n let res = router_data.decide_flows(\n state,\n &session_connector_data.connector,\n CallConnectorAction::Trigger,\n None,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n gateway_context,\n );\n\n join_handlers.push(res);\n }\n\n let result = join_all(join_handlers).await;\n\n for (connector_res, session_connector) in result.into_iter().zip(connectors) {\n let connector_name = session_connector.connector.connector_name.to_string();\n match connector_res {\n Ok(connector_response) => {\n if let Ok(router_types::PaymentsResponseData::SessionResponse {\n session_token,\n ..\n }) = connector_response.response.clone()\n {\n // If session token is NoSessionTokenReceived, it is not pushed into the sessions_token as there is no response or there can be some error\n // In case of error, that error is already logged\n if !matches!(\n session_token,\n api_models::payments::SessionToken::NoSessionTokenReceived,\n ) {\n payment_data.push_sessions_token(session_token);\n }\n }\n if let Err(connector_error_response) = connector_response.response {\n logger::error!(\n \"sessions_connector_error {} {:?}\",\n connector_name,\n connector_error_response\n );\n }\n }\n Err(api_error) => {\n logger::error!(\"sessions_api_error {} {:?}\", connector_name, api_error);\n }\n }\n }\n\n // If click_to_pay is enabled and authentication_product_ids is configured in profile, we need to attach click_to_pay block in the session response for invoking click_to_pay SDK\n if business_profile.is_click_to_pay_enabled {\n if let Some(value) = business_profile.authentication_product_ids.clone() {\n let session_token = get_session_token_for_click_to_pay(\n state,\n merchant_context.get_merchant_account().get_id(),\n merchant_context,\n value,\n payment_data.get_payment_intent(),\n business_profile.get_id(),\n )\n .await?;\n payment_data.push_sessions_token(session_token);\n }\n }\n\n let call_connectors_end_time = Instant::now();\n let call_connectors_duration =\n call_connectors_end_time.saturating_duration_since(call_connectors_start_time);\n tracing::info!(duration = format!(\"Duration taken: {}\", call_connectors_duration.as_millis()));\n\n Ok(payment_data)\n}", + "diff_span": { + "before": " // TODO: determine execution path for SDK session token call.\n let execution_path = ExecutionPath::Direct;\n // Execution mode is irrelevant for Direct execution path\n let execution_mode = ExecutionMode::Shadow;\n\n let gateway_context = gateway_context::RouterGatewayContext {", + "after": " // TODO: determine execution path for SDK session token call.\n let execution_path = ExecutionPath::Direct;\n let execution_mode = ExecutionMode::NotApplicable;\n\n let gateway_context = gateway_context::RouterGatewayContext {" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments/flows/external_proxy_flow.rs::types::ExternalVaultProxyPaymentsRouterData::function::decide_flows", + "file": "crates/router/src/core/payments/flows/external_proxy_flow.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn decide_flows<'a>(\n mut self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n connector_request: Option,\n business_profile: &domain::Profile,\n header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: crate::core::payments::gateway::RouterGatewayContext,\n ) -> RouterResult {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::ExternalVaultProxy,\n types::ExternalVaultProxyPaymentsData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n\n logger::debug!(auth_type=?self.auth_type);\n let mut auth_router_data = services::execute_connector_processing_step(\n state,\n connector_integration,\n &self,\n call_connector_action.clone(),\n connector_request,\n return_raw_connector_response,\n )\n .await\n .to_payment_failed_response()?;\n\n // External vault proxy doesn't use integrity checks\n auth_router_data.integrity_check = Ok(());\n metrics::PAYMENT_COUNT.add(1, &[]);\n\n Ok(auth_router_data)\n }", + "after_code": "async fn decide_flows<'a>(\n mut self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n connector_request: Option,\n business_profile: &domain::Profile,\n header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: gateway_context::RouterGatewayContext,\n ) -> RouterResult {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::ExternalVaultProxy,\n types::ExternalVaultProxyPaymentsData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n\n logger::debug!(auth_type=?self.auth_type);\n let mut auth_router_data = services::execute_connector_processing_step(\n state,\n connector_integration,\n &self,\n call_connector_action.clone(),\n connector_request,\n return_raw_connector_response,\n )\n .await\n .to_payment_failed_response()?;\n\n // External vault proxy doesn't use integrity checks\n auth_router_data.integrity_check = Ok(());\n metrics::PAYMENT_COUNT.add(1, &[]);\n\n Ok(auth_router_data)\n }", + "diff_span": { + "before": " header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: crate::core::payments::gateway::RouterGatewayContext,\n ) -> RouterResult {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<", + "after": " header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: gateway_context::RouterGatewayContext,\n ) -> RouterResult {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments.rs::function::call_connector_service", + "file": "crates/router/src/core/payments.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn call_connector_service(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: api::ConnectorData,\n operation: &BoxedOperation<'_, F, ApiRequest, D>,\n payment_data: &mut D,\n customer: &Option,\n call_connector_action: CallConnectorAction,\n schedule_time: Option,\n header_payload: HeaderPayload,\n frm_suggestion: Option,\n business_profile: &domain::Profile,\n is_retry_payment: bool,\n should_retry_with_pan: bool,\n return_raw_connector_response: Option,\n merchant_connector_account_type_details: domain::MerchantConnectorAccountTypeDetails,\n mut router_data: RouterData,\n updated_customer: Option,\n tokenization_action: TokenizationAction,\n) -> RouterResult>\nwhere\n F: Send + Clone + Sync,\n RouterDReq: Send + Sync,\n\n // To create connector flow specific interface data\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData: Feature + Send,\n // To construct connector flow specific api\n dyn api::Connector: services::api::ConnectorIntegration\n + Send\n + Sync,\n{\n let add_access_token_result = router_data\n .add_access_token(\n state,\n &connector,\n merchant_context,\n payment_data.get_creds_identifier(),\n )\n .await?;\n\n router_data = router_data.add_session_token(state, &connector).await?;\n\n let should_continue_further = access_token::update_router_data_with_access_token_result(\n &add_access_token_result,\n &mut router_data,\n &call_connector_action,\n );\n let payment_method_token_response = router_data\n .add_payment_method_token(\n state,\n &connector,\n &tokenization_action,\n should_continue_further,\n )\n .await?;\n let should_continue_further = tokenization::update_router_data_with_payment_method_token_result(\n payment_method_token_response,\n &mut router_data,\n is_retry_payment,\n should_continue_further,\n );\n let should_continue = match router_data\n .create_order_at_connector(state, &connector, should_continue_further)\n .await?\n {\n Some(create_order_response) => {\n if let Ok(order_id) = create_order_response.clone().create_order_result {\n payment_data.set_connector_response_reference_id(Some(order_id))\n }\n\n // Set the response in routerdata response to carry forward\n router_data\n .update_router_data_with_create_order_response(create_order_response.clone());\n create_order_response.create_order_result.ok().map(|_| ())\n }\n // If create order is not required, then we can proceed with further processing\n None => Some(()),\n };\n\n // In case of authorize flow, pre-task and post-tasks are being called in build request\n // if we do not want to proceed further, then the function will return Ok(None, false)\n let (connector_request, should_continue_further) = match should_continue {\n Some(_) => {\n router_data\n .build_flow_specific_connector_request(\n state,\n &connector,\n call_connector_action.clone(),\n )\n .await?\n }\n None => (None, false),\n };\n\n // Update the payment trackers just before calling the connector\n // Since the request is already built in the previous step,\n // there should be no error in request construction from hyperswitch end\n (_, *payment_data) = operation\n .to_update_tracker()?\n .update_trackers(\n state,\n req_state,\n payment_data.clone(),\n customer.clone(),\n merchant_context.get_merchant_account().storage_scheme,\n updated_customer,\n merchant_context.get_merchant_key_store(),\n frm_suggestion,\n header_payload.clone(),\n )\n .await?;\n\n let router_data = if should_continue_further {\n // The status of payment_attempt and intent will be updated in the previous step\n // update this in router_data.\n // This is added because few connector integrations do not update the status,\n // and rely on previous status set in router_data\n // TODO: status is already set when constructing payment data, why should this be done again?\n // router_data.status = payment_data.get_payment_attempt().status;\n router_data\n .decide_flows(\n state,\n &connector,\n call_connector_action,\n connector_request,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n None,\n )\n .await\n } else {\n Ok(router_data)\n }?;\n\n Ok(router_data)\n}", + "after_code": "pub async fn call_connector_service(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: api::ConnectorData,\n operation: &BoxedOperation<'_, F, ApiRequest, D>,\n payment_data: &mut D,\n customer: &Option,\n call_connector_action: CallConnectorAction,\n schedule_time: Option,\n header_payload: HeaderPayload,\n frm_suggestion: Option,\n business_profile: &domain::Profile,\n is_retry_payment: bool,\n should_retry_with_pan: bool,\n return_raw_connector_response: Option,\n merchant_connector_account_type_details: domain::MerchantConnectorAccountTypeDetails,\n mut router_data: RouterData,\n updated_customer: Option,\n tokenization_action: TokenizationAction,\n) -> RouterResult>\nwhere\n F: Send + Clone + Sync,\n RouterDReq: Send + Sync,\n\n // To create connector flow specific interface data\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData: Feature + Send,\n // To construct connector flow specific api\n dyn api::Connector: services::api::ConnectorIntegration\n + Send\n + Sync,\n{\n let add_access_token_result = router_data\n .add_access_token(\n state,\n &connector,\n merchant_context,\n payment_data.get_creds_identifier(),\n )\n .await?;\n\n router_data = router_data.add_session_token(state, &connector).await?;\n\n let should_continue_further = access_token::update_router_data_with_access_token_result(\n &add_access_token_result,\n &mut router_data,\n &call_connector_action,\n );\n let payment_method_token_response = router_data\n .add_payment_method_token(\n state,\n &connector,\n &tokenization_action,\n should_continue_further,\n )\n .await?;\n let should_continue_further = tokenization::update_router_data_with_payment_method_token_result(\n payment_method_token_response,\n &mut router_data,\n is_retry_payment,\n should_continue_further,\n );\n let should_continue = match router_data\n .create_order_at_connector(state, &connector, should_continue_further)\n .await?\n {\n Some(create_order_response) => {\n if let Ok(order_id) = create_order_response.clone().create_order_result {\n payment_data.set_connector_response_reference_id(Some(order_id))\n }\n\n // Set the response in routerdata response to carry forward\n router_data\n .update_router_data_with_create_order_response(create_order_response.clone());\n create_order_response.create_order_result.ok().map(|_| ())\n }\n // If create order is not required, then we can proceed with further processing\n None => Some(()),\n };\n\n // In case of authorize flow, pre-task and post-tasks are being called in build request\n // if we do not want to proceed further, then the function will return Ok(None, false)\n let (connector_request, should_continue_further) = match should_continue {\n Some(_) => {\n router_data\n .build_flow_specific_connector_request(\n state,\n &connector,\n call_connector_action.clone(),\n )\n .await?\n }\n None => (None, false),\n };\n\n // Update the payment trackers just before calling the connector\n // Since the request is already built in the previous step,\n // there should be no error in request construction from hyperswitch end\n (_, *payment_data) = operation\n .to_update_tracker()?\n .update_trackers(\n state,\n req_state,\n payment_data.clone(),\n customer.clone(),\n merchant_context.get_merchant_account().storage_scheme,\n updated_customer,\n merchant_context.get_merchant_key_store(),\n frm_suggestion,\n header_payload.clone(),\n )\n .await?;\n\n let router_data = if should_continue_further {\n // The status of payment_attempt and intent will be updated in the previous step\n // update this in router_data.\n // This is added because few connector integrations do not update the status,\n // and rely on previous status set in router_data\n // TODO: status is already set when constructing payment data, why should this be done again?\n // router_data.status = payment_data.get_payment_attempt().status;\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path: ExecutionPath::Direct,\n execution_mode: ExecutionMode::NotApplicable,\n };\n router_data\n .decide_flows(\n state,\n &connector,\n call_connector_action,\n connector_request,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n gateway_context,\n )\n .await\n } else {\n Ok(router_data)\n }?;\n\n Ok(router_data)\n}", + "diff_span": { + "before": " header_payload.clone(),\n return_raw_connector_response,\n None,\n )\n .await", + "after": " // TODO: status is already set when constructing payment data, why should this be done again?\n // router_data.status = payment_data.get_payment_attempt().status;\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids,\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path: ExecutionPath::Direct,\n execution_mode: ExecutionMode::NotApplicable,\n };\n router_data\n .decide_flows(\n state,\n &connector,\n call_connector_action,\n connector_request,\n business_profile,\n header_payload.clone(),\n return_raw_connector_response,\n gateway_context,\n )\n .await" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments/helpers.rs::function::process_through_direct_with_shadow_unified_connector_service", + "file": "crates/router/src/core/payments/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn process_through_direct_with_shadow_unified_connector_service<\n 'a,\n F,\n RouterDReq,\n ApiRequest,\n D,\n>(\n state: &'a SessionState,\n req_state: routes::app::ReqState,\n merchant_context: &'a domain::MerchantContext,\n connector: api::ConnectorData,\n operation: &'a BoxedOperation<'a, F, ApiRequest, D>,\n payment_data: &'a mut D,\n customer: &Option,\n call_connector_action: CallConnectorAction,\n shadow_ucs_call_connector_action: Option,\n validate_result: &'a OperationsValidateResult,\n schedule_time: Option,\n header_payload: domain_payments::HeaderPayload,\n frm_suggestion: Option,\n business_profile: &'a domain::Profile,\n is_retry_payment: bool,\n all_keys_required: Option,\n merchant_connector_account: MerchantConnectorAccountType,\n router_data: RouterData,\n tokenization_action: TokenizationAction,\n) -> RouterResult<(\n RouterData,\n MerchantConnectorAccountType,\n)>\nwhere\n F: Send + Clone + Sync + 'static,\n RouterDReq: Send + Sync + Clone + 'static + Serialize,\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData:\n Feature + Send + Clone + Serialize,\n dyn api::Connector: services::api::ConnectorIntegration,\n{\n router_env::logger::info!(\n \"Processing payment through Direct gateway system with UCS in shadow mode - payment_id={}, attempt_id={}\",\n payment_data.get_payment_intent().payment_id.get_string_repr(),\n payment_data.get_payment_attempt().attempt_id\n );\n\n // Extract merchant_order_reference_id from payment data for UCS audit trail\n let merchant_order_reference_id = payment_data\n .get_payment_intent()\n .merchant_order_reference_id\n .clone();\n\n // Calculate connector_label before cloning data for shadow UCS\n let unified_connector_service_connector_label =\n get_connector_label_for_customer(&merchant_connector_account, payment_data);\n\n let creds_identifier = payment_data.get_creds_identifier().map(str::to_owned);\n\n // Clone data needed for shadow UCS call\n let unified_connector_service_router_data = router_data.clone();\n let unified_connector_service_merchant_connector_account = merchant_connector_account.clone();\n let unified_connector_service_merchant_context = merchant_context.clone();\n let unified_connector_service_header_payload = header_payload.clone();\n let unified_connector_service_state = state.clone();\n let unified_connector_service_merchant_order_reference_id = merchant_order_reference_id;\n let unified_connector_service_creds_identifier = creds_identifier.clone();\n let unified_connector_service_customer = customer.clone();\n let unified_connector_service_payment_attempt_data = payment_data.get_payment_attempt().clone();\n let unified_connector_service_connector_payment_id = payment_data\n .get_payment_intent()\n .payment_id\n .get_string_repr()\n .to_string();\n\n let lineage_ids = grpc_client::LineageIds::new(\n business_profile.merchant_id.clone(),\n business_profile.get_id().clone(),\n );\n\n // Update feature metadata to track Direct routing usage for stickiness\n update_gateway_system_in_feature_metadata(payment_data, GatewaySystem::Direct)?;\n\n let execution_path = ExecutionPath::Direct;\n let execution_mode = ExecutionMode::Shadow;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids: lineage_ids.clone(),\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path,\n execution_mode,\n };\n\n // Call Direct connector service\n let result = call_connector_service(\n state,\n req_state,\n merchant_context,\n connector.clone(),\n operation,\n payment_data,\n customer,\n call_connector_action.clone(),\n validate_result,\n schedule_time,\n header_payload,\n frm_suggestion,\n business_profile,\n is_retry_payment,\n all_keys_required,\n merchant_connector_account,\n router_data,\n tokenization_action,\n gateway_context,\n )\n .await?;\n\n // Spawn shadow UCS call in background\n let direct_router_data = result.0.clone();\n tokio::spawn(async move {\n execute_shadow_unified_connector_service_call(\n unified_connector_service_state,\n unified_connector_service_router_data,\n direct_router_data,\n unified_connector_service_header_payload,\n lineage_ids,\n unified_connector_service_merchant_connector_account,\n &connector,\n unified_connector_service_merchant_context,\n unified_connector_service_merchant_order_reference_id,\n call_connector_action,\n shadow_ucs_call_connector_action,\n unified_connector_service_creds_identifier,\n unified_connector_service_customer,\n unified_connector_service_payment_attempt_data,\n unified_connector_service_connector_label,\n unified_connector_service_connector_payment_id,\n )\n .await\n .map_err(|e| {\n router_env::logger::debug!(\n \"Shadow UCS call in Direct with shadow UCS processing failed: {:?}\",\n e\n )\n })\n .ok()\n });\n\n Ok(result)\n}", + "after_code": "pub async fn process_through_direct_with_shadow_unified_connector_service<\n 'a,\n F,\n RouterDReq,\n ApiRequest,\n D,\n>(\n state: &'a SessionState,\n req_state: routes::app::ReqState,\n merchant_context: &'a domain::MerchantContext,\n connector: api::ConnectorData,\n operation: &'a BoxedOperation<'a, F, ApiRequest, D>,\n payment_data: &'a mut D,\n customer: &Option,\n call_connector_action: CallConnectorAction,\n shadow_ucs_call_connector_action: Option,\n validate_result: &'a OperationsValidateResult,\n schedule_time: Option,\n header_payload: domain_payments::HeaderPayload,\n frm_suggestion: Option,\n business_profile: &'a domain::Profile,\n is_retry_payment: bool,\n all_keys_required: Option,\n merchant_connector_account: MerchantConnectorAccountType,\n router_data: RouterData,\n tokenization_action: TokenizationAction,\n) -> RouterResult<(\n RouterData,\n MerchantConnectorAccountType,\n)>\nwhere\n F: Send + Clone + Sync + 'static,\n RouterDReq: Send + Sync + Clone + 'static + Serialize,\n D: OperationSessionGetters + OperationSessionSetters + Send + Sync + Clone,\n D: ConstructFlowSpecificData,\n RouterData:\n Feature + Send + Clone + Serialize,\n dyn api::Connector: services::api::ConnectorIntegration,\n{\n router_env::logger::info!(\n \"Processing payment through Direct gateway system with UCS in shadow mode - payment_id={}, attempt_id={}\",\n payment_data.get_payment_intent().payment_id.get_string_repr(),\n payment_data.get_payment_attempt().attempt_id\n );\n\n // Extract merchant_order_reference_id from payment data for UCS audit trail\n let merchant_order_reference_id = payment_data\n .get_payment_intent()\n .merchant_order_reference_id\n .clone();\n\n // Calculate connector_label before cloning data for shadow UCS\n let unified_connector_service_connector_label =\n get_connector_label_for_customer(&merchant_connector_account, payment_data);\n\n let creds_identifier = payment_data.get_creds_identifier().map(str::to_owned);\n\n // Clone data needed for shadow UCS call\n let unified_connector_service_router_data = router_data.clone();\n let unified_connector_service_merchant_connector_account = merchant_connector_account.clone();\n let unified_connector_service_merchant_context = merchant_context.clone();\n let unified_connector_service_header_payload = header_payload.clone();\n let unified_connector_service_state = state.clone();\n let unified_connector_service_merchant_order_reference_id = merchant_order_reference_id;\n let unified_connector_service_creds_identifier = creds_identifier.clone();\n let unified_connector_service_customer = customer.clone();\n let unified_connector_service_payment_attempt_data = payment_data.get_payment_attempt().clone();\n let unified_connector_service_connector_payment_id = payment_data\n .get_payment_intent()\n .payment_id\n .get_string_repr()\n .to_string();\n\n let lineage_ids = grpc_client::LineageIds::new(\n business_profile.merchant_id.clone(),\n business_profile.get_id().clone(),\n );\n\n // Update feature metadata to track Direct routing usage for stickiness\n update_gateway_system_in_feature_metadata(payment_data, GatewaySystem::Direct)?;\n let execution_mode = ExecutionMode::NotApplicable;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids: lineage_ids.clone(),\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path: ExecutionPath::Direct,\n execution_mode,\n };\n\n // Call Direct connector service\n let result = call_connector_service(\n state,\n req_state,\n merchant_context,\n connector.clone(),\n operation,\n payment_data,\n customer,\n call_connector_action.clone(),\n validate_result,\n schedule_time,\n header_payload,\n frm_suggestion,\n business_profile,\n is_retry_payment,\n all_keys_required,\n merchant_connector_account,\n router_data,\n tokenization_action,\n gateway_context,\n )\n .await?;\n\n // Spawn shadow UCS call in background\n let direct_router_data = result.0.clone();\n tokio::spawn(async move {\n execute_shadow_unified_connector_service_call(\n unified_connector_service_state,\n unified_connector_service_router_data,\n direct_router_data,\n unified_connector_service_header_payload,\n lineage_ids,\n unified_connector_service_merchant_connector_account,\n &connector,\n unified_connector_service_merchant_context,\n unified_connector_service_merchant_order_reference_id,\n call_connector_action,\n shadow_ucs_call_connector_action,\n unified_connector_service_creds_identifier,\n unified_connector_service_customer,\n unified_connector_service_payment_attempt_data,\n unified_connector_service_connector_label,\n unified_connector_service_connector_payment_id,\n )\n .await\n .map_err(|e| {\n router_env::logger::debug!(\n \"Shadow UCS call in Direct with shadow UCS processing failed: {:?}\",\n e\n )\n })\n .ok()\n });\n\n Ok(result)\n}", + "diff_span": { + "before": " // Update feature metadata to track Direct routing usage for stickiness\n update_gateway_system_in_feature_metadata(payment_data, GatewaySystem::Direct)?;\n\n let execution_path = ExecutionPath::Direct;\n let execution_mode = ExecutionMode::Shadow;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids: lineage_ids.clone(),\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path,\n execution_mode,\n };", + "after": " // Update feature metadata to track Direct routing usage for stickiness\n update_gateway_system_in_feature_metadata(payment_data, GatewaySystem::Direct)?;\n let execution_mode = ExecutionMode::NotApplicable;\n\n let gateway_context = gateway_context::RouterGatewayContext {\n creds_identifier: payment_data.get_creds_identifier().map(|id| id.to_string()),\n merchant_context: merchant_context.clone(),\n header_payload: header_payload.clone(),\n lineage_ids: lineage_ids.clone(),\n merchant_connector_account: merchant_connector_account.clone(),\n execution_path: ExecutionPath::Direct,\n execution_mode,\n };" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments/flows.rs::trait::Feature", + "file": "crates/router/src/core/payments/flows.rs", + "kind": "trait_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub trait Feature {\n #[cfg(feature = \"v1\")]\n async fn decide_flows<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n connector_request: Option,\n business_profile: &domain::Profile,\n header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: gateway_context::RouterGatewayContext,\n ) -> RouterResult\n where\n Self: Sized,\n F: Clone,\n dyn api::Connector: services::ConnectorIntegration;\n\n #[cfg(feature = \"v2\")]\n async fn decide_flows<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n connector_request: Option,\n business_profile: &domain::Profile,\n header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n ) -> RouterResult\n where\n Self: Sized,\n F: Clone,\n dyn api::Connector: services::ConnectorIntegration;\n\n async fn add_access_token<'a>(\n &self,\n state: &SessionState,\n connector: &api::ConnectorData,\n merchant_context: &domain::MerchantContext,\n creds_identifier: Option<&str>,\n ) -> RouterResult\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration;\n\n async fn add_session_token<'a>(\n self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n ) -> RouterResult\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(self)\n }\n\n async fn add_payment_method_token<'a>(\n &mut self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n _tokenization_action: &payments::TokenizationAction,\n _should_continue_payment: bool,\n ) -> RouterResult\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(types::PaymentMethodTokenResult {\n payment_method_token_result: Ok(None),\n is_payment_method_tokenization_performed: false,\n connector_response: None,\n })\n }\n\n async fn preprocessing_steps<'a>(\n self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n ) -> RouterResult\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(self)\n }\n\n async fn postprocessing_steps<'a>(\n self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n ) -> RouterResult\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(self)\n }\n\n async fn create_connector_customer<'a>(\n &self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n ) -> RouterResult>\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(None)\n }\n\n /// Returns the connector request and a bool which specifies whether to proceed with further\n async fn build_flow_specific_connector_request(\n &mut self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n _call_connector_action: payments::CallConnectorAction,\n ) -> RouterResult<(Option, bool)> {\n Ok((None, true))\n }\n\n async fn create_order_at_connector(\n &mut self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n _should_continue_payment: bool,\n ) -> RouterResult>\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(None)\n }\n\n fn update_router_data_with_create_order_response(\n &mut self,\n _create_order_result: types::CreateOrderResult,\n ) {\n }\n\n fn get_current_flow_info(&self) -> Option> {\n None\n }\n\n async fn call_preprocessing_through_unified_connector_service<'a>(\n self,\n _state: &SessionState,\n _header_payload: &domain_payments::HeaderPayload,\n _lineage_ids: &grpc_client::LineageIds,\n #[cfg(feature = \"v1\")] _merchant_connector_account: helpers::MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")]\n _merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n _merchant_context: &domain::MerchantContext,\n _connector_data: &api::ConnectorData,\n _unified_connector_service_execution_mode: ExecutionMode,\n _merchant_order_reference_id: Option,\n ) -> RouterResult<(Self, bool)>\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n // Default behaviour is to do nothing and continue further\n Ok((self, true))\n }\n\n async fn call_unified_connector_service<'a>(\n &mut self,\n _state: &SessionState,\n _header_payload: &domain_payments::HeaderPayload,\n _lineage_ids: grpc_client::LineageIds,\n #[cfg(feature = \"v1\")] _merchant_connector_account: helpers::MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")]\n _merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n _merchant_context: &domain::MerchantContext,\n _connector_data: &api::ConnectorData,\n _unified_connector_service_execution_mode: ExecutionMode,\n _merchant_order_reference_id: Option,\n _call_connector_action: common_enums::CallConnectorAction,\n _creds_identifier: Option,\n ) -> RouterResult<()>\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(())\n }\n\n #[cfg(feature = \"v2\")]\n async fn call_unified_connector_service_with_external_vault_proxy<'a>(\n &mut self,\n _state: &SessionState,\n _header_payload: &domain_payments::HeaderPayload,\n _lineage_ids: grpc_client::LineageIds,\n _merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n _external_vault_merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n _merchant_context: &domain::MerchantContext,\n _unified_connector_service_execution_mode: ExecutionMode,\n _merchant_order_reference_id: Option,\n ) -> RouterResult<()>\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(())\n }\n}", + "after_code": "pub trait Feature {\n async fn decide_flows<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n connector_request: Option,\n business_profile: &domain::Profile,\n header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: gateway_context::RouterGatewayContext,\n ) -> RouterResult\n where\n Self: Sized,\n F: Clone,\n dyn api::Connector: services::ConnectorIntegration;\n\n async fn add_access_token<'a>(\n &self,\n state: &SessionState,\n connector: &api::ConnectorData,\n merchant_context: &domain::MerchantContext,\n creds_identifier: Option<&str>,\n ) -> RouterResult\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration;\n\n async fn add_session_token<'a>(\n self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n ) -> RouterResult\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(self)\n }\n\n async fn add_payment_method_token<'a>(\n &mut self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n _tokenization_action: &payments::TokenizationAction,\n _should_continue_payment: bool,\n ) -> RouterResult\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(types::PaymentMethodTokenResult {\n payment_method_token_result: Ok(None),\n is_payment_method_tokenization_performed: false,\n connector_response: None,\n })\n }\n\n async fn preprocessing_steps<'a>(\n self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n ) -> RouterResult\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(self)\n }\n\n async fn postprocessing_steps<'a>(\n self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n ) -> RouterResult\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(self)\n }\n\n async fn create_connector_customer<'a>(\n &self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n ) -> RouterResult>\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(None)\n }\n\n /// Returns the connector request and a bool which specifies whether to proceed with further\n async fn build_flow_specific_connector_request(\n &mut self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n _call_connector_action: payments::CallConnectorAction,\n ) -> RouterResult<(Option, bool)> {\n Ok((None, true))\n }\n\n async fn create_order_at_connector(\n &mut self,\n _state: &SessionState,\n _connector: &api::ConnectorData,\n _should_continue_payment: bool,\n ) -> RouterResult>\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(None)\n }\n\n fn update_router_data_with_create_order_response(\n &mut self,\n _create_order_result: types::CreateOrderResult,\n ) {\n }\n\n fn get_current_flow_info(&self) -> Option> {\n None\n }\n\n async fn call_preprocessing_through_unified_connector_service<'a>(\n self,\n _state: &SessionState,\n _header_payload: &domain_payments::HeaderPayload,\n _lineage_ids: &grpc_client::LineageIds,\n #[cfg(feature = \"v1\")] _merchant_connector_account: helpers::MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")]\n _merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n _merchant_context: &domain::MerchantContext,\n _connector_data: &api::ConnectorData,\n _unified_connector_service_execution_mode: ExecutionMode,\n _merchant_order_reference_id: Option,\n ) -> RouterResult<(Self, bool)>\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n // Default behaviour is to do nothing and continue further\n Ok((self, true))\n }\n\n async fn call_unified_connector_service<'a>(\n &mut self,\n _state: &SessionState,\n _header_payload: &domain_payments::HeaderPayload,\n _lineage_ids: grpc_client::LineageIds,\n #[cfg(feature = \"v1\")] _merchant_connector_account: helpers::MerchantConnectorAccountType,\n #[cfg(feature = \"v2\")]\n _merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n _merchant_context: &domain::MerchantContext,\n _connector_data: &api::ConnectorData,\n _unified_connector_service_execution_mode: ExecutionMode,\n _merchant_order_reference_id: Option,\n _call_connector_action: common_enums::CallConnectorAction,\n _creds_identifier: Option,\n ) -> RouterResult<()>\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(())\n }\n\n #[cfg(feature = \"v2\")]\n async fn call_unified_connector_service_with_external_vault_proxy<'a>(\n &mut self,\n _state: &SessionState,\n _header_payload: &domain_payments::HeaderPayload,\n _lineage_ids: grpc_client::LineageIds,\n _merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n _external_vault_merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n _merchant_context: &domain::MerchantContext,\n _unified_connector_service_execution_mode: ExecutionMode,\n _merchant_order_reference_id: Option,\n ) -> RouterResult<()>\n where\n F: Clone,\n Self: Sized,\n dyn api::Connector: services::ConnectorIntegration,\n {\n Ok(())\n }\n}", + "diff_span": { + "before": "pub trait Feature {\n #[cfg(feature = \"v1\")]\n async fn decide_flows<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n connector_request: Option,\n business_profile: &domain::Profile,\n header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: gateway_context::RouterGatewayContext,\n ) -> RouterResult\n where\n Self: Sized,\n F: Clone,\n dyn api::Connector: services::ConnectorIntegration;\n\n #[cfg(feature = \"v2\")]\n async fn decide_flows<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n connector_request: Option,\n business_profile: &domain::Profile,\n header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n ) -> RouterResult\n where", + "after": "" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments/gateway/psync_gateway.rs::domain::PSync::function::execute", + "file": "crates/router/src/core/payments/gateway/psync_gateway.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn execute(\n self: Box,\n state: &SessionState,\n _connector_integration: BoxedConnectorIntegrationInterface<\n domain::PSync,\n RCD,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n >,\n router_data: &RouterData<\n domain::PSync,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n >,\n call_connector_action: CallConnectorAction,\n _connector_request: Option,\n _return_raw_connector_response: Option,\n context: RouterGatewayContext,\n ) -> CustomResult<\n RouterData,\n ConnectorError,\n > {\n let connector_name = router_data.connector.clone();\n let connector_enum = common_enums::connector_enums::Connector::from_str(&connector_name)\n .change_context(ConnectorError::InvalidConnectorName)?;\n let merchant_connector_account = context.merchant_connector_account;\n let creds_identifier = context.creds_identifier;\n let merchant_context = context.merchant_context;\n let lineage_ids = context.lineage_ids;\n let header_payload = context.header_payload;\n let unified_connector_service_execution_mode = context.execution_mode;\n let merchant_order_reference_id = header_payload.x_reference_id.clone();\n let is_ucs_psync_disabled = state\n .conf\n .grpc_client\n .unified_connector_service\n .as_ref()\n .is_some_and(|config| {\n config\n .ucs_psync_disabled_connectors\n .contains(&connector_enum)\n });\n\n if is_ucs_psync_disabled {\n logger::info!(\n \"UCS PSync call disabled for connector: {}, skipping UCS call\",\n connector_name\n );\n return Ok(router_data.clone());\n }\n let client = state\n .grpc_client\n .unified_connector_service_client\n .clone()\n .ok_or(ConnectorError::RequestEncodingFailed)\n .attach_printable(\"Failed to fetch Unified Connector Service client\")?;\n\n let payment_get_request = payments_grpc::PaymentServiceGetRequest::foreign_try_from((\n &*router_data,\n call_connector_action,\n ))\n .change_context(ConnectorError::RequestEncodingFailed)\n .attach_printable(\"Failed to construct Payment Get Request\")?;\n\n let merchant_connector_id = merchant_connector_account.get_mca_id();\n\n let connector_auth_metadata =\n unified_connector_service::build_unified_connector_service_auth_metadata(\n merchant_connector_account,\n &merchant_context,\n )\n .change_context(ConnectorError::RequestEncodingFailed)\n .attach_printable(\"Failed to construct request metadata\")?;\n let merchant_reference_id = header_payload\n .x_reference_id\n .clone()\n .or(merchant_order_reference_id)\n .map(|id| id_type::PaymentReferenceId::from_str(id.as_str()))\n .transpose()\n .inspect_err(|err| logger::warn!(error=?err, \"Invalid Merchant ReferenceId found\"))\n .ok()\n .flatten()\n .map(ucs_types::UcsReferenceId::Payment);\n let header_payload = state\n .get_grpc_headers_ucs(unified_connector_service_execution_mode)\n .external_vault_proxy_metadata(None)\n .merchant_reference_id(merchant_reference_id)\n .lineage_ids(lineage_ids);\n let connector_name = router_data.connector.clone();\n let updated_router_data = Box::pin(unified_connector_service::ucs_logging_wrapper_new(\n router_data.clone(),\n state,\n payment_get_request,\n header_payload,\n |mut router_data, payment_get_request, grpc_headers| async move {\n let response = client\n .payment_get(payment_get_request, connector_auth_metadata, grpc_headers)\n .await\n .attach_printable(\"Failed to get payment\")?;\n\n let payment_get_response = response.into_inner();\n\n let (router_data_response, status_code) =\n handle_unified_connector_service_response_for_payment_get(\n payment_get_response.clone(),\n )\n .attach_printable(\"Failed to deserialize UCS response\")?;\n\n // Extract and store access token if present\n if let Some(access_token) =\n unified_connector_service::get_access_token_from_ucs_response(\n state,\n &merchant_context,\n &connector_name,\n merchant_connector_id.as_ref(),\n creds_identifier.clone(),\n payment_get_response.state.as_ref(),\n )\n .await\n {\n if let Err(error) = unified_connector_service::set_access_token_for_ucs(\n state,\n &merchant_context,\n &connector_name,\n access_token,\n merchant_connector_id.as_ref(),\n creds_identifier,\n )\n .await\n {\n logger::error!(\n ?error,\n \"Failed to store UCS access token from psync response\"\n );\n } else {\n logger::debug!(\"Successfully stored access token from UCS psync response\");\n }\n }\n\n let router_data_response = router_data_response.map(|(response, status)| {\n router_data.status = status;\n response\n });\n router_data.response = router_data_response;\n router_data.amount_captured = payment_get_response.captured_amount;\n router_data.minor_amount_captured = payment_get_response\n .minor_captured_amount\n .map(MinorUnit::new);\n router_data.raw_connector_response = payment_get_response\n .raw_connector_response\n .clone()\n .map(|raw_connector_response| raw_connector_response.expose().into());\n router_data.connector_http_status_code = Some(status_code);\n\n Ok((router_data, payment_get_response))\n },\n ))\n .await\n .change_context(ConnectorError::ResponseHandlingFailed)?;\n\n Ok(updated_router_data)\n }", + "after_code": "async fn execute(\n self: Box,\n state: &SessionState,\n _connector_integration: BoxedConnectorIntegrationInterface<\n Self,\n RCD,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n >,\n router_data: &RouterData,\n call_connector_action: CallConnectorAction,\n _connector_request: Option,\n _return_raw_connector_response: Option,\n context: RouterGatewayContext,\n ) -> CustomResult<\n RouterData,\n ConnectorError,\n > {\n let connector_name = router_data.connector.clone();\n let connector_enum = common_enums::connector_enums::Connector::from_str(&connector_name)\n .change_context(ConnectorError::InvalidConnectorName)?;\n let merchant_connector_account = context.merchant_connector_account;\n let creds_identifier = context.creds_identifier;\n let merchant_context = context.merchant_context;\n let lineage_ids = context.lineage_ids;\n let header_payload = context.header_payload;\n let unified_connector_service_execution_mode = context.execution_mode;\n let merchant_order_reference_id = header_payload.x_reference_id.clone();\n let is_ucs_psync_disabled = state\n .conf\n .grpc_client\n .unified_connector_service\n .as_ref()\n .is_some_and(|config| {\n config\n .ucs_psync_disabled_connectors\n .contains(&connector_enum)\n });\n\n if is_ucs_psync_disabled {\n logger::info!(\n \"UCS PSync call disabled for connector: {}, skipping UCS call\",\n connector_name\n );\n return Ok(router_data.clone());\n }\n let client = state\n .grpc_client\n .unified_connector_service_client\n .clone()\n .ok_or(ConnectorError::RequestEncodingFailed)\n .attach_printable(\"Failed to fetch Unified Connector Service client\")?;\n\n let payment_get_request = payments_grpc::PaymentServiceGetRequest::foreign_try_from((\n router_data,\n call_connector_action,\n ))\n .change_context(ConnectorError::RequestEncodingFailed)\n .attach_printable(\"Failed to construct Payment Get Request\")?;\n\n let merchant_connector_id = merchant_connector_account.get_mca_id();\n\n let connector_auth_metadata =\n unified_connector_service::build_unified_connector_service_auth_metadata(\n merchant_connector_account,\n &merchant_context,\n )\n .change_context(ConnectorError::RequestEncodingFailed)\n .attach_printable(\"Failed to construct request metadata\")?;\n let merchant_reference_id = header_payload\n .x_reference_id\n .clone()\n .or(merchant_order_reference_id)\n .map(|id| id_type::PaymentReferenceId::from_str(id.as_str()))\n .transpose()\n .inspect_err(|err| logger::warn!(error=?err, \"Invalid Merchant ReferenceId found\"))\n .ok()\n .flatten()\n .map(ucs_types::UcsReferenceId::Payment);\n let header_payload = state\n .get_grpc_headers_ucs(unified_connector_service_execution_mode)\n .external_vault_proxy_metadata(None)\n .merchant_reference_id(merchant_reference_id)\n .lineage_ids(lineage_ids);\n let connector_name = router_data.connector.clone();\n let updated_router_data = Box::pin(unified_connector_service::ucs_logging_wrapper_new(\n router_data.clone(),\n state,\n payment_get_request,\n header_payload,\n |mut router_data, payment_get_request, grpc_headers| async move {\n let response = client\n .payment_get(payment_get_request, connector_auth_metadata, grpc_headers)\n .await\n .attach_printable(\"Failed to get payment\")?;\n\n let payment_get_response = response.into_inner();\n\n let (router_data_response, status_code) =\n handle_unified_connector_service_response_for_payment_get(\n payment_get_response.clone(),\n )\n .attach_printable(\"Failed to deserialize UCS response\")?;\n\n // Extract and store access token if present\n if let Some(access_token) =\n unified_connector_service::get_access_token_from_ucs_response(\n state,\n &merchant_context,\n &connector_name,\n merchant_connector_id.as_ref(),\n creds_identifier.clone(),\n payment_get_response.state.as_ref(),\n )\n .await\n {\n if let Err(error) = unified_connector_service::set_access_token_for_ucs(\n state,\n &merchant_context,\n &connector_name,\n access_token,\n merchant_connector_id.as_ref(),\n creds_identifier,\n )\n .await\n {\n logger::error!(\n ?error,\n \"Failed to store UCS access token from psync response\"\n );\n } else {\n logger::debug!(\"Successfully stored access token from UCS psync response\");\n }\n }\n\n let router_data_response = router_data_response.map(|(response, status)| {\n router_data.status = status;\n response\n });\n router_data.response = router_data_response;\n router_data.amount_captured = payment_get_response.captured_amount;\n router_data.minor_amount_captured = payment_get_response\n .minor_captured_amount\n .map(MinorUnit::new);\n router_data.raw_connector_response = payment_get_response\n .raw_connector_response\n .clone()\n .map(|raw_connector_response| raw_connector_response.expose().into());\n router_data.connector_http_status_code = Some(status_code);\n\n Ok((router_data, payment_get_response))\n },\n ))\n .await\n .change_context(ConnectorError::ResponseHandlingFailed)?;\n\n Ok(updated_router_data)\n }", + "diff_span": { + "before": " state: &SessionState,\n _connector_integration: BoxedConnectorIntegrationInterface<\n domain::PSync,\n RCD,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n >,\n router_data: &RouterData<\n domain::PSync,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n >,\n call_connector_action: CallConnectorAction,\n _connector_request: Option,\n _return_raw_connector_response: Option,\n context: RouterGatewayContext,\n ) -> CustomResult<\n RouterData,\n ConnectorError,\n > {\n let connector_name = router_data.connector.clone();\n let connector_enum = common_enums::connector_enums::Connector::from_str(&connector_name)\n .change_context(ConnectorError::InvalidConnectorName)?;\n let merchant_connector_account = context.merchant_connector_account;\n let creds_identifier = context.creds_identifier;\n let merchant_context = context.merchant_context;\n let lineage_ids = context.lineage_ids;\n let header_payload = context.header_payload;\n let unified_connector_service_execution_mode = context.execution_mode;\n let merchant_order_reference_id = header_payload.x_reference_id.clone();\n let is_ucs_psync_disabled = state\n .conf\n .grpc_client\n .unified_connector_service\n .as_ref()\n .is_some_and(|config| {\n config\n .ucs_psync_disabled_connectors\n .contains(&connector_enum)\n });\n\n if is_ucs_psync_disabled {\n logger::info!(\n \"UCS PSync call disabled for connector: {}, skipping UCS call\",\n connector_name\n );\n return Ok(router_data.clone());\n }\n let client = state\n .grpc_client\n .unified_connector_service_client\n .clone()\n .ok_or(ConnectorError::RequestEncodingFailed)\n .attach_printable(\"Failed to fetch Unified Connector Service client\")?;\n\n let payment_get_request = payments_grpc::PaymentServiceGetRequest::foreign_try_from((\n &*router_data,\n call_connector_action,\n ))", + "after": " state: &SessionState,\n _connector_integration: BoxedConnectorIntegrationInterface<\n Self,\n RCD,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n >,\n router_data: &RouterData,\n call_connector_action: CallConnectorAction,\n _connector_request: Option,\n _return_raw_connector_response: Option,\n context: RouterGatewayContext,\n ) -> CustomResult<\n RouterData,\n ConnectorError,\n > {\n let connector_name = router_data.connector.clone();\n let connector_enum = common_enums::connector_enums::Connector::from_str(&connector_name)\n .change_context(ConnectorError::InvalidConnectorName)?;\n let merchant_connector_account = context.merchant_connector_account;\n let creds_identifier = context.creds_identifier;\n let merchant_context = context.merchant_context;\n let lineage_ids = context.lineage_ids;\n let header_payload = context.header_payload;\n let unified_connector_service_execution_mode = context.execution_mode;\n let merchant_order_reference_id = header_payload.x_reference_id.clone();\n let is_ucs_psync_disabled = state\n .conf\n .grpc_client\n .unified_connector_service\n .as_ref()\n .is_some_and(|config| {\n config\n .ucs_psync_disabled_connectors\n .contains(&connector_enum)\n });\n\n if is_ucs_psync_disabled {\n logger::info!(\n \"UCS PSync call disabled for connector: {}, skipping UCS call\",\n connector_name\n );\n return Ok(router_data.clone());\n }\n let client = state\n .grpc_client\n .unified_connector_service_client\n .clone()\n .ok_or(ConnectorError::RequestEncodingFailed)\n .attach_printable(\"Failed to fetch Unified Connector Service client\")?;\n\n let payment_get_request = payments_grpc::PaymentServiceGetRequest::foreign_try_from((\n router_data,\n call_connector_action,\n ))" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/common_enums/src/enums.rs::enum::ExecutionMode", + "file": "crates/common_enums/src/enums.rs", + "kind": "enum_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub enum ExecutionMode {\n #[default]\n Primary,\n Shadow,\n}", + "after_code": "pub enum ExecutionMode {\n #[default]\n Primary,\n Shadow,\n NotApplicable,\n}", + "diff_span": { + "before": "", + "after": " Primary,\n Shadow,\n NotApplicable,\n}" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments/gateway/psync_gateway.rs::domain::PSync::function::get_gateway", + "file": "crates/router/src/core/payments/gateway/psync_gateway.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn get_gateway(\n execution_path: ExecutionPath,\n ) -> Box<\n dyn payment_gateway::PaymentGateway<\n SessionState,\n RCD,\n Self,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n RouterGatewayContext,\n >,\n > {\n match execution_path {\n ExecutionPath::Direct => Box::new(payment_gateway::DirectGateway),\n ExecutionPath::UnifiedConnectorService\n | ExecutionPath::ShadowUnifiedConnectorService => Box::new(domain::PSync),\n }\n }", + "after_code": "fn get_gateway(\n execution_path: ExecutionPath,\n ) -> Box<\n dyn payment_gateway::PaymentGateway<\n SessionState,\n RCD,\n Self,\n types::PaymentsSyncData,\n types::PaymentsResponseData,\n RouterGatewayContext,\n >,\n > {\n match execution_path {\n ExecutionPath::Direct => Box::new(payment_gateway::DirectGateway),\n ExecutionPath::UnifiedConnectorService\n | ExecutionPath::ShadowUnifiedConnectorService => Box::new(Self),\n }\n }", + "diff_span": { + "before": " ExecutionPath::Direct => Box::new(payment_gateway::DirectGateway),\n ExecutionPath::UnifiedConnectorService\n | ExecutionPath::ShadowUnifiedConnectorService => Box::new(domain::PSync),\n }\n }", + "after": " ExecutionPath::Direct => Box::new(payment_gateway::DirectGateway),\n ExecutionPath::UnifiedConnectorService\n | ExecutionPath::ShadowUnifiedConnectorService => Box::new(Self),\n }\n }" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + }, + { + "id": "crates/router/src/core/payments/flows/external_proxy_flow.rs::impl::types::ExternalVaultProxyPaymentsRouterData", + "file": "crates/router/src/core/payments/flows/external_proxy_flow.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl Feature\n for types::ExternalVaultProxyPaymentsRouterData\n{\n async fn decide_flows<'a>(\n mut self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n connector_request: Option,\n business_profile: &domain::Profile,\n header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: crate::core::payments::gateway::RouterGatewayContext,\n ) -> RouterResult {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::ExternalVaultProxy,\n types::ExternalVaultProxyPaymentsData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n\n logger::debug!(auth_type=?self.auth_type);\n let mut auth_router_data = services::execute_connector_processing_step(\n state,\n connector_integration,\n &self,\n call_connector_action.clone(),\n connector_request,\n return_raw_connector_response,\n )\n .await\n .to_payment_failed_response()?;\n\n // External vault proxy doesn't use integrity checks\n auth_router_data.integrity_check = Ok(());\n metrics::PAYMENT_COUNT.add(1, &[]);\n\n Ok(auth_router_data)\n }\n\n async fn add_access_token<'a>(\n &self,\n state: &SessionState,\n connector: &api::ConnectorData,\n _merchant_context: &domain::MerchantContext,\n creds_identifier: Option<&str>,\n ) -> RouterResult {\n access_token::add_access_token(state, connector, self, creds_identifier).await\n }\n\n async fn add_session_token<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n ) -> RouterResult\n where\n Self: Sized,\n {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::AuthorizeSessionToken,\n types::AuthorizeSessionTokenData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n let authorize_data = &types::PaymentsAuthorizeSessionTokenRouterData::foreign_from((\n &self,\n types::AuthorizeSessionTokenData::foreign_from(&self),\n ));\n let resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n authorize_data,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .to_payment_failed_response()?;\n let mut router_data = self;\n router_data.session_token = resp.session_token;\n Ok(router_data)\n }\n\n async fn add_payment_method_token<'a>(\n &mut self,\n state: &SessionState,\n connector: &api::ConnectorData,\n tokenization_action: &payments::TokenizationAction,\n should_continue_payment: bool,\n ) -> RouterResult {\n let request = self.request.clone();\n tokenization::add_payment_method_token(\n state,\n connector,\n tokenization_action,\n self,\n types::PaymentMethodTokenizationData::try_from(request)?,\n should_continue_payment,\n )\n .await\n }\n\n async fn preprocessing_steps<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n ) -> RouterResult {\n todo!()\n }\n\n async fn postprocessing_steps<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n ) -> RouterResult {\n todo!()\n }\n\n async fn create_connector_customer<'a>(\n &self,\n state: &SessionState,\n connector: &api::ConnectorData,\n ) -> RouterResult> {\n customers::create_connector_customer(\n state,\n connector,\n self,\n types::ConnectorCustomerData::try_from(self)?,\n )\n .await\n }\n\n async fn build_flow_specific_connector_request(\n &mut self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n ) -> RouterResult<(Option, bool)> {\n match call_connector_action {\n payments::CallConnectorAction::Trigger => {\n connector\n .connector\n .validate_connector_against_payment_request(\n self.request.capture_method,\n self.payment_method,\n self.request.payment_method_type,\n )\n .to_payment_failed_response()?;\n\n // Check if the connector supports mandate payment\n // if the payment_method_type does not support mandate for the given connector, downgrade the setup future usage to on session\n if self.request.setup_future_usage\n == Some(diesel_models::enums::FutureUsage::OffSession)\n && !self\n .request\n .payment_method_type\n .and_then(|payment_method_type| {\n state\n .conf\n .mandates\n .supported_payment_methods\n .0\n .get(&enums::PaymentMethod::from(payment_method_type))\n .and_then(|supported_pm_for_mandates| {\n supported_pm_for_mandates.0.get(&payment_method_type).map(\n |supported_connector_for_mandates| {\n supported_connector_for_mandates\n .connector_list\n .contains(&connector.connector_name)\n },\n )\n })\n })\n .unwrap_or(false)\n {\n // downgrade the setup future usage to on session\n self.request.setup_future_usage =\n Some(diesel_models::enums::FutureUsage::OnSession);\n };\n\n // External vault proxy doesn't use regular payment method validation\n // Skip mandate payment validation for external vault proxy\n\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::ExternalVaultProxy,\n types::ExternalVaultProxyPaymentsData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n\n metrics::EXECUTE_PRETASK_COUNT.add(\n 1,\n router_env::metric_attributes!(\n (\"connector\", connector.connector_name.to_string()),\n (\"flow\", format!(\"{:?}\", api::ExternalVaultProxy)),\n ),\n );\n\n logger::debug!(completed_pre_tasks=?true);\n\n // External vault proxy always proceeds\n Ok((\n connector_integration\n .build_request(self, &state.conf.connectors)\n .to_payment_failed_response()?,\n true,\n ))\n }\n _ => Ok((None, true)),\n }\n }\n\n async fn create_order_at_connector(\n &mut self,\n state: &SessionState,\n connector: &api::ConnectorData,\n should_continue_payment: bool,\n ) -> RouterResult> {\n if connector\n .connector_name\n .requires_order_creation_before_payment(self.payment_method)\n && should_continue_payment\n {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::CreateOrder,\n types::CreateOrderRequestData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n\n let request_data = types::CreateOrderRequestData::try_from(self.request.clone())?;\n\n let response_data: Result =\n Err(types::ErrorResponse::default());\n\n let createorder_router_data =\n helpers::router_data_type_conversion::<_, api::CreateOrder, _, _, _, _>(\n self.clone(),\n request_data,\n response_data,\n );\n\n let resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &createorder_router_data,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .to_payment_failed_response()?;\n\n let create_order_resp = match resp.response {\n Ok(res) => {\n if let types::PaymentsResponseData::PaymentsCreateOrderResponse { order_id } =\n res\n {\n Ok(order_id)\n } else {\n Err(error_stack::report!(ApiErrorResponse::InternalServerError)\n .attach_printable(format!(\n \"Unexpected response format from connector: {res:?}\",\n )))?\n }\n }\n Err(error) => Err(error),\n };\n\n Ok(Some(types::CreateOrderResult {\n create_order_result: create_order_resp,\n }))\n } else {\n // If the connector does not require order creation, return None\n Ok(None)\n }\n }\n\n fn update_router_data_with_create_order_response(\n &mut self,\n create_order_result: types::CreateOrderResult,\n ) {\n match create_order_result.create_order_result {\n Ok(order_id) => {\n self.request.order_id = Some(order_id.clone()); // ? why this is assigned here and ucs also wants this to populate data\n self.response =\n Ok(types::PaymentsResponseData::PaymentsCreateOrderResponse { order_id });\n }\n Err(err) => {\n self.response = Err(err.clone());\n }\n }\n }\n\n #[cfg(feature = \"v2\")]\n async fn call_unified_connector_service_with_external_vault_proxy<'a>(\n &mut self,\n state: &SessionState,\n header_payload: &domain_payments::HeaderPayload,\n lineage_ids: grpc_client::LineageIds,\n merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n external_vault_merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n merchant_context: &domain::MerchantContext,\n unified_connector_service_execution_mode: enums::ExecutionMode,\n merchant_order_reference_id: Option,\n ) -> RouterResult<()> {\n let client = state\n .grpc_client\n .unified_connector_service_client\n .clone()\n .ok_or(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to fetch Unified Connector Service client\")?;\n\n let payment_authorize_request =\n payments_grpc::PaymentServiceAuthorizeRequest::foreign_try_from(&*self)\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to construct Payment Authorize Request\")?;\n\n let connector_auth_metadata =\n unified_connector_service::build_unified_connector_service_auth_metadata(\n merchant_connector_account,\n merchant_context,\n )\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to construct request metadata\")?;\n\n let external_vault_proxy_metadata =\n unified_connector_service::build_unified_connector_service_external_vault_proxy_metadata(\n external_vault_merchant_connector_account\n )\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to construct external vault proxy metadata\")?;\n let merchant_reference_id = header_payload\n .x_reference_id\n .clone()\n .or(merchant_order_reference_id)\n .map(|id| id_type::PaymentReferenceId::from_str(id.as_str()))\n .transpose()\n .inspect_err(|err| logger::warn!(error=?err, \"Invalid Merchant ReferenceId found\"))\n .ok()\n .flatten()\n .map(ucs_types::UcsReferenceId::Payment);\n let headers_builder = state\n .get_grpc_headers_ucs(unified_connector_service_execution_mode)\n .external_vault_proxy_metadata(Some(external_vault_proxy_metadata))\n .merchant_reference_id(merchant_reference_id)\n .lineage_ids(lineage_ids);\n let updated_router_data = Box::pin(ucs_logging_wrapper(\n self.clone(),\n state,\n payment_authorize_request.clone(),\n headers_builder,\n |mut router_data, payment_authorize_request, grpc_headers| async move {\n let response = client\n .payment_authorize(\n payment_authorize_request,\n connector_auth_metadata,\n grpc_headers,\n )\n .await\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to authorize payment\")?;\n\n let payment_authorize_response = response.into_inner();\n\n let ucs_data =\n unified_connector_service::handle_unified_connector_service_response_for_payment_authorize(\n payment_authorize_response.clone(),\n )\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to deserialize UCS response\")?;\n\n let router_data_response = ucs_data.router_data_response.map(|(response, status)|{\n router_data.status = status;\n response\n });\n router_data.response = router_data_response;\n router_data.raw_connector_response = payment_authorize_response\n .raw_connector_response\n .clone()\n .map(|raw_connector_response| raw_connector_response.expose().into());\n router_data.connector_http_status_code = Some(ucs_data.status_code);\n\n Ok((router_data, payment_authorize_response))\n }\n )).await?;\n\n // Copy back the updated data\n *self = updated_router_data;\n Ok(())\n }\n}", + "after_code": "impl Feature\n for types::ExternalVaultProxyPaymentsRouterData\n{\n async fn decide_flows<'a>(\n mut self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n connector_request: Option,\n business_profile: &domain::Profile,\n header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: gateway_context::RouterGatewayContext,\n ) -> RouterResult {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::ExternalVaultProxy,\n types::ExternalVaultProxyPaymentsData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n\n logger::debug!(auth_type=?self.auth_type);\n let mut auth_router_data = services::execute_connector_processing_step(\n state,\n connector_integration,\n &self,\n call_connector_action.clone(),\n connector_request,\n return_raw_connector_response,\n )\n .await\n .to_payment_failed_response()?;\n\n // External vault proxy doesn't use integrity checks\n auth_router_data.integrity_check = Ok(());\n metrics::PAYMENT_COUNT.add(1, &[]);\n\n Ok(auth_router_data)\n }\n\n async fn add_access_token<'a>(\n &self,\n state: &SessionState,\n connector: &api::ConnectorData,\n _merchant_context: &domain::MerchantContext,\n creds_identifier: Option<&str>,\n ) -> RouterResult {\n access_token::add_access_token(state, connector, self, creds_identifier).await\n }\n\n async fn add_session_token<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n ) -> RouterResult\n where\n Self: Sized,\n {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::AuthorizeSessionToken,\n types::AuthorizeSessionTokenData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n let authorize_data = &types::PaymentsAuthorizeSessionTokenRouterData::foreign_from((\n &self,\n types::AuthorizeSessionTokenData::foreign_from(&self),\n ));\n let resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n authorize_data,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .to_payment_failed_response()?;\n let mut router_data = self;\n router_data.session_token = resp.session_token;\n Ok(router_data)\n }\n\n async fn add_payment_method_token<'a>(\n &mut self,\n state: &SessionState,\n connector: &api::ConnectorData,\n tokenization_action: &payments::TokenizationAction,\n should_continue_payment: bool,\n ) -> RouterResult {\n let request = self.request.clone();\n tokenization::add_payment_method_token(\n state,\n connector,\n tokenization_action,\n self,\n types::PaymentMethodTokenizationData::try_from(request)?,\n should_continue_payment,\n )\n .await\n }\n\n async fn preprocessing_steps<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n ) -> RouterResult {\n todo!()\n }\n\n async fn postprocessing_steps<'a>(\n self,\n state: &SessionState,\n connector: &api::ConnectorData,\n ) -> RouterResult {\n todo!()\n }\n\n async fn create_connector_customer<'a>(\n &self,\n state: &SessionState,\n connector: &api::ConnectorData,\n ) -> RouterResult> {\n customers::create_connector_customer(\n state,\n connector,\n self,\n types::ConnectorCustomerData::try_from(self)?,\n )\n .await\n }\n\n async fn build_flow_specific_connector_request(\n &mut self,\n state: &SessionState,\n connector: &api::ConnectorData,\n call_connector_action: payments::CallConnectorAction,\n ) -> RouterResult<(Option, bool)> {\n match call_connector_action {\n payments::CallConnectorAction::Trigger => {\n connector\n .connector\n .validate_connector_against_payment_request(\n self.request.capture_method,\n self.payment_method,\n self.request.payment_method_type,\n )\n .to_payment_failed_response()?;\n\n // Check if the connector supports mandate payment\n // if the payment_method_type does not support mandate for the given connector, downgrade the setup future usage to on session\n if self.request.setup_future_usage\n == Some(diesel_models::enums::FutureUsage::OffSession)\n && !self\n .request\n .payment_method_type\n .and_then(|payment_method_type| {\n state\n .conf\n .mandates\n .supported_payment_methods\n .0\n .get(&enums::PaymentMethod::from(payment_method_type))\n .and_then(|supported_pm_for_mandates| {\n supported_pm_for_mandates.0.get(&payment_method_type).map(\n |supported_connector_for_mandates| {\n supported_connector_for_mandates\n .connector_list\n .contains(&connector.connector_name)\n },\n )\n })\n })\n .unwrap_or(false)\n {\n // downgrade the setup future usage to on session\n self.request.setup_future_usage =\n Some(diesel_models::enums::FutureUsage::OnSession);\n };\n\n // External vault proxy doesn't use regular payment method validation\n // Skip mandate payment validation for external vault proxy\n\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::ExternalVaultProxy,\n types::ExternalVaultProxyPaymentsData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n\n metrics::EXECUTE_PRETASK_COUNT.add(\n 1,\n router_env::metric_attributes!(\n (\"connector\", connector.connector_name.to_string()),\n (\"flow\", format!(\"{:?}\", api::ExternalVaultProxy)),\n ),\n );\n\n logger::debug!(completed_pre_tasks=?true);\n\n // External vault proxy always proceeds\n Ok((\n connector_integration\n .build_request(self, &state.conf.connectors)\n .to_payment_failed_response()?,\n true,\n ))\n }\n _ => Ok((None, true)),\n }\n }\n\n async fn create_order_at_connector(\n &mut self,\n state: &SessionState,\n connector: &api::ConnectorData,\n should_continue_payment: bool,\n ) -> RouterResult> {\n if connector\n .connector_name\n .requires_order_creation_before_payment(self.payment_method)\n && should_continue_payment\n {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::CreateOrder,\n types::CreateOrderRequestData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n\n let request_data = types::CreateOrderRequestData::try_from(self.request.clone())?;\n\n let response_data: Result =\n Err(types::ErrorResponse::default());\n\n let createorder_router_data =\n helpers::router_data_type_conversion::<_, api::CreateOrder, _, _, _, _>(\n self.clone(),\n request_data,\n response_data,\n );\n\n let resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &createorder_router_data,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await\n .to_payment_failed_response()?;\n\n let create_order_resp = match resp.response {\n Ok(res) => {\n if let types::PaymentsResponseData::PaymentsCreateOrderResponse { order_id } =\n res\n {\n Ok(order_id)\n } else {\n Err(error_stack::report!(ApiErrorResponse::InternalServerError)\n .attach_printable(format!(\n \"Unexpected response format from connector: {res:?}\",\n )))?\n }\n }\n Err(error) => Err(error),\n };\n\n Ok(Some(types::CreateOrderResult {\n create_order_result: create_order_resp,\n }))\n } else {\n // If the connector does not require order creation, return None\n Ok(None)\n }\n }\n\n fn update_router_data_with_create_order_response(\n &mut self,\n create_order_result: types::CreateOrderResult,\n ) {\n match create_order_result.create_order_result {\n Ok(order_id) => {\n self.request.order_id = Some(order_id.clone()); // ? why this is assigned here and ucs also wants this to populate data\n self.response =\n Ok(types::PaymentsResponseData::PaymentsCreateOrderResponse { order_id });\n }\n Err(err) => {\n self.response = Err(err.clone());\n }\n }\n }\n\n #[cfg(feature = \"v2\")]\n async fn call_unified_connector_service_with_external_vault_proxy<'a>(\n &mut self,\n state: &SessionState,\n header_payload: &domain_payments::HeaderPayload,\n lineage_ids: grpc_client::LineageIds,\n merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n external_vault_merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n merchant_context: &domain::MerchantContext,\n unified_connector_service_execution_mode: enums::ExecutionMode,\n merchant_order_reference_id: Option,\n ) -> RouterResult<()> {\n let client = state\n .grpc_client\n .unified_connector_service_client\n .clone()\n .ok_or(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to fetch Unified Connector Service client\")?;\n\n let payment_authorize_request =\n payments_grpc::PaymentServiceAuthorizeRequest::foreign_try_from(&*self)\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to construct Payment Authorize Request\")?;\n\n let connector_auth_metadata =\n unified_connector_service::build_unified_connector_service_auth_metadata(\n merchant_connector_account,\n merchant_context,\n )\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to construct request metadata\")?;\n\n let external_vault_proxy_metadata =\n unified_connector_service::build_unified_connector_service_external_vault_proxy_metadata(\n external_vault_merchant_connector_account\n )\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to construct external vault proxy metadata\")?;\n let merchant_reference_id = header_payload\n .x_reference_id\n .clone()\n .or(merchant_order_reference_id)\n .map(|id| id_type::PaymentReferenceId::from_str(id.as_str()))\n .transpose()\n .inspect_err(|err| logger::warn!(error=?err, \"Invalid Merchant ReferenceId found\"))\n .ok()\n .flatten()\n .map(ucs_types::UcsReferenceId::Payment);\n let headers_builder = state\n .get_grpc_headers_ucs(unified_connector_service_execution_mode)\n .external_vault_proxy_metadata(Some(external_vault_proxy_metadata))\n .merchant_reference_id(merchant_reference_id)\n .lineage_ids(lineage_ids);\n let updated_router_data = Box::pin(ucs_logging_wrapper(\n self.clone(),\n state,\n payment_authorize_request.clone(),\n headers_builder,\n |mut router_data, payment_authorize_request, grpc_headers| async move {\n let response = client\n .payment_authorize(\n payment_authorize_request,\n connector_auth_metadata,\n grpc_headers,\n )\n .await\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to authorize payment\")?;\n\n let payment_authorize_response = response.into_inner();\n\n let ucs_data =\n unified_connector_service::handle_unified_connector_service_response_for_payment_authorize(\n payment_authorize_response.clone(),\n )\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to deserialize UCS response\")?;\n\n let router_data_response = ucs_data.router_data_response.map(|(response, status)|{\n router_data.status = status;\n response\n });\n router_data.response = router_data_response;\n router_data.raw_connector_response = payment_authorize_response\n .raw_connector_response\n .clone()\n .map(|raw_connector_response| raw_connector_response.expose().into());\n router_data.connector_http_status_code = Some(ucs_data.status_code);\n\n Ok((router_data, payment_authorize_response))\n }\n )).await?;\n\n // Copy back the updated data\n *self = updated_router_data;\n Ok(())\n }\n}", + "diff_span": { + "before": " header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: crate::core::payments::gateway::RouterGatewayContext,\n ) -> RouterResult {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<", + "after": " header_payload: domain_payments::HeaderPayload,\n return_raw_connector_response: Option,\n gateway_context: gateway_context::RouterGatewayContext,\n ) -> RouterResult {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<" + }, + "commit_sha": "12d9ca69243934a34dd406ff64391be34995d822" + } + ] +} \ No newline at end of file