Add files using upload-large-folder tool
Browse filesThis view is limited to 50 files because it contains too many changes.
See raw diff
- diffs/pr_10028/2a6e9c4/diff.json +0 -0
- diffs/pr_10028/3825e06/diff.json +0 -0
- diffs/pr_10028/8975593/diff.json +6 -0
- diffs/pr_10028/8a9a4b0/diff.json +0 -0
- diffs/pr_10028/af56ea2/diff.json +8 -0
- diffs/pr_10028/d9fc61f/diff.json +0 -0
- diffs/pr_10074/1dbbd26/diff.json +6 -0
- diffs/pr_10074/2e7e89d/diff.json +24 -0
- diffs/pr_10074/3c58f51/diff.json +24 -0
- diffs/pr_10074/3cd1e2f/diff.json +24 -0
- diffs/pr_10074/c028b95/diff.json +0 -0
- diffs/pr_10076/05667c9/diff.json +0 -0
- diffs/pr_10076/26c1620/diff.json +0 -0
- diffs/pr_10076/7a75438/diff.json +24 -0
- diffs/pr_10076/8e8aecd/diff.json +74 -0
- diffs/pr_10076/a825dc6/diff.json +0 -0
- diffs/pr_10164/0476285/diff.json +39 -0
- diffs/pr_10164/23e4f23/diff.json +44 -0
- diffs/pr_10164/4ef1f76/diff.json +160 -0
- diffs/pr_10164/c4615d6/diff.json +100 -0
- diffs/pr_10164/cd64e30/diff.json +149 -0
- diffs/pr_10164/d5b75af/diff.json +126 -0
- diffs/pr_10164/e6a0a11/diff.json +39 -0
- diffs/pr_10164/f2aab46/diff.json +26 -0
- diffs/pr_10164/f6cf43a/diff.json +90 -0
- diffs/pr_10170/0decc8d/diff.json +115 -0
- diffs/pr_10170/9dcd2d6/diff.json +69 -0
- diffs/pr_10170/cda385a/diff.json +84 -0
- diffs/pr_10170/ec7049c/diff.json +67 -0
- diffs/pr_10191/130e554/diff.json +6 -0
- diffs/pr_10191/1e27f4e/diff.json +6 -0
- diffs/pr_10191/3c59884/diff.json +24 -0
- diffs/pr_10191/4c0ebf5/diff.json +8 -0
- diffs/pr_10191/93123f3/diff.json +24 -0
- diffs/pr_10191/ce01165/diff.json +40 -0
- diffs/pr_10191/eb1ff11/diff.json +86 -0
- diffs/pr_10200/0ddfe0a/diff.json +24 -0
- diffs/pr_10200/0fa9235/diff.json +6 -0
- diffs/pr_10200/6afa7af/diff.json +0 -0
- diffs/pr_10200/aa8c870/diff.json +104 -0
- diffs/pr_10200/c5195ff/diff.json +8 -0
- diffs/pr_10200/ddb6ac8/diff.json +8 -0
- diffs/pr_10200/e3dcb7f/diff.json +0 -0
- diffs/pr_10204/00cbc6f/diff.json +70 -0
- diffs/pr_10204/3832432/diff.json +70 -0
- diffs/pr_10204/5f3a9e5/diff.json +70 -0
- diffs/pr_10204/8c449f3/diff.json +24 -0
- diffs/pr_10204/a0a1faf/diff.json +160 -0
- diffs/pr_10204/bc1c621/diff.json +0 -0
- diffs/pr_10204/ea81c76/diff.json +0 -0
diffs/pr_10028/2a6e9c4/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10028/3825e06/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10028/8975593/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "8975593d7444d5863d7b9ac30f70a6e877ad245e",
|
| 3 |
+
"pr_number": 10028,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10028/8a9a4b0/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10028/af56ea2/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "af56ea2ae9a7b788ef2eadea05565a552cf574ca",
|
| 3 |
+
"pr_number": 10028,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/subscriptions/src/core.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_10028/d9fc61f/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10074/1dbbd26/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "1dbbd26b6a43c186a77b8ee2899e8428dd236364",
|
| 3 |
+
"pr_number": 10074,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10074/2e7e89d/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "2e7e89dc88a55f622c3338c253c5e53238f6b530",
|
| 3 |
+
"pr_number": 10074,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/webhooks/incoming.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::update_connector_mandate_details",
|
| 10 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "async fn update_connector_mandate_details(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n object_ref_id: api::ObjectReferenceId,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let webhook_connector_mandate_details = connector\n .get_mandate_details(request_details)\n .switch()\n .attach_printable(\"Could not find connector mandate details in incoming webhook body\")?;\n\n let webhook_connector_network_transaction_id = connector\n .get_network_txn_id(request_details)\n .switch()\n .attach_printable(\n \"Could not find connector network transaction id in incoming webhook body\",\n )?;\n\n // Either one OR both of the fields are present\n if webhook_connector_mandate_details.is_some()\n || webhook_connector_network_transaction_id.is_some()\n {\n let payment_attempt =\n get_payment_attempt_from_object_reference_id(state, object_ref_id, merchant_context)\n .await?;\n if let Some(ref payment_method_id) = payment_attempt.payment_method_id {\n let key_manager_state = &state.into();\n let payment_method_info = state\n .store\n .find_payment_method(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n payment_method_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentMethodNotFound)?;\n\n // Update connector's mandate details\n let updated_connector_mandate_details =\n if let Some(webhook_mandate_details) = webhook_connector_mandate_details {\n let mandate_details = payment_method_info\n .get_common_mandate_reference()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to deserialize to Payment Mandate Reference\")?;\n\n let merchant_connector_account_id = payment_attempt\n .merchant_connector_id\n .clone()\n .get_required_value(\"merchant_connector_id\")?;\n\n if mandate_details.payments.as_ref().is_none_or(|payments| {\n !payments.0.contains_key(&merchant_connector_account_id)\n }) {\n // Update the payment attempt to maintain consistency across tables.\n let (mandate_metadata, connector_mandate_request_reference_id) =\n payment_attempt\n .connector_mandate_detail\n .as_ref()\n .map(|details| {\n (\n details.mandate_metadata.clone(),\n details.connector_mandate_request_reference_id.clone(),\n )\n })\n .unwrap_or((None, None));\n\n let connector_mandate_reference_id = ConnectorMandateReferenceId {\n connector_mandate_id: Some(\n webhook_mandate_details\n .connector_mandate_id\n .peek()\n .to_string(),\n ),\n payment_method_id: Some(payment_method_id.to_string()),\n mandate_metadata,\n connector_mandate_request_reference_id,\n };\n\n let attempt_update =\n storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n tokenization: None, // We need to handle tokenization field update in webhooks as well\n updated_by: merchant_context\n .get_merchant_account()\n .storage_scheme\n .to_string(),\n };\n\n state\n .store\n .update_payment_attempt_with_attempt_id(\n payment_attempt.clone(),\n attempt_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n insert_mandate_details(\n &payment_attempt,\n &webhook_mandate_details,\n Some(mandate_details),\n )?\n } else {\n logger::info!(\n \"Skipping connector mandate details update since they are already present.\"\n );\n None\n }\n } else {\n None\n };\n\n let connector_mandate_details_value = updated_connector_mandate_details\n .map(|common_mandate| {\n common_mandate.get_mandate_details_value().map_err(|err| {\n router_env::logger::error!(\n \"Failed to get get_mandate_details_value : {:?}\",\n err\n );\n errors::ApiErrorResponse::MandateUpdateFailed\n })\n })\n .transpose()?;\n\n let pm_update = diesel_models::PaymentMethodUpdate::ConnectorNetworkTransactionIdAndMandateDetailsUpdate {\n connector_mandate_details: connector_mandate_details_value.map(masking::Secret::new),\n network_transaction_id: webhook_connector_network_transaction_id\n .map(|webhook_network_transaction_id| webhook_network_transaction_id.get_id().clone()),\n };\n\n state\n .store\n .update_payment_method(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n payment_method_info,\n pm_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to update payment method in db\")?;\n }\n }\n Ok(())\n}",
|
| 16 |
+
"after_code": "async fn update_connector_mandate_details(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n object_ref_id: api::ObjectReferenceId,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let webhook_connector_mandate_details = connector\n .get_mandate_details(request_details)\n .switch()\n .attach_printable(\"Could not find connector mandate details in incoming webhook body\")?;\n\n let webhook_connector_network_transaction_id = connector\n .get_network_txn_id(request_details)\n .switch()\n .attach_printable(\n \"Could not find connector network transaction id in incoming webhook body\",\n )?;\n\n // Either one OR both of the fields are present\n if webhook_connector_mandate_details.is_some()\n || webhook_connector_network_transaction_id.is_some()\n {\n let payment_attempt =\n get_payment_attempt_from_object_reference_id(state, object_ref_id, merchant_context)\n .await?;\n if let Some(ref payment_method_id) = payment_attempt.payment_method_id {\n let key_manager_state = &state.into();\n let payment_method_info = state\n .store\n .find_payment_method(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n payment_method_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentMethodNotFound)?;\n\n // Update connector's mandate details\n let updated_connector_mandate_details =\n if let Some(webhook_mandate_details) = webhook_connector_mandate_details {\n let mandate_details = payment_method_info\n .get_common_mandate_reference()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to deserialize to Payment Mandate Reference\")?;\n\n let merchant_connector_account_id = payment_attempt\n .merchant_connector_id\n .clone()\n .get_required_value(\"merchant_connector_id\")?;\n\n if mandate_details.payments.as_ref().is_none_or(|payments| {\n !payments.0.contains_key(&merchant_connector_account_id)\n }) {\n // Update the payment attempt to maintain consistency across tables.\n let (mandate_metadata, connector_mandate_request_reference_id) =\n payment_attempt\n .connector_mandate_detail\n .as_ref()\n .map(|details| {\n (\n details.mandate_metadata.clone(),\n details.connector_mandate_request_reference_id.clone(),\n )\n })\n .unwrap_or((None, None));\n\n let connector_mandate_reference_id = ConnectorMandateReferenceId {\n connector_mandate_id: Some(\n webhook_mandate_details\n .connector_mandate_id\n .peek()\n .to_string(),\n ),\n payment_method_id: Some(payment_method_id.to_string()),\n mandate_metadata,\n connector_mandate_request_reference_id,\n };\n\n let attempt_update =\n storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n tokenization: None, // We need to handle tokenization field update in webhooks as well\n updated_by: merchant_context\n .get_merchant_account()\n .storage_scheme\n .to_string(),\n };\n\n state\n .store\n .update_payment_attempt_with_attempt_id(\n payment_attempt.clone(),\n attempt_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n insert_mandate_details(\n &payment_attempt,\n &webhook_mandate_details,\n Some(mandate_details),\n )?\n } else {\n logger::info!(\n \"Skipping connector mandate details update since they are already present.\"\n );\n None\n }\n } else {\n None\n };\n\n let connector_mandate_details_value = updated_connector_mandate_details\n .map(|common_mandate| {\n common_mandate.get_mandate_details_value().map_err(|err| {\n router_env::logger::error!(\n \"Failed to get get_mandate_details_value : {:?}\",\n err\n );\n errors::ApiErrorResponse::MandateUpdateFailed\n })\n })\n .transpose()?;\n\n let pm_update = diesel_models::PaymentMethodUpdate::ConnectorNetworkTransactionIdAndMandateDetailsUpdate {\n connector_mandate_details: connector_mandate_details_value.map(masking::Secret::new),\n network_transaction_id: webhook_connector_network_transaction_id\n .map(|webhook_network_transaction_id| webhook_network_transaction_id.get_id().clone()),\n };\n\n state\n .store\n .update_payment_method(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n payment_method_info,\n pm_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to update payment method in db\")?;\n }\n }\n Ok(())\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n tokenization: None, // We need to handle tokenization field update in webhooks as well\n updated_by: merchant_context\n .get_merchant_account()",
|
| 19 |
+
"after": " storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n tokenization: None, // We need to handle tokenization field update in webhooks as well\n updated_by: merchant_context\n .get_merchant_account()"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "2e7e89dc88a55f622c3338c253c5e53238f6b530"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10074/3c58f51/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "3c58f51165dbe3ae7b4e426d9740051544119171",
|
| 3 |
+
"pr_number": 10074,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/webhooks/incoming.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::update_connector_mandate_details",
|
| 10 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "async fn update_connector_mandate_details(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n object_ref_id: api::ObjectReferenceId,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let webhook_connector_mandate_details = connector\n .get_mandate_details(request_details)\n .switch()\n .attach_printable(\"Could not find connector mandate details in incoming webhook body\")?;\n\n let webhook_connector_network_transaction_id = connector\n .get_network_txn_id(request_details)\n .switch()\n .attach_printable(\n \"Could not find connector network transaction id in incoming webhook body\",\n )?;\n\n // Either one OR both of the fields are present\n if webhook_connector_mandate_details.is_some()\n || webhook_connector_network_transaction_id.is_some()\n {\n let payment_attempt =\n get_payment_attempt_from_object_reference_id(state, object_ref_id, merchant_context)\n .await?;\n if let Some(ref payment_method_id) = payment_attempt.payment_method_id {\n let key_manager_state = &state.into();\n let payment_method_info = state\n .store\n .find_payment_method(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n payment_method_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentMethodNotFound)?;\n\n // Update connector's mandate details\n let updated_connector_mandate_details =\n if let Some(webhook_mandate_details) = webhook_connector_mandate_details {\n let mandate_details = payment_method_info\n .get_common_mandate_reference()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to deserialize to Payment Mandate Reference\")?;\n\n let merchant_connector_account_id = payment_attempt\n .merchant_connector_id\n .clone()\n .get_required_value(\"merchant_connector_id\")?;\n\n if mandate_details.payments.as_ref().is_none_or(|payments| {\n !payments.0.contains_key(&merchant_connector_account_id)\n }) {\n // Update the payment attempt to maintain consistency across tables.\n let (mandate_metadata, connector_mandate_request_reference_id) =\n payment_attempt\n .connector_mandate_detail\n .as_ref()\n .map(|details| {\n (\n details.mandate_metadata.clone(),\n details.connector_mandate_request_reference_id.clone(),\n )\n })\n .unwrap_or((None, None));\n\n let connector_mandate_reference_id = ConnectorMandateReferenceId {\n connector_mandate_id: Some(\n webhook_mandate_details\n .connector_mandate_id\n .peek()\n .to_string(),\n ),\n payment_method_id: Some(payment_method_id.to_string()),\n mandate_metadata,\n connector_mandate_request_reference_id,\n };\n\n let attempt_update =\n storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n tokenization: None,\n updated_by: merchant_context\n .get_merchant_account()\n .storage_scheme\n .to_string(),\n };\n\n state\n .store\n .update_payment_attempt_with_attempt_id(\n payment_attempt.clone(),\n attempt_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n insert_mandate_details(\n &payment_attempt,\n &webhook_mandate_details,\n Some(mandate_details),\n )?\n } else {\n logger::info!(\n \"Skipping connector mandate details update since they are already present.\"\n );\n None\n }\n } else {\n None\n };\n\n let connector_mandate_details_value = updated_connector_mandate_details\n .map(|common_mandate| {\n common_mandate.get_mandate_details_value().map_err(|err| {\n router_env::logger::error!(\n \"Failed to get get_mandate_details_value : {:?}\",\n err\n );\n errors::ApiErrorResponse::MandateUpdateFailed\n })\n })\n .transpose()?;\n\n let pm_update = diesel_models::PaymentMethodUpdate::ConnectorNetworkTransactionIdAndMandateDetailsUpdate {\n connector_mandate_details: connector_mandate_details_value.map(masking::Secret::new),\n network_transaction_id: webhook_connector_network_transaction_id\n .map(|webhook_network_transaction_id| webhook_network_transaction_id.get_id().clone()),\n };\n\n state\n .store\n .update_payment_method(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n payment_method_info,\n pm_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to update payment method in db\")?;\n }\n }\n Ok(())\n}",
|
| 16 |
+
"after_code": "async fn update_connector_mandate_details(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n object_ref_id: api::ObjectReferenceId,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let webhook_connector_mandate_details = connector\n .get_mandate_details(request_details)\n .switch()\n .attach_printable(\"Could not find connector mandate details in incoming webhook body\")?;\n\n let webhook_connector_network_transaction_id = connector\n .get_network_txn_id(request_details)\n .switch()\n .attach_printable(\n \"Could not find connector network transaction id in incoming webhook body\",\n )?;\n\n // Either one OR both of the fields are present\n if webhook_connector_mandate_details.is_some()\n || webhook_connector_network_transaction_id.is_some()\n {\n let payment_attempt =\n get_payment_attempt_from_object_reference_id(state, object_ref_id, merchant_context)\n .await?;\n if let Some(ref payment_method_id) = payment_attempt.payment_method_id {\n let key_manager_state = &state.into();\n let payment_method_info = state\n .store\n .find_payment_method(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n payment_method_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentMethodNotFound)?;\n\n // Update connector's mandate details\n let updated_connector_mandate_details =\n if let Some(webhook_mandate_details) = webhook_connector_mandate_details {\n let mandate_details = payment_method_info\n .get_common_mandate_reference()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to deserialize to Payment Mandate Reference\")?;\n\n let merchant_connector_account_id = payment_attempt\n .merchant_connector_id\n .clone()\n .get_required_value(\"merchant_connector_id\")?;\n\n if mandate_details.payments.as_ref().is_none_or(|payments| {\n !payments.0.contains_key(&merchant_connector_account_id)\n }) {\n // Update the payment attempt to maintain consistency across tables.\n let (mandate_metadata, connector_mandate_request_reference_id) =\n payment_attempt\n .connector_mandate_detail\n .as_ref()\n .map(|details| {\n (\n details.mandate_metadata.clone(),\n details.connector_mandate_request_reference_id.clone(),\n )\n })\n .unwrap_or((None, None));\n\n let connector_mandate_reference_id = ConnectorMandateReferenceId {\n connector_mandate_id: Some(\n webhook_mandate_details\n .connector_mandate_id\n .peek()\n .to_string(),\n ),\n payment_method_id: Some(payment_method_id.to_string()),\n mandate_metadata,\n connector_mandate_request_reference_id,\n };\n\n let attempt_update =\n storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n tokenization: None, // We need to handle tokenization field update in webhooks as well\n updated_by: merchant_context\n .get_merchant_account()\n .storage_scheme\n .to_string(),\n };\n\n state\n .store\n .update_payment_attempt_with_attempt_id(\n payment_attempt.clone(),\n attempt_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n insert_mandate_details(\n &payment_attempt,\n &webhook_mandate_details,\n Some(mandate_details),\n )?\n } else {\n logger::info!(\n \"Skipping connector mandate details update since they are already present.\"\n );\n None\n }\n } else {\n None\n };\n\n let connector_mandate_details_value = updated_connector_mandate_details\n .map(|common_mandate| {\n common_mandate.get_mandate_details_value().map_err(|err| {\n router_env::logger::error!(\n \"Failed to get get_mandate_details_value : {:?}\",\n err\n );\n errors::ApiErrorResponse::MandateUpdateFailed\n })\n })\n .transpose()?;\n\n let pm_update = diesel_models::PaymentMethodUpdate::ConnectorNetworkTransactionIdAndMandateDetailsUpdate {\n connector_mandate_details: connector_mandate_details_value.map(masking::Secret::new),\n network_transaction_id: webhook_connector_network_transaction_id\n .map(|webhook_network_transaction_id| webhook_network_transaction_id.get_id().clone()),\n };\n\n state\n .store\n .update_payment_method(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n payment_method_info,\n pm_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to update payment method in db\")?;\n }\n }\n Ok(())\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n tokenization: None,\n updated_by: merchant_context\n .get_merchant_account()",
|
| 19 |
+
"after": " storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n tokenization: None, // We need to handle tokenization field update in webhooks as well\n updated_by: merchant_context\n .get_merchant_account()"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "3c58f51165dbe3ae7b4e426d9740051544119171"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10074/3cd1e2f/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "3cd1e2f1333e2ee27b4b1e327cd0047da14b60be",
|
| 3 |
+
"pr_number": 10074,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/payments/operations/payment_confirm.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/payments/operations/payment_confirm.rs::PaymentConfirm::function::update_trackers",
|
| 10 |
+
"file": "crates/router/src/core/payments/operations/payment_confirm.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "async fn update_trackers<'b>(\n &'b self,\n state: &'b SessionState,\n req_state: ReqState,\n mut payment_data: PaymentData<F>,\n customer: Option<domain::Customer>,\n storage_scheme: storage_enums::MerchantStorageScheme,\n updated_customer: Option<storage::CustomerUpdate>,\n key_store: &domain::MerchantKeyStore,\n frm_suggestion: Option<FrmSuggestion>,\n header_payload: hyperswitch_domain_models::payments::HeaderPayload,\n ) -> RouterResult<(\n BoxedOperation<'b, F, api::PaymentsRequest, PaymentData<F>>,\n PaymentData<F>,\n )>\n where\n F: 'b + Send,\n {\n let payment_method = payment_data.payment_attempt.payment_method;\n let browser_info = payment_data.payment_attempt.browser_info.clone();\n let frm_message = payment_data.frm_message.clone();\n let capture_method = payment_data.payment_attempt.capture_method;\n\n let default_status_result = (\n storage_enums::IntentStatus::Processing,\n storage_enums::AttemptStatus::Pending,\n (None, None),\n );\n let status_handler_for_frm_results = |frm_suggestion: FrmSuggestion| match frm_suggestion {\n FrmSuggestion::FrmCancelTransaction => (\n storage_enums::IntentStatus::Failed,\n storage_enums::AttemptStatus::Failure,\n frm_message.map_or((None, None), |fraud_check| {\n (\n Some(Some(fraud_check.frm_status.to_string())),\n Some(fraud_check.frm_reason.map(|reason| reason.to_string())),\n )\n }),\n ),\n FrmSuggestion::FrmManualReview => (\n storage_enums::IntentStatus::RequiresMerchantAction,\n storage_enums::AttemptStatus::Unresolved,\n (None, None),\n ),\n FrmSuggestion::FrmAuthorizeTransaction => (\n storage_enums::IntentStatus::RequiresCapture,\n storage_enums::AttemptStatus::Authorized,\n (None, None),\n ),\n };\n\n let status_handler_for_authentication_results =\n |authentication: &storage::Authentication| {\n if authentication.authentication_status.is_failed() {\n (\n storage_enums::IntentStatus::Failed,\n storage_enums::AttemptStatus::Failure,\n (\n Some(Some(\"EXTERNAL_AUTHENTICATION_FAILURE\".to_string())),\n Some(Some(\"external authentication failure\".to_string())),\n ),\n )\n } else if authentication.is_separate_authn_required() {\n (\n storage_enums::IntentStatus::RequiresCustomerAction,\n storage_enums::AttemptStatus::AuthenticationPending,\n (None, None),\n )\n } else {\n default_status_result.clone()\n }\n };\n\n let (intent_status, attempt_status, (error_code, error_message)) =\n match (frm_suggestion, payment_data.authentication.as_ref()) {\n (Some(frm_suggestion), _) => status_handler_for_frm_results(frm_suggestion),\n (_, Some(authentication_details)) => status_handler_for_authentication_results(\n &authentication_details.authentication,\n ),\n _ => default_status_result,\n };\n\n let connector = payment_data.payment_attempt.connector.clone();\n let merchant_connector_id = payment_data.payment_attempt.merchant_connector_id.clone();\n let connector_request_reference_id = payment_data\n .payment_attempt\n .connector_request_reference_id\n .clone();\n\n let straight_through_algorithm = payment_data\n .payment_attempt\n .straight_through_algorithm\n .clone();\n let payment_token = payment_data.token.clone();\n let payment_method_type = payment_data.payment_attempt.payment_method_type;\n let profile_id = payment_data\n .payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let payment_experience = payment_data.payment_attempt.payment_experience;\n let additional_pm_data = payment_data\n .payment_method_data\n .as_ref()\n .async_map(|payment_method_data| async {\n helpers::get_additional_payment_data(payment_method_data, &*state.store, profile_id)\n .await\n })\n .await\n .transpose()?\n .flatten();\n\n let encoded_additional_pm_data = additional_pm_data\n .as_ref()\n .map(Encode::encode_to_value)\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encode additional pm data\")?;\n\n let customer_details = payment_data.payment_intent.customer_details.clone();\n let business_sub_label = payment_data.payment_attempt.business_sub_label.clone();\n let authentication_type = payment_data.payment_attempt.authentication_type;\n\n let (shipping_address_id, billing_address_id, payment_method_billing_address_id) = (\n payment_data.payment_intent.shipping_address_id.clone(),\n payment_data.payment_intent.billing_address_id.clone(),\n payment_data\n .payment_attempt\n .payment_method_billing_address_id\n .clone(),\n );\n\n let customer_id = customer.clone().map(|c| c.customer_id);\n let return_url = payment_data.payment_intent.return_url.take();\n let setup_future_usage = payment_data.payment_intent.setup_future_usage;\n let business_label = payment_data.payment_intent.business_label.clone();\n let business_country = payment_data.payment_intent.business_country;\n let description = payment_data.payment_intent.description.take();\n let statement_descriptor_name =\n payment_data.payment_intent.statement_descriptor_name.take();\n let statement_descriptor_suffix = payment_data\n .payment_intent\n .statement_descriptor_suffix\n .take();\n let order_details = payment_data.payment_intent.order_details.clone();\n let metadata = payment_data.payment_intent.metadata.clone();\n let frm_metadata = payment_data.payment_intent.frm_metadata.clone();\n\n let client_source = header_payload\n .client_source\n .clone()\n .or(payment_data.payment_attempt.client_source.clone());\n let client_version = header_payload\n .client_version\n .clone()\n .or(payment_data.payment_attempt.client_version.clone());\n\n let m_payment_data_payment_attempt = payment_data.payment_attempt.clone();\n let m_payment_method_id =\n payment_data\n .payment_attempt\n .payment_method_id\n .clone()\n .or(payment_data\n .payment_method_info\n .as_ref()\n .map(|payment_method| payment_method.payment_method_id.clone()));\n let m_browser_info = browser_info.clone();\n let m_connector = connector.clone();\n let m_capture_method = capture_method;\n let m_payment_token = payment_token.clone();\n let m_additional_pm_data = encoded_additional_pm_data\n .clone()\n .or(payment_data.payment_attempt.payment_method_data.clone());\n let m_business_sub_label = business_sub_label.clone();\n let m_straight_through_algorithm = straight_through_algorithm.clone();\n let m_error_code = error_code.clone();\n let m_error_message = error_message.clone();\n let m_fingerprint_id = payment_data.payment_attempt.fingerprint_id.clone();\n let m_db = state.clone().store;\n let surcharge_amount = payment_data\n .surcharge_details\n .as_ref()\n .map(|surcharge_details| surcharge_details.surcharge_amount);\n let tax_amount = payment_data\n .surcharge_details\n .as_ref()\n .map(|surcharge_details| surcharge_details.tax_on_surcharge_amount);\n\n let (\n external_three_ds_authentication_attempted,\n authentication_connector,\n authentication_id,\n ) = match payment_data.authentication.as_ref() {\n Some(authentication_store) => (\n Some(\n authentication_store\n .authentication\n .is_separate_authn_required(),\n ),\n authentication_store\n .authentication\n .authentication_connector\n .clone(),\n Some(\n authentication_store\n .authentication\n .authentication_id\n .clone(),\n ),\n ),\n None => (None, None, None),\n };\n\n let card_discovery = payment_data.get_card_discovery_for_card_payment_method();\n let is_stored_credential = helpers::is_stored_credential(\n &payment_data.recurring_details,\n &payment_data.pm_token,\n payment_data.mandate_id.is_some(),\n payment_data.payment_attempt.is_stored_credential,\n );\n let payment_attempt_fut = tokio::spawn(\n async move {\n m_db.update_payment_attempt_with_attempt_id(\n m_payment_data_payment_attempt,\n storage::PaymentAttemptUpdate::ConfirmUpdate {\n currency: payment_data.currency,\n status: attempt_status,\n payment_method,\n authentication_type,\n capture_method: m_capture_method,\n browser_info: m_browser_info,\n connector: m_connector,\n payment_token: m_payment_token,\n payment_method_data: m_additional_pm_data,\n payment_method_type,\n payment_experience,\n business_sub_label: m_business_sub_label,\n straight_through_algorithm: m_straight_through_algorithm,\n error_code: m_error_code,\n error_message: m_error_message,\n updated_by: storage_scheme.to_string(),\n merchant_connector_id,\n external_three_ds_authentication_attempted,\n authentication_connector,\n authentication_id,\n payment_method_billing_address_id,\n fingerprint_id: m_fingerprint_id,\n payment_method_id: m_payment_method_id,\n client_source,\n client_version,\n customer_acceptance: payment_data.payment_attempt.customer_acceptance.clone(),\n net_amount:\n hyperswitch_domain_models::payments::payment_attempt::NetAmount::new(\n payment_data.payment_attempt.net_amount.get_order_amount(),\n payment_data.payment_intent.shipping_cost,\n payment_data\n .payment_attempt\n .net_amount\n .get_order_tax_amount(),\n surcharge_amount,\n tax_amount,\n ),\n\n connector_mandate_detail: payment_data\n .payment_attempt\n .connector_mandate_detail\n .clone(),\n card_discovery,\n routing_approach: payment_data.payment_attempt.routing_approach.clone(),\n connector_request_reference_id,\n network_transaction_id: payment_data\n .payment_attempt\n .network_transaction_id\n .clone(),\n is_stored_credential,\n request_extended_authorization: payment_data\n .payment_attempt\n .request_extended_authorization,\n tokenization: payment_data.payment_attempt.get_tokenization_strategy(),\n },\n storage_scheme,\n )\n .map(|x| x.to_not_found_response(errors::ApiErrorResponse::PaymentNotFound))\n .await\n }\n .in_current_span(),\n );\n\n let billing_address = payment_data.address.get_payment_billing();\n let key_manager_state = state.into();\n let billing_details = billing_address\n .async_map(|billing_details| {\n create_encrypted_data(&key_manager_state, key_store, billing_details)\n })\n .await\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to encrypt billing details\")?;\n\n let shipping_address = payment_data.address.get_shipping();\n let shipping_details = shipping_address\n .async_map(|shipping_details| {\n create_encrypted_data(&key_manager_state, key_store, shipping_details)\n })\n .await\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to encrypt shipping details\")?;\n\n let m_payment_data_payment_intent = payment_data.payment_intent.clone();\n let m_customer_id = customer_id.clone();\n let m_shipping_address_id = shipping_address_id.clone();\n let m_billing_address_id = billing_address_id.clone();\n let m_return_url = return_url.clone();\n let m_business_label = business_label.clone();\n let m_description = description.clone();\n let m_statement_descriptor_name = statement_descriptor_name.clone();\n let m_statement_descriptor_suffix = statement_descriptor_suffix.clone();\n let m_order_details = order_details.clone();\n let m_metadata = metadata.clone();\n let m_frm_metadata = frm_metadata.clone();\n let m_db = state.clone().store;\n let m_storage_scheme = storage_scheme.to_string();\n let session_expiry = m_payment_data_payment_intent.session_expiry;\n let m_key_store = key_store.clone();\n let key_manager_state = state.into();\n let is_payment_processor_token_flow =\n payment_data.payment_intent.is_payment_processor_token_flow;\n let payment_intent_fut = tokio::spawn(\n async move {\n m_db.update_payment_intent(\n &key_manager_state,\n m_payment_data_payment_intent,\n storage::PaymentIntentUpdate::Update(Box::new(PaymentIntentUpdateFields {\n amount: payment_data.payment_intent.amount,\n currency: payment_data.currency,\n setup_future_usage,\n status: intent_status,\n customer_id: m_customer_id,\n shipping_address_id: m_shipping_address_id,\n billing_address_id: m_billing_address_id,\n return_url: m_return_url,\n business_country,\n business_label: m_business_label,\n description: m_description,\n statement_descriptor_name: m_statement_descriptor_name,\n statement_descriptor_suffix: m_statement_descriptor_suffix,\n order_details: m_order_details,\n metadata: m_metadata,\n payment_confirm_source: header_payload.payment_confirm_source,\n updated_by: m_storage_scheme,\n fingerprint_id: None,\n session_expiry,\n request_external_three_ds_authentication: None,\n frm_metadata: m_frm_metadata,\n customer_details,\n merchant_order_reference_id: None,\n billing_details,\n shipping_details,\n is_payment_processor_token_flow,\n tax_details: None,\n force_3ds_challenge: payment_data.payment_intent.force_3ds_challenge,\n is_iframe_redirection_enabled: payment_data\n .payment_intent\n .is_iframe_redirection_enabled,\n is_confirm_operation: true, // Indicates that this is a confirm operation\n payment_channel: payment_data.payment_intent.payment_channel,\n feature_metadata: payment_data\n .payment_intent\n .feature_metadata\n .clone()\n .map(masking::Secret::new),\n tax_status: payment_data.payment_intent.tax_status,\n discount_amount: payment_data.payment_intent.discount_amount,\n order_date: payment_data.payment_intent.order_date,\n shipping_amount_tax: payment_data.payment_intent.shipping_amount_tax,\n duty_amount: payment_data.payment_intent.duty_amount,\n enable_partial_authorization: payment_data\n .payment_intent\n .enable_partial_authorization,\n enable_overcapture: payment_data.payment_intent.enable_overcapture,\n })),\n &m_key_store,\n storage_scheme,\n )\n .map(|x| x.to_not_found_response(errors::ApiErrorResponse::PaymentNotFound))\n .await\n }\n .in_current_span(),\n );\n\n let customer_fut =\n if let Some((updated_customer, customer)) = updated_customer.zip(customer) {\n let m_customer_merchant_id = customer.merchant_id.to_owned();\n let m_key_store = key_store.clone();\n let m_updated_customer = updated_customer.clone();\n let session_state = state.clone();\n let m_db = session_state.store.clone();\n let key_manager_state = state.into();\n tokio::spawn(\n async move {\n let m_customer_customer_id = customer.customer_id.to_owned();\n m_db.update_customer_by_customer_id_merchant_id(\n &key_manager_state,\n m_customer_customer_id,\n m_customer_merchant_id,\n customer,\n m_updated_customer,\n &m_key_store,\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to update CustomerConnector in customer\")?;\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(())\n }\n .in_current_span(),\n )\n } else {\n tokio::spawn(\n async move { Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(()) }\n .in_current_span(),\n )\n };\n\n let (payment_intent, payment_attempt, _) = tokio::try_join!(\n utils::flatten_join_error(payment_intent_fut),\n utils::flatten_join_error(payment_attempt_fut),\n utils::flatten_join_error(customer_fut)\n )?;\n\n payment_data.payment_intent = payment_intent;\n payment_data.payment_attempt = payment_attempt;\n\n let client_src = payment_data.payment_attempt.client_source.clone();\n let client_ver = payment_data.payment_attempt.client_version.clone();\n\n let frm_message = payment_data.frm_message.clone();\n req_state\n .event_context\n .event(AuditEvent::new(AuditEventType::PaymentConfirm {\n client_src,\n client_ver,\n frm_message: Box::new(frm_message),\n }))\n .with(payment_data.to_event())\n .emit();\n Ok((Box::new(self), payment_data))\n }",
|
| 16 |
+
"after_code": "async fn update_trackers<'b>(\n &'b self,\n state: &'b SessionState,\n req_state: ReqState,\n mut payment_data: PaymentData<F>,\n customer: Option<domain::Customer>,\n storage_scheme: storage_enums::MerchantStorageScheme,\n updated_customer: Option<storage::CustomerUpdate>,\n key_store: &domain::MerchantKeyStore,\n frm_suggestion: Option<FrmSuggestion>,\n header_payload: hyperswitch_domain_models::payments::HeaderPayload,\n ) -> RouterResult<(\n BoxedOperation<'b, F, api::PaymentsRequest, PaymentData<F>>,\n PaymentData<F>,\n )>\n where\n F: 'b + Send,\n {\n let payment_method = payment_data.payment_attempt.payment_method;\n let browser_info = payment_data.payment_attempt.browser_info.clone();\n let frm_message = payment_data.frm_message.clone();\n let capture_method = payment_data.payment_attempt.capture_method;\n\n let default_status_result = (\n storage_enums::IntentStatus::Processing,\n storage_enums::AttemptStatus::Pending,\n (None, None),\n );\n let status_handler_for_frm_results = |frm_suggestion: FrmSuggestion| match frm_suggestion {\n FrmSuggestion::FrmCancelTransaction => (\n storage_enums::IntentStatus::Failed,\n storage_enums::AttemptStatus::Failure,\n frm_message.map_or((None, None), |fraud_check| {\n (\n Some(Some(fraud_check.frm_status.to_string())),\n Some(fraud_check.frm_reason.map(|reason| reason.to_string())),\n )\n }),\n ),\n FrmSuggestion::FrmManualReview => (\n storage_enums::IntentStatus::RequiresMerchantAction,\n storage_enums::AttemptStatus::Unresolved,\n (None, None),\n ),\n FrmSuggestion::FrmAuthorizeTransaction => (\n storage_enums::IntentStatus::RequiresCapture,\n storage_enums::AttemptStatus::Authorized,\n (None, None),\n ),\n };\n\n let status_handler_for_authentication_results =\n |authentication: &storage::Authentication| {\n if authentication.authentication_status.is_failed() {\n (\n storage_enums::IntentStatus::Failed,\n storage_enums::AttemptStatus::Failure,\n (\n Some(Some(\"EXTERNAL_AUTHENTICATION_FAILURE\".to_string())),\n Some(Some(\"external authentication failure\".to_string())),\n ),\n )\n } else if authentication.is_separate_authn_required() {\n (\n storage_enums::IntentStatus::RequiresCustomerAction,\n storage_enums::AttemptStatus::AuthenticationPending,\n (None, None),\n )\n } else {\n default_status_result.clone()\n }\n };\n\n let (intent_status, attempt_status, (error_code, error_message)) =\n match (frm_suggestion, payment_data.authentication.as_ref()) {\n (Some(frm_suggestion), _) => status_handler_for_frm_results(frm_suggestion),\n (_, Some(authentication_details)) => status_handler_for_authentication_results(\n &authentication_details.authentication,\n ),\n _ => default_status_result,\n };\n\n let connector = payment_data.payment_attempt.connector.clone();\n let merchant_connector_id = payment_data.payment_attempt.merchant_connector_id.clone();\n let connector_request_reference_id = payment_data\n .payment_attempt\n .connector_request_reference_id\n .clone();\n\n let straight_through_algorithm = payment_data\n .payment_attempt\n .straight_through_algorithm\n .clone();\n let payment_token = payment_data.token.clone();\n let payment_method_type = payment_data.payment_attempt.payment_method_type;\n let profile_id = payment_data\n .payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let payment_experience = payment_data.payment_attempt.payment_experience;\n let additional_pm_data = payment_data\n .payment_method_data\n .as_ref()\n .async_map(|payment_method_data| async {\n helpers::get_additional_payment_data(payment_method_data, &*state.store, profile_id)\n .await\n })\n .await\n .transpose()?\n .flatten();\n\n let encoded_additional_pm_data = additional_pm_data\n .as_ref()\n .map(Encode::encode_to_value)\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encode additional pm data\")?;\n\n let customer_details = payment_data.payment_intent.customer_details.clone();\n let business_sub_label = payment_data.payment_attempt.business_sub_label.clone();\n let authentication_type = payment_data.payment_attempt.authentication_type;\n\n let (shipping_address_id, billing_address_id, payment_method_billing_address_id) = (\n payment_data.payment_intent.shipping_address_id.clone(),\n payment_data.payment_intent.billing_address_id.clone(),\n payment_data\n .payment_attempt\n .payment_method_billing_address_id\n .clone(),\n );\n\n let customer_id = customer.clone().map(|c| c.customer_id);\n let return_url = payment_data.payment_intent.return_url.take();\n let setup_future_usage = payment_data.payment_intent.setup_future_usage;\n let business_label = payment_data.payment_intent.business_label.clone();\n let business_country = payment_data.payment_intent.business_country;\n let description = payment_data.payment_intent.description.take();\n let statement_descriptor_name =\n payment_data.payment_intent.statement_descriptor_name.take();\n let statement_descriptor_suffix = payment_data\n .payment_intent\n .statement_descriptor_suffix\n .take();\n let order_details = payment_data.payment_intent.order_details.clone();\n let metadata = payment_data.payment_intent.metadata.clone();\n let frm_metadata = payment_data.payment_intent.frm_metadata.clone();\n\n let client_source = header_payload\n .client_source\n .clone()\n .or(payment_data.payment_attempt.client_source.clone());\n let client_version = header_payload\n .client_version\n .clone()\n .or(payment_data.payment_attempt.client_version.clone());\n\n let m_payment_data_payment_attempt = payment_data.payment_attempt.clone();\n let m_payment_method_id =\n payment_data\n .payment_attempt\n .payment_method_id\n .clone()\n .or(payment_data\n .payment_method_info\n .as_ref()\n .map(|payment_method| payment_method.payment_method_id.clone()));\n let m_browser_info = browser_info.clone();\n let m_connector = connector.clone();\n let m_capture_method = capture_method;\n let m_payment_token = payment_token.clone();\n let m_additional_pm_data = encoded_additional_pm_data\n .clone()\n .or(payment_data.payment_attempt.payment_method_data.clone());\n let m_business_sub_label = business_sub_label.clone();\n let m_straight_through_algorithm = straight_through_algorithm.clone();\n let m_error_code = error_code.clone();\n let m_error_message = error_message.clone();\n let m_fingerprint_id = payment_data.payment_attempt.fingerprint_id.clone();\n let m_db = state.clone().store;\n let surcharge_amount = payment_data\n .surcharge_details\n .as_ref()\n .map(|surcharge_details| surcharge_details.surcharge_amount);\n let tax_amount = payment_data\n .surcharge_details\n .as_ref()\n .map(|surcharge_details| surcharge_details.tax_on_surcharge_amount);\n\n let (\n external_three_ds_authentication_attempted,\n authentication_connector,\n authentication_id,\n ) = match payment_data.authentication.as_ref() {\n Some(authentication_store) => (\n Some(\n authentication_store\n .authentication\n .is_separate_authn_required(),\n ),\n authentication_store\n .authentication\n .authentication_connector\n .clone(),\n Some(\n authentication_store\n .authentication\n .authentication_id\n .clone(),\n ),\n ),\n None => (None, None, None),\n };\n\n let card_discovery = payment_data.get_card_discovery_for_card_payment_method();\n let is_stored_credential = helpers::is_stored_credential(\n &payment_data.recurring_details,\n &payment_data.pm_token,\n payment_data.mandate_id.is_some(),\n payment_data.payment_attempt.is_stored_credential,\n );\n let payment_attempt_fut = tokio::spawn(\n async move {\n m_db.update_payment_attempt_with_attempt_id(\n m_payment_data_payment_attempt,\n storage::PaymentAttemptUpdate::ConfirmUpdate {\n currency: payment_data.currency,\n status: attempt_status,\n payment_method,\n authentication_type,\n capture_method: m_capture_method,\n browser_info: m_browser_info,\n connector: m_connector,\n payment_token: m_payment_token,\n payment_method_data: m_additional_pm_data,\n payment_method_type,\n payment_experience,\n business_sub_label: m_business_sub_label,\n straight_through_algorithm: m_straight_through_algorithm,\n error_code: m_error_code,\n error_message: m_error_message,\n updated_by: storage_scheme.to_string(),\n merchant_connector_id,\n external_three_ds_authentication_attempted,\n authentication_connector,\n authentication_id,\n payment_method_billing_address_id,\n fingerprint_id: m_fingerprint_id,\n payment_method_id: m_payment_method_id,\n client_source,\n client_version,\n customer_acceptance: payment_data\n .payment_attempt\n .customer_acceptance\n .clone(),\n net_amount:\n hyperswitch_domain_models::payments::payment_attempt::NetAmount::new(\n payment_data.payment_attempt.net_amount.get_order_amount(),\n payment_data.payment_intent.shipping_cost,\n payment_data\n .payment_attempt\n .net_amount\n .get_order_tax_amount(),\n surcharge_amount,\n tax_amount,\n ),\n\n connector_mandate_detail: payment_data\n .payment_attempt\n .connector_mandate_detail\n .clone(),\n card_discovery,\n routing_approach: payment_data.payment_attempt.routing_approach.clone(),\n connector_request_reference_id,\n network_transaction_id: payment_data\n .payment_attempt\n .network_transaction_id\n .clone(),\n is_stored_credential,\n request_extended_authorization: payment_data\n .payment_attempt\n .request_extended_authorization,\n tokenization: payment_data.payment_attempt.get_tokenization_strategy(),\n },\n storage_scheme,\n )\n .map(|x| x.to_not_found_response(errors::ApiErrorResponse::PaymentNotFound))\n .await\n }\n .in_current_span(),\n );\n\n let billing_address = payment_data.address.get_payment_billing();\n let key_manager_state = state.into();\n let billing_details = billing_address\n .async_map(|billing_details| {\n create_encrypted_data(&key_manager_state, key_store, billing_details)\n })\n .await\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to encrypt billing details\")?;\n\n let shipping_address = payment_data.address.get_shipping();\n let shipping_details = shipping_address\n .async_map(|shipping_details| {\n create_encrypted_data(&key_manager_state, key_store, shipping_details)\n })\n .await\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to encrypt shipping details\")?;\n\n let m_payment_data_payment_intent = payment_data.payment_intent.clone();\n let m_customer_id = customer_id.clone();\n let m_shipping_address_id = shipping_address_id.clone();\n let m_billing_address_id = billing_address_id.clone();\n let m_return_url = return_url.clone();\n let m_business_label = business_label.clone();\n let m_description = description.clone();\n let m_statement_descriptor_name = statement_descriptor_name.clone();\n let m_statement_descriptor_suffix = statement_descriptor_suffix.clone();\n let m_order_details = order_details.clone();\n let m_metadata = metadata.clone();\n let m_frm_metadata = frm_metadata.clone();\n let m_db = state.clone().store;\n let m_storage_scheme = storage_scheme.to_string();\n let session_expiry = m_payment_data_payment_intent.session_expiry;\n let m_key_store = key_store.clone();\n let key_manager_state = state.into();\n let is_payment_processor_token_flow =\n payment_data.payment_intent.is_payment_processor_token_flow;\n let payment_intent_fut = tokio::spawn(\n async move {\n m_db.update_payment_intent(\n &key_manager_state,\n m_payment_data_payment_intent,\n storage::PaymentIntentUpdate::Update(Box::new(PaymentIntentUpdateFields {\n amount: payment_data.payment_intent.amount,\n currency: payment_data.currency,\n setup_future_usage,\n status: intent_status,\n customer_id: m_customer_id,\n shipping_address_id: m_shipping_address_id,\n billing_address_id: m_billing_address_id,\n return_url: m_return_url,\n business_country,\n business_label: m_business_label,\n description: m_description,\n statement_descriptor_name: m_statement_descriptor_name,\n statement_descriptor_suffix: m_statement_descriptor_suffix,\n order_details: m_order_details,\n metadata: m_metadata,\n payment_confirm_source: header_payload.payment_confirm_source,\n updated_by: m_storage_scheme,\n fingerprint_id: None,\n session_expiry,\n request_external_three_ds_authentication: None,\n frm_metadata: m_frm_metadata,\n customer_details,\n merchant_order_reference_id: None,\n billing_details,\n shipping_details,\n is_payment_processor_token_flow,\n tax_details: None,\n force_3ds_challenge: payment_data.payment_intent.force_3ds_challenge,\n is_iframe_redirection_enabled: payment_data\n .payment_intent\n .is_iframe_redirection_enabled,\n is_confirm_operation: true, // Indicates that this is a confirm operation\n payment_channel: payment_data.payment_intent.payment_channel,\n feature_metadata: payment_data\n .payment_intent\n .feature_metadata\n .clone()\n .map(masking::Secret::new),\n tax_status: payment_data.payment_intent.tax_status,\n discount_amount: payment_data.payment_intent.discount_amount,\n order_date: payment_data.payment_intent.order_date,\n shipping_amount_tax: payment_data.payment_intent.shipping_amount_tax,\n duty_amount: payment_data.payment_intent.duty_amount,\n enable_partial_authorization: payment_data\n .payment_intent\n .enable_partial_authorization,\n enable_overcapture: payment_data.payment_intent.enable_overcapture,\n })),\n &m_key_store,\n storage_scheme,\n )\n .map(|x| x.to_not_found_response(errors::ApiErrorResponse::PaymentNotFound))\n .await\n }\n .in_current_span(),\n );\n\n let customer_fut =\n if let Some((updated_customer, customer)) = updated_customer.zip(customer) {\n let m_customer_merchant_id = customer.merchant_id.to_owned();\n let m_key_store = key_store.clone();\n let m_updated_customer = updated_customer.clone();\n let session_state = state.clone();\n let m_db = session_state.store.clone();\n let key_manager_state = state.into();\n tokio::spawn(\n async move {\n let m_customer_customer_id = customer.customer_id.to_owned();\n m_db.update_customer_by_customer_id_merchant_id(\n &key_manager_state,\n m_customer_customer_id,\n m_customer_merchant_id,\n customer,\n m_updated_customer,\n &m_key_store,\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to update CustomerConnector in customer\")?;\n\n Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(())\n }\n .in_current_span(),\n )\n } else {\n tokio::spawn(\n async move { Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(()) }\n .in_current_span(),\n )\n };\n\n let (payment_intent, payment_attempt, _) = tokio::try_join!(\n utils::flatten_join_error(payment_intent_fut),\n utils::flatten_join_error(payment_attempt_fut),\n utils::flatten_join_error(customer_fut)\n )?;\n\n payment_data.payment_intent = payment_intent;\n payment_data.payment_attempt = payment_attempt;\n\n let client_src = payment_data.payment_attempt.client_source.clone();\n let client_ver = payment_data.payment_attempt.client_version.clone();\n\n let frm_message = payment_data.frm_message.clone();\n req_state\n .event_context\n .event(AuditEvent::new(AuditEventType::PaymentConfirm {\n client_src,\n client_ver,\n frm_message: Box::new(frm_message),\n }))\n .with(payment_data.to_event())\n .emit();\n Ok((Box::new(self), payment_data))\n }",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " client_source,\n client_version,\n customer_acceptance: payment_data.payment_attempt.customer_acceptance.clone(),\n net_amount:\n hyperswitch_domain_models::payments::payment_attempt::NetAmount::new(",
|
| 19 |
+
"after": " client_source,\n client_version,\n customer_acceptance: payment_data\n .payment_attempt\n .customer_acceptance\n .clone(),\n net_amount:\n hyperswitch_domain_models::payments::payment_attempt::NetAmount::new("
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "3cd1e2f1333e2ee27b4b1e327cd0047da14b60be"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10074/c028b95/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10076/05667c9/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10076/26c1620/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10076/7a75438/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "7a754381e2d56d7114fed476d090510ae2f581e2",
|
| 3 |
+
"pr_number": 10076,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::build_unified_connector_service_payment_method",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub fn build_unified_connector_service_payment_method(\n payment_method_data: hyperswitch_domain_models::payment_method_data::PaymentMethodData,\n payment_method_type: PaymentMethodType,\n) -> CustomResult<payments_grpc::PaymentMethod, UnifiedConnectorServiceError> {\n match payment_method_data {\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Card(card) => {\n let card_exp_month = card\n .get_card_expiry_month_2_digit()\n .attach_printable(\"Failed to extract 2-digit expiry month from card\")\n .change_context(UnifiedConnectorServiceError::InvalidDataFormat {\n field_name: \"card_exp_month\",\n })?\n .peek()\n .to_string();\n\n let card_network = card\n .card_network\n .clone()\n .map(payments_grpc::CardNetwork::foreign_try_from)\n .transpose()?;\n\n let card_details = CardDetails {\n card_number: Some(\n CardNumber::from_str(&card.card_number.get_card_no()).change_context(\n UnifiedConnectorServiceError::RequestEncodingFailedWithReason(\n \"Failed to parse card number\".to_string(),\n ),\n )?,\n ),\n card_exp_month: Some(card_exp_month.into()),\n card_exp_year: Some(card.get_expiry_year_4_digit().expose().into()),\n card_cvc: Some(card.card_cvc.expose().into()),\n card_holder_name: card.card_holder_name.map(|name| name.expose().into()),\n card_issuer: card.card_issuer.clone(),\n card_network: card_network.map(|card_network| card_network.into()),\n card_type: card.card_type.clone(),\n bank_code: card.bank_code.clone(),\n nick_name: card.nick_name.map(|n| n.expose()),\n card_issuing_country_alpha2: card.card_issuing_country.clone(),\n };\n\n let grpc_card_type = match payment_method_type {\n PaymentMethodType::Credit => {\n payments_grpc::card_payment_method_type::CardType::Credit(card_details)\n }\n PaymentMethodType::Debit => {\n payments_grpc::card_payment_method_type::CardType::Debit(card_details)\n }\n _ => {\n return Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into());\n }\n };\n\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Card(CardPaymentMethodType {\n card_type: Some(grpc_card_type),\n })),\n })\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Upi(upi_data) => {\n let upi_type = match upi_data {\n hyperswitch_domain_models::payment_method_data::UpiData::UpiCollect(\n upi_collect_data,\n ) => {\n let upi_details = payments_grpc::UpiCollect {\n vpa_id: upi_collect_data.vpa_id.map(|vpa| vpa.expose().into()),\n };\n PaymentMethod::UpiCollect(upi_details)\n }\n hyperswitch_domain_models::payment_method_data::UpiData::UpiIntent(_) => {\n let upi_details = payments_grpc::UpiIntent { app_name: None };\n PaymentMethod::UpiIntent(upi_details)\n }\n hyperswitch_domain_models::payment_method_data::UpiData::UpiQr(_) => {\n let upi_details = payments_grpc::UpiQr {};\n PaymentMethod::UpiQr(upi_details)\n }\n };\n\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(upi_type),\n })\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Reward => {\n match payment_method_type {\n PaymentMethodType::ClassicReward => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Reward(RewardPaymentMethodType {\n reward_type: 1,\n })),\n }),\n PaymentMethodType::Evoucher => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Reward(RewardPaymentMethodType {\n reward_type: 2,\n })),\n }),\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into()),\n }\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Wallet(wallet_data) => {\n match wallet_data {\n hyperswitch_domain_models::payment_method_data::WalletData::Mifinity(mifinity_data) => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Wallet(WalletPaymentMethodType {\n wallet_type: Some(WalletType::Mifinity(payments_grpc::MifinityWallet {\n date_of_birth: Some(\n mifinity_data.date_of_birth.peek().to_string().into(),\n ),\n language_preference: mifinity_data.language_preference,\n })),\n })),\n }),\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into()),\n }\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Crypto(crypto_data) => {\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Crypto(CryptoCurrencyPaymentMethodType {\n crypto_currency: Some(CryptoCurrency {\n pay_currency: crypto_data.pay_currency.clone(),\n network: crypto_data.network.clone(),\n }),\n })),\n })\n }\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method: {payment_method_data:?}\"\n ))\n .into()),\n }\n}",
|
| 16 |
+
"after_code": "pub fn build_unified_connector_service_payment_method(\n payment_method_data: hyperswitch_domain_models::payment_method_data::PaymentMethodData,\n payment_method_type: PaymentMethodType,\n) -> CustomResult<payments_grpc::PaymentMethod, UnifiedConnectorServiceError> {\n match payment_method_data {\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Card(card) => {\n let card_exp_month = card\n .get_card_expiry_month_2_digit()\n .attach_printable(\"Failed to extract 2-digit expiry month from card\")\n .change_context(UnifiedConnectorServiceError::InvalidDataFormat {\n field_name: \"card_exp_month\",\n })?\n .peek()\n .to_string();\n\n let card_network = card\n .card_network\n .clone()\n .map(payments_grpc::CardNetwork::foreign_try_from)\n .transpose()?;\n\n let card_details = CardDetails {\n card_number: Some(\n CardNumber::from_str(&card.card_number.get_card_no()).change_context(\n UnifiedConnectorServiceError::RequestEncodingFailedWithReason(\n \"Failed to parse card number\".to_string(),\n ),\n )?,\n ),\n card_exp_month: Some(card_exp_month.into()),\n card_exp_year: Some(card.get_expiry_year_4_digit().expose().into()),\n card_cvc: Some(card.card_cvc.expose().into()),\n card_holder_name: card.card_holder_name.map(|name| name.expose().into()),\n card_issuer: card.card_issuer.clone(),\n card_network: card_network.map(|card_network| card_network.into()),\n card_type: card.card_type.clone(),\n bank_code: card.bank_code.clone(),\n nick_name: card.nick_name.map(|n| n.expose()),\n card_issuing_country_alpha2: card.card_issuing_country.clone(),\n };\n\n let grpc_card_type = match payment_method_type {\n PaymentMethodType::Credit => {\n payments_grpc::card_payment_method_type::CardType::Credit(card_details)\n }\n PaymentMethodType::Debit => {\n payments_grpc::card_payment_method_type::CardType::Debit(card_details)\n }\n _ => {\n return Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into());\n }\n };\n\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Card(CardPaymentMethodType {\n card_type: Some(grpc_card_type),\n })),\n })\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Upi(upi_data) => {\n let upi_type = match upi_data {\n hyperswitch_domain_models::payment_method_data::UpiData::UpiCollect(\n upi_collect_data,\n ) => {\n let upi_details = payments_grpc::UpiCollect {\n vpa_id: upi_collect_data.vpa_id.map(|vpa| vpa.expose().into()),\n };\n PaymentMethod::UpiCollect(upi_details)\n }\n hyperswitch_domain_models::payment_method_data::UpiData::UpiIntent(_) => {\n let upi_details = payments_grpc::UpiIntent { app_name: None };\n PaymentMethod::UpiIntent(upi_details)\n }\n hyperswitch_domain_models::payment_method_data::UpiData::UpiQr(_) => {\n let upi_details = payments_grpc::UpiQr {};\n PaymentMethod::UpiQr(upi_details)\n }\n };\n\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(upi_type),\n })\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Reward => {\n match payment_method_type {\n PaymentMethodType::ClassicReward => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Reward(RewardPaymentMethodType {\n reward_type: 1,\n })),\n }),\n PaymentMethodType::Evoucher => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Reward(RewardPaymentMethodType {\n reward_type: 2,\n })),\n }),\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into()),\n }\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Wallet(wallet_data) => {\n match wallet_data {\n hyperswitch_domain_models::payment_method_data::WalletData::Mifinity(\n mifinity_data,\n ) => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Wallet(WalletPaymentMethodType {\n wallet_type: Some(WalletType::Mifinity(payments_grpc::MifinityWallet {\n date_of_birth: Some(\n mifinity_data.date_of_birth.peek().to_string().into(),\n ),\n language_preference: mifinity_data.language_preference,\n })),\n })),\n }),\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method subtype: {payment_method_type:?}\"\n ))\n .into()),\n }\n }\n hyperswitch_domain_models::payment_method_data::PaymentMethodData::Crypto(crypto_data) => {\n Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Crypto(CryptoCurrencyPaymentMethodType {\n crypto_currency: Some(CryptoCurrency {\n pay_currency: crypto_data.pay_currency.clone(),\n network: crypto_data.network.clone(),\n }),\n })),\n })\n }\n _ => Err(UnifiedConnectorServiceError::NotImplemented(format!(\n \"Unimplemented payment method: {payment_method_data:?}\"\n ))\n .into()),\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " hyperswitch_domain_models::payment_method_data::PaymentMethodData::Wallet(wallet_data) => {\n match wallet_data {\n hyperswitch_domain_models::payment_method_data::WalletData::Mifinity(mifinity_data) => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Wallet(WalletPaymentMethodType {\n wallet_type: Some(WalletType::Mifinity(payments_grpc::MifinityWallet {",
|
| 19 |
+
"after": " hyperswitch_domain_models::payment_method_data::PaymentMethodData::Wallet(wallet_data) => {\n match wallet_data {\n hyperswitch_domain_models::payment_method_data::WalletData::Mifinity(\n mifinity_data,\n ) => Ok(payments_grpc::PaymentMethod {\n payment_method: Some(PaymentMethod::Wallet(WalletPaymentMethodType {\n wallet_type: Some(WalletType::Mifinity(payments_grpc::MifinityWallet {"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "7a754381e2d56d7114fed476d090510ae2f581e2"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10076/8e8aecd/diff.json
ADDED
|
@@ -0,0 +1,74 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "8e8aecdf0cb8d9015daa6006be9c2454c3817f5d",
|
| 3 |
+
"pr_number": 10076,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::decide_execution_path",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn decide_execution_path(\n connector_type: ConnectorIntegrationType,\n previous_gateway: Option<GatewaySystem>,\n shadow_rollout_enabled: ShadowRolloutAvailability,\n) -> RouterResult<(GatewaySystem, ExecutionPath)> {\n match (connector_type, previous_gateway, shadow_rollout_enabled) {\n // Case 1: DirectConnector with no previous gateway and no shadow rollout\n // This is a fresh payment request for a direct connector - use direct gateway\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 2: DirectConnector previously used Direct gateway, no shadow rollout\n // Continue using the same direct gateway for consistency\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 3: DirectConnector previously used UCS, but now switching back to Direct (no shadow)\n // Migration scenario: UCS was used before, but now we're reverting to Direct\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 4: UcsConnector configuration, but previously used Direct gateway (no shadow)\n // Maintain Direct for backward compatibility - don't switch mid-transaction\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 5: DirectConnector with no previous gateway, shadow rollout enabled\n // Use Direct as primary, but also execute UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 6: DirectConnector previously used Direct, shadow rollout enabled\n // Continue with Direct as primary, execute UCS in shadow mode for testing\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 7: DirectConnector previously used UCS, shadow rollout enabled\n // Revert to Direct as primary, but keep UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 8: UcsConnector configuration, previously used Direct, shadow rollout enabled\n // Maintain Direct as primary for transaction consistency, shadow UCS for testing\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 9a: UcsConnector with no previous gateway and shadow rollout enabled\n // Fresh payment for UCS-enabled connector with shadow mode - use shadow UCS\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::ShadowUnifiedConnectorService,\n ))\n }\n\n // Case 9b: UcsConnector with no previous gateway and no shadow rollout\n // Fresh payment for a UCS-enabled connector - use UCS as primary\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::NotAvailable) => {\n Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n ))\n }\n\n // Case 10: UcsConnector previously used UCS (regardless of shadow rollout)\n // Continue using UCS for consistency in the payment flow\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n _,\n ) => Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )),\n }\n}",
|
| 16 |
+
"after_code": "fn decide_execution_path(\n connector_type: ConnectorIntegrationType,\n previous_gateway: Option<GatewaySystem>,\n shadow_rollout_enabled: ShadowRolloutAvailability,\n) -> RouterResult<(GatewaySystem, ExecutionPath)> {\n match (connector_type, previous_gateway, shadow_rollout_enabled) {\n // Case 1: DirectConnector with no previous gateway and no shadow rollout\n // This is a fresh payment request for a direct connector - use direct gateway\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 2: DirectConnector previously used Direct gateway, no shadow rollout\n // Continue using the same direct gateway for consistency\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 3: DirectConnector previously used UCS, but now switching back to Direct (no shadow)\n // Migration scenario: UCS was used before, but now we're reverting to Direct\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 4: UcsConnector configuration, but previously used Direct gateway (no shadow)\n // Maintain Direct for backward compatibility - don't switch mid-transaction\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 5: DirectConnector with no previous gateway, shadow rollout enabled\n // Use Direct as primary, but also execute UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 6: DirectConnector previously used Direct, shadow rollout enabled\n // Continue with Direct as primary, execute UCS in shadow mode for testing\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 7: DirectConnector previously used UCS, shadow rollout enabled\n // Revert to Direct as primary, but keep UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 8: UcsConnector configuration, previously used Direct, shadow rollout enabled\n // Maintain Direct as primary for transaction consistency, shadow UCS for testing\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 9a: UcsConnector with no previous gateway and shadow rollout enabled\n // Fresh payment for UCS-enabled connector with shadow mode - use shadow UCS\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n ))\n }\n\n // Case 9b: UcsConnector with no previous gateway and no shadow rollout\n // Fresh payment for a UCS-enabled connector - use UCS as primary\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::NotAvailable) => {\n Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n ))\n }\n\n // Case 10: UcsConnector previously used UCS (regardless of shadow rollout)\n // Continue using UCS for consistency in the payment flow\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n _,\n ) => Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )),\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::ShadowUnifiedConnectorService,\n ))",
|
| 19 |
+
"after": " (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n ))"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "8e8aecdf0cb8d9015daa6006be9c2454c3817f5d"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service_for_webhooks",
|
| 25 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "pub async fn should_call_unified_connector_service_for_webhooks(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n) -> RouterResult<ExecutionPath> {\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n let flow_name = \"Webhooks\";\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n // Build rollout keys - webhooks don't use payment method, so use a simplified key format\n let rollout_key = format!(\n \"{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n flow_name\n );\n let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // For webhooks, there is no previous gateway system to consider (webhooks are stateless)\n let previous_gateway = None;\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n .await\n .unwrap_or(0.0);\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Use the same decision logic as payments, with no call_connector_action to consider\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n router_env::logger::debug!(\"UCS is disabled for webhooks, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n } else {\n // UCS is enabled, use decide function with no previous gateway for webhooks\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n };\n\n router_env::logger::info!(\n \"Webhook gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n Ok(execution_path)\n}",
|
| 31 |
+
"after_code": "pub async fn should_call_unified_connector_service_for_webhooks(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n) -> RouterResult<ExecutionPath> {\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n let flow_name = \"Webhooks\";\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n // Build rollout keys - webhooks don't use payment method, so use a simplified key format\n let rollout_key = format!(\n \"{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n flow_name\n );\n let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // For webhooks, there is no previous gateway system to consider (webhooks are stateless)\n let previous_gateway = None;\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let (_shadow_key_exists, shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Use the same decision logic as payments, with no call_connector_action to consider\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n router_env::logger::debug!(\"UCS is disabled for webhooks, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n } else {\n // UCS is enabled, use decide function with no previous gateway for webhooks\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n };\n\n router_env::logger::info!(\n \"Webhook gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n Ok(execution_path)\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": "\n // Get shadow percentage to determine priority\n let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n .await\n .unwrap_or(0.0);\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );",
|
| 34 |
+
"after": "\n // Get shadow percentage to determine priority\n let (_shadow_key_exists, shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "8e8aecdf0cb8d9015daa6006be9c2454c3817f5d"
|
| 37 |
+
},
|
| 38 |
+
{
|
| 39 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service",
|
| 40 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 41 |
+
"kind": "function_item",
|
| 42 |
+
"status": "modified",
|
| 43 |
+
"code_changed": true,
|
| 44 |
+
"imports_changed": false,
|
| 45 |
+
"before_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n shadow_ucs_call_connector_action: Option<CallConnectorAction>,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n .await\n .unwrap_or(0.0);\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is present with non-zero percentage, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is 0.0 or not present, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n if shadow_ucs_call_connector_action.is_some() {\n (\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )\n } else {\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 46 |
+
"after_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n shadow_ucs_call_connector_action: Option<CallConnectorAction>,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!(\n shadow_key = %shadow_rollout_key,\n shadow_percentage = shadow_percentage,\n rollout_enabled = rollout_result.should_execute,\n \"Shadow key exists but disabled (0.0%), falling back to rollout or direct\"\n );\n // Shadow disabled, result is the same regardless of rollout status\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute {\n // Block 2: No shadow key, but rollout is enabled - use primary UCS\n router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else {\n // Block 3: Neither shadow nor rollout enabled - use direct\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n if shadow_ucs_call_connector_action.is_some() {\n (\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )\n } else {\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 47 |
+
"diff_span": {
|
| 48 |
+
"before": " let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n .await\n .unwrap_or(0.0);\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is present with non-zero percentage, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is 0.0 or not present, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching",
|
| 49 |
+
"after": " let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!(\n shadow_key = %shadow_rollout_key,\n shadow_percentage = shadow_percentage,\n rollout_enabled = rollout_result.should_execute,\n \"Shadow key exists but disabled (0.0%), falling back to rollout or direct\"\n );\n // Shadow disabled, result is the same regardless of rollout status\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute {\n // Block 2: No shadow key, but rollout is enabled - use primary UCS\n router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else {\n // Block 3: Neither shadow nor rollout enabled - use direct\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching"
|
| 50 |
+
},
|
| 51 |
+
"commit_sha": "8e8aecdf0cb8d9015daa6006be9c2454c3817f5d"
|
| 52 |
+
},
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_config_info",
|
| 55 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 56 |
+
"kind": "function_item",
|
| 57 |
+
"status": "added",
|
| 58 |
+
"before_code": null,
|
| 59 |
+
"after_code": "async fn get_rollout_config_info(state: &SessionState, config_key: &str) -> (bool, Option<f64>) {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage =\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n };\n (true, percentage)\n }\n Err(_) => (false, None), // Key doesn't exist\n }\n}",
|
| 60 |
+
"diff_span": null,
|
| 61 |
+
"commit_sha": "8e8aecdf0cb8d9015daa6006be9c2454c3817f5d"
|
| 62 |
+
},
|
| 63 |
+
{
|
| 64 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_percentage",
|
| 65 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 66 |
+
"kind": "function_item",
|
| 67 |
+
"status": "removed",
|
| 68 |
+
"before_code": "async fn get_rollout_percentage(state: &SessionState, config_key: &str) -> Option<f64> {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Try to parse as JSON first (new format), fallback to float (legacy format)\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n }\n }\n Err(_) => None,\n }\n}",
|
| 69 |
+
"after_code": null,
|
| 70 |
+
"diff_span": null,
|
| 71 |
+
"commit_sha": "8e8aecdf0cb8d9015daa6006be9c2454c3817f5d"
|
| 72 |
+
}
|
| 73 |
+
]
|
| 74 |
+
}
|
diffs/pr_10076/a825dc6/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10164/0476285/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "0476285479c9195e80bf6a3cd4d274cfa8b348a4",
|
| 3 |
+
"pr_number": 10164,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/external_services/src/http_client/client.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_base_client",
|
| 10 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = if let Ok(read_lock) = cache.read() {\n if let Some(cached_client) = read_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n drop(read_lock);\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n }\n } else {\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 16 |
+
"after_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n\n let client = if let Ok(read_lock) = cache.read() {\n if let Some(cached_client) = read_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n drop(read_lock);\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n }\n } else {\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = if let Ok(read_lock) = cache.read() {\n if let Some(cached_client) = read_lock.get(&cache_key) {",
|
| 19 |
+
"after": "\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n\n let client = if let Ok(read_lock) = cache.read() {\n if let Some(cached_client) = read_lock.get(&cache_key) {"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "0476285479c9195e80bf6a3cd4d274cfa8b348a4"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/external_services/src/http_client/client.rs::function::create_new_proxy_client",
|
| 25 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "fn create_new_proxy_client(\n cache: &RwLock<HashMap<Proxy, reqwest::Client>>,\n cache_key: Proxy,\n proxy_config: &Proxy,\n metrics_tag: &[router_env::opentelemetry::KeyValue],\n) -> CustomResult<reqwest::Client, HttpClientError> {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client after write lock for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(cached_client.clone())\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n \n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n Ok(new_client)\n }\n}",
|
| 31 |
+
"after_code": "fn create_new_proxy_client(\n cache: &RwLock<HashMap<Proxy, reqwest::Client>>,\n cache_key: Proxy,\n proxy_config: &Proxy,\n metrics_tag: &[router_env::opentelemetry::KeyValue],\n) -> CustomResult<reqwest::Client, HttpClientError> {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(cached_client.clone())\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n Ok(new_client)\n }\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": "\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client after write lock for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(cached_client.clone())\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n \n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);",
|
| 34 |
+
"after": "\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(cached_client.clone())\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "0476285479c9195e80bf6a3cd4d274cfa8b348a4"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_10164/23e4f23/diff.json
ADDED
|
@@ -0,0 +1,44 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "23e4f235e190ed07e5effe6b0c07557ab1844fa5",
|
| 3 |
+
"pr_number": 10164,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/external_services/src/http_client/client.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_base_client",
|
| 10 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n\n let client = if let Ok(read_lock) = cache.read() {\n if let Some(cached_client) = read_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n drop(read_lock);\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n }\n } else {\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 16 |
+
"after_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = get_or_create_proxy_client(cache, cache_key, proxy_config, metrics_tag)?;\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n\n let client = if let Ok(read_lock) = cache.read() {\n if let Some(cached_client) = read_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n drop(read_lock);\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n }\n } else {\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n };\n\n Ok(client)",
|
| 19 |
+
"after": "\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = get_or_create_proxy_client(cache, cache_key, proxy_config, metrics_tag)?;\n\n Ok(client)"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "23e4f235e190ed07e5effe6b0c07557ab1844fa5"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_or_create_proxy_client",
|
| 25 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "added",
|
| 28 |
+
"before_code": null,
|
| 29 |
+
"after_code": "fn get_or_create_proxy_client(\n cache: &RwLock<HashMap<Proxy, reqwest::Client>>,\n cache_key: Proxy,\n proxy_config: &Proxy,\n metrics_tag: &[router_env::opentelemetry::KeyValue],\n) -> CustomResult<reqwest::Client, HttpClientError> {\n let read_result = cache.read().ok().and_then(|read_lock| read_lock.get(&cache_key).cloned());\n \n let client = match read_result {\n Some(cached_client) => {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client\n }\n None => {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n match write_lock.get(&cache_key) {\n Some(cached_client) => {\n logger::debug!(\"Retrieved cached proxy client after write lock for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n }\n None => {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n new_client\n }\n }\n }\n };\n\n Ok(client)\n}",
|
| 30 |
+
"diff_span": null,
|
| 31 |
+
"commit_sha": "23e4f235e190ed07e5effe6b0c07557ab1844fa5"
|
| 32 |
+
},
|
| 33 |
+
{
|
| 34 |
+
"id": "crates/external_services/src/http_client/client.rs::function::create_new_proxy_client",
|
| 35 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 36 |
+
"kind": "function_item",
|
| 37 |
+
"status": "removed",
|
| 38 |
+
"before_code": "fn create_new_proxy_client(\n cache: &RwLock<HashMap<Proxy, reqwest::Client>>,\n cache_key: Proxy,\n proxy_config: &Proxy,\n metrics_tag: &[router_env::opentelemetry::KeyValue],\n) -> CustomResult<reqwest::Client, HttpClientError> {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(cached_client.clone())\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n Ok(new_client)\n }\n}",
|
| 39 |
+
"after_code": null,
|
| 40 |
+
"diff_span": null,
|
| 41 |
+
"commit_sha": "23e4f235e190ed07e5effe6b0c07557ab1844fa5"
|
| 42 |
+
}
|
| 43 |
+
]
|
| 44 |
+
}
|
diffs/pr_10164/4ef1f76/diff.json
ADDED
|
@@ -0,0 +1,160 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a",
|
| 3 |
+
"pr_number": 10164,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/external_services/src/http_client/client.rs",
|
| 6 |
+
"crates/external_services/src/http_client/metrics.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_base_client",
|
| 11 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": true,
|
| 16 |
+
"before_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n Ok(DEFAULT_CLIENT\n .get_or_try_init(|| {\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct base client\")\n })?\n .clone())\n}",
|
| 17 |
+
"after_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n // Create simple metrics attributes for proxy client tracking\n\n let http_proxy_host = extract_proxy_host(&proxy_config.http_url);\n let https_proxy_host = extract_proxy_host(&proxy_config.https_url);\n\n let proxy_metrics_tag = metric_attributes!((\"client_type\", \"proxy\"), (\"http_proxy_host\", http_proxy_host), (\"https_proxy_host\", https_proxy_host));\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n if let Some(client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &proxy_metrics_tag.clone());\n return Ok(client.clone());\n }\n // Create new proxy client if not in cache\n logger::info!(\"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\", cache_key, proxy_config.http_url, proxy_config.https_url);\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, &proxy_metrics_tag.clone());\n\n let client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, &proxy_metrics_tag.clone());\n cache_lock.insert(cache_key.clone(), client.clone());\n logger::debug!(\"Cached new proxy client with key: {}\", cache_key);\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n let default_metrics_tag = metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, &default_metrics_tag.clone());\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &default_metrics_tag.clone());\n Ok(client)\n }\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n Ok(DEFAULT_CLIENT\n .get_or_try_init(|| {\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct base client\")\n })?\n .clone())\n}",
|
| 20 |
+
"after": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n // Create simple metrics attributes for proxy client tracking\n\n let http_proxy_host = extract_proxy_host(&proxy_config.http_url);\n let https_proxy_host = extract_proxy_host(&proxy_config.https_url);\n\n let proxy_metrics_tag = metric_attributes!((\"client_type\", \"proxy\"), (\"http_proxy_host\", http_proxy_host), (\"https_proxy_host\", https_proxy_host));\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n if let Some(client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &proxy_metrics_tag.clone());\n return Ok(client.clone());\n }\n // Create new proxy client if not in cache\n logger::info!(\"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\", cache_key, proxy_config.http_url, proxy_config.https_url);\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, &proxy_metrics_tag.clone());\n\n let client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, &proxy_metrics_tag.clone());\n cache_lock.insert(cache_key.clone(), client.clone());\n logger::debug!(\"Cached new proxy client with key: {}\", cache_key);\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n let default_metrics_tag = metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, &default_metrics_tag.clone());\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &default_metrics_tag.clone());\n Ok(client)\n }\n}"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a",
|
| 23 |
+
"before_imports": [
|
| 24 |
+
"pub use common_utils::errors::CustomResult;"
|
| 25 |
+
],
|
| 26 |
+
"after_imports": [
|
| 27 |
+
"pub use common_utils::errors::CustomResult;",
|
| 28 |
+
"use router_env::{logger, metric_attributes};",
|
| 29 |
+
"use super::metrics;"
|
| 30 |
+
]
|
| 31 |
+
},
|
| 32 |
+
{
|
| 33 |
+
"id": "crates/external_services/src/http_client/client.rs::function::create_client",
|
| 34 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 35 |
+
"kind": "function_item",
|
| 36 |
+
"status": "modified",
|
| 37 |
+
"code_changed": false,
|
| 38 |
+
"imports_changed": true,
|
| 39 |
+
"before_code": "pub fn create_client(\n proxy_config: &Proxy,\n client_certificate: Option<masking::Secret<String>>,\n client_certificate_key: Option<masking::Secret<String>>,\n ca_certificate: Option<masking::Secret<String>>,\n) -> CustomResult<reqwest::Client, HttpClientError> {\n // Case 1: Mutual TLS with client certificate and key\n if let (Some(encoded_certificate), Some(encoded_certificate_key)) =\n (client_certificate.clone(), client_certificate_key.clone())\n {\n if ca_certificate.is_some() {\n logger::warn!(\"All of client certificate, client key, and CA certificate are provided. CA certificate will be ignored in mutual TLS setup.\");\n }\n\n logger::debug!(\"Creating HTTP client with mutual TLS (client cert + key)\");\n let client_builder =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config);\n\n let identity = create_identity_from_certificate_and_key(\n encoded_certificate.clone(),\n encoded_certificate_key,\n )?;\n let certificate_list = create_certificate(encoded_certificate)?;\n let client_builder = certificate_list\n .into_iter()\n .fold(client_builder, |client_builder, certificate| {\n client_builder.add_root_certificate(certificate)\n });\n return client_builder\n .identity(identity)\n .use_rustls_tls()\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct client with certificate and certificate key\");\n }\n\n // Case 2: Use provided CA certificate for server authentication only (one-way TLS)\n if let Some(ca_pem) = ca_certificate {\n logger::debug!(\"Creating HTTP client with one-way TLS (CA certificate)\");\n let pem = ca_pem.expose().replace(\"\\\\r\\\\n\", \"\\n\"); // Fix escaped newlines\n let cert = reqwest::Certificate::from_pem(pem.as_bytes())\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to parse CA certificate PEM block\")?;\n let client_builder =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .add_root_certificate(cert);\n return client_builder\n .use_rustls_tls()\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct client with CA certificate\");\n }\n\n // Case 3: Default client (no certs)\n logger::debug!(\"Creating default HTTP client (no client or CA certificates)\");\n get_base_client(proxy_config)\n}",
|
| 40 |
+
"after_code": "pub fn create_client(\n proxy_config: &Proxy,\n client_certificate: Option<masking::Secret<String>>,\n client_certificate_key: Option<masking::Secret<String>>,\n ca_certificate: Option<masking::Secret<String>>,\n) -> CustomResult<reqwest::Client, HttpClientError> {\n // Case 1: Mutual TLS with client certificate and key\n if let (Some(encoded_certificate), Some(encoded_certificate_key)) =\n (client_certificate.clone(), client_certificate_key.clone())\n {\n if ca_certificate.is_some() {\n logger::warn!(\"All of client certificate, client key, and CA certificate are provided. CA certificate will be ignored in mutual TLS setup.\");\n }\n\n logger::debug!(\"Creating HTTP client with mutual TLS (client cert + key)\");\n let client_builder =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config);\n\n let identity = create_identity_from_certificate_and_key(\n encoded_certificate.clone(),\n encoded_certificate_key,\n )?;\n let certificate_list = create_certificate(encoded_certificate)?;\n let client_builder = certificate_list\n .into_iter()\n .fold(client_builder, |client_builder, certificate| {\n client_builder.add_root_certificate(certificate)\n });\n return client_builder\n .identity(identity)\n .use_rustls_tls()\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct client with certificate and certificate key\");\n }\n\n // Case 2: Use provided CA certificate for server authentication only (one-way TLS)\n if let Some(ca_pem) = ca_certificate {\n logger::debug!(\"Creating HTTP client with one-way TLS (CA certificate)\");\n let pem = ca_pem.expose().replace(\"\\\\r\\\\n\", \"\\n\"); // Fix escaped newlines\n let cert = reqwest::Certificate::from_pem(pem.as_bytes())\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to parse CA certificate PEM block\")?;\n let client_builder =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .add_root_certificate(cert);\n return client_builder\n .use_rustls_tls()\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct client with CA certificate\");\n }\n\n // Case 3: Default client (no certs)\n logger::debug!(\"Creating default HTTP client (no client or CA certificates)\");\n get_base_client(proxy_config)\n}",
|
| 41 |
+
"diff_span": {
|
| 42 |
+
"before": "",
|
| 43 |
+
"after": ""
|
| 44 |
+
},
|
| 45 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a",
|
| 46 |
+
"before_imports": [
|
| 47 |
+
"pub use common_utils::errors::CustomResult;",
|
| 48 |
+
"use router_env::logger;"
|
| 49 |
+
],
|
| 50 |
+
"after_imports": [
|
| 51 |
+
"pub use common_utils::errors::CustomResult;",
|
| 52 |
+
"use router_env::{logger, metric_attributes};"
|
| 53 |
+
]
|
| 54 |
+
},
|
| 55 |
+
{
|
| 56 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_client_builder",
|
| 57 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 58 |
+
"kind": "function_item",
|
| 59 |
+
"status": "modified",
|
| 60 |
+
"code_changed": true,
|
| 61 |
+
"imports_changed": true,
|
| 62 |
+
"before_code": "pub fn get_client_builder(\n proxy_config: &Proxy,\n) -> CustomResult<reqwest::ClientBuilder, HttpClientError> {\n let mut client_builder = reqwest::Client::builder()\n .redirect(reqwest::redirect::Policy::none())\n .pool_idle_timeout(Duration::from_secs(\n proxy_config\n .idle_pool_connection_timeout\n .unwrap_or_default(),\n ));\n\n let proxy_exclusion_config =\n reqwest::NoProxy::from_string(&proxy_config.bypass_proxy_hosts.clone().unwrap_or_default());\n\n // Proxy all HTTPS traffic through the configured HTTPS proxy\n if let Some(url) = proxy_config.https_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::https(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTPS proxy configuration error\")?\n .no_proxy(proxy_exclusion_config.clone()),\n );\n }\n\n // Proxy all HTTP traffic through the configured HTTP proxy\n if let Some(url) = proxy_config.http_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::http(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTP proxy configuration error\")?\n .no_proxy(proxy_exclusion_config),\n );\n }\n\n Ok(client_builder)\n}",
|
| 63 |
+
"after_code": "pub fn get_client_builder(\n proxy_config: &Proxy,\n) -> CustomResult<reqwest::ClientBuilder, HttpClientError> {\n let mut client_builder = reqwest::Client::builder()\n .redirect(reqwest::redirect::Policy::none())\n .pool_idle_timeout(Duration::from_secs(\n proxy_config\n .idle_pool_connection_timeout\n .unwrap_or_default(),\n ));\n\n let proxy_exclusion_config =\n reqwest::NoProxy::from_string(&proxy_config.bypass_proxy_hosts.clone().unwrap_or_default());\n\n logger::debug!(\"Proxy HTTP Proxy -> {:?} and HTTPS Proxy -> {:?}\", proxy_config.http_url.clone(), proxy_config.https_url.clone());\n\n // Proxy all HTTPS traffic through the configured HTTPS proxy\n if let Some(url) = proxy_config.https_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::https(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTPS proxy configuration error\")?\n .no_proxy(proxy_exclusion_config.clone()),\n );\n }\n\n // Proxy all HTTP traffic through the configured HTTP proxy\n if let Some(url) = proxy_config.http_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::http(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTP proxy configuration error\")?\n .no_proxy(proxy_exclusion_config),\n );\n }\n\n Ok(client_builder)\n}",
|
| 64 |
+
"diff_span": {
|
| 65 |
+
"before": "",
|
| 66 |
+
"after": " let proxy_exclusion_config =\n reqwest::NoProxy::from_string(&proxy_config.bypass_proxy_hosts.clone().unwrap_or_default());\n\n logger::debug!(\"Proxy HTTP Proxy -> {:?} and HTTPS Proxy -> {:?}\", proxy_config.http_url.clone(), proxy_config.https_url.clone());\n\n // Proxy all HTTPS traffic through the configured HTTPS proxy"
|
| 67 |
+
},
|
| 68 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a",
|
| 69 |
+
"before_imports": [
|
| 70 |
+
"use std::time::Duration;",
|
| 71 |
+
"pub use common_utils::errors::CustomResult;"
|
| 72 |
+
],
|
| 73 |
+
"after_imports": [
|
| 74 |
+
"pub use common_utils::errors::CustomResult;",
|
| 75 |
+
"use router_env::{logger, metric_attributes};"
|
| 76 |
+
]
|
| 77 |
+
},
|
| 78 |
+
{
|
| 79 |
+
"id": "crates/external_services/src/http_client/client.rs::function::apply_mitm_certificate",
|
| 80 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 81 |
+
"kind": "function_item",
|
| 82 |
+
"status": "modified",
|
| 83 |
+
"code_changed": false,
|
| 84 |
+
"imports_changed": true,
|
| 85 |
+
"before_code": "fn apply_mitm_certificate(\n mut client_builder: reqwest::ClientBuilder,\n proxy_config: &Proxy,\n) -> reqwest::ClientBuilder {\n if let Some(mitm_ca_cert) = &proxy_config.mitm_ca_certificate {\n let pem = mitm_ca_cert.clone().expose().replace(\"\\\\r\\\\n\", \"\\n\");\n match reqwest::Certificate::from_pem(pem.as_bytes()) {\n Ok(cert) => {\n logger::debug!(\"Successfully added MITM CA certificate\");\n client_builder = client_builder.add_root_certificate(cert);\n }\n Err(err) => {\n logger::error!(\n \"Failed to parse MITM CA certificate: {}, continuing without MITM support\",\n err\n );\n }\n }\n }\n client_builder\n}",
|
| 86 |
+
"after_code": "fn apply_mitm_certificate(\n mut client_builder: reqwest::ClientBuilder,\n proxy_config: &Proxy,\n) -> reqwest::ClientBuilder {\n if let Some(mitm_ca_cert) = &proxy_config.mitm_ca_certificate {\n let pem = mitm_ca_cert.clone().expose().replace(\"\\\\r\\\\n\", \"\\n\");\n match reqwest::Certificate::from_pem(pem.as_bytes()) {\n Ok(cert) => {\n logger::debug!(\"Successfully added MITM CA certificate\");\n client_builder = client_builder.add_root_certificate(cert);\n }\n Err(err) => {\n logger::error!(\n \"Failed to parse MITM CA certificate: {}, continuing without MITM support\",\n err\n );\n }\n }\n }\n client_builder\n}",
|
| 87 |
+
"diff_span": {
|
| 88 |
+
"before": "",
|
| 89 |
+
"after": ""
|
| 90 |
+
},
|
| 91 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a",
|
| 92 |
+
"before_imports": [
|
| 93 |
+
"use router_env::logger;"
|
| 94 |
+
],
|
| 95 |
+
"after_imports": [
|
| 96 |
+
"use router_env::{logger, metric_attributes};"
|
| 97 |
+
]
|
| 98 |
+
},
|
| 99 |
+
{
|
| 100 |
+
"id": "crates/external_services/src/http_client/client.rs::Proxy::function::has_proxy_config",
|
| 101 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 102 |
+
"kind": "function_item",
|
| 103 |
+
"status": "added",
|
| 104 |
+
"before_code": null,
|
| 105 |
+
"after_code": "fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() \n || self.https_url.is_some() \n || self.mitm_ca_certificate.is_some()\n }",
|
| 106 |
+
"diff_span": null,
|
| 107 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a"
|
| 108 |
+
},
|
| 109 |
+
{
|
| 110 |
+
"id": "crates/external_services/src/http_client/client.rs::Proxy::function::cache_key",
|
| 111 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 112 |
+
"kind": "function_item",
|
| 113 |
+
"status": "added",
|
| 114 |
+
"before_code": null,
|
| 115 |
+
"after_code": "fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n Some(format!(\n \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"), \n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }",
|
| 116 |
+
"diff_span": null,
|
| 117 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a"
|
| 118 |
+
},
|
| 119 |
+
{
|
| 120 |
+
"id": "crates/external_services/src/http_client/client.rs::impl::Proxy",
|
| 121 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 122 |
+
"kind": "impl_item",
|
| 123 |
+
"status": "added",
|
| 124 |
+
"before_code": null,
|
| 125 |
+
"after_code": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n Some(format!(\n \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"), \n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }\n \n fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() \n || self.https_url.is_some() \n || self.mitm_ca_certificate.is_some()\n }\n}",
|
| 126 |
+
"diff_span": null,
|
| 127 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a"
|
| 128 |
+
},
|
| 129 |
+
{
|
| 130 |
+
"id": "crates/external_services/src/http_client/client.rs::trait::ProxyClientCacheKey",
|
| 131 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 132 |
+
"kind": "trait_item",
|
| 133 |
+
"status": "added",
|
| 134 |
+
"before_code": null,
|
| 135 |
+
"after_code": "trait ProxyClientCacheKey {\n fn cache_key(&self) -> Option<String>;\n fn has_proxy_config(&self) -> bool;\n}",
|
| 136 |
+
"diff_span": null,
|
| 137 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a"
|
| 138 |
+
},
|
| 139 |
+
{
|
| 140 |
+
"id": "crates/external_services/src/http_client/client.rs::function::extract_proxy_host",
|
| 141 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 142 |
+
"kind": "function_item",
|
| 143 |
+
"status": "added",
|
| 144 |
+
"before_code": null,
|
| 145 |
+
"after_code": "fn extract_proxy_host(url_opt: &Option<String>) -> String {\n url_opt.as_ref()\n .and_then(|url| url::Url::parse(url).ok())\n .and_then(|parsed_url| parsed_url.host_str().map(|s| s.to_string()))\n .unwrap_or_else(|| \"none\".to_string())\n}",
|
| 146 |
+
"diff_span": null,
|
| 147 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a"
|
| 148 |
+
},
|
| 149 |
+
{
|
| 150 |
+
"id": "crates/external_services/src/http_client/client.rs::static::PROXY_CLIENT_CACHE",
|
| 151 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 152 |
+
"kind": "static_item",
|
| 153 |
+
"status": "added",
|
| 154 |
+
"before_code": null,
|
| 155 |
+
"after_code": "static PROXY_CLIENT_CACHE: OnceCell<Mutex<HashMap<String, reqwest::Client>>> = OnceCell::new();",
|
| 156 |
+
"diff_span": null,
|
| 157 |
+
"commit_sha": "4ef1f76f686d4e5311544342797853b91e40b75a"
|
| 158 |
+
}
|
| 159 |
+
]
|
| 160 |
+
}
|
diffs/pr_10164/c4615d6/diff.json
ADDED
|
@@ -0,0 +1,100 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "c4615d6fe209240c2b12642ea1cf40a0043153a8",
|
| 3 |
+
"pr_number": 10164,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/external_services/src/http_client/client.rs",
|
| 6 |
+
"crates/external_services/src/http_client/metrics.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_base_client",
|
| 11 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n // Create simple metrics attributes for proxy client tracking\n\n let http_proxy_host = extract_proxy_host(&proxy_config.http_url);\n let https_proxy_host = extract_proxy_host(&proxy_config.https_url);\n\n let proxy_metrics_tag = metric_attributes!((\"client_type\", \"proxy\"), (\"http_proxy_host\", http_proxy_host), (\"https_proxy_host\", https_proxy_host));\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n if let Some(client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &proxy_metrics_tag.clone());\n return Ok(client.clone());\n }\n // Create new proxy client if not in cache\n logger::info!(\"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\", cache_key, proxy_config.http_url, proxy_config.https_url);\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, &proxy_metrics_tag.clone());\n\n let client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, &proxy_metrics_tag.clone());\n cache_lock.insert(cache_key.clone(), client.clone());\n logger::debug!(\"Cached new proxy client with key: {}\", cache_key);\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n let default_metrics_tag = metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, &default_metrics_tag.clone());\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &default_metrics_tag.clone());\n Ok(client)\n }\n}",
|
| 17 |
+
"after_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n // Create simple metrics attributes for proxy client tracking\n\n let http_proxy_host = extract_proxy_host(&proxy_config.http_url);\n let https_proxy_host = extract_proxy_host(&proxy_config.https_url);\n\n let proxy_metrics_tag = metric_attributes!(\n (\"client_type\", \"proxy\"),\n (\"http_proxy_host\", http_proxy_host),\n (\"https_proxy_host\", https_proxy_host)\n );\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n if let Some(client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &proxy_metrics_tag.clone());\n return Ok(client.clone());\n }\n // Create new proxy client if not in cache\n logger::info!(\n \"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\",\n cache_key,\n proxy_config.http_url,\n proxy_config.https_url\n );\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, &proxy_metrics_tag.clone());\n\n let client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, &proxy_metrics_tag.clone());\n cache_lock.insert(cache_key.clone(), client.clone());\n logger::debug!(\"Cached new proxy client with key: {}\", cache_key);\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n let default_metrics_tag = metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, &default_metrics_tag.clone());\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &default_metrics_tag.clone());\n Ok(client)\n }\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n // Create simple metrics attributes for proxy client tracking\n\n let http_proxy_host = extract_proxy_host(&proxy_config.http_url);\n let https_proxy_host = extract_proxy_host(&proxy_config.https_url);\n\n let proxy_metrics_tag = metric_attributes!((\"client_type\", \"proxy\"), (\"http_proxy_host\", http_proxy_host), (\"https_proxy_host\", https_proxy_host));\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n if let Some(client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &proxy_metrics_tag.clone());\n return Ok(client.clone());\n }\n // Create new proxy client if not in cache\n logger::info!(\"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\", cache_key, proxy_config.http_url, proxy_config.https_url);\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, &proxy_metrics_tag.clone());\n",
|
| 20 |
+
"after": " let https_proxy_host = extract_proxy_host(&proxy_config.https_url);\n\n let proxy_metrics_tag = metric_attributes!(\n (\"client_type\", \"proxy\"),\n (\"http_proxy_host\", http_proxy_host),\n (\"https_proxy_host\", https_proxy_host)\n );\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n if let Some(client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &proxy_metrics_tag.clone());\n return Ok(client.clone());\n }\n // Create new proxy client if not in cache\n logger::info!(\n \"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\",\n cache_key,\n proxy_config.http_url,\n proxy_config.https_url\n );\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, &proxy_metrics_tag.clone());\n"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "c4615d6fe209240c2b12642ea1cf40a0043153a8"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_client_builder",
|
| 26 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 27 |
+
"kind": "function_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "pub fn get_client_builder(\n proxy_config: &Proxy,\n) -> CustomResult<reqwest::ClientBuilder, HttpClientError> {\n let mut client_builder = reqwest::Client::builder()\n .redirect(reqwest::redirect::Policy::none())\n .pool_idle_timeout(Duration::from_secs(\n proxy_config\n .idle_pool_connection_timeout\n .unwrap_or_default(),\n ));\n\n let proxy_exclusion_config =\n reqwest::NoProxy::from_string(&proxy_config.bypass_proxy_hosts.clone().unwrap_or_default());\n\n logger::debug!(\"Proxy HTTP Proxy -> {:?} and HTTPS Proxy -> {:?}\", proxy_config.http_url.clone(), proxy_config.https_url.clone());\n\n // Proxy all HTTPS traffic through the configured HTTPS proxy\n if let Some(url) = proxy_config.https_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::https(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTPS proxy configuration error\")?\n .no_proxy(proxy_exclusion_config.clone()),\n );\n }\n\n // Proxy all HTTP traffic through the configured HTTP proxy\n if let Some(url) = proxy_config.http_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::http(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTP proxy configuration error\")?\n .no_proxy(proxy_exclusion_config),\n );\n }\n\n Ok(client_builder)\n}",
|
| 32 |
+
"after_code": "pub fn get_client_builder(\n proxy_config: &Proxy,\n) -> CustomResult<reqwest::ClientBuilder, HttpClientError> {\n let mut client_builder = reqwest::Client::builder()\n .redirect(reqwest::redirect::Policy::none())\n .pool_idle_timeout(Duration::from_secs(\n proxy_config\n .idle_pool_connection_timeout\n .unwrap_or_default(),\n ));\n\n let proxy_exclusion_config =\n reqwest::NoProxy::from_string(&proxy_config.bypass_proxy_hosts.clone().unwrap_or_default());\n\n logger::debug!(\n \"Proxy HTTP Proxy -> {:?} and HTTPS Proxy -> {:?}\",\n proxy_config.http_url.clone(),\n proxy_config.https_url.clone()\n );\n\n // Proxy all HTTPS traffic through the configured HTTPS proxy\n if let Some(url) = proxy_config.https_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::https(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTPS proxy configuration error\")?\n .no_proxy(proxy_exclusion_config.clone()),\n );\n }\n\n // Proxy all HTTP traffic through the configured HTTP proxy\n if let Some(url) = proxy_config.http_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::http(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTP proxy configuration error\")?\n .no_proxy(proxy_exclusion_config),\n );\n }\n\n Ok(client_builder)\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " reqwest::NoProxy::from_string(&proxy_config.bypass_proxy_hosts.clone().unwrap_or_default());\n\n logger::debug!(\"Proxy HTTP Proxy -> {:?} and HTTPS Proxy -> {:?}\", proxy_config.http_url.clone(), proxy_config.https_url.clone());\n\n // Proxy all HTTPS traffic through the configured HTTPS proxy",
|
| 35 |
+
"after": " reqwest::NoProxy::from_string(&proxy_config.bypass_proxy_hosts.clone().unwrap_or_default());\n\n logger::debug!(\n \"Proxy HTTP Proxy -> {:?} and HTTPS Proxy -> {:?}\",\n proxy_config.http_url.clone(),\n proxy_config.https_url.clone()\n );\n\n // Proxy all HTTPS traffic through the configured HTTPS proxy"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "c4615d6fe209240c2b12642ea1cf40a0043153a8"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/external_services/src/http_client/client.rs::Proxy::function::has_proxy_config",
|
| 41 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() \n || self.https_url.is_some() \n || self.mitm_ca_certificate.is_some()\n }",
|
| 47 |
+
"after_code": "fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some() || self.mitm_ca_certificate.is_some()\n }",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": "fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() \n || self.https_url.is_some() \n || self.mitm_ca_certificate.is_some()\n }",
|
| 50 |
+
"after": "fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some() || self.mitm_ca_certificate.is_some()\n }"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "c4615d6fe209240c2b12642ea1cf40a0043153a8"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/external_services/src/http_client/client.rs::Proxy::function::cache_key",
|
| 56 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 57 |
+
"kind": "function_item",
|
| 58 |
+
"status": "modified",
|
| 59 |
+
"code_changed": true,
|
| 60 |
+
"imports_changed": false,
|
| 61 |
+
"before_code": "fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n Some(format!(\n \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"), \n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }",
|
| 62 |
+
"after_code": "fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n Some(format!(\n \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"),\n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }",
|
| 63 |
+
"diff_span": {
|
| 64 |
+
"before": " \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"), \n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),",
|
| 65 |
+
"after": " \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"),\n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),"
|
| 66 |
+
},
|
| 67 |
+
"commit_sha": "c4615d6fe209240c2b12642ea1cf40a0043153a8"
|
| 68 |
+
},
|
| 69 |
+
{
|
| 70 |
+
"id": "crates/external_services/src/http_client/client.rs::impl::Proxy",
|
| 71 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 72 |
+
"kind": "impl_item",
|
| 73 |
+
"status": "modified",
|
| 74 |
+
"code_changed": true,
|
| 75 |
+
"imports_changed": false,
|
| 76 |
+
"before_code": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n Some(format!(\n \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"), \n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }\n \n fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() \n || self.https_url.is_some() \n || self.mitm_ca_certificate.is_some()\n }\n}",
|
| 77 |
+
"after_code": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n Some(format!(\n \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"),\n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }\n\n fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some() || self.mitm_ca_certificate.is_some()\n }\n}",
|
| 78 |
+
"diff_span": {
|
| 79 |
+
"before": " \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"), \n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }\n \n fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() \n || self.https_url.is_some() \n || self.mitm_ca_certificate.is_some()\n }\n}",
|
| 80 |
+
"after": " \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"),\n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }\n\n fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some() || self.mitm_ca_certificate.is_some()\n }\n}"
|
| 81 |
+
},
|
| 82 |
+
"commit_sha": "c4615d6fe209240c2b12642ea1cf40a0043153a8"
|
| 83 |
+
},
|
| 84 |
+
{
|
| 85 |
+
"id": "crates/external_services/src/http_client/client.rs::function::extract_proxy_host",
|
| 86 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 87 |
+
"kind": "function_item",
|
| 88 |
+
"status": "modified",
|
| 89 |
+
"code_changed": true,
|
| 90 |
+
"imports_changed": false,
|
| 91 |
+
"before_code": "fn extract_proxy_host(url_opt: &Option<String>) -> String {\n url_opt.as_ref()\n .and_then(|url| url::Url::parse(url).ok())\n .and_then(|parsed_url| parsed_url.host_str().map(|s| s.to_string()))\n .unwrap_or_else(|| \"none\".to_string())\n}",
|
| 92 |
+
"after_code": "fn extract_proxy_host(url_opt: &Option<String>) -> String {\n url_opt\n .as_ref()\n .and_then(|url| url::Url::parse(url).ok())\n .and_then(|parsed_url| parsed_url.host_str().map(|s| s.to_string()))\n .unwrap_or_else(|| \"none\".to_string())\n}",
|
| 93 |
+
"diff_span": {
|
| 94 |
+
"before": "fn extract_proxy_host(url_opt: &Option<String>) -> String {\n url_opt.as_ref()\n .and_then(|url| url::Url::parse(url).ok())\n .and_then(|parsed_url| parsed_url.host_str().map(|s| s.to_string()))",
|
| 95 |
+
"after": "fn extract_proxy_host(url_opt: &Option<String>) -> String {\n url_opt\n .as_ref()\n .and_then(|url| url::Url::parse(url).ok())\n .and_then(|parsed_url| parsed_url.host_str().map(|s| s.to_string()))"
|
| 96 |
+
},
|
| 97 |
+
"commit_sha": "c4615d6fe209240c2b12642ea1cf40a0043153a8"
|
| 98 |
+
}
|
| 99 |
+
]
|
| 100 |
+
}
|
diffs/pr_10164/cd64e30/diff.json
ADDED
|
@@ -0,0 +1,149 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "cd64e30723e1a07b4725e3bfdfe7c3ad5cad5dbb",
|
| 3 |
+
"pr_number": 10164,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/external_services/src/http_client/client.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_base_client",
|
| 10 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": true,
|
| 15 |
+
"before_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n // Create simple metrics attributes for proxy client tracking\n\n let http_proxy_host = extract_proxy_host(&proxy_config.http_url);\n let https_proxy_host = extract_proxy_host(&proxy_config.https_url);\n\n let proxy_metrics_tag = metric_attributes!(\n (\"client_type\", \"proxy\"),\n (\"http_proxy_host\", http_proxy_host),\n (\"https_proxy_host\", https_proxy_host)\n );\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n if let Some(client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &proxy_metrics_tag.clone());\n return Ok(client.clone());\n }\n // Create new proxy client if not in cache\n logger::info!(\n \"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\",\n cache_key,\n proxy_config.http_url,\n proxy_config.https_url\n );\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, &proxy_metrics_tag.clone());\n\n let client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, &proxy_metrics_tag.clone());\n cache_lock.insert(cache_key.clone(), client.clone());\n logger::debug!(\"Cached new proxy client with key: {}\", cache_key);\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n let default_metrics_tag = metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, &default_metrics_tag.clone());\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &default_metrics_tag.clone());\n Ok(client)\n }\n}",
|
| 16 |
+
"after_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n let client = if let Some(cached_client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n // Create new proxy client if not in cache\n logger::info!(\n \"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\",\n cache_key,\n proxy_config.http_url,\n proxy_config.https_url\n );\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n cache_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client with key: {}\", cache_key);\n new_client\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n // Create simple metrics attributes for proxy client tracking\n\n let http_proxy_host = extract_proxy_host(&proxy_config.http_url);\n let https_proxy_host = extract_proxy_host(&proxy_config.https_url);\n\n let proxy_metrics_tag = metric_attributes!(\n (\"client_type\", \"proxy\"),\n (\"http_proxy_host\", http_proxy_host),\n (\"https_proxy_host\", https_proxy_host)\n );\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n if let Some(client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &proxy_metrics_tag.clone());\n return Ok(client.clone());\n }\n // Create new proxy client if not in cache\n logger::info!(\n \"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\",\n cache_key,\n proxy_config.http_url,\n proxy_config.https_url\n );\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, &proxy_metrics_tag.clone());\n\n let client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, &proxy_metrics_tag.clone());\n cache_lock.insert(cache_key.clone(), client.clone());\n logger::debug!(\"Cached new proxy client with key: {}\", cache_key);\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n let default_metrics_tag = metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, &default_metrics_tag.clone());\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, &default_metrics_tag.clone());\n Ok(client)\n }",
|
| 19 |
+
"after": " logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n let client = if let Some(cached_client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n // Create new proxy client if not in cache\n logger::info!(\n \"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\",\n cache_key,\n proxy_config.http_url,\n proxy_config.https_url\n );\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n cache_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client with key: {}\", cache_key);\n new_client\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "cd64e30723e1a07b4725e3bfdfe7c3ad5cad5dbb",
|
| 22 |
+
"before_imports": [
|
| 23 |
+
"pub use common_utils::errors::CustomResult;",
|
| 24 |
+
"use router_env::{logger, metric_attributes};",
|
| 25 |
+
"use super::metrics;"
|
| 26 |
+
],
|
| 27 |
+
"after_imports": [
|
| 28 |
+
"pub use common_utils::errors::CustomResult;",
|
| 29 |
+
"use router_env::logger;",
|
| 30 |
+
"use super::metrics;"
|
| 31 |
+
]
|
| 32 |
+
},
|
| 33 |
+
{
|
| 34 |
+
"id": "crates/external_services/src/http_client/client.rs::function::create_client",
|
| 35 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 36 |
+
"kind": "function_item",
|
| 37 |
+
"status": "modified",
|
| 38 |
+
"code_changed": false,
|
| 39 |
+
"imports_changed": true,
|
| 40 |
+
"before_code": "pub fn create_client(\n proxy_config: &Proxy,\n client_certificate: Option<masking::Secret<String>>,\n client_certificate_key: Option<masking::Secret<String>>,\n ca_certificate: Option<masking::Secret<String>>,\n) -> CustomResult<reqwest::Client, HttpClientError> {\n // Case 1: Mutual TLS with client certificate and key\n if let (Some(encoded_certificate), Some(encoded_certificate_key)) =\n (client_certificate.clone(), client_certificate_key.clone())\n {\n if ca_certificate.is_some() {\n logger::warn!(\"All of client certificate, client key, and CA certificate are provided. CA certificate will be ignored in mutual TLS setup.\");\n }\n\n logger::debug!(\"Creating HTTP client with mutual TLS (client cert + key)\");\n let client_builder =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config);\n\n let identity = create_identity_from_certificate_and_key(\n encoded_certificate.clone(),\n encoded_certificate_key,\n )?;\n let certificate_list = create_certificate(encoded_certificate)?;\n let client_builder = certificate_list\n .into_iter()\n .fold(client_builder, |client_builder, certificate| {\n client_builder.add_root_certificate(certificate)\n });\n return client_builder\n .identity(identity)\n .use_rustls_tls()\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct client with certificate and certificate key\");\n }\n\n // Case 2: Use provided CA certificate for server authentication only (one-way TLS)\n if let Some(ca_pem) = ca_certificate {\n logger::debug!(\"Creating HTTP client with one-way TLS (CA certificate)\");\n let pem = ca_pem.expose().replace(\"\\\\r\\\\n\", \"\\n\"); // Fix escaped newlines\n let cert = reqwest::Certificate::from_pem(pem.as_bytes())\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to parse CA certificate PEM block\")?;\n let client_builder =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .add_root_certificate(cert);\n return client_builder\n .use_rustls_tls()\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct client with CA certificate\");\n }\n\n // Case 3: Default client (no certs)\n logger::debug!(\"Creating default HTTP client (no client or CA certificates)\");\n get_base_client(proxy_config)\n}",
|
| 41 |
+
"after_code": "pub fn create_client(\n proxy_config: &Proxy,\n client_certificate: Option<masking::Secret<String>>,\n client_certificate_key: Option<masking::Secret<String>>,\n ca_certificate: Option<masking::Secret<String>>,\n) -> CustomResult<reqwest::Client, HttpClientError> {\n // Case 1: Mutual TLS with client certificate and key\n if let (Some(encoded_certificate), Some(encoded_certificate_key)) =\n (client_certificate.clone(), client_certificate_key.clone())\n {\n if ca_certificate.is_some() {\n logger::warn!(\"All of client certificate, client key, and CA certificate are provided. CA certificate will be ignored in mutual TLS setup.\");\n }\n\n logger::debug!(\"Creating HTTP client with mutual TLS (client cert + key)\");\n let client_builder =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config);\n\n let identity = create_identity_from_certificate_and_key(\n encoded_certificate.clone(),\n encoded_certificate_key,\n )?;\n let certificate_list = create_certificate(encoded_certificate)?;\n let client_builder = certificate_list\n .into_iter()\n .fold(client_builder, |client_builder, certificate| {\n client_builder.add_root_certificate(certificate)\n });\n return client_builder\n .identity(identity)\n .use_rustls_tls()\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct client with certificate and certificate key\");\n }\n\n // Case 2: Use provided CA certificate for server authentication only (one-way TLS)\n if let Some(ca_pem) = ca_certificate {\n logger::debug!(\"Creating HTTP client with one-way TLS (CA certificate)\");\n let pem = ca_pem.expose().replace(\"\\\\r\\\\n\", \"\\n\"); // Fix escaped newlines\n let cert = reqwest::Certificate::from_pem(pem.as_bytes())\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to parse CA certificate PEM block\")?;\n let client_builder =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .add_root_certificate(cert);\n return client_builder\n .use_rustls_tls()\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct client with CA certificate\");\n }\n\n // Case 3: Default client (no certs)\n logger::debug!(\"Creating default HTTP client (no client or CA certificates)\");\n get_base_client(proxy_config)\n}",
|
| 42 |
+
"diff_span": {
|
| 43 |
+
"before": "",
|
| 44 |
+
"after": ""
|
| 45 |
+
},
|
| 46 |
+
"commit_sha": "cd64e30723e1a07b4725e3bfdfe7c3ad5cad5dbb",
|
| 47 |
+
"before_imports": [
|
| 48 |
+
"pub use common_utils::errors::CustomResult;",
|
| 49 |
+
"use router_env::{logger, metric_attributes};"
|
| 50 |
+
],
|
| 51 |
+
"after_imports": [
|
| 52 |
+
"pub use common_utils::errors::CustomResult;",
|
| 53 |
+
"use router_env::logger;"
|
| 54 |
+
]
|
| 55 |
+
},
|
| 56 |
+
{
|
| 57 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_client_builder",
|
| 58 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 59 |
+
"kind": "function_item",
|
| 60 |
+
"status": "modified",
|
| 61 |
+
"code_changed": false,
|
| 62 |
+
"imports_changed": true,
|
| 63 |
+
"before_code": "pub fn get_client_builder(\n proxy_config: &Proxy,\n) -> CustomResult<reqwest::ClientBuilder, HttpClientError> {\n let mut client_builder = reqwest::Client::builder()\n .redirect(reqwest::redirect::Policy::none())\n .pool_idle_timeout(Duration::from_secs(\n proxy_config\n .idle_pool_connection_timeout\n .unwrap_or_default(),\n ));\n\n let proxy_exclusion_config =\n reqwest::NoProxy::from_string(&proxy_config.bypass_proxy_hosts.clone().unwrap_or_default());\n\n logger::debug!(\n \"Proxy HTTP Proxy -> {:?} and HTTPS Proxy -> {:?}\",\n proxy_config.http_url.clone(),\n proxy_config.https_url.clone()\n );\n\n // Proxy all HTTPS traffic through the configured HTTPS proxy\n if let Some(url) = proxy_config.https_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::https(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTPS proxy configuration error\")?\n .no_proxy(proxy_exclusion_config.clone()),\n );\n }\n\n // Proxy all HTTP traffic through the configured HTTP proxy\n if let Some(url) = proxy_config.http_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::http(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTP proxy configuration error\")?\n .no_proxy(proxy_exclusion_config),\n );\n }\n\n Ok(client_builder)\n}",
|
| 64 |
+
"after_code": "pub fn get_client_builder(\n proxy_config: &Proxy,\n) -> CustomResult<reqwest::ClientBuilder, HttpClientError> {\n let mut client_builder = reqwest::Client::builder()\n .redirect(reqwest::redirect::Policy::none())\n .pool_idle_timeout(Duration::from_secs(\n proxy_config\n .idle_pool_connection_timeout\n .unwrap_or_default(),\n ));\n\n let proxy_exclusion_config =\n reqwest::NoProxy::from_string(&proxy_config.bypass_proxy_hosts.clone().unwrap_or_default());\n\n logger::debug!(\n \"Proxy HTTP Proxy -> {:?} and HTTPS Proxy -> {:?}\",\n proxy_config.http_url.clone(),\n proxy_config.https_url.clone()\n );\n\n // Proxy all HTTPS traffic through the configured HTTPS proxy\n if let Some(url) = proxy_config.https_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::https(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTPS proxy configuration error\")?\n .no_proxy(proxy_exclusion_config.clone()),\n );\n }\n\n // Proxy all HTTP traffic through the configured HTTP proxy\n if let Some(url) = proxy_config.http_url.as_ref() {\n client_builder = client_builder.proxy(\n reqwest::Proxy::http(url)\n .change_context(HttpClientError::InvalidProxyConfiguration)\n .attach_printable(\"HTTP proxy configuration error\")?\n .no_proxy(proxy_exclusion_config),\n );\n }\n\n Ok(client_builder)\n}",
|
| 65 |
+
"diff_span": {
|
| 66 |
+
"before": "",
|
| 67 |
+
"after": ""
|
| 68 |
+
},
|
| 69 |
+
"commit_sha": "cd64e30723e1a07b4725e3bfdfe7c3ad5cad5dbb",
|
| 70 |
+
"before_imports": [
|
| 71 |
+
"pub use common_utils::errors::CustomResult;",
|
| 72 |
+
"use router_env::{logger, metric_attributes};"
|
| 73 |
+
],
|
| 74 |
+
"after_imports": [
|
| 75 |
+
"pub use common_utils::errors::CustomResult;",
|
| 76 |
+
"use router_env::logger;"
|
| 77 |
+
]
|
| 78 |
+
},
|
| 79 |
+
{
|
| 80 |
+
"id": "crates/external_services/src/http_client/client.rs::Proxy::function::cache_key",
|
| 81 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 82 |
+
"kind": "function_item",
|
| 83 |
+
"status": "modified",
|
| 84 |
+
"code_changed": true,
|
| 85 |
+
"imports_changed": true,
|
| 86 |
+
"before_code": "fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n Some(format!(\n \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"),\n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }",
|
| 87 |
+
"after_code": "fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n\n logger::debug!(\n \"Generating cache key for proxy config: {:?}\",\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some()\n )\n );\n\n let mut hasher = DefaultHasher::new();\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some(),\n )\n .hash(&mut hasher);\n\n let cache_key = format!(\"proxy_{:x}\", hasher.finish());\n logger::debug!(\"Generated cache key: {}\", cache_key);\n\n Some(cache_key)\n }",
|
| 88 |
+
"diff_span": {
|
| 89 |
+
"before": " return None;\n }\n Some(format!(\n \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"),\n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }",
|
| 90 |
+
"after": " return None;\n }\n\n logger::debug!(\n \"Generating cache key for proxy config: {:?}\",\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some()\n )\n );\n\n let mut hasher = DefaultHasher::new();\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some(),\n )\n .hash(&mut hasher);\n\n let cache_key = format!(\"proxy_{:x}\", hasher.finish());\n logger::debug!(\"Generated cache key: {}\", cache_key);\n\n Some(cache_key)\n }"
|
| 91 |
+
},
|
| 92 |
+
"commit_sha": "cd64e30723e1a07b4725e3bfdfe7c3ad5cad5dbb",
|
| 93 |
+
"before_imports": [],
|
| 94 |
+
"after_imports": [
|
| 95 |
+
"use router_env::logger;"
|
| 96 |
+
]
|
| 97 |
+
},
|
| 98 |
+
{
|
| 99 |
+
"id": "crates/external_services/src/http_client/client.rs::function::apply_mitm_certificate",
|
| 100 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 101 |
+
"kind": "function_item",
|
| 102 |
+
"status": "modified",
|
| 103 |
+
"code_changed": false,
|
| 104 |
+
"imports_changed": true,
|
| 105 |
+
"before_code": "fn apply_mitm_certificate(\n mut client_builder: reqwest::ClientBuilder,\n proxy_config: &Proxy,\n) -> reqwest::ClientBuilder {\n if let Some(mitm_ca_cert) = &proxy_config.mitm_ca_certificate {\n let pem = mitm_ca_cert.clone().expose().replace(\"\\\\r\\\\n\", \"\\n\");\n match reqwest::Certificate::from_pem(pem.as_bytes()) {\n Ok(cert) => {\n logger::debug!(\"Successfully added MITM CA certificate\");\n client_builder = client_builder.add_root_certificate(cert);\n }\n Err(err) => {\n logger::error!(\n \"Failed to parse MITM CA certificate: {}, continuing without MITM support\",\n err\n );\n }\n }\n }\n client_builder\n}",
|
| 106 |
+
"after_code": "fn apply_mitm_certificate(\n mut client_builder: reqwest::ClientBuilder,\n proxy_config: &Proxy,\n) -> reqwest::ClientBuilder {\n if let Some(mitm_ca_cert) = &proxy_config.mitm_ca_certificate {\n let pem = mitm_ca_cert.clone().expose().replace(\"\\\\r\\\\n\", \"\\n\");\n match reqwest::Certificate::from_pem(pem.as_bytes()) {\n Ok(cert) => {\n logger::debug!(\"Successfully added MITM CA certificate\");\n client_builder = client_builder.add_root_certificate(cert);\n }\n Err(err) => {\n logger::error!(\n \"Failed to parse MITM CA certificate: {}, continuing without MITM support\",\n err\n );\n }\n }\n }\n client_builder\n}",
|
| 107 |
+
"diff_span": {
|
| 108 |
+
"before": "",
|
| 109 |
+
"after": ""
|
| 110 |
+
},
|
| 111 |
+
"commit_sha": "cd64e30723e1a07b4725e3bfdfe7c3ad5cad5dbb",
|
| 112 |
+
"before_imports": [
|
| 113 |
+
"use router_env::{logger, metric_attributes};"
|
| 114 |
+
],
|
| 115 |
+
"after_imports": [
|
| 116 |
+
"use router_env::logger;"
|
| 117 |
+
]
|
| 118 |
+
},
|
| 119 |
+
{
|
| 120 |
+
"id": "crates/external_services/src/http_client/client.rs::impl::Proxy",
|
| 121 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 122 |
+
"kind": "impl_item",
|
| 123 |
+
"status": "modified",
|
| 124 |
+
"code_changed": true,
|
| 125 |
+
"imports_changed": true,
|
| 126 |
+
"before_code": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n Some(format!(\n \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"),\n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }\n\n fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some() || self.mitm_ca_certificate.is_some()\n }\n}",
|
| 127 |
+
"after_code": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n\n logger::debug!(\n \"Generating cache key for proxy config: {:?}\",\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some()\n )\n );\n\n let mut hasher = DefaultHasher::new();\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some(),\n )\n .hash(&mut hasher);\n\n let cache_key = format!(\"proxy_{:x}\", hasher.finish());\n logger::debug!(\"Generated cache key: {}\", cache_key);\n\n Some(cache_key)\n }\n\n fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some() || self.mitm_ca_certificate.is_some()\n }\n}",
|
| 128 |
+
"diff_span": {
|
| 129 |
+
"before": " return None;\n }\n Some(format!(\n \"http:{}_https:{}_bypass:{}_timeout:{}_mitm:{}\",\n self.http_url.as_deref().unwrap_or(\"\"),\n self.https_url.as_deref().unwrap_or(\"\"),\n self.bypass_proxy_hosts.as_deref().unwrap_or(\"\"),\n self.idle_pool_connection_timeout.unwrap_or_default(),\n self.mitm_ca_certificate.is_some()\n ))\n }\n",
|
| 130 |
+
"after": " return None;\n }\n\n logger::debug!(\n \"Generating cache key for proxy config: {:?}\",\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some()\n )\n );\n\n let mut hasher = DefaultHasher::new();\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some(),\n )\n .hash(&mut hasher);\n\n let cache_key = format!(\"proxy_{:x}\", hasher.finish());\n logger::debug!(\"Generated cache key: {}\", cache_key);\n\n Some(cache_key)\n }\n"
|
| 131 |
+
},
|
| 132 |
+
"commit_sha": "cd64e30723e1a07b4725e3bfdfe7c3ad5cad5dbb",
|
| 133 |
+
"before_imports": [],
|
| 134 |
+
"after_imports": [
|
| 135 |
+
"use router_env::logger;"
|
| 136 |
+
]
|
| 137 |
+
},
|
| 138 |
+
{
|
| 139 |
+
"id": "crates/external_services/src/http_client/client.rs::function::extract_proxy_host",
|
| 140 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 141 |
+
"kind": "function_item",
|
| 142 |
+
"status": "removed",
|
| 143 |
+
"before_code": "fn extract_proxy_host(url_opt: &Option<String>) -> String {\n url_opt\n .as_ref()\n .and_then(|url| url::Url::parse(url).ok())\n .and_then(|parsed_url| parsed_url.host_str().map(|s| s.to_string()))\n .unwrap_or_else(|| \"none\".to_string())\n}",
|
| 144 |
+
"after_code": null,
|
| 145 |
+
"diff_span": null,
|
| 146 |
+
"commit_sha": "cd64e30723e1a07b4725e3bfdfe7c3ad5cad5dbb"
|
| 147 |
+
}
|
| 148 |
+
]
|
| 149 |
+
}
|
diffs/pr_10164/d5b75af/diff.json
ADDED
|
@@ -0,0 +1,126 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "d5b75af4b0cda129747d925a7c4afd55a344f109",
|
| 3 |
+
"pr_number": 10164,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/external_services/src/http_client/client.rs",
|
| 6 |
+
"crates/external_services/src/http_client/metrics.rs",
|
| 7 |
+
"crates/masking/src/secret.rs"
|
| 8 |
+
],
|
| 9 |
+
"diffs": [
|
| 10 |
+
{
|
| 11 |
+
"id": "crates/external_services/src/http_client/client.rs::Proxy::function::cache_key",
|
| 12 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 13 |
+
"kind": "function_item",
|
| 14 |
+
"status": "modified",
|
| 15 |
+
"code_changed": true,
|
| 16 |
+
"imports_changed": false,
|
| 17 |
+
"before_code": "fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n\n logger::debug!(\n \"Generating cache key for proxy config: {:?}\",\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some()\n )\n );\n\n let mut hasher = DefaultHasher::new();\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some(),\n )\n .hash(&mut hasher);\n\n let cache_key = format!(\"proxy_{:x}\", hasher.finish());\n logger::debug!(\"Generated cache key: {}\", cache_key);\n\n Some(cache_key)\n }",
|
| 18 |
+
"after_code": "fn cache_key(&self) -> Option<Proxy> {\n if self.has_proxy_config() {\n logger::debug!(\"Using proxy config as cache key: {:?}\", self);\n\n // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Proxy {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),\n bypass_proxy_hosts: self.bypass_proxy_hosts.clone(),\n mitm_ca_certificate: self.mitm_ca_certificate.clone(),\n idle_pool_connection_timeout: None, // Exclude timeout from cache key\n mitm_enabled: self.mitm_enabled,\n })\n } else {\n None\n }\n }",
|
| 19 |
+
"diff_span": {
|
| 20 |
+
"before": "fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n\n logger::debug!(\n \"Generating cache key for proxy config: {:?}\",\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some()\n )\n );\n\n let mut hasher = DefaultHasher::new();\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some(),\n )\n .hash(&mut hasher);\n\n let cache_key = format!(\"proxy_{:x}\", hasher.finish());\n logger::debug!(\"Generated cache key: {}\", cache_key);\n\n Some(cache_key)\n }",
|
| 21 |
+
"after": "fn cache_key(&self) -> Option<Proxy> {\n if self.has_proxy_config() {\n logger::debug!(\"Using proxy config as cache key: {:?}\", self);\n\n // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Proxy {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),\n bypass_proxy_hosts: self.bypass_proxy_hosts.clone(),\n mitm_ca_certificate: self.mitm_ca_certificate.clone(),\n idle_pool_connection_timeout: None, // Exclude timeout from cache key\n mitm_enabled: self.mitm_enabled,\n })\n } else {\n None\n }\n }"
|
| 22 |
+
},
|
| 23 |
+
"commit_sha": "d5b75af4b0cda129747d925a7c4afd55a344f109"
|
| 24 |
+
},
|
| 25 |
+
{
|
| 26 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_base_client",
|
| 27 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 28 |
+
"kind": "function_item",
|
| 29 |
+
"status": "modified",
|
| 30 |
+
"code_changed": true,
|
| 31 |
+
"imports_changed": false,
|
| 32 |
+
"before_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n let client = if let Some(cached_client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n // Create new proxy client if not in cache\n logger::info!(\n \"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\",\n cache_key,\n proxy_config.http_url,\n proxy_config.https_url\n );\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n cache_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client with key: {}\", cache_key);\n new_client\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 33 |
+
"after_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = if let Some(cached_client) = cache.read().unwrap().get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n new_client\n }\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 34 |
+
"diff_span": {
|
| 35 |
+
"before": " // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\"Using proxy-specific client cache with key: {}\", cache_key);\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n // Use proxy-specific client cache\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| Mutex::new(HashMap::new()));\n let mut cache_lock = cache.lock().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache lock\")\n })?;\n\n let client = if let Some(cached_client) = cache_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for key: {}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n // Create new proxy client if not in cache\n logger::info!(\n \"Creating new proxy client for key: {} (http_proxy: {:?}, https_proxy: {:?})\",\n cache_key,\n proxy_config.http_url,\n proxy_config.https_url\n );\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n cache_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client with key: {}\", cache_key);\n new_client\n };\n",
|
| 36 |
+
"after": " // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = if let Some(cached_client) = cache.read().unwrap().get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n new_client\n }\n };\n"
|
| 37 |
+
},
|
| 38 |
+
"commit_sha": "d5b75af4b0cda129747d925a7c4afd55a344f109"
|
| 39 |
+
},
|
| 40 |
+
{
|
| 41 |
+
"id": "crates/external_services/src/http_client/client.rs::trait::ProxyClientCacheKey",
|
| 42 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 43 |
+
"kind": "trait_item",
|
| 44 |
+
"status": "modified",
|
| 45 |
+
"code_changed": true,
|
| 46 |
+
"imports_changed": false,
|
| 47 |
+
"before_code": "trait ProxyClientCacheKey {\n fn cache_key(&self) -> Option<String>;\n fn has_proxy_config(&self) -> bool;\n}",
|
| 48 |
+
"after_code": "trait ProxyClientCacheKey {\n fn cache_key(&self) -> Option<Proxy>;\n}",
|
| 49 |
+
"diff_span": {
|
| 50 |
+
"before": "trait ProxyClientCacheKey {\n fn cache_key(&self) -> Option<String>;\n fn has_proxy_config(&self) -> bool;\n}",
|
| 51 |
+
"after": "trait ProxyClientCacheKey {\n fn cache_key(&self) -> Option<Proxy>;\n}"
|
| 52 |
+
},
|
| 53 |
+
"commit_sha": "d5b75af4b0cda129747d925a7c4afd55a344f109"
|
| 54 |
+
},
|
| 55 |
+
{
|
| 56 |
+
"id": "crates/external_services/src/http_client/client.rs::impl::Proxy",
|
| 57 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 58 |
+
"kind": "impl_item",
|
| 59 |
+
"status": "modified",
|
| 60 |
+
"code_changed": true,
|
| 61 |
+
"imports_changed": false,
|
| 62 |
+
"before_code": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n\n logger::debug!(\n \"Generating cache key for proxy config: {:?}\",\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some()\n )\n );\n\n let mut hasher = DefaultHasher::new();\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some(),\n )\n .hash(&mut hasher);\n\n let cache_key = format!(\"proxy_{:x}\", hasher.finish());\n logger::debug!(\"Generated cache key: {}\", cache_key);\n\n Some(cache_key)\n }\n\n fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some() || self.mitm_ca_certificate.is_some()\n }\n}",
|
| 63 |
+
"after_code": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<Proxy> {\n if self.has_proxy_config() {\n logger::debug!(\"Using proxy config as cache key: {:?}\", self);\n\n // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Proxy {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),\n bypass_proxy_hosts: self.bypass_proxy_hosts.clone(),\n mitm_ca_certificate: self.mitm_ca_certificate.clone(),\n idle_pool_connection_timeout: None, // Exclude timeout from cache key\n mitm_enabled: self.mitm_enabled,\n })\n } else {\n None\n }\n }\n}",
|
| 64 |
+
"diff_span": {
|
| 65 |
+
"before": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<String> {\n if !self.has_proxy_config() {\n return None;\n }\n\n logger::debug!(\n \"Generating cache key for proxy config: {:?}\",\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some()\n )\n );\n\n let mut hasher = DefaultHasher::new();\n (\n &self.http_url,\n &self.https_url,\n &self.bypass_proxy_hosts,\n self.mitm_ca_certificate.is_some(),\n )\n .hash(&mut hasher);\n\n let cache_key = format!(\"proxy_{:x}\", hasher.finish());\n logger::debug!(\"Generated cache key: {}\", cache_key);\n\n Some(cache_key)\n }\n\n fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some() || self.mitm_ca_certificate.is_some()\n }\n}",
|
| 66 |
+
"after": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<Proxy> {\n if self.has_proxy_config() {\n logger::debug!(\"Using proxy config as cache key: {:?}\", self);\n\n // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Proxy {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),\n bypass_proxy_hosts: self.bypass_proxy_hosts.clone(),\n mitm_ca_certificate: self.mitm_ca_certificate.clone(),\n idle_pool_connection_timeout: None, // Exclude timeout from cache key\n mitm_enabled: self.mitm_enabled,\n })\n } else {\n None\n }\n }"
|
| 67 |
+
},
|
| 68 |
+
"commit_sha": "d5b75af4b0cda129747d925a7c4afd55a344f109"
|
| 69 |
+
},
|
| 70 |
+
{
|
| 71 |
+
"id": "crates/external_services/src/http_client/client.rs::static::PROXY_CLIENT_CACHE",
|
| 72 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 73 |
+
"kind": "static_item",
|
| 74 |
+
"status": "modified",
|
| 75 |
+
"code_changed": true,
|
| 76 |
+
"imports_changed": false,
|
| 77 |
+
"before_code": "static PROXY_CLIENT_CACHE: OnceCell<Mutex<HashMap<String, reqwest::Client>>> = OnceCell::new();",
|
| 78 |
+
"after_code": "static PROXY_CLIENT_CACHE: OnceCell<RwLock<HashMap<Proxy, reqwest::Client>>> = OnceCell::new();",
|
| 79 |
+
"diff_span": {
|
| 80 |
+
"before": "static PROXY_CLIENT_CACHE: OnceCell<Mutex<HashMap<String, reqwest::Client>>> = OnceCell::new();",
|
| 81 |
+
"after": "static PROXY_CLIENT_CACHE: OnceCell<RwLock<HashMap<Proxy, reqwest::Client>>> = OnceCell::new();"
|
| 82 |
+
},
|
| 83 |
+
"commit_sha": "d5b75af4b0cda129747d925a7c4afd55a344f109"
|
| 84 |
+
},
|
| 85 |
+
{
|
| 86 |
+
"id": "crates/masking/src/secret.rs::hash_tests::function::test_secret_hash_implementation",
|
| 87 |
+
"file": "crates/masking/src/secret.rs",
|
| 88 |
+
"kind": "function_item",
|
| 89 |
+
"status": "added",
|
| 90 |
+
"before_code": null,
|
| 91 |
+
"after_code": "fn test_secret_hash_implementation() {\n let secret1: Secret<String> = Secret::new(\"test_string\".to_string());\n let secret2: Secret<String> = Secret::new(\"test_string\".to_string());\n let secret3: Secret<String> = Secret::new(\"different_string\".to_string());\n\n // Test that equal secrets hash to the same value\n let mut hasher1 = DefaultHasher::new();\n let mut hasher2 = DefaultHasher::new();\n secret1.hash(&mut hasher1);\n secret2.hash(&mut hasher2);\n assert_eq!(hasher1.finish(), hasher2.finish());\n\n // Test that different secrets hash to different values (usually)\n let mut hasher3 = DefaultHasher::new();\n secret3.hash(&mut hasher3);\n assert_ne!(hasher1.finish(), hasher3.finish());\n }",
|
| 92 |
+
"diff_span": null,
|
| 93 |
+
"commit_sha": "d5b75af4b0cda129747d925a7c4afd55a344f109"
|
| 94 |
+
},
|
| 95 |
+
{
|
| 96 |
+
"id": "crates/masking/src/secret.rs::Secret<SecretValue, MaskingStrategy>::function::hash",
|
| 97 |
+
"file": "crates/masking/src/secret.rs",
|
| 98 |
+
"kind": "function_item",
|
| 99 |
+
"status": "added",
|
| 100 |
+
"before_code": null,
|
| 101 |
+
"after_code": "fn hash<H: std::hash::Hasher>(&self, state: &mut H) {\n self.peek().hash(state);\n }",
|
| 102 |
+
"diff_span": null,
|
| 103 |
+
"commit_sha": "d5b75af4b0cda129747d925a7c4afd55a344f109"
|
| 104 |
+
},
|
| 105 |
+
{
|
| 106 |
+
"id": "crates/masking/src/secret.rs::mod::hash_tests",
|
| 107 |
+
"file": "crates/masking/src/secret.rs",
|
| 108 |
+
"kind": "mod_item",
|
| 109 |
+
"status": "added",
|
| 110 |
+
"before_code": null,
|
| 111 |
+
"after_code": "mod hash_tests {\n use std::hash::{DefaultHasher, Hash, Hasher};\n\n use super::*;\n\n #[test]\n fn test_secret_hash_implementation() {\n let secret1: Secret<String> = Secret::new(\"test_string\".to_string());\n let secret2: Secret<String> = Secret::new(\"test_string\".to_string());\n let secret3: Secret<String> = Secret::new(\"different_string\".to_string());\n\n // Test that equal secrets hash to the same value\n let mut hasher1 = DefaultHasher::new();\n let mut hasher2 = DefaultHasher::new();\n secret1.hash(&mut hasher1);\n secret2.hash(&mut hasher2);\n assert_eq!(hasher1.finish(), hasher2.finish());\n\n // Test that different secrets hash to different values (usually)\n let mut hasher3 = DefaultHasher::new();\n secret3.hash(&mut hasher3);\n assert_ne!(hasher1.finish(), hasher3.finish());\n }\n}",
|
| 112 |
+
"diff_span": null,
|
| 113 |
+
"commit_sha": "d5b75af4b0cda129747d925a7c4afd55a344f109"
|
| 114 |
+
},
|
| 115 |
+
{
|
| 116 |
+
"id": "crates/external_services/src/http_client/client.rs::Proxy::function::has_proxy_config",
|
| 117 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 118 |
+
"kind": "function_item",
|
| 119 |
+
"status": "removed",
|
| 120 |
+
"before_code": "fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some() || self.mitm_ca_certificate.is_some()\n }",
|
| 121 |
+
"after_code": null,
|
| 122 |
+
"diff_span": null,
|
| 123 |
+
"commit_sha": "d5b75af4b0cda129747d925a7c4afd55a344f109"
|
| 124 |
+
}
|
| 125 |
+
]
|
| 126 |
+
}
|
diffs/pr_10164/e6a0a11/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "e6a0a1125f2756397826d1070135003a9b345b38",
|
| 3 |
+
"pr_number": 10164,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/external_services/src/http_client/client.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_or_create_proxy_client",
|
| 10 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn get_or_create_proxy_client(\n cache: &RwLock<HashMap<Proxy, reqwest::Client>>,\n cache_key: Proxy,\n proxy_config: &Proxy,\n metrics_tag: &[router_env::opentelemetry::KeyValue],\n) -> CustomResult<reqwest::Client, HttpClientError> {\n let read_result = cache.read().ok().and_then(|read_lock| read_lock.get(&cache_key).cloned());\n \n let client = match read_result {\n Some(cached_client) => {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client\n }\n None => {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n match write_lock.get(&cache_key) {\n Some(cached_client) => {\n logger::debug!(\"Retrieved cached proxy client after write lock for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n }\n None => {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n new_client\n }\n }\n }\n };\n\n Ok(client)\n}",
|
| 16 |
+
"after_code": "fn get_or_create_proxy_client(\n cache: &RwLock<HashMap<Proxy, reqwest::Client>>,\n cache_key: Proxy,\n proxy_config: &Proxy,\n metrics_tag: &[router_env::opentelemetry::KeyValue],\n) -> CustomResult<reqwest::Client, HttpClientError> {\n let read_result = cache\n .read()\n .ok()\n .and_then(|read_lock| read_lock.get(&cache_key).cloned());\n\n let client = match read_result {\n Some(cached_client) => {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client\n }\n None => {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n match write_lock.get(&cache_key) {\n Some(cached_client) => {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n }\n None => {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n new_client\n }\n }\n }\n };\n\n Ok(client)\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " metrics_tag: &[router_env::opentelemetry::KeyValue],\n) -> CustomResult<reqwest::Client, HttpClientError> {\n let read_result = cache.read().ok().and_then(|read_lock| read_lock.get(&cache_key).cloned());\n \n let client = match read_result {\n Some(cached_client) => {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client\n }\n None => {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n match write_lock.get(&cache_key) {\n Some(cached_client) => {\n logger::debug!(\"Retrieved cached proxy client after write lock for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n }\n None => {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client = apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);",
|
| 19 |
+
"after": " metrics_tag: &[router_env::opentelemetry::KeyValue],\n) -> CustomResult<reqwest::Client, HttpClientError> {\n let read_result = cache\n .read()\n .ok()\n .and_then(|read_lock| read_lock.get(&cache_key).cloned());\n\n let client = match read_result {\n Some(cached_client) => {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client\n }\n None => {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n match write_lock.get(&cache_key) {\n Some(cached_client) => {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n }\n None => {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "e6a0a1125f2756397826d1070135003a9b345b38"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_base_client",
|
| 25 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = get_or_create_proxy_client(cache, cache_key, proxy_config, metrics_tag)?;\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 31 |
+
"after_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n\n let client = get_or_create_proxy_client(cache, cache_key, proxy_config, metrics_tag)?;\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": "\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = get_or_create_proxy_client(cache, cache_key, proxy_config, metrics_tag)?;\n",
|
| 34 |
+
"after": "\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n\n let client = get_or_create_proxy_client(cache, cache_key, proxy_config, metrics_tag)?;\n"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "e6a0a1125f2756397826d1070135003a9b345b38"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_10164/f2aab46/diff.json
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "f2aab461db3a667cb9be357a45f3f0515792e846",
|
| 3 |
+
"pr_number": 10164,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/external_services/src/http_client/client.rs",
|
| 6 |
+
"crates/external_services/src/http_client/metrics.rs",
|
| 7 |
+
"crates/masking/src/secret.rs"
|
| 8 |
+
],
|
| 9 |
+
"diffs": [
|
| 10 |
+
{
|
| 11 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_base_client",
|
| 12 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 13 |
+
"kind": "function_item",
|
| 14 |
+
"status": "modified",
|
| 15 |
+
"code_changed": true,
|
| 16 |
+
"imports_changed": false,
|
| 17 |
+
"before_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = if let Some(cached_client) = cache.read().unwrap().get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n new_client\n }\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 18 |
+
"after_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n\n let client = if let Some(cached_client) = cache.read().unwrap().get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n new_client\n }\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 19 |
+
"diff_span": {
|
| 20 |
+
"before": "\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = if let Some(cached_client) = cache.read().unwrap().get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);",
|
| 21 |
+
"after": "\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n\n let client = if let Some(cached_client) = cache.read().unwrap().get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);"
|
| 22 |
+
},
|
| 23 |
+
"commit_sha": "f2aab461db3a667cb9be357a45f3f0515792e846"
|
| 24 |
+
}
|
| 25 |
+
]
|
| 26 |
+
}
|
diffs/pr_10164/f6cf43a/diff.json
ADDED
|
@@ -0,0 +1,90 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "f6cf43a3fc4c68b826c823cf167cc385fe7e6f5c",
|
| 3 |
+
"pr_number": 10164,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/external_services/src/http_client/client.rs",
|
| 6 |
+
"crates/hyperswitch_interfaces/src/types.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/external_services/src/http_client/client.rs::function::get_base_client",
|
| 11 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n\n let client = if let Some(cached_client) = cache.read().unwrap().get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n new_client\n }\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 17 |
+
"after_code": "fn get_base_client(proxy_config: &Proxy) -> CustomResult<reqwest::Client, HttpClientError> {\n // Check if proxy configuration is provided using trait method\n if let Some(cache_key) = proxy_config.cache_key() {\n logger::debug!(\n \"Using proxy-specific client cache with key: {:?}\",\n cache_key\n );\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"proxy\"));\n\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = if let Ok(read_lock) = cache.read() {\n if let Some(cached_client) = read_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n drop(read_lock);\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n }\n } else {\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n };\n\n Ok(client)\n } else {\n logger::debug!(\"No proxy configuration detected, using DEFAULT_CLIENT\");\n\n let metrics_tag = router_env::metric_attributes!((\"client_type\", \"default\"));\n\n // Use DEFAULT_CLIENT for non-proxy scenarios\n let client = DEFAULT_CLIENT\n .get_or_try_init(|| {\n logger::info!(\"Initializing DEFAULT_CLIENT (no proxy configuration)\");\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct default client\")\n })?\n .clone();\n\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(client)\n }\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": "\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n\n let client = if let Some(cached_client) = cache.read().unwrap().get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\n \"Retrieved cached proxy client after write lock for config: {:?}\",\n cache_key\n );\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n\n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n new_client\n }\n };",
|
| 20 |
+
"after": "\n let cache = PROXY_CLIENT_CACHE.get_or_init(|| RwLock::new(HashMap::new()));\n \n let client = if let Ok(read_lock) = cache.read() {\n if let Some(cached_client) = read_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n cached_client.clone()\n } else {\n drop(read_lock);\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n }\n } else {\n create_new_proxy_client(cache, cache_key, proxy_config, metrics_tag)?\n };\n"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "f6cf43a3fc4c68b826c823cf167cc385fe7e6f5c"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/hyperswitch_interfaces/src/types.rs::impl::Proxy",
|
| 26 |
+
"file": "crates/hyperswitch_interfaces/src/types.rs",
|
| 27 |
+
"kind": "impl_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "impl Default for Proxy {\n fn default() -> Self {\n Self {\n http_url: Default::default(),\n https_url: Default::default(),\n idle_pool_connection_timeout: Some(90),\n bypass_proxy_hosts: Default::default(),\n mitm_ca_certificate: None,\n mitm_enabled: None,\n }\n }\n}",
|
| 32 |
+
"after_code": "impl Proxy {\n /// Check if any proxy configuration is present\n pub fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some()\n }\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": "impl Default for Proxy {\n fn default() -> Self {\n Self {\n http_url: Default::default(),\n https_url: Default::default(),\n idle_pool_connection_timeout: Some(90),\n bypass_proxy_hosts: Default::default(),\n mitm_ca_certificate: None,\n mitm_enabled: None,\n }\n }\n}",
|
| 35 |
+
"after": "impl Proxy {\n /// Check if any proxy configuration is present\n pub fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some()\n }\n}"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "f6cf43a3fc4c68b826c823cf167cc385fe7e6f5c"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/external_services/src/http_client/client.rs::Proxy::function::cache_key",
|
| 41 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "fn cache_key(&self) -> Option<Proxy> {\n if self.has_proxy_config() {\n logger::debug!(\"Using proxy config as cache key: {:?}\", self);\n\n // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Proxy {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),\n bypass_proxy_hosts: self.bypass_proxy_hosts.clone(),\n mitm_ca_certificate: self.mitm_ca_certificate.clone(),\n idle_pool_connection_timeout: None, // Exclude timeout from cache key\n mitm_enabled: self.mitm_enabled,\n })\n } else {\n None\n }\n }",
|
| 47 |
+
"after_code": "fn cache_key(&self) -> Option<Proxy> {\n if self.has_proxy_config() {\n logger::debug!(\"Using proxy config as cache key: {:?}\", self);\n\n // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Self {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),\n bypass_proxy_hosts: self.bypass_proxy_hosts.clone(),\n mitm_ca_certificate: self.mitm_ca_certificate.clone(),\n idle_pool_connection_timeout: None, // Exclude timeout from cache key\n mitm_enabled: self.mitm_enabled,\n })\n } else {\n None\n }\n }",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Proxy {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),",
|
| 50 |
+
"after": " // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Self {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "f6cf43a3fc4c68b826c823cf167cc385fe7e6f5c"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/external_services/src/http_client/client.rs::impl::Proxy",
|
| 56 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 57 |
+
"kind": "impl_item",
|
| 58 |
+
"status": "modified",
|
| 59 |
+
"code_changed": true,
|
| 60 |
+
"imports_changed": false,
|
| 61 |
+
"before_code": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<Proxy> {\n if self.has_proxy_config() {\n logger::debug!(\"Using proxy config as cache key: {:?}\", self);\n\n // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Proxy {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),\n bypass_proxy_hosts: self.bypass_proxy_hosts.clone(),\n mitm_ca_certificate: self.mitm_ca_certificate.clone(),\n idle_pool_connection_timeout: None, // Exclude timeout from cache key\n mitm_enabled: self.mitm_enabled,\n })\n } else {\n None\n }\n }\n}",
|
| 62 |
+
"after_code": "impl ProxyClientCacheKey for Proxy {\n fn cache_key(&self) -> Option<Proxy> {\n if self.has_proxy_config() {\n logger::debug!(\"Using proxy config as cache key: {:?}\", self);\n\n // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Self {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),\n bypass_proxy_hosts: self.bypass_proxy_hosts.clone(),\n mitm_ca_certificate: self.mitm_ca_certificate.clone(),\n idle_pool_connection_timeout: None, // Exclude timeout from cache key\n mitm_enabled: self.mitm_enabled,\n })\n } else {\n None\n }\n }\n}",
|
| 63 |
+
"diff_span": {
|
| 64 |
+
"before": " // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Proxy {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),",
|
| 65 |
+
"after": " // Return a clone of the proxy config for caching\n // Exclude timeout from cache key by creating a normalized version\n Some(Self {\n http_url: self.http_url.clone(),\n https_url: self.https_url.clone(),"
|
| 66 |
+
},
|
| 67 |
+
"commit_sha": "f6cf43a3fc4c68b826c823cf167cc385fe7e6f5c"
|
| 68 |
+
},
|
| 69 |
+
{
|
| 70 |
+
"id": "crates/hyperswitch_interfaces/src/types.rs::Proxy::function::has_proxy_config",
|
| 71 |
+
"file": "crates/hyperswitch_interfaces/src/types.rs",
|
| 72 |
+
"kind": "function_item",
|
| 73 |
+
"status": "added",
|
| 74 |
+
"before_code": null,
|
| 75 |
+
"after_code": "pub fn has_proxy_config(&self) -> bool {\n self.http_url.is_some() || self.https_url.is_some()\n }",
|
| 76 |
+
"diff_span": null,
|
| 77 |
+
"commit_sha": "f6cf43a3fc4c68b826c823cf167cc385fe7e6f5c"
|
| 78 |
+
},
|
| 79 |
+
{
|
| 80 |
+
"id": "crates/external_services/src/http_client/client.rs::function::create_new_proxy_client",
|
| 81 |
+
"file": "crates/external_services/src/http_client/client.rs",
|
| 82 |
+
"kind": "function_item",
|
| 83 |
+
"status": "added",
|
| 84 |
+
"before_code": null,
|
| 85 |
+
"after_code": "fn create_new_proxy_client(\n cache: &RwLock<HashMap<Proxy, reqwest::Client>>,\n cache_key: Proxy,\n proxy_config: &Proxy,\n metrics_tag: &[router_env::opentelemetry::KeyValue],\n) -> CustomResult<reqwest::Client, HttpClientError> {\n let mut write_lock = cache.try_write().map_err(|_| {\n error_stack::Report::new(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to acquire proxy client cache write lock\")\n })?;\n\n if let Some(cached_client) = write_lock.get(&cache_key) {\n logger::debug!(\"Retrieved cached proxy client after write lock for config: {:?}\", cache_key);\n metrics::HTTP_CLIENT_CACHE_HIT.add(1, metrics_tag);\n Ok(cached_client.clone())\n } else {\n logger::info!(\"Creating new proxy client for config: {:?}\", cache_key);\n \n metrics::HTTP_CLIENT_CACHE_MISS.add(1, metrics_tag);\n\n let new_client =\n apply_mitm_certificate(get_client_builder(proxy_config)?, proxy_config)\n .build()\n .change_context(HttpClientError::ClientConstructionFailed)\n .attach_printable(\"Failed to construct proxy client\")?;\n\n metrics::HTTP_CLIENT_CREATED.add(1, metrics_tag);\n\n write_lock.insert(cache_key.clone(), new_client.clone());\n logger::debug!(\"Cached new proxy client for config: {:?}\", cache_key);\n Ok(new_client)\n }\n}",
|
| 86 |
+
"diff_span": null,
|
| 87 |
+
"commit_sha": "f6cf43a3fc4c68b826c823cf167cc385fe7e6f5c"
|
| 88 |
+
}
|
| 89 |
+
]
|
| 90 |
+
}
|
diffs/pr_10170/0decc8d/diff.json
ADDED
|
@@ -0,0 +1,115 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "0decc8d7799991008d204a74654eb9d53c28a28d",
|
| 3 |
+
"pr_number": 10170,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 6 |
+
"crates/router/src/types/payment_methods.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::get_network_token",
|
| 11 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "pub async fn get_network_token(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_ref_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::TokenResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.fetch_token_url.as_str(),\n );\n let payload = pm_types::GetCardToken {\n card_reference: network_token_requestor_ref_id,\n customer_id: customer_id.clone(),\n };\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to fetch network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"get network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })?;\n\n let token_response: pm_types::TokenResponse = res\n .response\n .parse_struct(\"Get Network Token Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::info!(\"Fetch Network Token Response: {:?}\", token_response);\n\n Ok(token_response)\n}",
|
| 17 |
+
"after_code": "pub async fn get_network_token(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_ref_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::TokenResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.fetch_token_url.as_str(),\n );\n let payload = pm_types::GetCardToken {\n card_reference: network_token_requestor_ref_id,\n customer_id: customer_id.clone(),\n };\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to fetch network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"get network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })?;\n\n let token_response: pm_types::TokenResponse = res\n .response\n .parse_struct(\"Get Network Token Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::info!(\"Fetch Network Token Response: {:?}\", token_response);\n\n Ok(token_response)\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {}\",\n parsed_error.error_message\n );",
|
| 20 |
+
"after": " error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "0decc8d7799991008d204a74654eb9d53c28a28d"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::mk_tokenization_req",
|
| 26 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 27 |
+
"kind": "function_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "pub async fn mk_tokenization_req(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::CardNetworkTokenResponsePayload, Option<String>),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n key_id,\n should_send_token: true,\n };\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::CardNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), Some(cn_response.card_reference)))\n}",
|
| 32 |
+
"after_code": "pub async fn mk_tokenization_req(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::CardNetworkTokenResponsePayload, Option<String>),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n should_send_token: true,\n };\n let masked_request_body = api_payload.masked_serialize().unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::CardNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), Some(cn_response.card_reference)))\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " card_data: Secret::new(jwt),\n order_data,\n key_id,\n should_send_token: true,\n };\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {}\",\n parsed_error.error_message\n );",
|
| 35 |
+
"after": " should_send_token: true,\n };\n let masked_request_body = api_payload.masked_serialize().unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "0decc8d7799991008d204a74654eb9d53c28a28d"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::generate_network_token",
|
| 41 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "pub async fn generate_network_token(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::GlobalCustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::GenerateNetworkTokenResponsePayload, String),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n key_id,\n should_send_token: true,\n };\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::debug!(\"Network Token Response: {:?}\", network_response);\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::GenerateNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), cn_response.card_reference))\n}",
|
| 47 |
+
"after_code": "pub async fn generate_network_token(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::GlobalCustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::GenerateNetworkTokenResponsePayload, String),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n key_id,\n should_send_token: true,\n };\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::debug!(\"Network Token Response: {:?}\", network_response);\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::GenerateNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), cn_response.card_reference))\n}",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {}\",\n parsed_error.error_message\n );",
|
| 50 |
+
"after": " error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "0decc8d7799991008d204a74654eb9d53c28a28d"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/router/src/types/payment_methods.rs::struct::NetworkTokenErrorResponse",
|
| 56 |
+
"file": "crates/router/src/types/payment_methods.rs",
|
| 57 |
+
"kind": "struct_item",
|
| 58 |
+
"status": "modified",
|
| 59 |
+
"code_changed": true,
|
| 60 |
+
"imports_changed": false,
|
| 61 |
+
"before_code": "pub struct NetworkTokenErrorResponse {\n pub error_message: String,\n pub error_info: NetworkTokenErrorInfo,\n}",
|
| 62 |
+
"after_code": "pub struct NetworkTokenErrorResponse {\n pub error_message: Option<String>,\n pub error_info: NetworkTokenErrorInfo,\n}",
|
| 63 |
+
"diff_span": {
|
| 64 |
+
"before": "pub struct NetworkTokenErrorResponse {\n pub error_message: String,\n pub error_info: NetworkTokenErrorInfo,\n}",
|
| 65 |
+
"after": "pub struct NetworkTokenErrorResponse {\n pub error_message: Option<String>,\n pub error_info: NetworkTokenErrorInfo,\n}"
|
| 66 |
+
},
|
| 67 |
+
"commit_sha": "0decc8d7799991008d204a74654eb9d53c28a28d"
|
| 68 |
+
},
|
| 69 |
+
{
|
| 70 |
+
"id": "crates/router/src/types/payment_methods.rs::struct::ApiPayload",
|
| 71 |
+
"file": "crates/router/src/types/payment_methods.rs",
|
| 72 |
+
"kind": "struct_item",
|
| 73 |
+
"status": "modified",
|
| 74 |
+
"code_changed": true,
|
| 75 |
+
"imports_changed": false,
|
| 76 |
+
"before_code": "pub struct ApiPayload {\n pub service: String,\n pub card_data: Secret<String>, //encrypted card data\n pub order_data: OrderData,\n pub key_id: String,\n pub should_send_token: bool,\n}",
|
| 77 |
+
"after_code": "pub struct ApiPayload {\n pub service: String,\n pub card_data: Secret<String>, //encrypted card data\n pub order_data: OrderData,\n pub should_send_token: bool,\n}",
|
| 78 |
+
"diff_span": {
|
| 79 |
+
"before": " pub card_data: Secret<String>, //encrypted card data\n pub order_data: OrderData,\n pub key_id: String,\n pub should_send_token: bool,\n}",
|
| 80 |
+
"after": ""
|
| 81 |
+
},
|
| 82 |
+
"commit_sha": "0decc8d7799991008d204a74654eb9d53c28a28d"
|
| 83 |
+
},
|
| 84 |
+
{
|
| 85 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::check_token_status_with_tokenization_service",
|
| 86 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 87 |
+
"kind": "function_item",
|
| 88 |
+
"status": "modified",
|
| 89 |
+
"code_changed": true,
|
| 90 |
+
"imports_changed": false,
|
| 91 |
+
"before_code": "pub async fn check_token_status_with_tokenization_service(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_reference_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::CheckTokenStatusResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.check_token_status_url.as_str(),\n );\n let payload = pm_types::CheckTokenStatus {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"Check Network token Status\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Network Tokenization Error Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let check_token_status_response: pm_types::CheckTokenStatusResponse = res\n .response\n .parse_struct(\"CheckTokenStatusResponse\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n Ok(check_token_status_response)\n}",
|
| 92 |
+
"after_code": "pub async fn check_token_status_with_tokenization_service(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_reference_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::CheckTokenStatusResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.check_token_status_url.as_str(),\n );\n let payload = pm_types::CheckTokenStatus {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"Check Network token Status\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Network Tokenization Error Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let check_token_status_response: pm_types::CheckTokenStatusResponse = res\n .response\n .parse_struct(\"CheckTokenStatusResponse\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n Ok(check_token_status_response)\n}",
|
| 93 |
+
"diff_span": {
|
| 94 |
+
"before": " error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {}\",\n parsed_error.error_message\n );",
|
| 95 |
+
"after": " error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );"
|
| 96 |
+
},
|
| 97 |
+
"commit_sha": "0decc8d7799991008d204a74654eb9d53c28a28d"
|
| 98 |
+
},
|
| 99 |
+
{
|
| 100 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::delete_network_token_from_tokenization_service",
|
| 101 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 102 |
+
"kind": "function_item",
|
| 103 |
+
"status": "modified",
|
| 104 |
+
"code_changed": true,
|
| 105 |
+
"imports_changed": false,
|
| 106 |
+
"before_code": "pub async fn delete_network_token_from_tokenization_service(\n state: &routes::SessionState,\n network_token_requestor_reference_id: String,\n customer_id: &id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<bool, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.delete_token_url.as_str(),\n );\n let payload = pm_types::DeleteCardToken {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to delete network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"delete network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let delete_token_response: pm_types::DeleteNetworkTokenResponse = res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n logger::info!(\"Delete Network Token Response: {:?}\", delete_token_response);\n\n if delete_token_response.status == pm_types::DeleteNetworkTokenStatus::Success {\n Ok(true)\n } else {\n Err(errors::NetworkTokenizationError::DeleteNetworkTokenFailed)\n .attach_printable(\"Delete Token at Token service failed\")\n }\n}",
|
| 107 |
+
"after_code": "pub async fn delete_network_token_from_tokenization_service(\n state: &routes::SessionState,\n network_token_requestor_reference_id: String,\n customer_id: &id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<bool, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.delete_token_url.as_str(),\n );\n let payload = pm_types::DeleteCardToken {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to delete network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"delete network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let delete_token_response: pm_types::DeleteNetworkTokenResponse = res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n logger::info!(\"Delete Network Token Response: {:?}\", delete_token_response);\n\n if delete_token_response.status == pm_types::DeleteNetworkTokenStatus::Success {\n Ok(true)\n } else {\n Err(errors::NetworkTokenizationError::DeleteNetworkTokenFailed)\n .attach_printable(\"Delete Token at Token service failed\")\n }\n}",
|
| 108 |
+
"diff_span": {
|
| 109 |
+
"before": " error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {}\",\n parsed_error.error_message\n );",
|
| 110 |
+
"after": " error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );"
|
| 111 |
+
},
|
| 112 |
+
"commit_sha": "0decc8d7799991008d204a74654eb9d53c28a28d"
|
| 113 |
+
}
|
| 114 |
+
]
|
| 115 |
+
}
|
diffs/pr_10170/9dcd2d6/diff.json
ADDED
|
@@ -0,0 +1,69 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "9dcd2d6e220ba1a7f687d5e84ad1415f1928451f",
|
| 3 |
+
"pr_number": 10170,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/payment_methods/network_tokenization.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::check_token_status_with_tokenization_service",
|
| 10 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub async fn check_token_status_with_tokenization_service(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_reference_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::CheckTokenStatusResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.check_token_status_url.as_str(),\n );\n let payload = pm_types::CheckTokenStatus {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"Check Network token Status\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Network Tokenization Error Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let check_token_status_response: pm_types::CheckTokenStatusResponse = res\n .response\n .parse_struct(\"CheckTokenStatusResponse\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n Ok(check_token_status_response)\n}",
|
| 16 |
+
"after_code": "pub async fn check_token_status_with_tokenization_service(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_reference_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::CheckTokenStatusResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.check_token_status_url.as_str(),\n );\n let payload = pm_types::CheckTokenStatus {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"Check Network token Status\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Network Tokenization Error Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let check_token_status_response: pm_types::CheckTokenStatusResponse = res\n .response\n .parse_struct(\"CheckTokenStatusResponse\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n Ok(check_token_status_response)\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "",
|
| 19 |
+
"after": " customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "9dcd2d6e220ba1a7f687d5e84ad1415f1928451f"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::generate_network_token",
|
| 25 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "pub async fn generate_network_token(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::GlobalCustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::GenerateNetworkTokenResponsePayload, String),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n key_id,\n should_send_token: true,\n };\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::debug!(\"Network Token Response: {:?}\", network_response);\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::GenerateNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), cn_response.card_reference))\n}",
|
| 31 |
+
"after_code": "pub async fn generate_network_token(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::GlobalCustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::GenerateNetworkTokenResponsePayload, String),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n should_send_token: true,\n };\n let masked_request_body = api_payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::debug!(\"Network Token Response: {:?}\", network_response);\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::GenerateNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), cn_response.card_reference))\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " card_data: Secret::new(jwt),\n order_data,\n key_id,\n should_send_token: true,\n };",
|
| 34 |
+
"after": " should_send_token: true,\n };\n let masked_request_body = api_payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n let mut request = services::Request::new("
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "9dcd2d6e220ba1a7f687d5e84ad1415f1928451f"
|
| 37 |
+
},
|
| 38 |
+
{
|
| 39 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::delete_network_token_from_tokenization_service",
|
| 40 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 41 |
+
"kind": "function_item",
|
| 42 |
+
"status": "modified",
|
| 43 |
+
"code_changed": true,
|
| 44 |
+
"imports_changed": false,
|
| 45 |
+
"before_code": "pub async fn delete_network_token_from_tokenization_service(\n state: &routes::SessionState,\n network_token_requestor_reference_id: String,\n customer_id: &id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<bool, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.delete_token_url.as_str(),\n );\n let payload = pm_types::DeleteCardToken {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to delete network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"delete network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let delete_token_response: pm_types::DeleteNetworkTokenResponse = res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n logger::info!(\"Delete Network Token Response: {:?}\", delete_token_response);\n\n if delete_token_response.status == pm_types::DeleteNetworkTokenStatus::Success {\n Ok(true)\n } else {\n Err(errors::NetworkTokenizationError::DeleteNetworkTokenFailed)\n .attach_printable(\"Delete Token at Token service failed\")\n }\n}",
|
| 46 |
+
"after_code": "pub async fn delete_network_token_from_tokenization_service(\n state: &routes::SessionState,\n network_token_requestor_reference_id: String,\n customer_id: &id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<bool, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.delete_token_url.as_str(),\n );\n let payload = pm_types::DeleteCardToken {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to delete network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"delete network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let delete_token_response: pm_types::DeleteNetworkTokenResponse = res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n logger::info!(\"Delete Network Token Response: {:?}\", delete_token_response);\n\n if delete_token_response.status == pm_types::DeleteNetworkTokenStatus::Success {\n Ok(true)\n } else {\n Err(errors::NetworkTokenizationError::DeleteNetworkTokenFailed)\n .attach_printable(\"Delete Token at Token service failed\")\n }\n}",
|
| 47 |
+
"diff_span": {
|
| 48 |
+
"before": "",
|
| 49 |
+
"after": " customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());"
|
| 50 |
+
},
|
| 51 |
+
"commit_sha": "9dcd2d6e220ba1a7f687d5e84ad1415f1928451f"
|
| 52 |
+
},
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::get_network_token",
|
| 55 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 56 |
+
"kind": "function_item",
|
| 57 |
+
"status": "modified",
|
| 58 |
+
"code_changed": true,
|
| 59 |
+
"imports_changed": false,
|
| 60 |
+
"before_code": "pub async fn get_network_token(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_ref_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::TokenResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.fetch_token_url.as_str(),\n );\n let payload = pm_types::GetCardToken {\n card_reference: network_token_requestor_ref_id,\n customer_id: customer_id.clone(),\n };\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to fetch network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"get network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })?;\n\n let token_response: pm_types::TokenResponse = res\n .response\n .parse_struct(\"Get Network Token Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::info!(\"Fetch Network Token Response: {:?}\", token_response);\n\n Ok(token_response)\n}",
|
| 61 |
+
"after_code": "pub async fn get_network_token(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_ref_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::TokenResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.fetch_token_url.as_str(),\n );\n let payload = pm_types::GetCardToken {\n card_reference: network_token_requestor_ref_id,\n customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to fetch network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"get network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })?;\n\n let token_response: pm_types::TokenResponse = res\n .response\n .parse_struct(\"Get Network Token Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::info!(\"Fetch Network Token Response: {:?}\", token_response);\n\n Ok(token_response)\n}",
|
| 62 |
+
"diff_span": {
|
| 63 |
+
"before": "",
|
| 64 |
+
"after": " customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());"
|
| 65 |
+
},
|
| 66 |
+
"commit_sha": "9dcd2d6e220ba1a7f687d5e84ad1415f1928451f"
|
| 67 |
+
}
|
| 68 |
+
]
|
| 69 |
+
}
|
diffs/pr_10170/cda385a/diff.json
ADDED
|
@@ -0,0 +1,84 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "cda385a045d5ac41041a8a95f2c9d1f9b1f5cdfb",
|
| 3 |
+
"pr_number": 10170,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/payment_methods/network_tokenization.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::check_token_status_with_tokenization_service",
|
| 10 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub async fn check_token_status_with_tokenization_service(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_reference_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::CheckTokenStatusResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.check_token_status_url.as_str(),\n );\n let payload = pm_types::CheckTokenStatus {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"Check Network token Status\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Network Tokenization Error Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let check_token_status_response: pm_types::CheckTokenStatusResponse = res\n .response\n .parse_struct(\"CheckTokenStatusResponse\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n Ok(check_token_status_response)\n}",
|
| 16 |
+
"after_code": "pub async fn check_token_status_with_tokenization_service(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_reference_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::CheckTokenStatusResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.check_token_status_url.as_str(),\n );\n let payload = pm_types::CheckTokenStatus {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .inspect_err(|e| logger::error!(error=?e, \"failed to mask serialize\"))\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"Check Network token Status\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Network Tokenization Error Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let check_token_status_response: pm_types::CheckTokenStatusResponse = res\n .response\n .parse_struct(\"CheckTokenStatusResponse\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n Ok(check_token_status_response)\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "",
|
| 19 |
+
"after": " let masked_request_body = payload\n .masked_serialize()\n .inspect_err(|e| logger::error!(error=?e, \"failed to mask serialize\"))\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "cda385a045d5ac41041a8a95f2c9d1f9b1f5cdfb"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::generate_network_token",
|
| 25 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "pub async fn generate_network_token(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::GlobalCustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::GenerateNetworkTokenResponsePayload, String),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n should_send_token: true,\n };\n let masked_request_body = api_payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::debug!(\"Network Token Response: {:?}\", network_response);\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::GenerateNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), cn_response.card_reference))\n}",
|
| 31 |
+
"after_code": "pub async fn generate_network_token(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::GlobalCustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::GenerateNetworkTokenResponsePayload, String),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n should_send_token: true,\n };\n let masked_request_body = api_payload\n .masked_serialize()\n .inspect_err(|e| logger::error!(error=?e, \"failed to mask serialize\"))\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::debug!(\"Network Token Response: {:?}\", network_response);\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::GenerateNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), cn_response.card_reference))\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": "",
|
| 34 |
+
"after": " let masked_request_body = api_payload\n .masked_serialize()\n .inspect_err(|e| logger::error!(error=?e, \"failed to mask serialize\"))\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "cda385a045d5ac41041a8a95f2c9d1f9b1f5cdfb"
|
| 37 |
+
},
|
| 38 |
+
{
|
| 39 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::delete_network_token_from_tokenization_service",
|
| 40 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 41 |
+
"kind": "function_item",
|
| 42 |
+
"status": "modified",
|
| 43 |
+
"code_changed": true,
|
| 44 |
+
"imports_changed": false,
|
| 45 |
+
"before_code": "pub async fn delete_network_token_from_tokenization_service(\n state: &routes::SessionState,\n network_token_requestor_reference_id: String,\n customer_id: &id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<bool, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.delete_token_url.as_str(),\n );\n let payload = pm_types::DeleteCardToken {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to delete network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"delete network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let delete_token_response: pm_types::DeleteNetworkTokenResponse = res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n logger::info!(\"Delete Network Token Response: {:?}\", delete_token_response);\n\n if delete_token_response.status == pm_types::DeleteNetworkTokenStatus::Success {\n Ok(true)\n } else {\n Err(errors::NetworkTokenizationError::DeleteNetworkTokenFailed)\n .attach_printable(\"Delete Token at Token service failed\")\n }\n}",
|
| 46 |
+
"after_code": "pub async fn delete_network_token_from_tokenization_service(\n state: &routes::SessionState,\n network_token_requestor_reference_id: String,\n customer_id: &id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<bool, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.delete_token_url.as_str(),\n );\n let payload = pm_types::DeleteCardToken {\n card_reference: network_token_requestor_reference_id,\n customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .inspect_err(|e| logger::error!(error=?e, \"failed to mask serialize\"))\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to delete network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"delete network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let delete_token_response: pm_types::DeleteNetworkTokenResponse = res\n .response\n .parse_struct(\"Delete Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n logger::info!(\"Delete Network Token Response: {:?}\", delete_token_response);\n\n if delete_token_response.status == pm_types::DeleteNetworkTokenStatus::Success {\n Ok(true)\n } else {\n Err(errors::NetworkTokenizationError::DeleteNetworkTokenFailed)\n .attach_printable(\"Delete Token at Token service failed\")\n }\n}",
|
| 47 |
+
"diff_span": {
|
| 48 |
+
"before": "",
|
| 49 |
+
"after": " let masked_request_body = payload\n .masked_serialize()\n .inspect_err(|e| logger::error!(error=?e, \"failed to mask serialize\"))\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);"
|
| 50 |
+
},
|
| 51 |
+
"commit_sha": "cda385a045d5ac41041a8a95f2c9d1f9b1f5cdfb"
|
| 52 |
+
},
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::get_network_token",
|
| 55 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 56 |
+
"kind": "function_item",
|
| 57 |
+
"status": "modified",
|
| 58 |
+
"code_changed": true,
|
| 59 |
+
"imports_changed": false,
|
| 60 |
+
"before_code": "pub async fn get_network_token(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_ref_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::TokenResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.fetch_token_url.as_str(),\n );\n let payload = pm_types::GetCardToken {\n card_reference: network_token_requestor_ref_id,\n customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to fetch network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"get network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })?;\n\n let token_response: pm_types::TokenResponse = res\n .response\n .parse_struct(\"Get Network Token Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::info!(\"Fetch Network Token Response: {:?}\", token_response);\n\n Ok(token_response)\n}",
|
| 61 |
+
"after_code": "pub async fn get_network_token(\n state: &routes::SessionState,\n customer_id: &id_type::GlobalCustomerId,\n network_token_requestor_ref_id: String,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<pm_types::TokenResponse, errors::NetworkTokenizationError> {\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.fetch_token_url.as_str(),\n );\n let payload = pm_types::GetCardToken {\n card_reference: network_token_requestor_ref_id,\n customer_id: customer_id.clone(),\n };\n\n let masked_request_body = payload\n .masked_serialize()\n .inspect_err(|e| logger::error!(error=?e, \"failed to mask serialize\"))\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .clone()\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n request.set_body(RequestContent::Json(Box::new(payload)));\n\n logger::info!(\"Request to fetch network token: {:?}\", request);\n\n // Send the request using `call_connector_api`\n let response = services::call_connector_api(state, request, \"get network token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })?;\n\n let token_response: pm_types::TokenResponse = res\n .response\n .parse_struct(\"Get Network Token Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::info!(\"Fetch Network Token Response: {:?}\", token_response);\n\n Ok(token_response)\n}",
|
| 62 |
+
"diff_span": {
|
| 63 |
+
"before": "",
|
| 64 |
+
"after": " let masked_request_body = payload\n .masked_serialize()\n .inspect_err(|e| logger::error!(error=?e, \"failed to mask serialize\"))\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);"
|
| 65 |
+
},
|
| 66 |
+
"commit_sha": "cda385a045d5ac41041a8a95f2c9d1f9b1f5cdfb"
|
| 67 |
+
},
|
| 68 |
+
{
|
| 69 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::mk_tokenization_req",
|
| 70 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 71 |
+
"kind": "function_item",
|
| 72 |
+
"status": "modified",
|
| 73 |
+
"code_changed": true,
|
| 74 |
+
"imports_changed": false,
|
| 75 |
+
"before_code": "pub async fn mk_tokenization_req(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::CardNetworkTokenResponsePayload, Option<String>),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n should_send_token: true,\n };\n let masked_request_body = api_payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::CardNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), Some(cn_response.card_reference)))\n}",
|
| 76 |
+
"after_code": "pub async fn mk_tokenization_req(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::CardNetworkTokenResponsePayload, Option<String>),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n should_send_token: true,\n };\n let masked_request_body = api_payload\n .masked_serialize()\n .inspect_err(|e| logger::error!(error=?e, \"failed to mask serialize\"))\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::CardNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), Some(cn_response.card_reference)))\n}",
|
| 77 |
+
"diff_span": {
|
| 78 |
+
"before": "",
|
| 79 |
+
"after": " let masked_request_body = api_payload\n .masked_serialize()\n .inspect_err(|e| logger::error!(error=?e, \"failed to mask serialize\"))\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);"
|
| 80 |
+
},
|
| 81 |
+
"commit_sha": "cda385a045d5ac41041a8a95f2c9d1f9b1f5cdfb"
|
| 82 |
+
}
|
| 83 |
+
]
|
| 84 |
+
}
|
diffs/pr_10170/ec7049c/diff.json
ADDED
|
@@ -0,0 +1,67 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "ec7049cd889c5fd8d1030782cca1d0d89273ee24",
|
| 3 |
+
"pr_number": 10170,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/payment_methods/network_tokenization.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::generate_network_token",
|
| 10 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": false,
|
| 14 |
+
"imports_changed": true,
|
| 15 |
+
"before_code": "pub async fn generate_network_token(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::GlobalCustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::GenerateNetworkTokenResponsePayload, String),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n key_id,\n should_send_token: true,\n };\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::debug!(\"Network Token Response: {:?}\", network_response);\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::GenerateNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), cn_response.card_reference))\n}",
|
| 16 |
+
"after_code": "pub async fn generate_network_token(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::GlobalCustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::GenerateNetworkTokenResponsePayload, String),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n key_id,\n should_send_token: true,\n };\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n logger::debug!(\"Network Token Response: {:?}\", network_response);\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::GenerateNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), cn_response.card_reference))\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "",
|
| 19 |
+
"after": ""
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "ec7049cd889c5fd8d1030782cca1d0d89273ee24",
|
| 22 |
+
"before_imports": [
|
| 23 |
+
"use hyperswitch_domain_models::payment_method_data::{\n NetworkTokenDetails, NetworkTokenDetailsPaymentMethod,\n};",
|
| 24 |
+
"use josekit::jwe;",
|
| 25 |
+
"use cards::{CardNumber, NetworkToken};",
|
| 26 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 27 |
+
"use crate::{\n core::{errors, payment_methods, payments::helpers},\n headers, logger,\n routes::{self, metrics},\n services::{self, encryption},\n settings,\n types::{api, domain, payment_methods as pm_types},\n};"
|
| 28 |
+
],
|
| 29 |
+
"after_imports": [
|
| 30 |
+
"use hyperswitch_domain_models::payment_method_data::{\n NetworkTokenDetails, NetworkTokenDetailsPaymentMethod,\n};",
|
| 31 |
+
"use josekit::jwe;",
|
| 32 |
+
"use cards::{CardNumber, NetworkToken};",
|
| 33 |
+
"use masking::{ErasedMaskSerialize, ExposeInterface, Mask, PeekInterface, Secret};",
|
| 34 |
+
"use crate::{\n core::{errors, payment_methods, payments::helpers},\n headers, logger,\n routes::{self, metrics},\n services::{self, encryption},\n settings,\n types::{api, domain, payment_methods as pm_types},\n};"
|
| 35 |
+
]
|
| 36 |
+
},
|
| 37 |
+
{
|
| 38 |
+
"id": "crates/router/src/core/payment_methods/network_tokenization.rs::function::mk_tokenization_req",
|
| 39 |
+
"file": "crates/router/src/core/payment_methods/network_tokenization.rs",
|
| 40 |
+
"kind": "function_item",
|
| 41 |
+
"status": "modified",
|
| 42 |
+
"code_changed": true,
|
| 43 |
+
"imports_changed": true,
|
| 44 |
+
"before_code": "pub async fn mk_tokenization_req(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::CardNetworkTokenResponsePayload, Option<String>),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n should_send_token: true,\n };\n let masked_request_body = api_payload.masked_serialize().unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::CardNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), Some(cn_response.card_reference)))\n}",
|
| 45 |
+
"after_code": "pub async fn mk_tokenization_req(\n state: &routes::SessionState,\n payload_bytes: &[u8],\n customer_id: id_type::CustomerId,\n tokenization_service: &settings::NetworkTokenizationService,\n) -> CustomResult<\n (pm_types::CardNetworkTokenResponsePayload, Option<String>),\n errors::NetworkTokenizationError,\n> {\n let enc_key = tokenization_service.public_key.peek().clone();\n\n let key_id = tokenization_service.key_id.clone();\n\n let jwt = encryption::encrypt_jwe(\n payload_bytes,\n enc_key,\n services::EncryptionAlgorithm::A128GCM,\n Some(key_id.as_str()),\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\"Error on jwe encrypt\")?;\n\n let order_data = pm_types::OrderData {\n consent_id: uuid::Uuid::new_v4().to_string(),\n customer_id,\n };\n\n let api_payload = pm_types::ApiPayload {\n service: NETWORK_TOKEN_SERVICE.to_string(),\n card_data: Secret::new(jwt),\n order_data,\n should_send_token: true,\n };\n let masked_request_body = api_payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n\n let mut request = services::Request::new(\n services::Method::Post,\n tokenization_service.generate_token_url.as_str(),\n );\n request.add_header(headers::CONTENT_TYPE, \"application/json\".into());\n request.add_header(\n headers::AUTHORIZATION,\n tokenization_service\n .token_service_api_key\n .peek()\n .clone()\n .into_masked(),\n );\n request.add_default_headers();\n\n request.set_body(RequestContent::Json(Box::new(api_payload)));\n\n logger::info!(\"Request to generate token: {:?}\", request);\n\n let response = services::call_connector_api(state, request, \"generate_token\")\n .await\n .change_context(errors::NetworkTokenizationError::ApiError);\n\n let res = response\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(\"Error while receiving response\")\n .and_then(|inner| match inner {\n Err(err_res) => {\n let parsed_error: pm_types::NetworkTokenErrorResponse = err_res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(\n errors::NetworkTokenizationError::ResponseDeserializationFailed,\n )?;\n logger::error!(\n error_code = %parsed_error.error_info.code,\n developer_message = %parsed_error.error_info.developer_message,\n \"Network tokenization error: {:?}\",\n parsed_error.error_message\n );\n Err(errors::NetworkTokenizationError::ResponseDeserializationFailed)\n .attach_printable(format!(\"Response Deserialization Failed: {err_res:?}\"))\n }\n Ok(res) => Ok(res),\n })\n .inspect_err(|err| {\n logger::error!(\"Error while deserializing response: {:?}\", err);\n })?;\n\n let network_response: pm_types::CardNetworkTokenResponse = res\n .response\n .parse_struct(\"Card Network Tokenization Response\")\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n\n let dec_key = tokenization_service.private_key.peek().clone();\n\n let card_network_token_response = services::decrypt_jwe(\n network_response.payload.peek(),\n services::KeyIdCheck::SkipKeyIdCheck,\n dec_key,\n jwe::RSA_OAEP_256,\n )\n .await\n .change_context(errors::NetworkTokenizationError::SaveNetworkTokenFailed)\n .attach_printable(\n \"Failed to decrypt the tokenization response from the tokenization service\",\n )?;\n\n let cn_response: pm_types::CardNetworkTokenResponsePayload =\n serde_json::from_str(&card_network_token_response)\n .change_context(errors::NetworkTokenizationError::ResponseDeserializationFailed)?;\n Ok((cn_response.clone(), Some(cn_response.card_reference)))\n}",
|
| 46 |
+
"diff_span": {
|
| 47 |
+
"before": " should_send_token: true,\n };\n let masked_request_body = api_payload.masked_serialize().unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n",
|
| 48 |
+
"after": " should_send_token: true,\n };\n let masked_request_body = api_payload\n .masked_serialize()\n .unwrap_or(serde_json::json!({ \"error\": \"failed to mask serialize\"}));\n logger::info!(raw_network_token_service_request=?masked_request_body);\n"
|
| 49 |
+
},
|
| 50 |
+
"commit_sha": "ec7049cd889c5fd8d1030782cca1d0d89273ee24",
|
| 51 |
+
"before_imports": [
|
| 52 |
+
"use hyperswitch_domain_models::payment_method_data::{\n NetworkTokenDetails, NetworkTokenDetailsPaymentMethod,\n};",
|
| 53 |
+
"use josekit::jwe;",
|
| 54 |
+
"use cards::{CardNumber, NetworkToken};",
|
| 55 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 56 |
+
"use crate::{\n core::{errors, payment_methods, payments::helpers},\n headers, logger,\n routes::{self, metrics},\n services::{self, encryption},\n settings,\n types::{api, domain, payment_methods as pm_types},\n};"
|
| 57 |
+
],
|
| 58 |
+
"after_imports": [
|
| 59 |
+
"use hyperswitch_domain_models::payment_method_data::{\n NetworkTokenDetails, NetworkTokenDetailsPaymentMethod,\n};",
|
| 60 |
+
"use josekit::jwe;",
|
| 61 |
+
"use cards::{CardNumber, NetworkToken};",
|
| 62 |
+
"use masking::{ErasedMaskSerialize, ExposeInterface, Mask, PeekInterface, Secret};",
|
| 63 |
+
"use crate::{\n core::{errors, payment_methods, payments::helpers},\n headers, logger,\n routes::{self, metrics},\n services::{self, encryption},\n settings,\n types::{api, domain, payment_methods as pm_types},\n};"
|
| 64 |
+
]
|
| 65 |
+
}
|
| 66 |
+
]
|
| 67 |
+
}
|
diffs/pr_10191/130e554/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "130e5544770af3efcf6f2bc06ee753d656ea4113",
|
| 3 |
+
"pr_number": 10191,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10191/1e27f4e/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "1e27f4ed49ae365cf815487efea474da272abb03",
|
| 3 |
+
"pr_number": 10191,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10191/3c59884/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "3c59884aea08adcaaf1c163b36e13a1a7da094a1",
|
| 3 |
+
"pr_number": 10191,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/smithy-generator/build.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/smithy-generator/build.rs::function::scan_rust_file",
|
| 10 |
+
"file": "crates/smithy-generator/build.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn scan_rust_file(\n file_path: &Path,\n crate_name: &str,\n module_path: &str,\n models: &mut Vec<SmithyModelInfo>,\n feature_resolver: &FeatureResolver,\n) -> Result<(), Box<dyn std::error::Error>> {\n if let Ok(content) = fs::read_to_string(file_path) {\n // More precise regex that captures cfg attributes, derive, and struct/enum declarations\n // This captures cfg attributes that may be separated from derive by comments/other attributes\n let re = Regex::new(r\"(?ms)((?:#\\[cfg\\([^\\]]*\\)\\]\\s*)*)((?:///[^\\r\\n]*\\s*|#\\[[^\\]]*\\]\\s*)*)(#\\[derive\\([^)]*\\bSmithyModel\\b[^)]*\\)\\])\\s*(?:(?:#\\[[^\\]]*\\]\\s*)|(?://[^\\r\\n]*\\s*)|(?:///[^\\r\\n]*\\s*)|(?:/\\*.*?\\*/\\s*))*(?:pub\\s+)?(?:struct|enum)\\s+([A-Z][A-Za-z0-9_]*)\\s*[<\\{\\(]\")\n .map_err(|e| format!(\"Failed to compile regex: {}\", e))?;\n\n for captures in re.captures_iter(&content) {\n let cfg_attrs = captures.get(1).map(|m| m.as_str()).unwrap_or(\"\");\n let derive_attr = captures.get(3).map(|m| m.as_str()).unwrap_or(\"\");\n let item_name = match captures.get(4) {\n Some(capture) => capture.as_str(),\n None => {\n continue;\n }\n };\n\n // Verify this is actually a SmithyModel derive by checking the derive attribute more precisely\n if !derive_attr.contains(\"SmithyModel\") {\n continue;\n }\n\n // For items with the same name but different feature gates (like FeatureMetadata),\n // we need to ensure we only include the version that actually has SmithyModel\n // under the current feature configuration\n let enabled_features = feature_resolver.get_enabled_crate_features(crate_name);\n\n // Special handling for items that have multiple definitions with different derives\n if item_name == \"FeatureMetadata\" || item_name == \"CustomerRequest\" || item_name == \"CustomerUpdateRequest\" {\n // FeatureMetadata only has SmithyModel in v1 version\n if !enabled_features.contains(\"v1\") {\n continue;\n }\n }\n\n // Check if this item is available under current feature gates\n if is_item_available_for_features(cfg_attrs, crate_name, feature_resolver) {\n // Validate that the item name is a valid Rust identifier\n if is_valid_rust_identifier(item_name) {\n let full_module_path = create_module_path(file_path, crate_name, module_path)?;\n\n models.push(SmithyModelInfo {\n struct_name: item_name.to_string(),\n module_path: full_module_path,\n cfg_attrs: cfg_attrs.to_string(),\n });\n }\n }\n }\n }\n Ok(())\n}",
|
| 16 |
+
"after_code": "fn scan_rust_file(\n file_path: &Path,\n crate_name: &str,\n module_path: &str,\n models: &mut Vec<SmithyModelInfo>,\n feature_resolver: &FeatureResolver,\n) -> Result<(), Box<dyn std::error::Error>> {\n if let Ok(content) = fs::read_to_string(file_path) {\n // More precise regex that captures cfg attributes, derive, and struct/enum declarations\n // This captures cfg attributes that may be separated from derive by comments/other attributes\n let re = Regex::new(r\"(?ms)((?:#\\[cfg\\([^\\]]*\\)\\]\\s*)*)((?:///[^\\r\\n]*\\s*|#\\[[^\\]]*\\]\\s*)*)(#\\[derive\\([^)]*\\bSmithyModel\\b[^)]*\\)\\])\\s*(?:(?:#\\[[^\\]]*\\]\\s*)|(?://[^\\r\\n]*\\s*)|(?:///[^\\r\\n]*\\s*)|(?:/\\*.*?\\*/\\s*))*(?:pub\\s+)?(?:struct|enum)\\s+([A-Z][A-Za-z0-9_]*)\\s*[<\\{\\(]\")\n .map_err(|e| format!(\"Failed to compile regex: {}\", e))?;\n\n for captures in re.captures_iter(&content) {\n let cfg_attrs = captures.get(1).map(|m| m.as_str()).unwrap_or(\"\");\n let derive_attr = captures.get(3).map(|m| m.as_str()).unwrap_or(\"\");\n let item_name = match captures.get(4) {\n Some(capture) => capture.as_str(),\n None => {\n continue;\n }\n };\n\n // Verify this is actually a SmithyModel derive by checking the derive attribute more precisely\n if !derive_attr.contains(\"SmithyModel\") {\n continue;\n }\n\n // For items with the same name but different feature gates (like FeatureMetadata),\n // we need to ensure we only include the version that actually has SmithyModel\n // under the current feature configuration\n let enabled_features = feature_resolver.get_enabled_crate_features(crate_name);\n\n // Special handling for items that have multiple definitions with different derives\n if item_name == \"FeatureMetadata\"\n || item_name == \"CustomerRequest\"\n || item_name == \"CustomerUpdateRequest\"\n {\n // FeatureMetadata only has SmithyModel in v1 version\n if !enabled_features.contains(\"v1\") {\n continue;\n }\n }\n\n // Check if this item is available under current feature gates\n if is_item_available_for_features(cfg_attrs, crate_name, feature_resolver) {\n // Validate that the item name is a valid Rust identifier\n if is_valid_rust_identifier(item_name) {\n let full_module_path = create_module_path(file_path, crate_name, module_path)?;\n\n models.push(SmithyModelInfo {\n struct_name: item_name.to_string(),\n module_path: full_module_path,\n cfg_attrs: cfg_attrs.to_string(),\n });\n }\n }\n }\n }\n Ok(())\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "\n // Special handling for items that have multiple definitions with different derives\n if item_name == \"FeatureMetadata\" || item_name == \"CustomerRequest\" || item_name == \"CustomerUpdateRequest\" {\n // FeatureMetadata only has SmithyModel in v1 version\n if !enabled_features.contains(\"v1\") {",
|
| 19 |
+
"after": "\n // Special handling for items that have multiple definitions with different derives\n if item_name == \"FeatureMetadata\"\n || item_name == \"CustomerRequest\"\n || item_name == \"CustomerUpdateRequest\"\n {\n // FeatureMetadata only has SmithyModel in v1 version\n if !enabled_features.contains(\"v1\") {"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "3c59884aea08adcaaf1c163b36e13a1a7da094a1"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10191/4c0ebf5/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "4c0ebf523984283221d963953200e41cc654552a",
|
| 3 |
+
"pr_number": 10191,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/payments.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_10191/93123f3/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "93123f3ac084a650b873ec2b63741bc99de71deb",
|
| 3 |
+
"pr_number": 10191,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/smithy-generator/build.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/smithy-generator/build.rs::function::scan_rust_file",
|
| 10 |
+
"file": "crates/smithy-generator/build.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn scan_rust_file(\n file_path: &Path,\n crate_name: &str,\n module_path: &str,\n models: &mut Vec<SmithyModelInfo>,\n feature_resolver: &FeatureResolver,\n) -> Result<(), Box<dyn std::error::Error>> {\n if let Ok(content) = fs::read_to_string(file_path) {\n // More precise regex that captures cfg attributes, derive, and struct/enum declarations\n // This captures cfg attributes that may be separated from derive by comments/other attributes\n let re = Regex::new(r\"(?ms)((?:#\\[cfg\\([^\\]]*\\)\\]\\s*)*)((?:///[^\\r\\n]*\\s*|#\\[[^\\]]*\\]\\s*)*)(#\\[derive\\([^)]*\\bSmithyModel\\b[^)]*\\)\\])\\s*(?:(?:#\\[[^\\]]*\\]\\s*)|(?://[^\\r\\n]*\\s*)|(?:///[^\\r\\n]*\\s*)|(?:/\\*.*?\\*/\\s*))*(?:pub\\s+)?(?:struct|enum)\\s+([A-Z][A-Za-z0-9_]*)\\s*[<\\{\\(]\")\n .map_err(|e| format!(\"Failed to compile regex: {}\", e))?;\n\n for captures in re.captures_iter(&content) {\n let cfg_attrs = captures.get(1).map(|m| m.as_str()).unwrap_or(\"\");\n let derive_attr = captures.get(3).map(|m| m.as_str()).unwrap_or(\"\");\n let item_name = match captures.get(4) {\n Some(capture) => capture.as_str(),\n None => {\n continue;\n }\n };\n\n // Verify this is actually a SmithyModel derive by checking the derive attribute more precisely\n if !derive_attr.contains(\"SmithyModel\") {\n continue;\n }\n\n // For items with the same name but different feature gates (like FeatureMetadata),\n // we need to ensure we only include the version that actually has SmithyModel\n // under the current feature configuration\n let enabled_features = feature_resolver.get_enabled_crate_features(crate_name);\n\n // Special handling for items that have multiple definitions with different derives\n if item_name == \"FeatureMetadata\" {\n // FeatureMetadata only has SmithyModel in v1 version\n if !enabled_features.contains(\"v1\") {\n continue;\n }\n }\n\n // Check if this item is available under current feature gates\n if is_item_available_for_features(cfg_attrs, crate_name, feature_resolver) {\n // Validate that the item name is a valid Rust identifier\n if is_valid_rust_identifier(item_name) {\n let full_module_path = create_module_path(file_path, crate_name, module_path)?;\n\n models.push(SmithyModelInfo {\n struct_name: item_name.to_string(),\n module_path: full_module_path,\n cfg_attrs: cfg_attrs.to_string(),\n });\n }\n }\n }\n }\n Ok(())\n}",
|
| 16 |
+
"after_code": "fn scan_rust_file(\n file_path: &Path,\n crate_name: &str,\n module_path: &str,\n models: &mut Vec<SmithyModelInfo>,\n feature_resolver: &FeatureResolver,\n) -> Result<(), Box<dyn std::error::Error>> {\n if let Ok(content) = fs::read_to_string(file_path) {\n // More precise regex that captures cfg attributes, derive, and struct/enum declarations\n // This captures cfg attributes that may be separated from derive by comments/other attributes\n let re = Regex::new(r\"(?ms)((?:#\\[cfg\\([^\\]]*\\)\\]\\s*)*)((?:///[^\\r\\n]*\\s*|#\\[[^\\]]*\\]\\s*)*)(#\\[derive\\([^)]*\\bSmithyModel\\b[^)]*\\)\\])\\s*(?:(?:#\\[[^\\]]*\\]\\s*)|(?://[^\\r\\n]*\\s*)|(?:///[^\\r\\n]*\\s*)|(?:/\\*.*?\\*/\\s*))*(?:pub\\s+)?(?:struct|enum)\\s+([A-Z][A-Za-z0-9_]*)\\s*[<\\{\\(]\")\n .map_err(|e| format!(\"Failed to compile regex: {}\", e))?;\n\n for captures in re.captures_iter(&content) {\n let cfg_attrs = captures.get(1).map(|m| m.as_str()).unwrap_or(\"\");\n let derive_attr = captures.get(3).map(|m| m.as_str()).unwrap_or(\"\");\n let item_name = match captures.get(4) {\n Some(capture) => capture.as_str(),\n None => {\n continue;\n }\n };\n\n // Verify this is actually a SmithyModel derive by checking the derive attribute more precisely\n if !derive_attr.contains(\"SmithyModel\") {\n continue;\n }\n\n // For items with the same name but different feature gates (like FeatureMetadata),\n // we need to ensure we only include the version that actually has SmithyModel\n // under the current feature configuration\n let enabled_features = feature_resolver.get_enabled_crate_features(crate_name);\n\n // Special handling for items that have multiple definitions with different derives\n if item_name == \"FeatureMetadata\" || item_name == \"CustomerRequest\" || item_name == \"CustomerUpdateRequest\" {\n // FeatureMetadata only has SmithyModel in v1 version\n if !enabled_features.contains(\"v1\") {\n continue;\n }\n }\n\n // Check if this item is available under current feature gates\n if is_item_available_for_features(cfg_attrs, crate_name, feature_resolver) {\n // Validate that the item name is a valid Rust identifier\n if is_valid_rust_identifier(item_name) {\n let full_module_path = create_module_path(file_path, crate_name, module_path)?;\n\n models.push(SmithyModelInfo {\n struct_name: item_name.to_string(),\n module_path: full_module_path,\n cfg_attrs: cfg_attrs.to_string(),\n });\n }\n }\n }\n }\n Ok(())\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "\n // Special handling for items that have multiple definitions with different derives\n if item_name == \"FeatureMetadata\" {\n // FeatureMetadata only has SmithyModel in v1 version\n if !enabled_features.contains(\"v1\") {",
|
| 19 |
+
"after": "\n // Special handling for items that have multiple definitions with different derives\n if item_name == \"FeatureMetadata\" || item_name == \"CustomerRequest\" || item_name == \"CustomerUpdateRequest\" {\n // FeatureMetadata only has SmithyModel in v1 version\n if !enabled_features.contains(\"v1\") {"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "93123f3ac084a650b873ec2b63741bc99de71deb"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10191/ce01165/diff.json
ADDED
|
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "ce01165119abcbebc7ddbcd42c81c212e3d3f995",
|
| 3 |
+
"pr_number": 10191,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/payments.rs",
|
| 6 |
+
"crates/api_models/src/refunds.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/api_models/src/payments.rs::struct::AmountFilter",
|
| 11 |
+
"file": "crates/api_models/src/payments.rs",
|
| 12 |
+
"kind": "struct_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "pub struct AmountFilter {\n /// The start amount to filter list of transactions which are greater than or equal to the start amount\n pub start_amount: Option<i64>,\n /// The end amount to filter list of transactions which are less than or equal to the end amount\n pub end_amount: Option<i64>,\n}",
|
| 17 |
+
"after_code": "pub struct AmountFilter {\n /// The start amount to filter list of transactions which are greater than or equal to the start amount\n #[smithy(value_type = \"Option<i64>\")]\n pub start_amount: Option<i64>,\n /// The end amount to filter list of transactions which are less than or equal to the end amount\n #[smithy(value_type = \"Option<i64>\")]\n pub end_amount: Option<i64>,\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": "",
|
| 20 |
+
"after": "pub struct AmountFilter {\n /// The start amount to filter list of transactions which are greater than or equal to the start amount\n #[smithy(value_type = \"Option<i64>\")]\n pub start_amount: Option<i64>,\n /// The end amount to filter list of transactions which are less than or equal to the end amount\n #[smithy(value_type = \"Option<i64>\")]\n pub end_amount: Option<i64>,\n}"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "ce01165119abcbebc7ddbcd42c81c212e3d3f995"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/api_models/src/refunds.rs::struct::RefundListResponse",
|
| 26 |
+
"file": "crates/api_models/src/refunds.rs",
|
| 27 |
+
"kind": "struct_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "pub struct RefundListResponse {\n /// The number of refunds included in the list\n pub count: usize,\n /// The total number of refunds in the list\n pub total_count: i64,\n /// The List of refund response object\n pub data: Vec<RefundResponse>,\n}",
|
| 32 |
+
"after_code": "pub struct RefundListResponse {\n /// The number of refunds included in the list\n #[smithy(value_type = \"usize\")]\n pub count: usize,\n /// The total number of refunds in the list\n #[smithy(value_type = \"i64\")]\n pub total_count: i64,\n /// The List of refund response object\n #[smithy(value_type = \"Vec<RefundResponse>\")]\n pub data: Vec<RefundResponse>,\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": "",
|
| 35 |
+
"after": "pub struct RefundListResponse {\n /// The number of refunds included in the list\n #[smithy(value_type = \"usize\")]\n pub count: usize,\n /// The total number of refunds in the list\n #[smithy(value_type = \"i64\")]\n pub total_count: i64,\n /// The List of refund response object\n #[smithy(value_type = \"Vec<RefundResponse>\")]\n pub data: Vec<RefundResponse>,\n}"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "ce01165119abcbebc7ddbcd42c81c212e3d3f995"
|
| 38 |
+
}
|
| 39 |
+
]
|
| 40 |
+
}
|
diffs/pr_10191/eb1ff11/diff.json
ADDED
|
@@ -0,0 +1,86 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "eb1ff11d01b3814e7ab4032a13fab0b4a8e707e2",
|
| 3 |
+
"pr_number": 10191,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/customers.rs",
|
| 6 |
+
"crates/api_models/src/mandates.rs",
|
| 7 |
+
"crates/common_enums/src/enums.rs"
|
| 8 |
+
],
|
| 9 |
+
"diffs": [
|
| 10 |
+
{
|
| 11 |
+
"id": "crates/api_models/src/mandates.rs::struct::MandateListConstraints",
|
| 12 |
+
"file": "crates/api_models/src/mandates.rs",
|
| 13 |
+
"kind": "struct_item",
|
| 14 |
+
"status": "modified",
|
| 15 |
+
"code_changed": true,
|
| 16 |
+
"imports_changed": false,
|
| 17 |
+
"before_code": "pub struct MandateListConstraints {\n /// limit on the number of objects to return\n pub limit: Option<i64>,\n /// offset on the number of objects to return\n pub offset: Option<i64>,\n /// status of the mandate\n pub mandate_status: Option<api_enums::MandateStatus>,\n /// connector linked to mandate\n pub connector: Option<String>,\n /// The time at which mandate is created\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n pub created_time: Option<PrimitiveDateTime>,\n /// Time less than the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.lt\")]\n pub created_time_lt: Option<PrimitiveDateTime>,\n /// Time greater than the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.gt\")]\n pub created_time_gt: Option<PrimitiveDateTime>,\n /// Time less than or equals to the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.lte\")]\n pub created_time_lte: Option<PrimitiveDateTime>,\n /// Time greater than or equals to the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.gte\")]\n pub created_time_gte: Option<PrimitiveDateTime>,\n}",
|
| 18 |
+
"after_code": "pub struct MandateListConstraints {\n /// limit on the number of objects to return\n #[smithy(value_type = \"Option<i64>\", http_query = \"limit\")]\n pub limit: Option<i64>,\n /// offset on the number of objects to return\n #[smithy(value_type = \"Option<i64>\", http_query = \"offset\")]\n pub offset: Option<i64>,\n /// status of the mandate\n #[smithy(value_type = \"Option<MandateStatus>\", http_query = \"mandate_status\")]\n pub mandate_status: Option<api_enums::MandateStatus>,\n /// connector linked to mandate\n #[smithy(value_type = \"Option<String>\", http_query = \"connector\")]\n pub connector: Option<String>,\n /// The time at which mandate is created\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[smithy(value_type = \"Option<String>\", http_query = \"created_time\")]\n pub created_time: Option<PrimitiveDateTime>,\n /// Time less than the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.lt\")]\n #[smithy(value_type = \"Option<String>\", http_query = \"created_time.lt\")]\n pub created_time_lt: Option<PrimitiveDateTime>,\n /// Time greater than the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.gt\")]\n #[smithy(value_type = \"Option<String>\", http_query = \"created_time.gt\")]\n pub created_time_gt: Option<PrimitiveDateTime>,\n /// Time less than or equals to the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.lte\")]\n #[smithy(value_type = \"Option<String>\", http_query = \"created_time.lte\")]\n pub created_time_lte: Option<PrimitiveDateTime>,\n /// Time greater than or equals to the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.gte\")]\n #[smithy(value_type = \"Option<String>\", http_query = \"created_time.gte\")]\n pub created_time_gte: Option<PrimitiveDateTime>,\n}",
|
| 19 |
+
"diff_span": {
|
| 20 |
+
"before": "",
|
| 21 |
+
"after": "pub struct MandateListConstraints {\n /// limit on the number of objects to return\n #[smithy(value_type = \"Option<i64>\", http_query = \"limit\")]\n pub limit: Option<i64>,\n /// offset on the number of objects to return\n #[smithy(value_type = \"Option<i64>\", http_query = \"offset\")]\n pub offset: Option<i64>,\n /// status of the mandate\n #[smithy(value_type = \"Option<MandateStatus>\", http_query = \"mandate_status\")]\n pub mandate_status: Option<api_enums::MandateStatus>,\n /// connector linked to mandate\n #[smithy(value_type = \"Option<String>\", http_query = \"connector\")]\n pub connector: Option<String>,\n /// The time at which mandate is created\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[smithy(value_type = \"Option<String>\", http_query = \"created_time\")]\n pub created_time: Option<PrimitiveDateTime>,\n /// Time less than the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.lt\")]\n #[smithy(value_type = \"Option<String>\", http_query = \"created_time.lt\")]\n pub created_time_lt: Option<PrimitiveDateTime>,\n /// Time greater than the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.gt\")]\n #[smithy(value_type = \"Option<String>\", http_query = \"created_time.gt\")]\n pub created_time_gt: Option<PrimitiveDateTime>,\n /// Time less than or equals to the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.lte\")]\n #[smithy(value_type = \"Option<String>\", http_query = \"created_time.lte\")]\n pub created_time_lte: Option<PrimitiveDateTime>,\n /// Time greater than or equals to the mandate created time\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(rename = \"created_time.gte\")]\n #[smithy(value_type = \"Option<String>\", http_query = \"created_time.gte\")]\n pub created_time_gte: Option<PrimitiveDateTime>,\n}"
|
| 22 |
+
},
|
| 23 |
+
"commit_sha": "eb1ff11d01b3814e7ab4032a13fab0b4a8e707e2"
|
| 24 |
+
},
|
| 25 |
+
{
|
| 26 |
+
"id": "crates/api_models/src/mandates.rs::struct::MandateRevokedResponse",
|
| 27 |
+
"file": "crates/api_models/src/mandates.rs",
|
| 28 |
+
"kind": "struct_item",
|
| 29 |
+
"status": "modified",
|
| 30 |
+
"code_changed": true,
|
| 31 |
+
"imports_changed": false,
|
| 32 |
+
"before_code": "pub struct MandateRevokedResponse {\n /// The identifier for mandate\n pub mandate_id: String,\n /// The status for mandates\n #[schema(value_type = MandateStatus)]\n pub status: api_enums::MandateStatus,\n /// If there was an error while calling the connectors the code is received here\n #[schema(example = \"E0001\")]\n pub error_code: Option<String>,\n /// If there was an error while calling the connector the error message is received here\n #[schema(example = \"Failed while verifying the card\")]\n pub error_message: Option<String>,\n}",
|
| 33 |
+
"after_code": "pub struct MandateRevokedResponse {\n /// The identifier for mandate\n #[smithy(value_type = \"String\")]\n pub mandate_id: String,\n /// The status for mandates\n #[schema(value_type = MandateStatus)]\n #[smithy(value_type = \"MandateStatus\")]\n pub status: api_enums::MandateStatus,\n /// If there was an error while calling the connectors the code is received here\n #[schema(example = \"E0001\")]\n #[smithy(value_type = \"Option<String>\")]\n pub error_code: Option<String>,\n /// If there was an error while calling the connector the error message is received here\n #[schema(example = \"Failed while verifying the card\")]\n #[smithy(value_type = \"Option<String>\")]\n pub error_message: Option<String>,\n}",
|
| 34 |
+
"diff_span": {
|
| 35 |
+
"before": "",
|
| 36 |
+
"after": "pub struct MandateRevokedResponse {\n /// The identifier for mandate\n #[smithy(value_type = \"String\")]\n pub mandate_id: String,\n /// The status for mandates\n #[schema(value_type = MandateStatus)]\n #[smithy(value_type = \"MandateStatus\")]\n pub status: api_enums::MandateStatus,\n /// If there was an error while calling the connectors the code is received here\n #[schema(example = \"E0001\")]\n #[smithy(value_type = \"Option<String>\")]\n pub error_code: Option<String>,\n /// If there was an error while calling the connector the error message is received here\n #[schema(example = \"Failed while verifying the card\")]\n #[smithy(value_type = \"Option<String>\")]\n pub error_message: Option<String>,\n}"
|
| 37 |
+
},
|
| 38 |
+
"commit_sha": "eb1ff11d01b3814e7ab4032a13fab0b4a8e707e2"
|
| 39 |
+
},
|
| 40 |
+
{
|
| 41 |
+
"id": "crates/api_models/src/mandates.rs::struct::MandateResponse",
|
| 42 |
+
"file": "crates/api_models/src/mandates.rs",
|
| 43 |
+
"kind": "struct_item",
|
| 44 |
+
"status": "modified",
|
| 45 |
+
"code_changed": true,
|
| 46 |
+
"imports_changed": false,
|
| 47 |
+
"before_code": "pub struct MandateResponse {\n /// The identifier for mandate\n pub mandate_id: String,\n /// The status for mandates\n #[schema(value_type = MandateStatus)]\n pub status: api_enums::MandateStatus,\n /// The identifier for payment method\n pub payment_method_id: String,\n /// The payment method\n pub payment_method: String,\n /// The payment method type\n pub payment_method_type: Option<String>,\n /// The card details for mandate\n pub card: Option<MandateCardDetails>,\n /// Details about the customer\u2019s acceptance\n #[schema(value_type = Option<CustomerAcceptance>)]\n pub customer_acceptance: Option<common_payments_types::CustomerAcceptance>,\n}",
|
| 48 |
+
"after_code": "pub struct MandateResponse {\n /// The identifier for mandate\n #[smithy(value_type = \"String\")]\n pub mandate_id: String,\n /// The status for mandates\n #[schema(value_type = MandateStatus)]\n #[smithy(value_type = \"MandateStatus\")]\n pub status: api_enums::MandateStatus,\n /// The identifier for payment method\n #[smithy(value_type = \"String\")]\n pub payment_method_id: String,\n /// The payment method\n #[smithy(value_type = \"String\")]\n pub payment_method: String,\n /// The payment method type\n #[smithy(value_type = \"Option<String>\")]\n pub payment_method_type: Option<String>,\n /// The card details for mandate\n #[smithy(value_type = \"Option<MandateCardDetails>\")]\n pub card: Option<MandateCardDetails>,\n /// Details about the customer\u2019s acceptance\n #[schema(value_type = Option<CustomerAcceptance>)]\n #[smithy(value_type = \"Option<CustomerAcceptance>\")]\n pub customer_acceptance: Option<common_payments_types::CustomerAcceptance>,\n}",
|
| 49 |
+
"diff_span": {
|
| 50 |
+
"before": "",
|
| 51 |
+
"after": "pub struct MandateResponse {\n /// The identifier for mandate\n #[smithy(value_type = \"String\")]\n pub mandate_id: String,\n /// The status for mandates\n #[schema(value_type = MandateStatus)]\n #[smithy(value_type = \"MandateStatus\")]\n pub status: api_enums::MandateStatus,\n /// The identifier for payment method\n #[smithy(value_type = \"String\")]\n pub payment_method_id: String,\n /// The payment method\n #[smithy(value_type = \"String\")]\n pub payment_method: String,\n /// The payment method type\n #[smithy(value_type = \"Option<String>\")]\n pub payment_method_type: Option<String>,\n /// The card details for mandate\n #[smithy(value_type = \"Option<MandateCardDetails>\")]\n pub card: Option<MandateCardDetails>,\n /// Details about the customer\u2019s acceptance\n #[schema(value_type = Option<CustomerAcceptance>)]\n #[smithy(value_type = \"Option<CustomerAcceptance>\")]\n pub customer_acceptance: Option<common_payments_types::CustomerAcceptance>,\n}"
|
| 52 |
+
},
|
| 53 |
+
"commit_sha": "eb1ff11d01b3814e7ab4032a13fab0b4a8e707e2"
|
| 54 |
+
},
|
| 55 |
+
{
|
| 56 |
+
"id": "crates/api_models/src/mandates.rs::struct::MandateCardDetails",
|
| 57 |
+
"file": "crates/api_models/src/mandates.rs",
|
| 58 |
+
"kind": "struct_item",
|
| 59 |
+
"status": "modified",
|
| 60 |
+
"code_changed": true,
|
| 61 |
+
"imports_changed": false,
|
| 62 |
+
"before_code": "pub struct MandateCardDetails {\n /// The last 4 digits of card\n pub last4_digits: Option<String>,\n /// The expiry month of card\n #[schema(value_type = Option<String>)]\n pub card_exp_month: Option<Secret<String>>,\n /// The expiry year of card\n #[schema(value_type = Option<String>)]\n pub card_exp_year: Option<Secret<String>>,\n /// The card holder name\n #[schema(value_type = Option<String>)]\n pub card_holder_name: Option<Secret<String>>,\n /// The token from card locker\n #[schema(value_type = Option<String>)]\n pub card_token: Option<Secret<String>>,\n /// The card scheme network for the particular card\n pub scheme: Option<String>,\n /// The country code in in which the card was issued\n pub issuer_country: Option<String>,\n #[schema(value_type = Option<String>)]\n /// A unique identifier alias to identify a particular card\n pub card_fingerprint: Option<Secret<String>>,\n /// The first 6 digits of card\n pub card_isin: Option<String>,\n /// The bank that issued the card\n pub card_issuer: Option<String>,\n /// The network that facilitates payment card transactions\n #[schema(value_type = Option<CardNetwork>)]\n pub card_network: Option<api_enums::CardNetwork>,\n /// The type of the payment card\n pub card_type: Option<String>,\n /// The nick_name of the card holder\n #[schema(value_type = Option<String>)]\n pub nick_name: Option<Secret<String>>,\n}",
|
| 63 |
+
"after_code": "pub struct MandateCardDetails {\n /// The last 4 digits of card\n #[smithy(value_type = \"Option<String>\")]\n pub last4_digits: Option<String>,\n /// The expiry month of card\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n pub card_exp_month: Option<Secret<String>>,\n /// The expiry year of card\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n pub card_exp_year: Option<Secret<String>>,\n /// The card holder name\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n pub card_holder_name: Option<Secret<String>>,\n /// The token from card locker\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n pub card_token: Option<Secret<String>>,\n /// The card scheme network for the particular card\n #[smithy(value_type = \"Option<String>\")]\n pub scheme: Option<String>,\n /// The country code in in which the card was issued\n #[smithy(value_type = \"Option<String>\")]\n pub issuer_country: Option<String>,\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n /// A unique identifier alias to identify a particular card\n pub card_fingerprint: Option<Secret<String>>,\n /// The first 6 digits of card\n #[smithy(value_type = \"Option<String>\")]\n pub card_isin: Option<String>,\n /// The bank that issued the card\n #[smithy(value_type = \"Option<String>\")]\n pub card_issuer: Option<String>,\n /// The network that facilitates payment card transactions\n #[schema(value_type = Option<CardNetwork>)]\n #[smithy(value_type = \"Option<CardNetwork>\")]\n pub card_network: Option<api_enums::CardNetwork>,\n /// The type of the payment card\n #[smithy(value_type = \"Option<String>\")]\n pub card_type: Option<String>,\n /// The nick_name of the card holder\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n pub nick_name: Option<Secret<String>>,\n}",
|
| 64 |
+
"diff_span": {
|
| 65 |
+
"before": "",
|
| 66 |
+
"after": "pub struct MandateCardDetails {\n /// The last 4 digits of card\n #[smithy(value_type = \"Option<String>\")]\n pub last4_digits: Option<String>,\n /// The expiry month of card\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n pub card_exp_month: Option<Secret<String>>,\n /// The expiry year of card\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n pub card_exp_year: Option<Secret<String>>,\n /// The card holder name\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n pub card_holder_name: Option<Secret<String>>,\n /// The token from card locker\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n pub card_token: Option<Secret<String>>,\n /// The card scheme network for the particular card\n #[smithy(value_type = \"Option<String>\")]\n pub scheme: Option<String>,\n /// The country code in in which the card was issued\n #[smithy(value_type = \"Option<String>\")]\n pub issuer_country: Option<String>,\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n /// A unique identifier alias to identify a particular card\n pub card_fingerprint: Option<Secret<String>>,\n /// The first 6 digits of card\n #[smithy(value_type = \"Option<String>\")]\n pub card_isin: Option<String>,\n /// The bank that issued the card\n #[smithy(value_type = \"Option<String>\")]\n pub card_issuer: Option<String>,\n /// The network that facilitates payment card transactions\n #[schema(value_type = Option<CardNetwork>)]\n #[smithy(value_type = \"Option<CardNetwork>\")]\n pub card_network: Option<api_enums::CardNetwork>,\n /// The type of the payment card\n #[smithy(value_type = \"Option<String>\")]\n pub card_type: Option<String>,\n /// The nick_name of the card holder\n #[schema(value_type = Option<String>)]\n #[smithy(value_type = \"Option<String>\")]\n pub nick_name: Option<Secret<String>>,\n}"
|
| 67 |
+
},
|
| 68 |
+
"commit_sha": "eb1ff11d01b3814e7ab4032a13fab0b4a8e707e2"
|
| 69 |
+
},
|
| 70 |
+
{
|
| 71 |
+
"id": "crates/api_models/src/customers.rs::struct::CustomerListRequest",
|
| 72 |
+
"file": "crates/api_models/src/customers.rs",
|
| 73 |
+
"kind": "struct_item",
|
| 74 |
+
"status": "modified",
|
| 75 |
+
"code_changed": true,
|
| 76 |
+
"imports_changed": false,
|
| 77 |
+
"before_code": "pub struct CustomerListRequest {\n /// Offset\n #[schema(example = 32)]\n pub offset: Option<u32>,\n /// Limit\n #[schema(example = 32)]\n pub limit: Option<u16>,\n pub customer_id: Option<id_type::CustomerId>,\n}",
|
| 78 |
+
"after_code": "pub struct CustomerListRequest {\n /// Offset\n #[schema(example = 32)]\n #[smithy(value_type = \"Option<u32>\", http_query = \"offset\")]\n pub offset: Option<u32>,\n /// Limit\n #[schema(example = 32)]\n #[smithy(value_type = \"Option<u16>\", http_query = \"limit\")]\n pub limit: Option<u16>,\n pub customer_id: Option<id_type::CustomerId>,\n}",
|
| 79 |
+
"diff_span": {
|
| 80 |
+
"before": "",
|
| 81 |
+
"after": " /// Offset\n #[schema(example = 32)]\n #[smithy(value_type = \"Option<u32>\", http_query = \"offset\")]\n pub offset: Option<u32>,\n /// Limit\n #[schema(example = 32)]\n #[smithy(value_type = \"Option<u16>\", http_query = \"limit\")]\n pub limit: Option<u16>,\n pub customer_id: Option<id_type::CustomerId>,"
|
| 82 |
+
},
|
| 83 |
+
"commit_sha": "eb1ff11d01b3814e7ab4032a13fab0b4a8e707e2"
|
| 84 |
+
}
|
| 85 |
+
]
|
| 86 |
+
}
|
diffs/pr_10200/0ddfe0a/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "0ddfe0a4aa68d6566b46f091f47939a1d504b7ff",
|
| 3 |
+
"pr_number": 10200,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/payouts.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/api_models/src/payouts.rs::struct::ApplePayDecrypt",
|
| 10 |
+
"file": "crates/api_models/src/payouts.rs",
|
| 11 |
+
"kind": "struct_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub struct ApplePayDecrypt {\n /// The dpan number associated with card number\n #[schema(value_type = String, example = \"4242424242424242\")]\n pub dpan: CardNumber,\n\n /// The card's expiry month\n #[schema(value_type = String)]\n pub expiry_month: Secret<String>,\n\n /// The card's expiry year\n #[schema(value_type = String)]\n pub expiry_year: Secret<String>,\n\n /// The card holder's name\n #[schema(value_type = String, example = \"John Doe\")]\n pub card_holder_name: Option<Secret<String>>,\n\n /// The card's network\n #[schema(value_type = CardNetwork, example = \"Visa\")]\n pub card_network: Option<CardNetwork>,\n}",
|
| 16 |
+
"after_code": "pub struct ApplePayDecrypt {\n /// The dpan number associated with card number\n #[schema(value_type = String, example = \"4242424242424242\")]\n pub dpan: CardNumber,\n\n /// The card's expiry month\n #[schema(value_type = String)]\n pub expiry_month: Secret<String>,\n\n /// The card's expiry year\n #[schema(value_type = String)]\n pub expiry_year: Secret<String>,\n\n /// The card holder's name\n #[schema(value_type = String, example = \"John Doe\")]\n pub card_holder_name: Option<Secret<String>>,\n\n /// The card's network\n #[schema(value_type = Option<CardNetwork>, example = \"Visa\")]\n pub card_network: Option<CardNetwork>,\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "\n /// The card's network\n #[schema(value_type = CardNetwork, example = \"Visa\")]\n pub card_network: Option<CardNetwork>,\n}",
|
| 19 |
+
"after": "\n /// The card's network\n #[schema(value_type = Option<CardNetwork>, example = \"Visa\")]\n pub card_network: Option<CardNetwork>,\n}"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "0ddfe0a4aa68d6566b46f091f47939a1d504b7ff"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10200/0fa9235/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "0fa9235a7881c365cf79b547e1a71b71168e4041",
|
| 3 |
+
"pr_number": 10200,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10200/6afa7af/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10200/aa8c870/diff.json
ADDED
|
@@ -0,0 +1,104 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "aa8c870a7e635111abb9585e94298c8acaff7f37",
|
| 3 |
+
"pr_number": 10200,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs::struct::CardSSL",
|
| 10 |
+
"file": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs",
|
| 11 |
+
"kind": "struct_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "struct CardSSL {\n card_number: cards::CardNumber,\n expiry_date: ExpiryDate,\n card_holder_name: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n cvc: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n card_address: Option<CardAddress>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n purpose_of_payment_code: Option<String>,\n}",
|
| 16 |
+
"after_code": "struct CardSSL {\n card_number: cards::CardNumber,\n expiry_date: ExpiryDate,\n card_holder_name: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n cvc: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"CardAddress::is_empty_option\")]\n card_address: Option<CardAddress>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n purpose_of_payment_code: Option<String>,\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " #[serde(skip_serializing_if = \"Option::is_none\")]\n cvc: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n card_address: Option<CardAddress>,\n #[serde(skip_serializing_if = \"Option::is_none\")]",
|
| 19 |
+
"after": " #[serde(skip_serializing_if = \"Option::is_none\")]\n cvc: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"CardAddress::is_empty_option\")]\n card_address: Option<CardAddress>,\n #[serde(skip_serializing_if = \"Option::is_none\")]"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "aa8c870a7e635111abb9585e94298c8acaff7f37"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs::struct::WorldpayxmlAddress",
|
| 25 |
+
"file": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs",
|
| 26 |
+
"kind": "struct_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "struct WorldpayxmlAddress {\n last_name: Option<Secret<String>>,\n address1: Option<Secret<String>>,\n postal_code: Option<Secret<String>>,\n city: Option<String>,\n country_code: Option<common_enums::CountryAlpha2>,\n}",
|
| 31 |
+
"after_code": "struct WorldpayxmlAddress {\n #[serde(skip_serializing_if = \"Option::is_none\")]\n last_name: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n address1: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n postal_code: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n city: Option<String>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n country_code: Option<common_enums::CountryAlpha2>,\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": "",
|
| 34 |
+
"after": "struct WorldpayxmlAddress {\n #[serde(skip_serializing_if = \"Option::is_none\")]\n last_name: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n address1: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n postal_code: Option<Secret<String>>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n city: Option<String>,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n country_code: Option<common_enums::CountryAlpha2>,\n}"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "aa8c870a7e635111abb9585e94298c8acaff7f37"
|
| 37 |
+
},
|
| 38 |
+
{
|
| 39 |
+
"id": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs::struct::CardAddress",
|
| 40 |
+
"file": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs",
|
| 41 |
+
"kind": "struct_item",
|
| 42 |
+
"status": "modified",
|
| 43 |
+
"code_changed": true,
|
| 44 |
+
"imports_changed": false,
|
| 45 |
+
"before_code": "struct CardAddress {\n address: WorldpayxmlAddress,\n}",
|
| 46 |
+
"after_code": "struct CardAddress {\n #[serde(skip_serializing_if = \"WorldpayxmlAddress::is_empty_option\")]\n address: Option<WorldpayxmlAddress>,\n}",
|
| 47 |
+
"diff_span": {
|
| 48 |
+
"before": "struct CardAddress {\n address: WorldpayxmlAddress,\n}",
|
| 49 |
+
"after": "struct CardAddress {\n #[serde(skip_serializing_if = \"WorldpayxmlAddress::is_empty_option\")]\n address: Option<WorldpayxmlAddress>,\n}"
|
| 50 |
+
},
|
| 51 |
+
"commit_sha": "aa8c870a7e635111abb9585e94298c8acaff7f37"
|
| 52 |
+
},
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs::impl::WorldpayxmlAddress",
|
| 55 |
+
"file": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs",
|
| 56 |
+
"kind": "impl_item",
|
| 57 |
+
"status": "added",
|
| 58 |
+
"before_code": null,
|
| 59 |
+
"after_code": "impl WorldpayxmlAddress {\n fn is_empty(&self) -> bool {\n self.last_name.is_none()\n && self.address1.is_none()\n && self.postal_code.is_none()\n && self.city.is_none()\n && self.country_code.is_none()\n }\n\n fn is_empty_option(addr: &Option<Self>) -> bool {\n match addr {\n Some(a) => a.is_empty(),\n None => true,\n }\n }\n}",
|
| 60 |
+
"diff_span": null,
|
| 61 |
+
"commit_sha": "aa8c870a7e635111abb9585e94298c8acaff7f37"
|
| 62 |
+
},
|
| 63 |
+
{
|
| 64 |
+
"id": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs::WorldpayxmlAddress::function::is_empty",
|
| 65 |
+
"file": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs",
|
| 66 |
+
"kind": "function_item",
|
| 67 |
+
"status": "added",
|
| 68 |
+
"before_code": null,
|
| 69 |
+
"after_code": "fn is_empty(&self) -> bool {\n self.last_name.is_none()\n && self.address1.is_none()\n && self.postal_code.is_none()\n && self.city.is_none()\n && self.country_code.is_none()\n }",
|
| 70 |
+
"diff_span": null,
|
| 71 |
+
"commit_sha": "aa8c870a7e635111abb9585e94298c8acaff7f37"
|
| 72 |
+
},
|
| 73 |
+
{
|
| 74 |
+
"id": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs::WorldpayxmlAddress::function::is_empty_option",
|
| 75 |
+
"file": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs",
|
| 76 |
+
"kind": "function_item",
|
| 77 |
+
"status": "added",
|
| 78 |
+
"before_code": null,
|
| 79 |
+
"after_code": "fn is_empty_option(addr: &Option<Self>) -> bool {\n match addr {\n Some(a) => a.is_empty(),\n None => true,\n }\n }",
|
| 80 |
+
"diff_span": null,
|
| 81 |
+
"commit_sha": "aa8c870a7e635111abb9585e94298c8acaff7f37"
|
| 82 |
+
},
|
| 83 |
+
{
|
| 84 |
+
"id": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs::CardAddress::function::is_empty_option",
|
| 85 |
+
"file": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs",
|
| 86 |
+
"kind": "function_item",
|
| 87 |
+
"status": "added",
|
| 88 |
+
"before_code": null,
|
| 89 |
+
"after_code": "fn is_empty_option(addr: &Option<Self>) -> bool {\n match addr {\n Some(a) => WorldpayxmlAddress::is_empty_option(&a.address),\n None => true,\n }\n }",
|
| 90 |
+
"diff_span": null,
|
| 91 |
+
"commit_sha": "aa8c870a7e635111abb9585e94298c8acaff7f37"
|
| 92 |
+
},
|
| 93 |
+
{
|
| 94 |
+
"id": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs::impl::CardAddress",
|
| 95 |
+
"file": "crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs",
|
| 96 |
+
"kind": "impl_item",
|
| 97 |
+
"status": "added",
|
| 98 |
+
"before_code": null,
|
| 99 |
+
"after_code": "impl CardAddress {\n fn is_empty_option(addr: &Option<Self>) -> bool {\n match addr {\n Some(a) => WorldpayxmlAddress::is_empty_option(&a.address),\n None => true,\n }\n }\n}",
|
| 100 |
+
"diff_span": null,
|
| 101 |
+
"commit_sha": "aa8c870a7e635111abb9585e94298c8acaff7f37"
|
| 102 |
+
}
|
| 103 |
+
]
|
| 104 |
+
}
|
diffs/pr_10200/c5195ff/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "c5195ff4f64995d030f00daf6fbd610954585ae7",
|
| 3 |
+
"pr_number": 10200,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_10200/ddb6ac8/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "ddb6ac8777a12cf753ba9e3de31eb7c0724f8820",
|
| 3 |
+
"pr_number": 10200,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/worldpayxml/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_10200/e3dcb7f/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10204/00cbc6f/diff.json
ADDED
|
@@ -0,0 +1,70 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "00cbc6f00b4f47d3d77536adac3d84480b2e8561",
|
| 3 |
+
"pr_number": 10204,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 6 |
+
"crates/hyperswitch_connectors/src/connectors/payload/transformers.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload.rs::Payload::function::get_webhook_object_reference_id",
|
| 11 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n let reference_id = webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?;\n\n Ok(api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n reference_id\n ),\n ))\n }\n // Refund handling not implemented since refund webhook payloads cannot be uniquely identified.\n // The only differentiator is the distinct IDs received for payment and refund.\n responses::PayloadWebhooksTrigger::Refund\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal => {\n Err(errors::ConnectorError::WebhooksNotImplemented.into())\n }\n }\n\n }",
|
| 17 |
+
"after_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n let reference_id = webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?;\n\n Ok(api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(reference_id),\n ))\n }\n // Refund handling not implemented since refund webhook payloads cannot be uniquely identified.\n // The only differentiator is the distinct IDs received for payment and refund.\n responses::PayloadWebhooksTrigger::Refund\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal => {\n Err(errors::ConnectorError::WebhooksNotImplemented.into())\n }\n }\n }",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": "\n Ok(api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n reference_id\n ),\n ))\n }\n // Refund handling not implemented since refund webhook payloads cannot be uniquely identified.\n // The only differentiator is the distinct IDs received for payment and refund.\n responses::PayloadWebhooksTrigger::Refund\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal => {\n Err(errors::ConnectorError::WebhooksNotImplemented.into())\n }\n }\n\n }",
|
| 20 |
+
"after": "\n Ok(api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(reference_id),\n ))\n }"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "00cbc6f00b4f47d3d77536adac3d84480b2e8561"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::impl::responses::PayloadPaymentStatus",
|
| 26 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 27 |
+
"kind": "impl_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "impl TryFrom<responses::PayloadWebhooksTrigger> for responses::PayloadPaymentStatus {\n type Error = Error;\n fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }.into())\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }\n}",
|
| 32 |
+
"after_code": "impl TryFrom<responses::PayloadWebhooksTrigger> for responses::PayloadPaymentStatus {\n type Error = Error;\n fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }\n .into())\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }.into())\n }\n responses::PayloadWebhooksTrigger::Chargeback",
|
| 35 |
+
"after": " message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }\n .into())\n }\n responses::PayloadWebhooksTrigger::Chargeback"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "00cbc6f00b4f47d3d77536adac3d84480b2e8561"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload.rs::Payload::function::get_webhook_resource_object",
|
| 41 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "fn get_webhook_resource_object(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n\n Ok(Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?))\n }",
|
| 47 |
+
"after_code": "fn get_webhook_resource_object(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n\n Ok(Box::new(responses::PayloadPaymentsResponse::try_from(\n webhook_body,\n )?))\n }",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n\n Ok(Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?))\n }",
|
| 50 |
+
"after": " .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n\n Ok(Box::new(responses::PayloadPaymentsResponse::try_from(\n webhook_body,\n )?))\n }"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "00cbc6f00b4f47d3d77536adac3d84480b2e8561"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::responses::PayloadPaymentStatus::function::try_from",
|
| 56 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 57 |
+
"kind": "function_item",
|
| 58 |
+
"status": "modified",
|
| 59 |
+
"code_changed": true,
|
| 60 |
+
"imports_changed": false,
|
| 61 |
+
"before_code": "fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }.into())\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }",
|
| 62 |
+
"after_code": "fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }\n .into())\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }",
|
| 63 |
+
"diff_span": {
|
| 64 |
+
"before": " message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }.into())\n }\n responses::PayloadWebhooksTrigger::Chargeback",
|
| 65 |
+
"after": " message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }\n .into())\n }\n responses::PayloadWebhooksTrigger::Chargeback"
|
| 66 |
+
},
|
| 67 |
+
"commit_sha": "00cbc6f00b4f47d3d77536adac3d84480b2e8561"
|
| 68 |
+
}
|
| 69 |
+
]
|
| 70 |
+
}
|
diffs/pr_10204/3832432/diff.json
ADDED
|
@@ -0,0 +1,70 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "3832432bead903aae76530c3f6893a01b780d68a",
|
| 3 |
+
"pr_number": 10204,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 6 |
+
"crates/hyperswitch_connectors/src/connectors/payload/transformers.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload.rs::Payload::function::get_webhook_object_reference_id",
|
| 11 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let reference_id = match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ),\n )\n },\n responses::PayloadWebhooksTrigger::Refund => Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n };\n\n Ok(reference_id)\n }",
|
| 17 |
+
"after_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let reference_id = match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ),\n )\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n };\n\n Ok(reference_id)\n }",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " ),\n )\n },\n responses::PayloadWebhooksTrigger::Refund => Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n };\n",
|
| 20 |
+
"after": " ),\n )\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n };\n"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "3832432bead903aae76530c3f6893a01b780d68a"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::impl::responses::PayloadPaymentStatus",
|
| 26 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 27 |
+
"kind": "impl_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "impl TryFrom<responses::PayloadWebhooksTrigger> for responses::PayloadPaymentStatus {\n type Error = Error;\n fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n responses::PayloadWebhooksTrigger::Chargeback \n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }\n}",
|
| 32 |
+
"after_code": "impl TryFrom<responses::PayloadWebhooksTrigger> for responses::PayloadPaymentStatus {\n type Error = Error;\n fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n responses::PayloadWebhooksTrigger::Chargeback \n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus",
|
| 35 |
+
"after": " responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "3832432bead903aae76530c3f6893a01b780d68a"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload.rs::Payload::function::get_webhook_resource_object",
|
| 41 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "fn get_webhook_resource_object(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n Ok(match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?)\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n })\n }",
|
| 47 |
+
"after_code": "fn get_webhook_resource_object(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n Ok(match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?)\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n })\n }",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n })",
|
| 50 |
+
"after": " }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n })"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "3832432bead903aae76530c3f6893a01b780d68a"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::responses::PayloadPaymentStatus::function::try_from",
|
| 56 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 57 |
+
"kind": "function_item",
|
| 58 |
+
"status": "modified",
|
| 59 |
+
"code_changed": true,
|
| 60 |
+
"imports_changed": false,
|
| 61 |
+
"before_code": "fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n responses::PayloadWebhooksTrigger::Chargeback \n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }",
|
| 62 |
+
"after_code": "fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }",
|
| 63 |
+
"diff_span": {
|
| 64 |
+
"before": " responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n responses::PayloadWebhooksTrigger::Chargeback \n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus",
|
| 65 |
+
"after": " responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus"
|
| 66 |
+
},
|
| 67 |
+
"commit_sha": "3832432bead903aae76530c3f6893a01b780d68a"
|
| 68 |
+
}
|
| 69 |
+
]
|
| 70 |
+
}
|
diffs/pr_10204/5f3a9e5/diff.json
ADDED
|
@@ -0,0 +1,70 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "5f3a9e542b8317a0bef96295fb14ff3b302f7a0e",
|
| 3 |
+
"pr_number": 10204,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 6 |
+
"crates/hyperswitch_connectors/src/connectors/payload/transformers.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload.rs::Payload::function::get_webhook_object_reference_id",
|
| 11 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let reference_id = match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ),\n )\n }\n // Refund handling not implemented since refund webhook payloads cannot be uniquely identified.\n // The only differentiator is the distinct IDs received for payment and refund.\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n };\n\n Ok(reference_id)\n }",
|
| 17 |
+
"after_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n let reference_id = webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?;\n\n Ok(api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n reference_id\n ),\n ))\n }\n // Refund handling not implemented since refund webhook payloads cannot be uniquely identified.\n // The only differentiator is the distinct IDs received for payment and refund.\n responses::PayloadWebhooksTrigger::Refund\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal => {\n Err(errors::ConnectorError::WebhooksNotImplemented.into())\n }\n }\n\n }",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let reference_id = match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ),\n )\n }\n // Refund handling not implemented since refund webhook payloads cannot be uniquely identified.\n // The only differentiator is the distinct IDs received for payment and refund.\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n };\n\n Ok(reference_id)\n }",
|
| 20 |
+
"after": " .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n let reference_id = webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?;\n\n Ok(api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n reference_id\n ),\n ))\n }\n // Refund handling not implemented since refund webhook payloads cannot be uniquely identified.\n // The only differentiator is the distinct IDs received for payment and refund.\n responses::PayloadWebhooksTrigger::Refund\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal => {\n Err(errors::ConnectorError::WebhooksNotImplemented.into())\n }\n }\n\n }"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "5f3a9e542b8317a0bef96295fb14ff3b302f7a0e"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::impl::responses::PayloadPaymentStatus",
|
| 26 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 27 |
+
"kind": "impl_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "impl TryFrom<responses::PayloadWebhooksTrigger> for responses::PayloadPaymentStatus {\n type Error = Error;\n fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }\n}",
|
| 32 |
+
"after_code": "impl TryFrom<responses::PayloadWebhooksTrigger> for responses::PayloadPaymentStatus {\n type Error = Error;\n fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }.into())\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n responses::PayloadWebhooksTrigger::Chargeback",
|
| 35 |
+
"after": " message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }.into())\n }\n responses::PayloadWebhooksTrigger::Chargeback"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "5f3a9e542b8317a0bef96295fb14ff3b302f7a0e"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload.rs::Payload::function::get_webhook_resource_object",
|
| 41 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "fn get_webhook_resource_object(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n Ok(match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?)\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n })\n }",
|
| 47 |
+
"after_code": "fn get_webhook_resource_object(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n\n Ok(Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?))\n }",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n Ok(match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?)\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n })\n }",
|
| 50 |
+
"after": " .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n\n Ok(Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?))\n }"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "5f3a9e542b8317a0bef96295fb14ff3b302f7a0e"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::responses::PayloadPaymentStatus::function::try_from",
|
| 56 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 57 |
+
"kind": "function_item",
|
| 58 |
+
"status": "modified",
|
| 59 |
+
"code_changed": true,
|
| 60 |
+
"imports_changed": false,
|
| 61 |
+
"before_code": "fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }",
|
| 62 |
+
"after_code": "fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }.into())\n }\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }",
|
| 63 |
+
"diff_span": {
|
| 64 |
+
"before": " message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n responses::PayloadWebhooksTrigger::Chargeback",
|
| 65 |
+
"after": " message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n }.into())\n }\n responses::PayloadWebhooksTrigger::Chargeback"
|
| 66 |
+
},
|
| 67 |
+
"commit_sha": "5f3a9e542b8317a0bef96295fb14ff3b302f7a0e"
|
| 68 |
+
}
|
| 69 |
+
]
|
| 70 |
+
}
|
diffs/pr_10204/8c449f3/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "8c449f3c54a594f8e711705df50a6433dbbe221c",
|
| 3 |
+
"pr_number": 10204,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/payload.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload.rs::Payload::function::get_webhook_object_reference_id",
|
| 10 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let reference_id = match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ),\n )\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n };\n\n Ok(reference_id)\n }",
|
| 16 |
+
"after_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let reference_id = match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ),\n )\n }\n // Refund handling not implemented since refund webhook payloads cannot be uniquely identified.\n // The only differentiator is the distinct IDs received for payment and refund.\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),\n connector: \"Payload\",\n })\n }\n };\n\n Ok(reference_id)\n }",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " )\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),",
|
| 19 |
+
"after": " )\n }\n // Refund handling not implemented since refund webhook payloads cannot be uniquely identified.\n // The only differentiator is the distinct IDs received for payment and refund.\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported {\n message: \"Refund Webhook\".to_string(),"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "8c449f3c54a594f8e711705df50a6433dbbe221c"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10204/a0a1faf/diff.json
ADDED
|
@@ -0,0 +1,160 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4",
|
| 3 |
+
"pr_number": 10204,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 6 |
+
"crates/hyperswitch_connectors/src/connectors/payload/transformers.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload.rs::Payload::function::get_webhook_object_reference_id",
|
| 11 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let reference_id = match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ),\n )\n }\n\n responses::PayloadWebhooksTrigger::Refund => {\n api_models::webhooks::ObjectReferenceId::RefundId(\n api_models::webhooks::RefundIdType::ConnectorRefundId(\n webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ),\n )\n }\n };\n\n Ok(reference_id)\n }",
|
| 17 |
+
"after_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let reference_id = match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ),\n )\n },\n responses::PayloadWebhooksTrigger::Refund => Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n };\n\n Ok(reference_id)\n }",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " ),\n )\n }\n\n responses::PayloadWebhooksTrigger::Refund => {\n api_models::webhooks::ObjectReferenceId::RefundId(\n api_models::webhooks::RefundIdType::ConnectorRefundId(\n webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ),\n )\n }\n };\n",
|
| 20 |
+
"after": " ),\n )\n },\n responses::PayloadWebhooksTrigger::Refund => Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n };\n"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::impl::IncomingWebhookEvent",
|
| 26 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 27 |
+
"kind": "impl_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "impl From<responses::PayloadWebhooksTrigger> for IncomingWebhookEvent {\n fn from(trigger: responses::PayloadWebhooksTrigger) -> Self {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Self::PaymentIntentSuccess,\n responses::PayloadWebhooksTrigger::Authorized => {\n Self::PaymentIntentAuthorizationSuccess\n }\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment => Self::PaymentIntentProcessing,\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Self::PaymentIntentFailure,\n responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::Reversal => Self::PaymentIntentCancelled,\n // Refund Events\n responses::PayloadWebhooksTrigger::Refund => Self::RefundSuccess,\n // Dispute Events\n responses::PayloadWebhooksTrigger::Chargeback => Self::DisputeOpened,\n responses::PayloadWebhooksTrigger::ChargebackReversal => Self::DisputeWon,\n // Other payment-related events\n // Events not supported by our standard flows\n responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Self::EventNotSupported\n }\n }\n }\n}",
|
| 32 |
+
"after_code": "impl From<responses::PayloadWebhooksTrigger> for IncomingWebhookEvent {\n fn from(trigger: responses::PayloadWebhooksTrigger) -> Self {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Self::PaymentIntentSuccess,\n responses::PayloadWebhooksTrigger::Authorized => {\n Self::PaymentIntentAuthorizationSuccess\n }\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment => Self::PaymentIntentProcessing,\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Self::PaymentIntentFailure,\n responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::Reversal => Self::PaymentIntentCancelled,\n // Dispute Events\n responses::PayloadWebhooksTrigger::Chargeback => Self::DisputeOpened,\n responses::PayloadWebhooksTrigger::ChargebackReversal => Self::DisputeWon,\n // Other payment-related events\n // Events not supported by our standard flows\n responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Refund\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Self::EventNotSupported\n }\n }\n }\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::Reversal => Self::PaymentIntentCancelled,\n // Refund Events\n responses::PayloadWebhooksTrigger::Refund => Self::RefundSuccess,\n // Dispute Events\n responses::PayloadWebhooksTrigger::Chargeback => Self::DisputeOpened,",
|
| 35 |
+
"after": " // Events not supported by our standard flows\n responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Refund\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::IncomingWebhookEvent::function::from",
|
| 41 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "fn from(trigger: responses::PayloadWebhooksTrigger) -> Self {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Self::PaymentIntentSuccess,\n responses::PayloadWebhooksTrigger::Authorized => {\n Self::PaymentIntentAuthorizationSuccess\n }\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment => Self::PaymentIntentProcessing,\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Self::PaymentIntentFailure,\n responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::Reversal => Self::PaymentIntentCancelled,\n // Refund Events\n responses::PayloadWebhooksTrigger::Refund => Self::RefundSuccess,\n // Dispute Events\n responses::PayloadWebhooksTrigger::Chargeback => Self::DisputeOpened,\n responses::PayloadWebhooksTrigger::ChargebackReversal => Self::DisputeWon,\n // Other payment-related events\n // Events not supported by our standard flows\n responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Self::EventNotSupported\n }\n }\n }",
|
| 47 |
+
"after_code": "fn from(trigger: responses::PayloadWebhooksTrigger) -> Self {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Self::PaymentIntentSuccess,\n responses::PayloadWebhooksTrigger::Authorized => {\n Self::PaymentIntentAuthorizationSuccess\n }\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment => Self::PaymentIntentProcessing,\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Self::PaymentIntentFailure,\n responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::Reversal => Self::PaymentIntentCancelled,\n // Dispute Events\n responses::PayloadWebhooksTrigger::Chargeback => Self::DisputeOpened,\n responses::PayloadWebhooksTrigger::ChargebackReversal => Self::DisputeWon,\n // Other payment-related events\n // Events not supported by our standard flows\n responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Refund\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Self::EventNotSupported\n }\n }\n }",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::Reversal => Self::PaymentIntentCancelled,\n // Refund Events\n responses::PayloadWebhooksTrigger::Refund => Self::RefundSuccess,\n // Dispute Events\n responses::PayloadWebhooksTrigger::Chargeback => Self::DisputeOpened,",
|
| 50 |
+
"after": " // Events not supported by our standard flows\n responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Refund\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::impl::responses::PayloadPaymentStatus",
|
| 56 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 57 |
+
"kind": "impl_item",
|
| 58 |
+
"status": "modified",
|
| 59 |
+
"code_changed": true,
|
| 60 |
+
"imports_changed": false,
|
| 61 |
+
"before_code": "impl TryFrom<responses::PayloadWebhooksTrigger> for responses::PayloadPaymentStatus {\n type Error = Error;\n fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n responses::PayloadWebhooksTrigger::Refund => Ok(Self::Processing),\n\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookResponseEncodingFailed.into())\n }\n }\n }\n}",
|
| 62 |
+
"after_code": "impl TryFrom<responses::PayloadWebhooksTrigger> for responses::PayloadPaymentStatus {\n type Error = Error;\n fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n responses::PayloadWebhooksTrigger::Chargeback \n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }\n}",
|
| 63 |
+
"diff_span": {
|
| 64 |
+
"before": " fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n responses::PayloadWebhooksTrigger::Refund => Ok(Self::Processing),\n\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookResponseEncodingFailed.into())\n }\n }",
|
| 65 |
+
"after": " | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n responses::PayloadWebhooksTrigger::Chargeback \n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }"
|
| 66 |
+
},
|
| 67 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 68 |
+
},
|
| 69 |
+
{
|
| 70 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload.rs::Payload::function::get_webhook_resource_object",
|
| 71 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload.rs",
|
| 72 |
+
"kind": "function_item",
|
| 73 |
+
"status": "modified",
|
| 74 |
+
"code_changed": true,
|
| 75 |
+
"imports_changed": false,
|
| 76 |
+
"before_code": "fn get_webhook_resource_object(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookReferenceIdNotFound)?;\n Ok(match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?)\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Box::new(responses::PayloadRefundResponse::try_from(webhook_body)?)\n }\n })\n }",
|
| 77 |
+
"after_code": "fn get_webhook_resource_object(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {\n let webhook_body: responses::PayloadWebhookEvent = request\n .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n Ok(match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?)\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n })\n }",
|
| 78 |
+
"diff_span": {
|
| 79 |
+
"before": " .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookReferenceIdNotFound)?;\n Ok(match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?)\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Box::new(responses::PayloadRefundResponse::try_from(webhook_body)?)\n }\n })",
|
| 80 |
+
"after": " .body\n .parse_struct(\"PayloadWebhookEvent\")\n .change_context(errors::ConnectorError::WebhookResourceObjectNotFound)?;\n Ok(match webhook_body.trigger {\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Box::new(responses::PayloadPaymentsResponse::try_from(webhook_body)?)\n }\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n })"
|
| 81 |
+
},
|
| 82 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 83 |
+
},
|
| 84 |
+
{
|
| 85 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::responses::PayloadPaymentStatus::function::try_from",
|
| 86 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 87 |
+
"kind": "function_item",
|
| 88 |
+
"status": "modified",
|
| 89 |
+
"code_changed": true,
|
| 90 |
+
"imports_changed": false,
|
| 91 |
+
"before_code": "fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n responses::PayloadWebhooksTrigger::Refund => Ok(Self::Processing),\n\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookResponseEncodingFailed.into())\n }\n }\n }",
|
| 92 |
+
"after_code": "fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n responses::PayloadWebhooksTrigger::Chargeback \n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }\n }",
|
| 93 |
+
"diff_span": {
|
| 94 |
+
"before": "fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n responses::PayloadWebhooksTrigger::Refund => Ok(Self::Processing),\n\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Processed => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Authorized => Ok(Self::Authorized),\n // Payment Processing Events\n responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal => Ok(Self::Processing),\n // Payment Failure Events\n responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookResponseEncodingFailed.into())\n }\n }",
|
| 95 |
+
"after": " | responses::PayloadWebhooksTrigger::BankAccountReject => Ok(Self::Declined),\n responses::PayloadWebhooksTrigger::Void => Ok(Self::Voided),\n responses::PayloadWebhooksTrigger::Refund => {\n Err(errors::ConnectorError::NotSupported{ message: \"Refund Webhook\".to_string(),\n connector: \"Payload\"})\n }\n responses::PayloadWebhooksTrigger::Chargeback \n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookEventTypeNotFound.into())\n }\n }"
|
| 96 |
+
},
|
| 97 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 98 |
+
},
|
| 99 |
+
{
|
| 100 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::responses::PayloadRefundResponse::function::try_from",
|
| 101 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 102 |
+
"kind": "function_item",
|
| 103 |
+
"status": "removed",
|
| 104 |
+
"before_code": "fn try_from(webhook_body: responses::PayloadWebhookEvent) -> Result<Self, Self::Error> {\n Ok(Self {\n amount: None,\n transaction_id: webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ledger: vec![],\n connector_payment_method_id: None,\n processing_id: None,\n ref_number: None,\n status: responses::RefundStatus::try_from(webhook_body.trigger)?,\n status_code: None,\n status_message: None,\n })\n }",
|
| 105 |
+
"after_code": null,
|
| 106 |
+
"diff_span": null,
|
| 107 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 108 |
+
},
|
| 109 |
+
{
|
| 110 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::responses::PayloadRefundResponse::type::Error",
|
| 111 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 112 |
+
"kind": "type_item",
|
| 113 |
+
"status": "removed",
|
| 114 |
+
"before_code": "type Error = error_stack::Report<errors::ConnectorError>;",
|
| 115 |
+
"after_code": null,
|
| 116 |
+
"diff_span": null,
|
| 117 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 118 |
+
},
|
| 119 |
+
{
|
| 120 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::responses::RefundStatus::function::try_from",
|
| 121 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 122 |
+
"kind": "function_item",
|
| 123 |
+
"status": "removed",
|
| 124 |
+
"before_code": "fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Refund => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookResponseEncodingFailed.into())\n }\n }\n }",
|
| 125 |
+
"after_code": null,
|
| 126 |
+
"diff_span": null,
|
| 127 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 128 |
+
},
|
| 129 |
+
{
|
| 130 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::impl::responses::RefundStatus",
|
| 131 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 132 |
+
"kind": "impl_item",
|
| 133 |
+
"status": "removed",
|
| 134 |
+
"before_code": "impl TryFrom<responses::PayloadWebhooksTrigger> for responses::RefundStatus {\n type Error = Error;\n fn try_from(trigger: responses::PayloadWebhooksTrigger) -> Result<Self, Self::Error> {\n match trigger {\n // Payment Success Events\n responses::PayloadWebhooksTrigger::Refund => Ok(Self::Processed),\n responses::PayloadWebhooksTrigger::Processed\n | responses::PayloadWebhooksTrigger::Authorized\n | responses::PayloadWebhooksTrigger::Payment\n | responses::PayloadWebhooksTrigger::AutomaticPayment\n | responses::PayloadWebhooksTrigger::Reversal\n | responses::PayloadWebhooksTrigger::Decline\n | responses::PayloadWebhooksTrigger::Reject\n | responses::PayloadWebhooksTrigger::BankAccountReject\n | responses::PayloadWebhooksTrigger::Void\n | responses::PayloadWebhooksTrigger::Chargeback\n | responses::PayloadWebhooksTrigger::ChargebackReversal\n | responses::PayloadWebhooksTrigger::PaymentActivationStatus\n | responses::PayloadWebhooksTrigger::Credit\n | responses::PayloadWebhooksTrigger::Deposit\n | responses::PayloadWebhooksTrigger::PaymentLinkStatus\n | responses::PayloadWebhooksTrigger::ProcessingStatus\n | responses::PayloadWebhooksTrigger::TransactionOperation\n | responses::PayloadWebhooksTrigger::TransactionOperationClear => {\n Err(errors::ConnectorError::WebhookResponseEncodingFailed.into())\n }\n }\n }\n}",
|
| 135 |
+
"after_code": null,
|
| 136 |
+
"diff_span": null,
|
| 137 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 138 |
+
},
|
| 139 |
+
{
|
| 140 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::responses::RefundStatus::type::Error",
|
| 141 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 142 |
+
"kind": "type_item",
|
| 143 |
+
"status": "removed",
|
| 144 |
+
"before_code": "type Error = Error;",
|
| 145 |
+
"after_code": null,
|
| 146 |
+
"diff_span": null,
|
| 147 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 148 |
+
},
|
| 149 |
+
{
|
| 150 |
+
"id": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs::impl::responses::PayloadRefundResponse",
|
| 151 |
+
"file": "crates/hyperswitch_connectors/src/connectors/payload/transformers.rs",
|
| 152 |
+
"kind": "impl_item",
|
| 153 |
+
"status": "removed",
|
| 154 |
+
"before_code": "impl TryFrom<responses::PayloadWebhookEvent> for responses::PayloadRefundResponse {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(webhook_body: responses::PayloadWebhookEvent) -> Result<Self, Self::Error> {\n Ok(Self {\n amount: None,\n transaction_id: webhook_body\n .triggered_on\n .transaction_id\n .ok_or(errors::ConnectorError::WebhookReferenceIdNotFound)?,\n ledger: vec![],\n connector_payment_method_id: None,\n processing_id: None,\n ref_number: None,\n status: responses::RefundStatus::try_from(webhook_body.trigger)?,\n status_code: None,\n status_message: None,\n })\n }\n}",
|
| 155 |
+
"after_code": null,
|
| 156 |
+
"diff_span": null,
|
| 157 |
+
"commit_sha": "a0a1faf5a66512f6884090359907f2cc0ffebff4"
|
| 158 |
+
}
|
| 159 |
+
]
|
| 160 |
+
}
|
diffs/pr_10204/bc1c621/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10204/ea81c76/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|