diff --git "a/diffs/pr_6687/2ef1dfa/diff.json" "b/diffs/pr_6687/2ef1dfa/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_6687/2ef1dfa/diff.json" @@ -0,0 +1,2103 @@ +{ + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "pr_number": 6687, + "rust_files": [ + "crates/hyperswitch_domain_models/src/mandates.rs", + "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "crates/hyperswitch_domain_models/src/payment_methods.rs", + "crates/router/src/core/payment_methods.rs", + "crates/router/src/core/payment_methods/cards.rs", + "crates/router/src/core/payments/tokenization.rs", + "crates/router/src/core/payouts/helpers.rs", + "crates/router/src/core/webhooks/incoming.rs" + ], + "diffs": [ + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::VaultId::function::generate", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn generate(id: String) -> Self {\n Self(id)\n }", + "after_code": "pub fn generate(id: String) -> Self {\n Self(id)\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::get_common_mandate_reference", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub fn get_common_mandate_reference(\n &self,\n ) -> Result {\n if let Some(value) = &self.connector_mandate_details {\n Ok(value.clone())\n } else {\n Ok(diesel_models::CommonMandateReference {\n payments: None,\n payouts: None,\n })\n }\n }", + "after_code": "pub fn get_common_mandate_reference(&self) -> Result {\n if let Some(value) = &self.connector_mandate_details {\n Ok(value.clone())\n } else {\n Ok(CommonMandateReference {\n payments: None,\n payouts: None,\n })\n }\n }", + "diff_span": { + "before": "pub fn get_common_mandate_reference(\n &self,\n ) -> Result {\n if let Some(value) = &self.connector_mandate_details {\n Ok(value.clone())\n } else {\n Ok(diesel_models::CommonMandateReference {\n payments: None,\n payouts: None,", + "after": "pub fn get_common_mandate_reference(&self) -> Result {\n if let Some(value) = &self.connector_mandate_details {\n Ok(value.clone())\n } else {\n Ok(CommonMandateReference {\n payments: None,\n payouts: None," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::refunds_incoming_webhook_flow", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn refunds_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n connector_name: &str,\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n) -> CustomResult {\n let db = &*state.store;\n //find refund by connector refund id\n let refund = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::RefundId(refund_id_type) => match refund_id_type {\n webhooks::RefundIdType::RefundId(id) => db\n .find_refund_by_merchant_id_refund_id(\n merchant_account.get_id(),\n &id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the refund\")?,\n webhooks::RefundIdType::ConnectorRefundId(id) => db\n .find_refund_by_merchant_id_connector_refund_id_connector(\n merchant_account.get_id(),\n &id,\n connector_name,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the refund\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-refund id when processing refund webhooks\")?,\n };\n let refund_id = refund.refund_id.to_owned();\n //if source verified then update refund status else trigger refund sync\n let updated_refund = if source_verified {\n let refund_update = storage::RefundUpdate::StatusUpdate {\n connector_refund_id: None,\n sent_to_gateway: true,\n refund_status: common_enums::RefundStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed refund status mapping from event type\")?,\n updated_by: merchant_account.storage_scheme.to_string(),\n connector_refund_data: None,\n };\n db.update_refund(\n refund.to_owned(),\n refund_update,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| format!(\"Failed while updating refund: refund_id: {refund_id}\"))?\n } else {\n Box::pin(refunds::refund_retrieve_core_with_refund_id(\n state.clone(),\n merchant_account.clone(),\n None,\n key_store.clone(),\n api_models::refunds::RefundsRetrieveRequest {\n refund_id: refund_id.to_owned(),\n force_sync: Some(true),\n merchant_connector_details: None,\n },\n ))\n .await\n .attach_printable_lazy(|| format!(\"Failed while updating refund: refund_id: {refund_id}\"))?\n };\n let event_type: Option = updated_refund.refund_status.foreign_into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let refund_response: api_models::refunds::RefundResponse =\n updated_refund.clone().foreign_into();\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Refunds,\n refund_id,\n enums::EventObjectType::RefundDetails,\n api::OutgoingWebhookContent::RefundDetails(Box::new(refund_response)),\n Some(updated_refund.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Refund {\n payment_id: updated_refund.payment_id,\n refund_id: updated_refund.refund_id,\n status: updated_refund.refund_status,\n })\n}", + "after_code": "async fn refunds_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n connector_name: &str,\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n) -> CustomResult {\n let db = &*state.store;\n //find refund by connector refund id\n let refund = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::RefundId(refund_id_type) => match refund_id_type {\n webhooks::RefundIdType::RefundId(id) => db\n .find_refund_by_merchant_id_refund_id(\n merchant_account.get_id(),\n &id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the refund\")?,\n webhooks::RefundIdType::ConnectorRefundId(id) => db\n .find_refund_by_merchant_id_connector_refund_id_connector(\n merchant_account.get_id(),\n &id,\n connector_name,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the refund\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-refund id when processing refund webhooks\")?,\n };\n let refund_id = refund.refund_id.to_owned();\n //if source verified then update refund status else trigger refund sync\n let updated_refund = if source_verified {\n let refund_update = storage::RefundUpdate::StatusUpdate {\n connector_refund_id: None,\n sent_to_gateway: true,\n refund_status: common_enums::RefundStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed refund status mapping from event type\")?,\n updated_by: merchant_account.storage_scheme.to_string(),\n connector_refund_data: None,\n };\n db.update_refund(\n refund.to_owned(),\n refund_update,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| format!(\"Failed while updating refund: refund_id: {refund_id}\"))?\n } else {\n Box::pin(refunds::refund_retrieve_core_with_refund_id(\n state.clone(),\n merchant_account.clone(),\n None,\n key_store.clone(),\n api_models::refunds::RefundsRetrieveRequest {\n refund_id: refund_id.to_owned(),\n force_sync: Some(true),\n merchant_connector_details: None,\n },\n ))\n .await\n .attach_printable_lazy(|| format!(\"Failed while updating refund: refund_id: {refund_id}\"))?\n };\n let event_type: Option = updated_refund.refund_status.foreign_into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let refund_response: api_models::refunds::RefundResponse =\n updated_refund.clone().foreign_into();\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Refunds,\n refund_id,\n enums::EventObjectType::RefundDetails,\n api::OutgoingWebhookContent::RefundDetails(Box::new(refund_response)),\n Some(updated_refund.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Refund {\n payment_id: updated_refund.payment_id,\n refund_id: updated_refund.refund_id,\n status: updated_refund.refund_status,\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use api_models::webhooks::{self, WebhookResponseTracker};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::enum::MerchantConnectorAccountUpdate", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "enum_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub enum MerchantConnectorAccountUpdate {\n Update {\n connector_type: Option,\n connector_account_details: Box>>,\n disabled: Option,\n payment_methods_enabled: Option>,\n metadata: Option,\n frm_configs: Option>,\n connector_webhook_details: Option,\n applepay_verified_domains: Option>,\n pm_auth_config: Box>,\n connector_label: Option,\n status: Option,\n connector_wallets_details: Box>>,\n additional_merchant_data: Box>>,\n },\n ConnectorWalletDetailsUpdate {\n connector_wallets_details: Encryptable,\n },\n}", + "after_code": "pub enum MerchantConnectorAccountUpdate {\n Update {\n connector_type: Option,\n connector_account_details: Box>>,\n disabled: Option,\n payment_methods_enabled: Option>,\n metadata: Option,\n frm_configs: Option>,\n connector_webhook_details: Option,\n applepay_verified_domains: Option>,\n pm_auth_config: Box>,\n connector_label: Option,\n status: Option,\n connector_wallets_details: Box>>,\n additional_merchant_data: Box>>,\n },\n ConnectorWalletDetailsUpdate {\n connector_wallets_details: Encryptable,\n },\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};" + ], + "after_imports": [ + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::function::convert_back", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn convert_back(\n state: &KeyManagerState,\n other: Self::DstType,\n key: &Secret>,\n _key_manager_identifier: Identifier,\n ) -> CustomResult {\n let identifier = Identifier::Merchant(other.merchant_id.clone());\n\n let decrypted_data = crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::BatchDecrypt(EncryptedMerchantConnectorAccount::to_encryptable(\n EncryptedMerchantConnectorAccount {\n connector_account_details: other.connector_account_details,\n additional_merchant_data: other.additional_merchant_data,\n connector_wallets_details: other.connector_wallets_details,\n },\n )),\n identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_batchoperation())\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting connector account details\".to_string(),\n })?;\n\n let decrypted_data = EncryptedMerchantConnectorAccount::from_encryptable(decrypted_data)\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting connector account details\".to_string(),\n })?;\n\n Ok(Self {\n id: other.id,\n merchant_id: other.merchant_id,\n connector_name: other.connector_name,\n connector_account_details: decrypted_data.connector_account_details,\n disabled: other.disabled,\n payment_methods_enabled: other.payment_methods_enabled,\n connector_type: other.connector_type,\n metadata: other.metadata,\n\n frm_configs: other.frm_config,\n connector_label: other.connector_label,\n created_at: other.created_at,\n modified_at: other.modified_at,\n connector_webhook_details: other.connector_webhook_details,\n profile_id: other.profile_id,\n applepay_verified_domains: other.applepay_verified_domains,\n pm_auth_config: other.pm_auth_config,\n status: other.status,\n connector_wallets_details: decrypted_data.connector_wallets_details,\n additional_merchant_data: decrypted_data.additional_merchant_data,\n version: other.version,\n })\n }", + "after_code": "async fn convert_back(\n state: &KeyManagerState,\n other: Self::DstType,\n key: &Secret>,\n _key_manager_identifier: Identifier,\n ) -> CustomResult {\n let identifier = Identifier::Merchant(other.merchant_id.clone());\n\n let decrypted_data = crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::BatchDecrypt(EncryptedMerchantConnectorAccount::to_encryptable(\n EncryptedMerchantConnectorAccount {\n connector_account_details: other.connector_account_details,\n additional_merchant_data: other.additional_merchant_data,\n connector_wallets_details: other.connector_wallets_details,\n },\n )),\n identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_batchoperation())\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting connector account details\".to_string(),\n })?;\n\n let decrypted_data = EncryptedMerchantConnectorAccount::from_encryptable(decrypted_data)\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting connector account details\".to_string(),\n })?;\n\n Ok(Self {\n id: other.id,\n merchant_id: other.merchant_id,\n connector_name: other.connector_name,\n connector_account_details: decrypted_data.connector_account_details,\n disabled: other.disabled,\n payment_methods_enabled: other.payment_methods_enabled,\n connector_type: other.connector_type,\n metadata: other.metadata,\n\n frm_configs: other.frm_config,\n connector_label: other.connector_label,\n created_at: other.created_at,\n modified_at: other.modified_at,\n connector_webhook_details: other.connector_webhook_details,\n profile_id: other.profile_id,\n applepay_verified_domains: other.applepay_verified_domains,\n pm_auth_config: other.pm_auth_config,\n status: other.status,\n connector_wallets_details: decrypted_data.connector_wallets_details,\n additional_merchant_data: decrypted_data.additional_merchant_data,\n version: other.version,\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};" + ], + "after_imports": [ + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::get_or_update_dispute_object", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_or_update_dispute_object(\n state: SessionState,\n option_dispute: Option,\n dispute_details: api::disputes::DisputePayload,\n merchant_id: &common_utils::id_type::MerchantId,\n organization_id: &common_utils::id_type::OrganizationId,\n payment_attempt: &PaymentAttempt,\n event_type: webhooks::IncomingWebhookEvent,\n business_profile: &domain::Profile,\n connector_name: &str,\n) -> CustomResult {\n let db = &*state.store;\n match option_dispute {\n None => {\n metrics::INCOMING_DISPUTE_WEBHOOK_NEW_RECORD_METRIC.add(1, &[]);\n let dispute_id = generate_id(consts::ID_LENGTH, \"dp\");\n let new_dispute = diesel_models::dispute::DisputeNew {\n dispute_id,\n amount: dispute_details.amount.clone(),\n currency: dispute_details.currency.to_string(),\n dispute_stage: dispute_details.dispute_stage,\n dispute_status: common_enums::DisputeStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"event type to dispute status mapping failed\")?,\n payment_id: payment_attempt.payment_id.to_owned(),\n connector: connector_name.to_owned(),\n attempt_id: payment_attempt.attempt_id.to_owned(),\n merchant_id: merchant_id.to_owned(),\n connector_status: dispute_details.connector_status,\n connector_dispute_id: dispute_details.connector_dispute_id,\n connector_reason: dispute_details.connector_reason,\n connector_reason_code: dispute_details.connector_reason_code,\n challenge_required_by: dispute_details.challenge_required_by,\n connector_created_at: dispute_details.created_at,\n connector_updated_at: dispute_details.updated_at,\n profile_id: Some(business_profile.get_id().to_owned()),\n evidence: None,\n merchant_connector_id: payment_attempt.merchant_connector_id.clone(),\n dispute_amount: dispute_details.amount.parse::().unwrap_or(0),\n organization_id: organization_id.clone(),\n dispute_currency: Some(dispute_details.currency),\n };\n state\n .store\n .insert_dispute(new_dispute.clone())\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n }\n Some(dispute) => {\n logger::info!(\"Dispute Already exists, Updating the dispute details\");\n metrics::INCOMING_DISPUTE_WEBHOOK_UPDATE_RECORD_METRIC.add(1, &[]);\n let dispute_status = diesel_models::enums::DisputeStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"event type to dispute state conversion failure\")?;\n crate::core::utils::validate_dispute_stage_and_dispute_status(\n dispute.dispute_stage,\n dispute.dispute_status,\n dispute_details.dispute_stage,\n dispute_status,\n )\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"dispute stage and status validation failed\")?;\n let update_dispute = diesel_models::dispute::DisputeUpdate::Update {\n dispute_stage: dispute_details.dispute_stage,\n dispute_status,\n connector_status: dispute_details.connector_status,\n connector_reason: dispute_details.connector_reason,\n connector_reason_code: dispute_details.connector_reason_code,\n challenge_required_by: dispute_details.challenge_required_by,\n connector_updated_at: dispute_details.updated_at,\n };\n db.update_dispute(dispute, update_dispute)\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n }\n }\n}", + "after_code": "async fn get_or_update_dispute_object(\n state: SessionState,\n option_dispute: Option,\n dispute_details: api::disputes::DisputePayload,\n merchant_id: &common_utils::id_type::MerchantId,\n organization_id: &common_utils::id_type::OrganizationId,\n payment_attempt: &PaymentAttempt,\n event_type: webhooks::IncomingWebhookEvent,\n business_profile: &domain::Profile,\n connector_name: &str,\n) -> CustomResult {\n let db = &*state.store;\n match option_dispute {\n None => {\n metrics::INCOMING_DISPUTE_WEBHOOK_NEW_RECORD_METRIC.add(1, &[]);\n let dispute_id = generate_id(consts::ID_LENGTH, \"dp\");\n let new_dispute = diesel_models::dispute::DisputeNew {\n dispute_id,\n amount: dispute_details.amount.clone(),\n currency: dispute_details.currency.to_string(),\n dispute_stage: dispute_details.dispute_stage,\n dispute_status: common_enums::DisputeStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"event type to dispute status mapping failed\")?,\n payment_id: payment_attempt.payment_id.to_owned(),\n connector: connector_name.to_owned(),\n attempt_id: payment_attempt.attempt_id.to_owned(),\n merchant_id: merchant_id.to_owned(),\n connector_status: dispute_details.connector_status,\n connector_dispute_id: dispute_details.connector_dispute_id,\n connector_reason: dispute_details.connector_reason,\n connector_reason_code: dispute_details.connector_reason_code,\n challenge_required_by: dispute_details.challenge_required_by,\n connector_created_at: dispute_details.created_at,\n connector_updated_at: dispute_details.updated_at,\n profile_id: Some(business_profile.get_id().to_owned()),\n evidence: None,\n merchant_connector_id: payment_attempt.merchant_connector_id.clone(),\n dispute_amount: dispute_details.amount.parse::().unwrap_or(0),\n organization_id: organization_id.clone(),\n dispute_currency: Some(dispute_details.currency),\n };\n state\n .store\n .insert_dispute(new_dispute.clone())\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n }\n Some(dispute) => {\n logger::info!(\"Dispute Already exists, Updating the dispute details\");\n metrics::INCOMING_DISPUTE_WEBHOOK_UPDATE_RECORD_METRIC.add(1, &[]);\n let dispute_status = diesel_models::enums::DisputeStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"event type to dispute state conversion failure\")?;\n crate::core::utils::validate_dispute_stage_and_dispute_status(\n dispute.dispute_stage,\n dispute.dispute_status,\n dispute_details.dispute_stage,\n dispute_status,\n )\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"dispute stage and status validation failed\")?;\n let update_dispute = diesel_models::dispute::DisputeUpdate::Update {\n dispute_stage: dispute_details.dispute_stage,\n dispute_status,\n connector_status: dispute_details.connector_status,\n connector_reason: dispute_details.connector_reason,\n connector_reason_code: dispute_details.connector_reason_code,\n challenge_required_by: dispute_details.challenge_required_by,\n connector_updated_at: dispute_details.updated_at,\n };\n db.update_dispute(dispute, update_dispute)\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::impl::MerchantConnectorAccountUpdateInternal", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl From for MerchantConnectorAccountUpdateInternal {\n fn from(merchant_connector_account_update: MerchantConnectorAccountUpdate) -> Self {\n match merchant_connector_account_update {\n MerchantConnectorAccountUpdate::Update {\n connector_type,\n connector_account_details,\n disabled,\n payment_methods_enabled,\n metadata,\n frm_configs,\n connector_webhook_details,\n applepay_verified_domains,\n pm_auth_config,\n connector_label,\n status,\n connector_wallets_details,\n additional_merchant_data,\n } => Self {\n connector_type,\n connector_account_details: connector_account_details.map(Encryption::from),\n disabled,\n payment_methods_enabled,\n metadata,\n frm_config: frm_configs,\n modified_at: Some(date_time::now()),\n connector_webhook_details,\n applepay_verified_domains,\n pm_auth_config: *pm_auth_config,\n connector_label,\n status,\n connector_wallets_details: connector_wallets_details.map(Encryption::from),\n additional_merchant_data: additional_merchant_data.map(Encryption::from),\n },\n MerchantConnectorAccountUpdate::ConnectorWalletDetailsUpdate {\n connector_wallets_details,\n } => Self {\n connector_wallets_details: Some(Encryption::from(connector_wallets_details)),\n connector_type: None,\n connector_account_details: None,\n connector_label: None,\n disabled: None,\n payment_methods_enabled: None,\n metadata: None,\n modified_at: None,\n connector_webhook_details: None,\n frm_config: None,\n applepay_verified_domains: None,\n pm_auth_config: None,\n status: None,\n additional_merchant_data: None,\n },\n }\n }\n}", + "after_code": "impl From for MerchantConnectorAccountUpdateInternal {\n fn from(merchant_connector_account_update: MerchantConnectorAccountUpdate) -> Self {\n match merchant_connector_account_update {\n MerchantConnectorAccountUpdate::Update {\n connector_type,\n connector_account_details,\n disabled,\n payment_methods_enabled,\n metadata,\n frm_configs,\n connector_webhook_details,\n applepay_verified_domains,\n pm_auth_config,\n connector_label,\n status,\n connector_wallets_details,\n additional_merchant_data,\n } => Self {\n connector_type,\n connector_account_details: connector_account_details.map(Encryption::from),\n disabled,\n payment_methods_enabled,\n metadata,\n frm_config: frm_configs,\n modified_at: Some(date_time::now()),\n connector_webhook_details,\n applepay_verified_domains,\n pm_auth_config: *pm_auth_config,\n connector_label,\n status,\n connector_wallets_details: connector_wallets_details.map(Encryption::from),\n additional_merchant_data: additional_merchant_data.map(Encryption::from),\n },\n MerchantConnectorAccountUpdate::ConnectorWalletDetailsUpdate {\n connector_wallets_details,\n } => Self {\n connector_wallets_details: Some(Encryption::from(connector_wallets_details)),\n connector_type: None,\n connector_account_details: None,\n connector_label: None,\n disabled: None,\n payment_methods_enabled: None,\n metadata: None,\n modified_at: None,\n connector_webhook_details: None,\n frm_config: None,\n applepay_verified_domains: None,\n pm_auth_config: None,\n status: None,\n additional_merchant_data: None,\n },\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::function::create_payment_method_metadata", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn create_payment_method_metadata(\n metadata: Option<&pii::SecretSerdeValue>,\n connector_token: Option<(String, String)>,\n) -> RouterResult> {\n let mut meta = match metadata {\n None => serde_json::Map::new(),\n Some(meta) => {\n let metadata = meta.clone().expose();\n let existing_metadata: serde_json::Map = metadata\n .parse_value(\"Map\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse the metadata\")?;\n existing_metadata\n }\n };\n Ok(connector_token.and_then(|connector_and_token| {\n meta.insert(\n connector_and_token.0,\n serde_json::Value::String(connector_and_token.1),\n )\n }))\n}", + "after_code": "pub fn create_payment_method_metadata(\n metadata: Option<&pii::SecretSerdeValue>,\n connector_token: Option<(String, String)>,\n) -> RouterResult> {\n let mut meta = match metadata {\n None => serde_json::Map::new(),\n Some(meta) => {\n let metadata = meta.clone().expose();\n let existing_metadata: serde_json::Map = metadata\n .parse_value(\"Map\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse the metadata\")?;\n existing_metadata\n }\n };\n Ok(connector_token.and_then(|connector_and_token| {\n meta.insert(\n connector_and_token.0,\n serde_json::Value::String(connector_and_token.1),\n )\n }))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use masking::{ExposeInterface, Secret};" + ], + "after_imports": [ + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use masking::{ExposeInterface, Secret};" + ] + }, + { + "id": "crates/router/src/core/payment_methods/cards.rs::function::update_payment_method_connector_mandate_details", + "file": "crates/router/src/core/payment_methods/cards.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub async fn update_payment_method_connector_mandate_details(\n state: &routes::SessionState,\n key_store: &domain::MerchantKeyStore,\n db: &dyn db::StorageInterface,\n pm: domain::PaymentMethod,\n connector_mandate_details: Option,\n storage_scheme: MerchantStorageScheme,\n) -> errors::CustomResult<(), errors::VaultError> {\n let connector_mandate_details_value = connector_mandate_details\n .map(|common_mandate| {\n common_mandate.get_mandate_details_value().map_err(|err| {\n router_env::logger::error!(\"Failed to get get_mandate_details_value : {:?}\", err);\n errors::VaultError::UpdateInPaymentMethodDataTableFailed\n })\n })\n .transpose()?;\n\n let pm_update = payment_method::PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details: connector_mandate_details_value,\n };\n\n db.update_payment_method(&(state.into()), key_store, pm, pm_update, storage_scheme)\n .await\n .change_context(errors::VaultError::UpdateInPaymentMethodDataTableFailed)?;\n Ok(())\n}", + "after_code": "pub async fn update_payment_method_connector_mandate_details(\n state: &routes::SessionState,\n key_store: &domain::MerchantKeyStore,\n db: &dyn db::StorageInterface,\n pm: domain::PaymentMethod,\n connector_mandate_details: Option,\n storage_scheme: MerchantStorageScheme,\n) -> errors::CustomResult<(), errors::VaultError> {\n let connector_mandate_details_value = connector_mandate_details\n .map(|common_mandate| {\n common_mandate.get_mandate_details_value().map_err(|err| {\n router_env::logger::error!(\"Failed to get get_mandate_details_value : {:?}\", err);\n errors::VaultError::UpdateInPaymentMethodDataTableFailed\n })\n })\n .transpose()?;\n\n let pm_update = payment_method::PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details: connector_mandate_details_value,\n };\n\n db.update_payment_method(&(state.into()), key_store, pm, pm_update, storage_scheme)\n .await\n .change_context(errors::VaultError::UpdateInPaymentMethodDataTableFailed)?;\n Ok(())\n}", + "diff_span": { + "before": " db: &dyn db::StorageInterface,\n pm: domain::PaymentMethod,\n connector_mandate_details: Option,\n storage_scheme: MerchantStorageScheme,\n) -> errors::CustomResult<(), errors::VaultError> {", + "after": " db: &dyn db::StorageInterface,\n pm: domain::PaymentMethod,\n connector_mandate_details: Option,\n storage_scheme: MerchantStorageScheme,\n) -> errors::CustomResult<(), errors::VaultError> {" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n consts,\n crypto::{self, Encryptable},\n encryption::Encryption,\n ext_traits::{AsyncExt, BytesExt, ConfigExt, Encode, StringExt, ValueExt},\n generate_id, id_type,\n request::Request,\n type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit,\n },\n};", + "use super::surcharge_decision_configs::{\n perform_surcharge_decision_management_for_payment_method_list,\n perform_surcharge_decision_management_for_saved_cards,\n};", + "use diesel_models::payment_method;" + ], + "after_imports": [ + "use hyperswitch_domain_models::mandates::CommonMandateReference;", + "use common_utils::{\n consts,\n crypto::{self, Encryptable},\n encryption::Encryption,\n ext_traits::{AsyncExt, BytesExt, ConfigExt, Encode, StringExt, ValueExt},\n generate_id, id_type,\n request::Request,\n type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit,\n },\n};", + "use super::surcharge_decision_configs::{\n perform_surcharge_decision_management_for_payment_method_list,\n perform_surcharge_decision_management_for_saved_cards,\n};", + "use diesel_models::payment_method;" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::function::save_in_locker", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn save_in_locker(\n _state: &SessionState,\n _merchant_account: &domain::MerchantAccount,\n _payment_method_request: api::PaymentMethodCreate,\n) -> RouterResult<(\n api_models::payment_methods::PaymentMethodResponse,\n Option,\n)> {\n todo!()\n}", + "after_code": "pub async fn save_in_locker(\n _state: &SessionState,\n _merchant_account: &domain::MerchantAccount,\n _payment_method_request: api::PaymentMethodCreate,\n) -> RouterResult<(\n api_models::payment_methods::PaymentMethodResponse,\n Option,\n)> {\n todo!()\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ], + "after_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::function::add_payment_method_token", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn add_payment_method_token(\n state: &SessionState,\n connector: &api::ConnectorData,\n tokenization_action: &payments::TokenizationAction,\n router_data: &mut types::RouterData,\n pm_token_request_data: types::PaymentMethodTokenizationData,\n should_continue_payment: bool,\n) -> RouterResult {\n if should_continue_payment {\n match tokenization_action {\n payments::TokenizationAction::TokenizeInConnector\n | payments::TokenizationAction::TokenizeInConnectorAndApplepayPreDecrypt(_) => {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::PaymentMethodToken,\n types::PaymentMethodTokenizationData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n\n let pm_token_response_data: Result<\n types::PaymentsResponseData,\n types::ErrorResponse,\n > = Err(types::ErrorResponse::default());\n\n let pm_token_router_data =\n helpers::router_data_type_conversion::<_, api::PaymentMethodToken, _, _, _, _>(\n router_data.clone(),\n pm_token_request_data,\n pm_token_response_data,\n );\n\n router_data\n .request\n .set_session_token(pm_token_router_data.session_token.clone());\n\n let resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &pm_token_router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payment_failed_response()?;\n\n metrics::CONNECTOR_PAYMENT_METHOD_TOKENIZATION.add(\n 1,\n router_env::metric_attributes!(\n (\"connector\", connector.connector_name.to_string()),\n (\"payment_method\", router_data.payment_method.to_string()),\n ),\n );\n\n let payment_token_resp = resp.response.map(|res| {\n if let types::PaymentsResponseData::TokenizationResponse { token } = res {\n Some(token)\n } else {\n None\n }\n });\n\n Ok(types::PaymentMethodTokenResult {\n payment_method_token_result: payment_token_resp,\n is_payment_method_tokenization_performed: true,\n })\n }\n _ => Ok(types::PaymentMethodTokenResult {\n payment_method_token_result: Ok(None),\n is_payment_method_tokenization_performed: false,\n }),\n }\n } else {\n logger::debug!(\"Skipping connector tokenization based on should_continue_payment flag\");\n Ok(types::PaymentMethodTokenResult {\n payment_method_token_result: Ok(None),\n is_payment_method_tokenization_performed: false,\n })\n }\n}", + "after_code": "pub async fn add_payment_method_token(\n state: &SessionState,\n connector: &api::ConnectorData,\n tokenization_action: &payments::TokenizationAction,\n router_data: &mut types::RouterData,\n pm_token_request_data: types::PaymentMethodTokenizationData,\n should_continue_payment: bool,\n) -> RouterResult {\n if should_continue_payment {\n match tokenization_action {\n payments::TokenizationAction::TokenizeInConnector\n | payments::TokenizationAction::TokenizeInConnectorAndApplepayPreDecrypt(_) => {\n let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n api::PaymentMethodToken,\n types::PaymentMethodTokenizationData,\n types::PaymentsResponseData,\n > = connector.connector.get_connector_integration();\n\n let pm_token_response_data: Result<\n types::PaymentsResponseData,\n types::ErrorResponse,\n > = Err(types::ErrorResponse::default());\n\n let pm_token_router_data =\n helpers::router_data_type_conversion::<_, api::PaymentMethodToken, _, _, _, _>(\n router_data.clone(),\n pm_token_request_data,\n pm_token_response_data,\n );\n\n router_data\n .request\n .set_session_token(pm_token_router_data.session_token.clone());\n\n let resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &pm_token_router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payment_failed_response()?;\n\n metrics::CONNECTOR_PAYMENT_METHOD_TOKENIZATION.add(\n 1,\n router_env::metric_attributes!(\n (\"connector\", connector.connector_name.to_string()),\n (\"payment_method\", router_data.payment_method.to_string()),\n ),\n );\n\n let payment_token_resp = resp.response.map(|res| {\n if let types::PaymentsResponseData::TokenizationResponse { token } = res {\n Some(token)\n } else {\n None\n }\n });\n\n Ok(types::PaymentMethodTokenResult {\n payment_method_token_result: payment_token_resp,\n is_payment_method_tokenization_performed: true,\n })\n }\n _ => Ok(types::PaymentMethodTokenResult {\n payment_method_token_result: Ok(None),\n is_payment_method_tokenization_performed: false,\n }),\n }\n } else {\n logger::debug!(\"Skipping connector tokenization based on should_continue_payment flag\");\n Ok(types::PaymentMethodTokenResult {\n payment_method_token_result: Ok(None),\n is_payment_method_tokenization_performed: false,\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use super::helpers;" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};", + "use super::helpers;", + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::payouts_incoming_webhook_flow", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn payouts_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n) -> CustomResult {\n metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n //find payout_attempt by object_reference_id\n let payout_attempt = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PayoutId(payout_id_type) => match payout_id_type {\n webhooks::PayoutIdType::PayoutAttemptId(id) => db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_account.get_id(),\n &id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n webhooks::PayoutIdType::ConnectorPayoutId(id) => db\n .find_payout_attempt_by_merchant_id_connector_payout_id(\n merchant_account.get_id(),\n &id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payout id when processing payout webhooks\")?,\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_account.get_id(),\n &payout_attempt.payout_id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout\")?;\n\n let payout_attempt_update = PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status: common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?,\n error_message: None,\n error_code: None,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n };\n\n let action_req =\n payout_models::PayoutRequest::PayoutActionRequest(payout_models::PayoutActionRequest {\n payout_id: payouts.payout_id.clone(),\n });\n\n let payout_data = payouts::make_payout_data(\n &state,\n &merchant_account,\n None,\n &key_store,\n &action_req,\n common_utils::consts::DEFAULT_LOCALE,\n )\n .await?;\n\n let updated_payout_attempt = db\n .update_payout_attempt(\n &payout_attempt,\n payout_attempt_update,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating payout attempt: payout_attempt_id: {}\",\n payout_attempt.payout_attempt_id\n )\n })?;\n\n let event_type: Option = updated_payout_attempt.status.foreign_into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let router_response =\n payouts::response_handler(&state, &merchant_account, &payout_data).await?;\n\n let payout_create_response: payout_models::PayoutCreateResponse = match router_response\n {\n services::ApplicationResponse::Json(response) => response,\n _ => Err(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout create response\")?,\n };\n\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Payouts,\n updated_payout_attempt.payout_id.clone(),\n enums::EventObjectType::PayoutDetails,\n api::OutgoingWebhookContent::PayoutDetails(Box::new(payout_create_response)),\n Some(updated_payout_attempt.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Payout {\n payout_id: updated_payout_attempt.payout_id,\n status: updated_payout_attempt.status,\n })\n } else {\n metrics::INCOMING_PAYOUT_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}", + "after_code": "async fn payouts_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n) -> CustomResult {\n metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n //find payout_attempt by object_reference_id\n let payout_attempt = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PayoutId(payout_id_type) => match payout_id_type {\n webhooks::PayoutIdType::PayoutAttemptId(id) => db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_account.get_id(),\n &id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n webhooks::PayoutIdType::ConnectorPayoutId(id) => db\n .find_payout_attempt_by_merchant_id_connector_payout_id(\n merchant_account.get_id(),\n &id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payout id when processing payout webhooks\")?,\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_account.get_id(),\n &payout_attempt.payout_id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout\")?;\n\n let payout_attempt_update = PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status: common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?,\n error_message: None,\n error_code: None,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n };\n\n let action_req =\n payout_models::PayoutRequest::PayoutActionRequest(payout_models::PayoutActionRequest {\n payout_id: payouts.payout_id.clone(),\n });\n\n let payout_data = payouts::make_payout_data(\n &state,\n &merchant_account,\n None,\n &key_store,\n &action_req,\n common_utils::consts::DEFAULT_LOCALE,\n )\n .await?;\n\n let updated_payout_attempt = db\n .update_payout_attempt(\n &payout_attempt,\n payout_attempt_update,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating payout attempt: payout_attempt_id: {}\",\n payout_attempt.payout_attempt_id\n )\n })?;\n\n let event_type: Option = updated_payout_attempt.status.foreign_into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let router_response =\n payouts::response_handler(&state, &merchant_account, &payout_data).await?;\n\n let payout_create_response: payout_models::PayoutCreateResponse = match router_response\n {\n services::ApplicationResponse::Json(response) => response,\n _ => Err(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout create response\")?,\n };\n\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Payouts,\n updated_payout_attempt.payout_id.clone(),\n enums::EventObjectType::PayoutDetails,\n api::OutgoingWebhookContent::PayoutDetails(Box::new(payout_create_response)),\n Some(updated_payout_attempt.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Payout {\n payout_id: updated_payout_attempt.payout_id,\n status: updated_payout_attempt.status,\n })\n } else {\n metrics::INCOMING_PAYOUT_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use error_stack::{report, ResultExt};", + "use super::{types, utils, MERCHANT_ID};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use error_stack::{report, ResultExt};", + "use super::{types, utils, MERCHANT_ID};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::convert", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "async fn convert(self) -> CustomResult {\n Ok(Self::DstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }", + "after_code": "async fn convert(self) -> CustomResult {\n Ok(Self::DstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }", + "diff_span": { + "before": " locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,", + "after": " locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: self.customer_acceptance,\n status: self.status," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::struct::SavePaymentMethodDataResponse", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct SavePaymentMethodDataResponse {\n pub payment_method_id: Option,\n pub payment_method_status: Option,\n pub connector_mandate_reference_id: Option,\n}", + "after_code": "pub struct SavePaymentMethodDataResponse {\n pub payment_method_id: Option,\n pub payment_method_status: Option,\n pub connector_mandate_reference_id: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ], + "after_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::external_authentication_incoming_webhook_flow", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn external_authentication_incoming_webhook_flow(\n state: SessionState,\n req_state: ReqState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n request_details: &IncomingWebhookRequestDetails<'_>,\n connector: &ConnectorEnum,\n object_ref_id: api::ObjectReferenceId,\n business_profile: domain::Profile,\n merchant_connector_account: domain::MerchantConnectorAccount,\n) -> CustomResult {\n if source_verified {\n let authentication_details = connector\n .get_external_authentication_details(request_details)\n .switch()?;\n let trans_status = authentication_details.trans_status;\n let authentication_update = storage::AuthenticationUpdate::PostAuthenticationUpdate {\n authentication_status: common_enums::AuthenticationStatus::foreign_from(\n trans_status.clone(),\n ),\n trans_status,\n authentication_value: authentication_details.authentication_value,\n eci: authentication_details.eci,\n };\n let authentication =\n if let webhooks::ObjectReferenceId::ExternalAuthenticationID(authentication_id_type) =\n object_ref_id\n {\n match authentication_id_type {\n webhooks::AuthenticationIdType::AuthenticationId(authentication_id) => state\n .store\n .find_authentication_by_merchant_id_authentication_id(\n merchant_account.get_id(),\n authentication_id.clone(),\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::AuthenticationNotFound {\n id: authentication_id,\n })\n .attach_printable(\"Error while fetching authentication record\"),\n webhooks::AuthenticationIdType::ConnectorAuthenticationId(\n connector_authentication_id,\n ) => state\n .store\n .find_authentication_by_merchant_id_connector_authentication_id(\n merchant_account.get_id().clone(),\n connector_authentication_id.clone(),\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::AuthenticationNotFound {\n id: connector_authentication_id,\n })\n .attach_printable(\"Error while fetching authentication record\"),\n }\n } else {\n Err(errors::ApiErrorResponse::WebhookProcessingFailure).attach_printable(\n \"received a non-external-authentication id for retrieving authentication\",\n )\n }?;\n let updated_authentication = state\n .store\n .update_authentication_by_merchant_id_authentication_id(\n authentication,\n authentication_update,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error while updating authentication\")?;\n // Check if it's a payment authentication flow, payment_id would be there only for payment authentication flows\n if let Some(payment_id) = updated_authentication.payment_id {\n let is_pull_mechanism_enabled = helper_utils::check_if_pull_mechanism_for_external_3ds_enabled_from_connector_metadata(merchant_connector_account.metadata.map(|metadata| metadata.expose()));\n // Merchant doesn't have pull mechanism enabled and if it's challenge flow, we have to authorize whenever we receive a ARes webhook\n if !is_pull_mechanism_enabled\n && updated_authentication.authentication_type\n == Some(common_enums::DecoupledAuthenticationType::Challenge)\n && event_type == webhooks::IncomingWebhookEvent::ExternalAuthenticationARes\n {\n let payment_confirm_req = api::PaymentsRequest {\n payment_id: Some(api_models::payments::PaymentIdType::PaymentIntentId(\n payment_id,\n )),\n merchant_id: Some(merchant_account.get_id().clone()),\n ..Default::default()\n };\n let payments_response = Box::pin(payments::payments_core::<\n api::Authorize,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData,\n >(\n state.clone(),\n req_state,\n merchant_account.clone(),\n None,\n key_store.clone(),\n payments::PaymentConfirm,\n payment_confirm_req,\n services::api::AuthFlow::Merchant,\n payments::CallConnectorAction::Trigger,\n None,\n HeaderPayload::with_source(enums::PaymentSource::ExternalAuthenticator),\n None, // Platform merchant account\n ))\n .await?;\n match payments_response {\n services::ApplicationResponse::JsonWithHeaders((payments_response, _)) => {\n let payment_id = payments_response.payment_id.clone();\n\n let status = payments_response.status;\n let event_type: Option =\n payments_response.status.foreign_into();\n // Set poll_id as completed in redis to allow the fetch status of poll through retrieve_poll_status api from client\n let poll_id = core_utils::get_poll_id(\n merchant_account.get_id(),\n core_utils::get_external_authentication_request_poll_id(&payment_id),\n );\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n redis_conn\n .set_key_without_modifying_ttl(\n &poll_id,\n api_models::poll::PollStatus::Completed.to_string(),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to add poll_id in redis\")?;\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let primary_object_created_at = payments_response.created;\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Payments,\n payment_id.get_string_repr().to_owned(),\n enums::EventObjectType::PaymentDetails,\n api::OutgoingWebhookContent::PaymentDetails(Box::new(\n payments_response,\n )),\n primary_object_created_at,\n ))\n .await?;\n };\n let response = WebhookResponseTracker::Payment { payment_id, status };\n Ok(response)\n }\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure).attach_printable(\n \"Did not get payment id as object reference id in webhook payments flow\",\n )?,\n }\n } else {\n Ok(WebhookResponseTracker::NoEffect)\n }\n } else {\n Ok(WebhookResponseTracker::NoEffect)\n }\n } else {\n logger::error!(\n \"Webhook source verification failed for external authentication webhook flow\"\n );\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}", + "after_code": "async fn external_authentication_incoming_webhook_flow(\n state: SessionState,\n req_state: ReqState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n request_details: &IncomingWebhookRequestDetails<'_>,\n connector: &ConnectorEnum,\n object_ref_id: api::ObjectReferenceId,\n business_profile: domain::Profile,\n merchant_connector_account: domain::MerchantConnectorAccount,\n) -> CustomResult {\n if source_verified {\n let authentication_details = connector\n .get_external_authentication_details(request_details)\n .switch()?;\n let trans_status = authentication_details.trans_status;\n let authentication_update = storage::AuthenticationUpdate::PostAuthenticationUpdate {\n authentication_status: common_enums::AuthenticationStatus::foreign_from(\n trans_status.clone(),\n ),\n trans_status,\n authentication_value: authentication_details.authentication_value,\n eci: authentication_details.eci,\n };\n let authentication =\n if let webhooks::ObjectReferenceId::ExternalAuthenticationID(authentication_id_type) =\n object_ref_id\n {\n match authentication_id_type {\n webhooks::AuthenticationIdType::AuthenticationId(authentication_id) => state\n .store\n .find_authentication_by_merchant_id_authentication_id(\n merchant_account.get_id(),\n authentication_id.clone(),\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::AuthenticationNotFound {\n id: authentication_id,\n })\n .attach_printable(\"Error while fetching authentication record\"),\n webhooks::AuthenticationIdType::ConnectorAuthenticationId(\n connector_authentication_id,\n ) => state\n .store\n .find_authentication_by_merchant_id_connector_authentication_id(\n merchant_account.get_id().clone(),\n connector_authentication_id.clone(),\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::AuthenticationNotFound {\n id: connector_authentication_id,\n })\n .attach_printable(\"Error while fetching authentication record\"),\n }\n } else {\n Err(errors::ApiErrorResponse::WebhookProcessingFailure).attach_printable(\n \"received a non-external-authentication id for retrieving authentication\",\n )\n }?;\n let updated_authentication = state\n .store\n .update_authentication_by_merchant_id_authentication_id(\n authentication,\n authentication_update,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error while updating authentication\")?;\n // Check if it's a payment authentication flow, payment_id would be there only for payment authentication flows\n if let Some(payment_id) = updated_authentication.payment_id {\n let is_pull_mechanism_enabled = helper_utils::check_if_pull_mechanism_for_external_3ds_enabled_from_connector_metadata(merchant_connector_account.metadata.map(|metadata| metadata.expose()));\n // Merchant doesn't have pull mechanism enabled and if it's challenge flow, we have to authorize whenever we receive a ARes webhook\n if !is_pull_mechanism_enabled\n && updated_authentication.authentication_type\n == Some(common_enums::DecoupledAuthenticationType::Challenge)\n && event_type == webhooks::IncomingWebhookEvent::ExternalAuthenticationARes\n {\n let payment_confirm_req = api::PaymentsRequest {\n payment_id: Some(api_models::payments::PaymentIdType::PaymentIntentId(\n payment_id,\n )),\n merchant_id: Some(merchant_account.get_id().clone()),\n ..Default::default()\n };\n let payments_response = Box::pin(payments::payments_core::<\n api::Authorize,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData,\n >(\n state.clone(),\n req_state,\n merchant_account.clone(),\n None,\n key_store.clone(),\n payments::PaymentConfirm,\n payment_confirm_req,\n services::api::AuthFlow::Merchant,\n payments::CallConnectorAction::Trigger,\n None,\n HeaderPayload::with_source(enums::PaymentSource::ExternalAuthenticator),\n None, // Platform merchant account\n ))\n .await?;\n match payments_response {\n services::ApplicationResponse::JsonWithHeaders((payments_response, _)) => {\n let payment_id = payments_response.payment_id.clone();\n\n let status = payments_response.status;\n let event_type: Option =\n payments_response.status.foreign_into();\n // Set poll_id as completed in redis to allow the fetch status of poll through retrieve_poll_status api from client\n let poll_id = core_utils::get_poll_id(\n merchant_account.get_id(),\n core_utils::get_external_authentication_request_poll_id(&payment_id),\n );\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n redis_conn\n .set_key_without_modifying_ttl(\n &poll_id,\n api_models::poll::PollStatus::Completed.to_string(),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to add poll_id in redis\")?;\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let primary_object_created_at = payments_response.created;\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Payments,\n payment_id.get_string_repr().to_owned(),\n enums::EventObjectType::PaymentDetails,\n api::OutgoingWebhookContent::PaymentDetails(Box::new(\n payments_response,\n )),\n primary_object_created_at,\n ))\n .await?;\n };\n let response = WebhookResponseTracker::Payment { payment_id, status };\n Ok(response)\n }\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure).attach_printable(\n \"Did not get payment id as object reference id in webhook payments flow\",\n )?,\n }\n } else {\n Ok(WebhookResponseTracker::NoEffect)\n }\n } else {\n Ok(WebhookResponseTracker::NoEffect)\n }\n } else {\n logger::error!(\n \"Webhook source verification failed for external authentication webhook flow\"\n );\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};", + "use error_stack::{report, ResultExt};", + "use super::{types, utils, MERCHANT_ID};" + ], + "after_imports": [ + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};", + "use error_stack::{report, ResultExt};", + "use super::{types, utils, MERCHANT_ID};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::VaultId::function::get_string_repr", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_string_repr(&self) -> &String {\n &self.0\n }", + "after_code": "pub fn get_string_repr(&self) -> &String {\n &self.0\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::bank_transfer_webhook_flow", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn bank_transfer_webhook_flow(\n state: SessionState,\n req_state: ReqState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n source_verified: bool,\n) -> CustomResult {\n let response = if source_verified {\n let payment_attempt = get_payment_attempt_from_object_reference_id(\n &state,\n webhook_details.object_reference_id,\n &merchant_account,\n )\n .await?;\n let payment_id = payment_attempt.payment_id;\n let request = api::PaymentsRequest {\n payment_id: Some(api_models::payments::PaymentIdType::PaymentIntentId(\n payment_id,\n )),\n payment_token: payment_attempt.payment_token,\n ..Default::default()\n };\n Box::pin(payments::payments_core::<\n api::Authorize,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData,\n >(\n state.clone(),\n req_state,\n merchant_account.to_owned(),\n None,\n key_store.clone(),\n payments::PaymentConfirm,\n request,\n services::api::AuthFlow::Merchant,\n payments::CallConnectorAction::Trigger,\n None,\n HeaderPayload::with_source(common_enums::PaymentSource::Webhook),\n None, //Platform merchant account\n ))\n .await\n } else {\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n };\n\n match response? {\n services::ApplicationResponse::JsonWithHeaders((payments_response, _)) => {\n let payment_id = payments_response.payment_id.clone();\n\n let event_type: Option = payments_response.status.foreign_into();\n let status = payments_response.status;\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let primary_object_created_at = payments_response.created;\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Payments,\n payment_id.get_string_repr().to_owned(),\n enums::EventObjectType::PaymentDetails,\n api::OutgoingWebhookContent::PaymentDetails(Box::new(payments_response)),\n primary_object_created_at,\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Payment { payment_id, status })\n }\n\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received non-json response from payments core\")?,\n }\n}", + "after_code": "async fn bank_transfer_webhook_flow(\n state: SessionState,\n req_state: ReqState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n source_verified: bool,\n) -> CustomResult {\n let response = if source_verified {\n let payment_attempt = get_payment_attempt_from_object_reference_id(\n &state,\n webhook_details.object_reference_id,\n &merchant_account,\n )\n .await?;\n let payment_id = payment_attempt.payment_id;\n let request = api::PaymentsRequest {\n payment_id: Some(api_models::payments::PaymentIdType::PaymentIntentId(\n payment_id,\n )),\n payment_token: payment_attempt.payment_token,\n ..Default::default()\n };\n Box::pin(payments::payments_core::<\n api::Authorize,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData,\n >(\n state.clone(),\n req_state,\n merchant_account.to_owned(),\n None,\n key_store.clone(),\n payments::PaymentConfirm,\n request,\n services::api::AuthFlow::Merchant,\n payments::CallConnectorAction::Trigger,\n None,\n HeaderPayload::with_source(common_enums::PaymentSource::Webhook),\n None, //Platform merchant account\n ))\n .await\n } else {\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n };\n\n match response? {\n services::ApplicationResponse::JsonWithHeaders((payments_response, _)) => {\n let payment_id = payments_response.payment_id.clone();\n\n let event_type: Option = payments_response.status.foreign_into();\n let status = payments_response.status;\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let primary_object_created_at = payments_response.created;\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Payments,\n payment_id.get_string_repr().to_owned(),\n enums::EventObjectType::PaymentDetails,\n api::OutgoingWebhookContent::PaymentDetails(Box::new(payments_response)),\n primary_object_created_at,\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Payment { payment_id, status })\n }\n\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received non-json response from payments core\")?,\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use error_stack::{report, ResultExt};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use error_stack::{report, ResultExt};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::get_payment_id", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_payment_id(\n db: &dyn StorageInterface,\n payment_id: &api::PaymentIdType,\n merchant_id: &common_utils::id_type::MerchantId,\n storage_scheme: enums::MerchantStorageScheme,\n) -> errors::RouterResult {\n let pay_id = || async {\n match payment_id {\n api_models::payments::PaymentIdType::PaymentIntentId(ref id) => Ok(id.to_owned()),\n api_models::payments::PaymentIdType::ConnectorTransactionId(ref id) => db\n .find_payment_attempt_by_merchant_id_connector_txn_id(\n merchant_id,\n id,\n storage_scheme,\n )\n .await\n .map(|p| p.payment_id),\n api_models::payments::PaymentIdType::PaymentAttemptId(ref id) => db\n .find_payment_attempt_by_attempt_id_merchant_id(id, merchant_id, storage_scheme)\n .await\n .map(|p| p.payment_id),\n api_models::payments::PaymentIdType::PreprocessingId(ref id) => db\n .find_payment_attempt_by_preprocessing_id_merchant_id(\n id,\n merchant_id,\n storage_scheme,\n )\n .await\n .map(|p| p.payment_id),\n }\n };\n\n pay_id()\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)\n}", + "after_code": "async fn get_payment_id(\n db: &dyn StorageInterface,\n payment_id: &api::PaymentIdType,\n merchant_id: &common_utils::id_type::MerchantId,\n storage_scheme: enums::MerchantStorageScheme,\n) -> errors::RouterResult {\n let pay_id = || async {\n match payment_id {\n api_models::payments::PaymentIdType::PaymentIntentId(ref id) => Ok(id.to_owned()),\n api_models::payments::PaymentIdType::ConnectorTransactionId(ref id) => db\n .find_payment_attempt_by_merchant_id_connector_txn_id(\n merchant_id,\n id,\n storage_scheme,\n )\n .await\n .map(|p| p.payment_id),\n api_models::payments::PaymentIdType::PaymentAttemptId(ref id) => db\n .find_payment_attempt_by_attempt_id_merchant_id(id, merchant_id, storage_scheme)\n .await\n .map(|p| p.payment_id),\n api_models::payments::PaymentIdType::PreprocessingId(ref id) => db\n .find_payment_attempt_by_preprocessing_id_merchant_id(\n id,\n merchant_id,\n storage_scheme,\n )\n .await\n .map(|p| p.payment_id),\n }\n };\n\n pay_id()\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::mandates_incoming_webhook_flow", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn mandates_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n) -> CustomResult {\n if source_verified {\n let db = &*state.store;\n let mandate = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::MandateId(webhooks::MandateIdType::MandateId(\n mandate_id,\n )) => db\n .find_mandate_by_merchant_id_mandate_id(\n merchant_account.get_id(),\n mandate_id.as_str(),\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MandateNotFound)?,\n webhooks::ObjectReferenceId::MandateId(\n webhooks::MandateIdType::ConnectorMandateId(connector_mandate_id),\n ) => db\n .find_mandate_by_merchant_id_connector_mandate_id(\n merchant_account.get_id(),\n connector_mandate_id.as_str(),\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MandateNotFound)?,\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-mandate id for retrieving mandate\")?,\n };\n let mandate_status = common_enums::MandateStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"event type to mandate status mapping failed\")?;\n let mandate_id = mandate.mandate_id.clone();\n let updated_mandate = db\n .update_mandate_by_merchant_id_mandate_id(\n merchant_account.get_id(),\n &mandate_id,\n storage::MandateUpdate::StatusUpdate { mandate_status },\n mandate,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MandateNotFound)?;\n let mandates_response = Box::new(\n api::mandates::MandateResponse::from_db_mandate(\n &state,\n key_store.clone(),\n updated_mandate.clone(),\n merchant_account.storage_scheme,\n )\n .await?,\n );\n let event_type: Option = updated_mandate.mandate_status.foreign_into();\n if let Some(outgoing_event_type) = event_type {\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Mandates,\n updated_mandate.mandate_id.clone(),\n enums::EventObjectType::MandateDetails,\n api::OutgoingWebhookContent::MandateDetails(mandates_response),\n Some(updated_mandate.created_at),\n ))\n .await?;\n }\n Ok(WebhookResponseTracker::Mandate {\n mandate_id: updated_mandate.mandate_id,\n status: updated_mandate.mandate_status,\n })\n } else {\n logger::error!(\"Webhook source verification failed for mandates webhook flow\");\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}", + "after_code": "async fn mandates_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n) -> CustomResult {\n if source_verified {\n let db = &*state.store;\n let mandate = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::MandateId(webhooks::MandateIdType::MandateId(\n mandate_id,\n )) => db\n .find_mandate_by_merchant_id_mandate_id(\n merchant_account.get_id(),\n mandate_id.as_str(),\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MandateNotFound)?,\n webhooks::ObjectReferenceId::MandateId(\n webhooks::MandateIdType::ConnectorMandateId(connector_mandate_id),\n ) => db\n .find_mandate_by_merchant_id_connector_mandate_id(\n merchant_account.get_id(),\n connector_mandate_id.as_str(),\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MandateNotFound)?,\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-mandate id for retrieving mandate\")?,\n };\n let mandate_status = common_enums::MandateStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"event type to mandate status mapping failed\")?;\n let mandate_id = mandate.mandate_id.clone();\n let updated_mandate = db\n .update_mandate_by_merchant_id_mandate_id(\n merchant_account.get_id(),\n &mandate_id,\n storage::MandateUpdate::StatusUpdate { mandate_status },\n mandate,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MandateNotFound)?;\n let mandates_response = Box::new(\n api::mandates::MandateResponse::from_db_mandate(\n &state,\n key_store.clone(),\n updated_mandate.clone(),\n merchant_account.storage_scheme,\n )\n .await?,\n );\n let event_type: Option = updated_mandate.mandate_status.foreign_into();\n if let Some(outgoing_event_type) = event_type {\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Mandates,\n updated_mandate.mandate_id.clone(),\n enums::EventObjectType::MandateDetails,\n api::OutgoingWebhookContent::MandateDetails(mandates_response),\n Some(updated_mandate.created_at),\n ))\n .await?;\n }\n Ok(WebhookResponseTracker::Mandate {\n mandate_id: updated_mandate.mandate_id,\n status: updated_mandate.mandate_status,\n })\n } else {\n logger::error!(\"Webhook source verification failed for mandates webhook flow\");\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use error_stack::{report, ResultExt};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use error_stack::{report, ResultExt};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::construct_new", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }", + "after_code": "async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }", + "diff_span": { + "before": " locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,", + "after": " locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: self.customer_acceptance,\n status: self.status," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::struct::SavePaymentMethodData", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct SavePaymentMethodData {\n request: Req,\n response: Result,\n payment_method_token: Option,\n payment_method: PaymentMethod,\n attempt_status: common_enums::AttemptStatus,\n}", + "after_code": "pub struct SavePaymentMethodData {\n request: Req,\n response: Result,\n payment_method_token: Option,\n payment_method: PaymentMethod,\n attempt_status: common_enums::AttemptStatus,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ], + "after_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::impl::MerchantConnectorAccount", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl behaviour::Conversion for MerchantConnectorAccount {\n type DstType = diesel_models::merchant_connector_account::MerchantConnectorAccount;\n type NewDstType = diesel_models::merchant_connector_account::MerchantConnectorAccountNew;\n\n async fn convert(self) -> CustomResult {\n Ok(\n diesel_models::merchant_connector_account::MerchantConnectorAccount {\n id: self.id,\n merchant_id: self.merchant_id,\n connector_name: self.connector_name,\n connector_account_details: self.connector_account_details.into(),\n disabled: self.disabled,\n payment_methods_enabled: self.payment_methods_enabled,\n connector_type: self.connector_type,\n metadata: self.metadata,\n frm_config: self.frm_configs,\n connector_label: self.connector_label,\n created_at: self.created_at,\n modified_at: self.modified_at,\n connector_webhook_details: self.connector_webhook_details,\n profile_id: self.profile_id,\n applepay_verified_domains: self.applepay_verified_domains,\n pm_auth_config: self.pm_auth_config,\n status: self.status,\n connector_wallets_details: self.connector_wallets_details.map(Encryption::from),\n additional_merchant_data: self.additional_merchant_data.map(|data| data.into()),\n version: self.version,\n },\n )\n }\n\n async fn convert_back(\n state: &KeyManagerState,\n other: Self::DstType,\n key: &Secret>,\n _key_manager_identifier: Identifier,\n ) -> CustomResult {\n let identifier = Identifier::Merchant(other.merchant_id.clone());\n\n let decrypted_data = crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::BatchDecrypt(EncryptedMerchantConnectorAccount::to_encryptable(\n EncryptedMerchantConnectorAccount {\n connector_account_details: other.connector_account_details,\n additional_merchant_data: other.additional_merchant_data,\n connector_wallets_details: other.connector_wallets_details,\n },\n )),\n identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_batchoperation())\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting connector account details\".to_string(),\n })?;\n\n let decrypted_data = EncryptedMerchantConnectorAccount::from_encryptable(decrypted_data)\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting connector account details\".to_string(),\n })?;\n\n Ok(Self {\n id: other.id,\n merchant_id: other.merchant_id,\n connector_name: other.connector_name,\n connector_account_details: decrypted_data.connector_account_details,\n disabled: other.disabled,\n payment_methods_enabled: other.payment_methods_enabled,\n connector_type: other.connector_type,\n metadata: other.metadata,\n\n frm_configs: other.frm_config,\n connector_label: other.connector_label,\n created_at: other.created_at,\n modified_at: other.modified_at,\n connector_webhook_details: other.connector_webhook_details,\n profile_id: other.profile_id,\n applepay_verified_domains: other.applepay_verified_domains,\n pm_auth_config: other.pm_auth_config,\n status: other.status,\n connector_wallets_details: decrypted_data.connector_wallets_details,\n additional_merchant_data: decrypted_data.additional_merchant_data,\n version: other.version,\n })\n }\n\n async fn construct_new(self) -> CustomResult {\n let now = date_time::now();\n Ok(Self::NewDstType {\n id: self.id,\n merchant_id: Some(self.merchant_id),\n connector_name: Some(self.connector_name),\n connector_account_details: Some(self.connector_account_details.into()),\n disabled: self.disabled,\n payment_methods_enabled: self.payment_methods_enabled,\n connector_type: Some(self.connector_type),\n metadata: self.metadata,\n frm_config: self.frm_configs,\n connector_label: self.connector_label,\n created_at: now,\n modified_at: now,\n connector_webhook_details: self.connector_webhook_details,\n profile_id: self.profile_id,\n applepay_verified_domains: self.applepay_verified_domains,\n pm_auth_config: self.pm_auth_config,\n status: self.status,\n connector_wallets_details: self.connector_wallets_details.map(Encryption::from),\n additional_merchant_data: self.additional_merchant_data.map(|data| data.into()),\n version: self.version,\n })\n }\n}", + "after_code": "impl behaviour::Conversion for MerchantConnectorAccount {\n type DstType = diesel_models::merchant_connector_account::MerchantConnectorAccount;\n type NewDstType = diesel_models::merchant_connector_account::MerchantConnectorAccountNew;\n\n async fn convert(self) -> CustomResult {\n Ok(\n diesel_models::merchant_connector_account::MerchantConnectorAccount {\n id: self.id,\n merchant_id: self.merchant_id,\n connector_name: self.connector_name,\n connector_account_details: self.connector_account_details.into(),\n disabled: self.disabled,\n payment_methods_enabled: self.payment_methods_enabled,\n connector_type: self.connector_type,\n metadata: self.metadata,\n frm_config: self.frm_configs,\n connector_label: self.connector_label,\n created_at: self.created_at,\n modified_at: self.modified_at,\n connector_webhook_details: self.connector_webhook_details,\n profile_id: self.profile_id,\n applepay_verified_domains: self.applepay_verified_domains,\n pm_auth_config: self.pm_auth_config,\n status: self.status,\n connector_wallets_details: self.connector_wallets_details.map(Encryption::from),\n additional_merchant_data: self.additional_merchant_data.map(|data| data.into()),\n version: self.version,\n },\n )\n }\n\n async fn convert_back(\n state: &KeyManagerState,\n other: Self::DstType,\n key: &Secret>,\n _key_manager_identifier: Identifier,\n ) -> CustomResult {\n let identifier = Identifier::Merchant(other.merchant_id.clone());\n\n let decrypted_data = crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::BatchDecrypt(EncryptedMerchantConnectorAccount::to_encryptable(\n EncryptedMerchantConnectorAccount {\n connector_account_details: other.connector_account_details,\n additional_merchant_data: other.additional_merchant_data,\n connector_wallets_details: other.connector_wallets_details,\n },\n )),\n identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_batchoperation())\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting connector account details\".to_string(),\n })?;\n\n let decrypted_data = EncryptedMerchantConnectorAccount::from_encryptable(decrypted_data)\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting connector account details\".to_string(),\n })?;\n\n Ok(Self {\n id: other.id,\n merchant_id: other.merchant_id,\n connector_name: other.connector_name,\n connector_account_details: decrypted_data.connector_account_details,\n disabled: other.disabled,\n payment_methods_enabled: other.payment_methods_enabled,\n connector_type: other.connector_type,\n metadata: other.metadata,\n\n frm_configs: other.frm_config,\n connector_label: other.connector_label,\n created_at: other.created_at,\n modified_at: other.modified_at,\n connector_webhook_details: other.connector_webhook_details,\n profile_id: other.profile_id,\n applepay_verified_domains: other.applepay_verified_domains,\n pm_auth_config: other.pm_auth_config,\n status: other.status,\n connector_wallets_details: decrypted_data.connector_wallets_details,\n additional_merchant_data: decrypted_data.additional_merchant_data,\n version: other.version,\n })\n }\n\n async fn construct_new(self) -> CustomResult {\n let now = date_time::now();\n Ok(Self::NewDstType {\n id: self.id,\n merchant_id: Some(self.merchant_id),\n connector_name: Some(self.connector_name),\n connector_account_details: Some(self.connector_account_details.into()),\n disabled: self.disabled,\n payment_methods_enabled: self.payment_methods_enabled,\n connector_type: Some(self.connector_type),\n metadata: self.metadata,\n frm_config: self.frm_configs,\n connector_label: self.connector_label,\n created_at: now,\n modified_at: now,\n connector_webhook_details: self.connector_webhook_details,\n profile_id: self.profile_id,\n applepay_verified_domains: self.applepay_verified_domains,\n pm_auth_config: self.pm_auth_config,\n status: self.status,\n connector_wallets_details: self.connector_wallets_details.map(Encryption::from),\n additional_merchant_data: self.additional_merchant_data.map(|data| data.into()),\n version: self.version,\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};", + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use super::behaviour;" + ], + "after_imports": [ + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use super::behaviour;" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::convert_back", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details,\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }", + "after_code": "async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }", + "diff_span": { + "before": " locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details,\n customer_acceptance: item.customer_acceptance,\n status: item.status,", + "after": " locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: item.customer_acceptance,\n status: item.status," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use crate::type_encryption::{crypto_operation, AsyncLift, CryptoOperation};", + "use masking::{PeekInterface, Secret};" + ], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};", + "use masking::{PeekInterface, Secret};" + ] + }, + { + "id": "crates/router/src/core/payment_methods.rs::function::create_payment_method_in_db", + "file": "crates/router/src/core/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub async fn create_payment_method_in_db(\n state: &SessionState,\n req: &api::PaymentMethodCreate,\n customer_id: &id_type::GlobalCustomerId,\n payment_method_id: id_type::GlobalPaymentMethodId,\n locker_id: Option,\n merchant_id: &id_type::MerchantId,\n customer_acceptance: Option,\n payment_method_data: domain::types::OptionalEncryptableJsonType<\n api::payment_methods::PaymentMethodsData,\n >,\n key_store: &domain::MerchantKeyStore,\n connector_mandate_details: Option,\n status: Option,\n network_transaction_id: Option,\n storage_scheme: enums::MerchantStorageScheme,\n payment_method_billing_address: crypto::OptionalEncryptableValue,\n card_scheme: Option,\n) -> errors::CustomResult {\n let db = &*state.store;\n let current_time = common_utils::date_time::now();\n\n let response = db\n .insert_payment_method(\n &state.into(),\n key_store,\n domain::PaymentMethod {\n customer_id: customer_id.to_owned(),\n merchant_id: merchant_id.to_owned(),\n id: payment_method_id,\n locker_id,\n payment_method_type: Some(req.payment_method_type),\n payment_method_subtype: Some(req.payment_method_subtype),\n payment_method_data,\n connector_mandate_details,\n customer_acceptance,\n client_secret: None,\n status: status.unwrap_or(enums::PaymentMethodStatus::Active),\n network_transaction_id: network_transaction_id.to_owned(),\n created_at: current_time,\n last_modified: current_time,\n last_used_at: current_time,\n payment_method_billing_address,\n updated_by: None,\n version: domain::consts::API_VERSION,\n locker_fingerprint_id: None,\n network_token_locker_id: None,\n network_token_payment_method_data: None,\n network_token_requestor_reference_id: None,\n },\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to add payment method in db\")?;\n\n Ok(response)\n}", + "after_code": "pub async fn create_payment_method_in_db(\n state: &SessionState,\n req: &api::PaymentMethodCreate,\n customer_id: &id_type::GlobalCustomerId,\n payment_method_id: id_type::GlobalPaymentMethodId,\n locker_id: Option,\n merchant_id: &id_type::MerchantId,\n customer_acceptance: Option,\n payment_method_data: domain::types::OptionalEncryptableJsonType<\n api::payment_methods::PaymentMethodsData,\n >,\n key_store: &domain::MerchantKeyStore,\n connector_mandate_details: Option,\n status: Option,\n network_transaction_id: Option,\n storage_scheme: enums::MerchantStorageScheme,\n payment_method_billing_address: crypto::OptionalEncryptableValue,\n card_scheme: Option,\n) -> errors::CustomResult {\n let db = &*state.store;\n let current_time = common_utils::date_time::now();\n\n let response = db\n .insert_payment_method(\n &state.into(),\n key_store,\n domain::PaymentMethod {\n customer_id: customer_id.to_owned(),\n merchant_id: merchant_id.to_owned(),\n id: payment_method_id,\n locker_id,\n payment_method_type: Some(req.payment_method_type),\n payment_method_subtype: Some(req.payment_method_subtype),\n payment_method_data,\n connector_mandate_details,\n customer_acceptance,\n client_secret: None,\n status: status.unwrap_or(enums::PaymentMethodStatus::Active),\n network_transaction_id: network_transaction_id.to_owned(),\n created_at: current_time,\n last_modified: current_time,\n last_used_at: current_time,\n payment_method_billing_address,\n updated_by: None,\n version: domain::consts::API_VERSION,\n locker_fingerprint_id: None,\n network_token_locker_id: None,\n network_token_payment_method_data: None,\n network_token_requestor_reference_id: None,\n },\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to add payment method in db\")?;\n\n Ok(response)\n}", + "diff_span": { + "before": " >,\n key_store: &domain::MerchantKeyStore,\n connector_mandate_details: Option,\n status: Option,\n network_transaction_id: Option,", + "after": " >,\n key_store: &domain::MerchantKeyStore,\n connector_mandate_details: Option,\n status: Option,\n network_transaction_id: Option," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use api_models::payment_methods;", + "use super::{\n errors::{RouterResponse, StorageErrorExt},\n pm_auth,\n};", + "use masking::{PeekInterface, Secret};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult},\n payments::helpers as payment_helpers,\n },\n routes::{app::StorageInterface, SessionState},\n services,\n types::{\n domain,\n storage::{self, enums as storage_enums},\n },\n};", + "use diesel_models::{\n enums, GenericLinkNew, PaymentMethodCollectLink, PaymentMethodCollectLinkData,\n};" + ], + "after_imports": [ + "use api_models::payment_methods;", + "use hyperswitch_domain_models::mandates::CommonMandateReference;", + "use super::{\n errors::{RouterResponse, StorageErrorExt},\n pm_auth,\n};", + "use masking::{PeekInterface, Secret};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult},\n payments::helpers as payment_helpers,\n },\n routes::{app::StorageInterface, SessionState},\n services,\n types::{\n domain,\n storage::{self, enums as storage_enums},\n },\n};", + "use diesel_models::{\n enums, GenericLinkNew, PaymentMethodCollectLink, PaymentMethodCollectLinkData,\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::struct::VaultId", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct VaultId(String);", + "after_code": "pub struct VaultId(String);", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::struct::FlattenedPaymentMethodsEnabled", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct FlattenedPaymentMethodsEnabled {\n pub payment_methods_enabled: Vec,\n}", + "after_code": "pub struct FlattenedPaymentMethodsEnabled {\n pub payment_methods_enabled: Vec,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::struct::PaymentMethodsEnabledForConnector", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct PaymentMethodsEnabledForConnector {\n pub payment_methods_enabled: common_types::payment_methods::RequestPaymentMethodTypes,\n pub payment_method: common_enums::PaymentMethod,\n pub connector: common_enums::connector_enums::Connector,\n}", + "after_code": "pub struct PaymentMethodsEnabledForConnector {\n pub payment_methods_enabled: common_types::payment_methods::RequestPaymentMethodTypes,\n pub payment_method: common_enums::PaymentMethod,\n pub connector: common_enums::connector_enums::Connector,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/payment_methods/cards.rs::function::get_mca_status", + "file": "crates/router/src/core/payment_methods/cards.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub async fn get_mca_status(\n state: &routes::SessionState,\n key_store: &domain::MerchantKeyStore,\n profile_id: Option,\n merchant_id: &id_type::MerchantId,\n is_connector_agnostic_mit_enabled: bool,\n connector_mandate_details: Option<&payment_method::CommonMandateReference>,\n network_transaction_id: Option<&String>,\n merchant_connector_accounts: &domain::MerchantConnectorAccounts,\n) -> bool {\n if is_connector_agnostic_mit_enabled && network_transaction_id.is_some() {\n return true;\n }\n match connector_mandate_details {\n Some(connector_mandate_details) => merchant_connector_accounts\n .is_merchant_connector_account_id_in_connector_mandate_details(\n profile_id.as_ref(),\n connector_mandate_details,\n ),\n None => false,\n }\n}", + "after_code": "pub async fn get_mca_status(\n state: &routes::SessionState,\n key_store: &domain::MerchantKeyStore,\n profile_id: Option,\n merchant_id: &id_type::MerchantId,\n is_connector_agnostic_mit_enabled: bool,\n connector_mandate_details: Option<&CommonMandateReference>,\n network_transaction_id: Option<&String>,\n merchant_connector_accounts: &domain::MerchantConnectorAccounts,\n) -> bool {\n if is_connector_agnostic_mit_enabled && network_transaction_id.is_some() {\n return true;\n }\n match connector_mandate_details {\n Some(connector_mandate_details) => merchant_connector_accounts\n .is_merchant_connector_account_id_in_connector_mandate_details(\n profile_id.as_ref(),\n connector_mandate_details,\n ),\n None => false,\n }\n}", + "diff_span": { + "before": " merchant_id: &id_type::MerchantId,\n is_connector_agnostic_mit_enabled: bool,\n connector_mandate_details: Option<&payment_method::CommonMandateReference>,\n network_transaction_id: Option<&String>,\n merchant_connector_accounts: &domain::MerchantConnectorAccounts,", + "after": " merchant_id: &id_type::MerchantId,\n is_connector_agnostic_mit_enabled: bool,\n connector_mandate_details: Option<&CommonMandateReference>,\n network_transaction_id: Option<&String>,\n merchant_connector_accounts: &domain::MerchantConnectorAccounts," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n consts,\n crypto::{self, Encryptable},\n encryption::Encryption,\n ext_traits::{AsyncExt, BytesExt, ConfigExt, Encode, StringExt, ValueExt},\n generate_id, id_type,\n request::Request,\n type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit,\n },\n};", + "use super::surcharge_decision_configs::{\n perform_surcharge_decision_management_for_payment_method_list,\n perform_surcharge_decision_management_for_saved_cards,\n};", + "use diesel_models::payment_method;" + ], + "after_imports": [ + "use hyperswitch_domain_models::mandates::CommonMandateReference;", + "use common_utils::{\n consts,\n crypto::{self, Encryptable},\n encryption::Encryption,\n ext_traits::{AsyncExt, BytesExt, ConfigExt, Encode, StringExt, ValueExt},\n generate_id, id_type,\n request::Request,\n type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit,\n },\n};", + "use super::surcharge_decision_configs::{\n perform_surcharge_decision_management_for_payment_method_list,\n perform_surcharge_decision_management_for_saved_cards,\n};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::function::add_connector_mandate_details_in_payment_method", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub fn add_connector_mandate_details_in_payment_method(\n payment_method_type: Option,\n authorized_amount: Option,\n authorized_currency: Option,\n merchant_connector_id: Option,\n connector_mandate_id: Option,\n mandate_metadata: Option>,\n connector_mandate_request_reference_id: Option,\n) -> Option {\n let mut mandate_details = HashMap::new();\n\n if let Some((mca_id, connector_mandate_id)) =\n merchant_connector_id.clone().zip(connector_mandate_id)\n {\n mandate_details.insert(\n mca_id,\n diesel_models::PaymentsMandateReferenceRecord {\n connector_mandate_id,\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata,\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id,\n },\n );\n Some(diesel_models::CommonMandateReference {\n payments: Some(diesel_models::PaymentsMandateReference(mandate_details)),\n payouts: None,\n })\n } else {\n None\n }\n}", + "after_code": "pub fn add_connector_mandate_details_in_payment_method(\n payment_method_type: Option,\n authorized_amount: Option,\n authorized_currency: Option,\n merchant_connector_id: Option,\n connector_mandate_id: Option,\n mandate_metadata: Option>,\n connector_mandate_request_reference_id: Option,\n) -> Option {\n let mut mandate_details = HashMap::new();\n\n if let Some((mca_id, connector_mandate_id)) =\n merchant_connector_id.clone().zip(connector_mandate_id)\n {\n mandate_details.insert(\n mca_id,\n PaymentsMandateReferenceRecord {\n connector_mandate_id,\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata,\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id,\n },\n );\n Some(CommonMandateReference {\n payments: Some(PaymentsMandateReference(mandate_details)),\n payouts: None,\n })\n } else {\n None\n }\n}", + "diff_span": { + "before": " mandate_metadata: Option>,\n connector_mandate_request_reference_id: Option,\n) -> Option {\n let mut mandate_details = HashMap::new();\n\n if let Some((mca_id, connector_mandate_id)) =\n merchant_connector_id.clone().zip(connector_mandate_id)\n {\n mandate_details.insert(\n mca_id,\n diesel_models::PaymentsMandateReferenceRecord {\n connector_mandate_id,\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata,\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id,\n },\n );\n Some(diesel_models::CommonMandateReference {\n payments: Some(diesel_models::PaymentsMandateReference(mandate_details)),\n payouts: None,\n })", + "after": " mandate_metadata: Option>,\n connector_mandate_request_reference_id: Option,\n) -> Option {\n let mut mandate_details = HashMap::new();\n\n if let Some((mca_id, connector_mandate_id)) =\n merchant_connector_id.clone().zip(connector_mandate_id)\n {\n mandate_details.insert(\n mca_id,\n PaymentsMandateReferenceRecord {\n connector_mandate_id,\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata,\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id,\n },\n );\n Some(CommonMandateReference {\n payments: Some(PaymentsMandateReference(mandate_details)),\n payouts: None,\n })" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use std::collections::HashMap;", + "use masking::{ExposeInterface, Secret};", + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};", + "use std::collections::HashMap;", + "use masking::{ExposeInterface, Secret};", + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::incoming_webhooks_wrapper", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn incoming_webhooks_wrapper(\n flow: &impl router_env::types::FlowMetric,\n state: SessionState,\n req_state: ReqState,\n req: &actix_web::HttpRequest,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n connector_name_or_mca_id: &str,\n body: actix_web::web::Bytes,\n is_relay_webhook: bool,\n) -> RouterResponse {\n let start_instant = Instant::now();\n let (application_response, webhooks_response_tracker, serialized_req) =\n Box::pin(incoming_webhooks_core::(\n state.clone(),\n req_state,\n req,\n merchant_account.clone(),\n key_store,\n connector_name_or_mca_id,\n body.clone(),\n is_relay_webhook,\n ))\n .await?;\n\n logger::info!(incoming_webhook_payload = ?serialized_req);\n\n let request_duration = Instant::now()\n .saturating_duration_since(start_instant)\n .as_millis();\n\n let request_id = RequestId::extract(req)\n .await\n .attach_printable(\"Unable to extract request id from request\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let auth_type = auth::AuthenticationType::WebhookAuth {\n merchant_id: merchant_account.get_id().clone(),\n };\n let status_code = 200;\n let api_event = ApiEventsType::Webhooks {\n connector: connector_name_or_mca_id.to_string(),\n payment_id: webhooks_response_tracker.get_payment_id(),\n };\n let response_value = serde_json::to_value(&webhooks_response_tracker)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not convert webhook effect to string\")?;\n\n let api_event = ApiEvent::new(\n state.tenant.tenant_id.clone(),\n Some(merchant_account.get_id().clone()),\n flow,\n &request_id,\n request_duration,\n status_code,\n serialized_req,\n Some(response_value),\n None,\n auth_type,\n None,\n api_event,\n req,\n req.method(),\n );\n state.event_handler().log_event(&api_event);\n Ok(application_response)\n}", + "after_code": "pub async fn incoming_webhooks_wrapper(\n flow: &impl router_env::types::FlowMetric,\n state: SessionState,\n req_state: ReqState,\n req: &actix_web::HttpRequest,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n connector_name_or_mca_id: &str,\n body: actix_web::web::Bytes,\n is_relay_webhook: bool,\n) -> RouterResponse {\n let start_instant = Instant::now();\n let (application_response, webhooks_response_tracker, serialized_req) =\n Box::pin(incoming_webhooks_core::(\n state.clone(),\n req_state,\n req,\n merchant_account.clone(),\n key_store,\n connector_name_or_mca_id,\n body.clone(),\n is_relay_webhook,\n ))\n .await?;\n\n logger::info!(incoming_webhook_payload = ?serialized_req);\n\n let request_duration = Instant::now()\n .saturating_duration_since(start_instant)\n .as_millis();\n\n let request_id = RequestId::extract(req)\n .await\n .attach_printable(\"Unable to extract request id from request\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let auth_type = auth::AuthenticationType::WebhookAuth {\n merchant_id: merchant_account.get_id().clone(),\n };\n let status_code = 200;\n let api_event = ApiEventsType::Webhooks {\n connector: connector_name_or_mca_id.to_string(),\n payment_id: webhooks_response_tracker.get_payment_id(),\n };\n let response_value = serde_json::to_value(&webhooks_response_tracker)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not convert webhook effect to string\")?;\n\n let api_event = ApiEvent::new(\n state.tenant.tenant_id.clone(),\n Some(merchant_account.get_id().clone()),\n flow,\n &request_id,\n request_duration,\n status_code,\n serialized_req,\n Some(response_value),\n None,\n auth_type,\n None,\n api_event,\n req,\n req.method(),\n );\n state.event_handler().log_event(&api_event);\n Ok(application_response)\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::relay_incoming_webhook_flow", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn relay_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n merchant_key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n) -> CustomResult {\n let flow_type: api::WebhookFlow = event_type.into();\n\n let result_response = match flow_type {\n webhooks::WebhookFlow::Refund => Box::pin(relay_refunds_incoming_webhook_flow(\n state,\n merchant_account,\n business_profile,\n merchant_key_store,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay refund failed\")?,\n webhooks::WebhookFlow::Payment\n | webhooks::WebhookFlow::Payout\n | webhooks::WebhookFlow::Dispute\n | webhooks::WebhookFlow::Subscription\n | webhooks::WebhookFlow::ReturnResponse\n | webhooks::WebhookFlow::BankTransfer\n | webhooks::WebhookFlow::Mandate\n | webhooks::WebhookFlow::ExternalAuthentication\n | webhooks::WebhookFlow::FraudCheck => Err(errors::ApiErrorResponse::NotSupported {\n message: \"Relay webhook flow types not supported\".to_string(),\n })?,\n };\n Ok(result_response)\n}", + "after_code": "async fn relay_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n merchant_key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n) -> CustomResult {\n let flow_type: api::WebhookFlow = event_type.into();\n\n let result_response = match flow_type {\n webhooks::WebhookFlow::Refund => Box::pin(relay_refunds_incoming_webhook_flow(\n state,\n merchant_account,\n business_profile,\n merchant_key_store,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay refund failed\")?,\n webhooks::WebhookFlow::Payment\n | webhooks::WebhookFlow::Payout\n | webhooks::WebhookFlow::Dispute\n | webhooks::WebhookFlow::Subscription\n | webhooks::WebhookFlow::ReturnResponse\n | webhooks::WebhookFlow::BankTransfer\n | webhooks::WebhookFlow::Mandate\n | webhooks::WebhookFlow::ExternalAuthentication\n | webhooks::WebhookFlow::FraudCheck => Err(errors::ApiErrorResponse::NotSupported {\n message: \"Relay webhook flow types not supported\".to_string(),\n })?,\n };\n Ok(result_response)\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};", + "use api_models::webhooks::{self, WebhookResponseTracker};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::function::get_connector_wallets_details", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_connector_wallets_details(&self) -> Option> {\n self.connector_wallets_details.as_deref().cloned()\n }", + "after_code": "pub fn get_connector_wallets_details(&self) -> Option> {\n self.connector_wallets_details.as_deref().cloned()\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};" + ], + "after_imports": [ + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::disputes_incoming_webhook_flow", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn disputes_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n source_verified: bool,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n event_type: webhooks::IncomingWebhookEvent,\n) -> CustomResult {\n metrics::INCOMING_DISPUTE_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n let dispute_details = connector.get_dispute_details(request_details).switch()?;\n let payment_attempt = get_payment_attempt_from_object_reference_id(\n &state,\n webhook_details.object_reference_id,\n &merchant_account,\n )\n .await?;\n let option_dispute = db\n .find_by_merchant_id_payment_id_connector_dispute_id(\n merchant_account.get_id(),\n &payment_attempt.payment_id,\n &dispute_details.connector_dispute_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)?;\n let dispute_object = get_or_update_dispute_object(\n state.clone(),\n option_dispute,\n dispute_details,\n merchant_account.get_id(),\n &merchant_account.organization_id,\n &payment_attempt,\n event_type,\n &business_profile,\n connector.id(),\n )\n .await?;\n let disputes_response = Box::new(dispute_object.clone().foreign_into());\n let event_type: enums::EventType = dispute_object.dispute_status.foreign_into();\n\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n event_type,\n enums::EventClass::Disputes,\n dispute_object.dispute_id.clone(),\n enums::EventObjectType::DisputeDetails,\n api::OutgoingWebhookContent::DisputeDetails(disputes_response),\n Some(dispute_object.created_at),\n ))\n .await?;\n metrics::INCOMING_DISPUTE_WEBHOOK_MERCHANT_NOTIFIED_METRIC.add(1, &[]);\n Ok(WebhookResponseTracker::Dispute {\n dispute_id: dispute_object.dispute_id,\n payment_id: dispute_object.payment_id,\n status: dispute_object.dispute_status,\n })\n } else {\n metrics::INCOMING_DISPUTE_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}", + "after_code": "async fn disputes_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n source_verified: bool,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n event_type: webhooks::IncomingWebhookEvent,\n) -> CustomResult {\n metrics::INCOMING_DISPUTE_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n let dispute_details = connector.get_dispute_details(request_details).switch()?;\n let payment_attempt = get_payment_attempt_from_object_reference_id(\n &state,\n webhook_details.object_reference_id,\n &merchant_account,\n )\n .await?;\n let option_dispute = db\n .find_by_merchant_id_payment_id_connector_dispute_id(\n merchant_account.get_id(),\n &payment_attempt.payment_id,\n &dispute_details.connector_dispute_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)?;\n let dispute_object = get_or_update_dispute_object(\n state.clone(),\n option_dispute,\n dispute_details,\n merchant_account.get_id(),\n &merchant_account.organization_id,\n &payment_attempt,\n event_type,\n &business_profile,\n connector.id(),\n )\n .await?;\n let disputes_response = Box::new(dispute_object.clone().foreign_into());\n let event_type: enums::EventType = dispute_object.dispute_status.foreign_into();\n\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n event_type,\n enums::EventClass::Disputes,\n dispute_object.dispute_id.clone(),\n enums::EventObjectType::DisputeDetails,\n api::OutgoingWebhookContent::DisputeDetails(disputes_response),\n Some(dispute_object.created_at),\n ))\n .await?;\n metrics::INCOMING_DISPUTE_WEBHOOK_MERCHANT_NOTIFIED_METRIC.add(1, &[]);\n Ok(WebhookResponseTracker::Dispute {\n dispute_id: dispute_object.dispute_id,\n payment_id: dispute_object.payment_id,\n status: dispute_object.dispute_status,\n })\n } else {\n metrics::INCOMING_DISPUTE_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use error_stack::{report, ResultExt};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use error_stack::{report, ResultExt};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};", + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::FlattenedPaymentMethodsEnabled::function::from_payment_connectors_list", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn from_payment_connectors_list(payment_connectors: Vec) -> Self {\n let payment_methods_enabled_flattened_with_connector = payment_connectors\n .into_iter()\n .map(|connector| {\n (\n connector.payment_methods_enabled.unwrap_or_default(),\n connector.connector_name,\n )\n })\n .flat_map(|(payment_method_enabled, connector_name)| {\n payment_method_enabled\n .into_iter()\n .flat_map(move |payment_method| {\n let request_payment_methods_enabled =\n payment_method.payment_method_subtypes.unwrap_or_default();\n let length = request_payment_methods_enabled.len();\n request_payment_methods_enabled.into_iter().zip(\n std::iter::repeat((connector_name, payment_method.payment_method_type))\n .take(length),\n )\n })\n })\n .map(\n |(request_payment_methods, (connector_name, payment_method))| {\n PaymentMethodsEnabledForConnector {\n payment_methods_enabled: request_payment_methods,\n connector: connector_name,\n payment_method,\n }\n },\n )\n .collect();\n\n Self {\n payment_methods_enabled: payment_methods_enabled_flattened_with_connector,\n }\n }", + "after_code": "pub fn from_payment_connectors_list(payment_connectors: Vec) -> Self {\n let payment_methods_enabled_flattened_with_connector = payment_connectors\n .into_iter()\n .map(|connector| {\n (\n connector.payment_methods_enabled.unwrap_or_default(),\n connector.connector_name,\n )\n })\n .flat_map(|(payment_method_enabled, connector_name)| {\n payment_method_enabled\n .into_iter()\n .flat_map(move |payment_method| {\n let request_payment_methods_enabled =\n payment_method.payment_method_subtypes.unwrap_or_default();\n let length = request_payment_methods_enabled.len();\n request_payment_methods_enabled.into_iter().zip(\n std::iter::repeat((connector_name, payment_method.payment_method_type))\n .take(length),\n )\n })\n })\n .map(\n |(request_payment_methods, (connector_name, payment_method))| {\n PaymentMethodsEnabledForConnector {\n payment_methods_enabled: request_payment_methods,\n connector: connector_name,\n payment_method,\n }\n },\n )\n .collect();\n\n Self {\n payment_methods_enabled: payment_methods_enabled_flattened_with_connector,\n }\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::get_payment_method_subtype", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_payment_method_subtype(&self) -> Option {\n self.payment_method_subtype\n }", + "after_code": "pub fn get_payment_method_subtype(&self) -> Option {\n self.payment_method_subtype\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::function::update_router_data_with_payment_method_token_result", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn update_router_data_with_payment_method_token_result(\n payment_method_token_result: types::PaymentMethodTokenResult,\n router_data: &mut types::RouterData,\n is_retry_payment: bool,\n should_continue_further: bool,\n) -> bool {\n if payment_method_token_result.is_payment_method_tokenization_performed {\n match payment_method_token_result.payment_method_token_result {\n Ok(pm_token_result) => {\n router_data.payment_method_token = pm_token_result.map(|pm_token| {\n hyperswitch_domain_models::router_data::PaymentMethodToken::Token(Secret::new(\n pm_token,\n ))\n });\n\n true\n }\n Err(err) => {\n if is_retry_payment {\n router_data.response = Err(err);\n false\n } else {\n logger::debug!(payment_method_tokenization_error=?err);\n true\n }\n }\n }\n } else {\n should_continue_further\n }\n}", + "after_code": "pub fn update_router_data_with_payment_method_token_result(\n payment_method_token_result: types::PaymentMethodTokenResult,\n router_data: &mut types::RouterData,\n is_retry_payment: bool,\n should_continue_further: bool,\n) -> bool {\n if payment_method_token_result.is_payment_method_tokenization_performed {\n match payment_method_token_result.payment_method_token_result {\n Ok(pm_token_result) => {\n router_data.payment_method_token = pm_token_result.map(|pm_token| {\n hyperswitch_domain_models::router_data::PaymentMethodToken::Token(Secret::new(\n pm_token,\n ))\n });\n\n true\n }\n Err(err) => {\n if is_retry_payment {\n router_data.response = Err(err);\n false\n } else {\n logger::debug!(payment_method_tokenization_error=?err);\n true\n }\n }\n }\n } else {\n should_continue_further\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use masking::{ExposeInterface, Secret};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};", + "use masking::{ExposeInterface, Secret};", + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::type::DstType", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "type_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "type DstType = diesel_models::merchant_connector_account::MerchantConnectorAccount;", + "after_code": "type DstType = diesel_models::merchant_connector_account::MerchantConnectorAccount;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::function::save_payment_method", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn save_payment_method(\n _state: &SessionState,\n _connector_name: String,\n _save_payment_method_data: SavePaymentMethodData,\n _customer_id: Option,\n _merchant_account: &domain::MerchantAccount,\n _payment_method_type: Option,\n _key_store: &domain::MerchantKeyStore,\n _billing_name: Option>,\n _payment_method_billing_address: Option<&api::Address>,\n _business_profile: &domain::Profile,\n _connector_mandate_request_reference_id: Option,\n) -> RouterResult\nwhere\n FData: mandate::MandateBehaviour + Clone,\n{\n todo!()\n}", + "after_code": "pub async fn save_payment_method(\n _state: &SessionState,\n _connector_name: String,\n _save_payment_method_data: SavePaymentMethodData,\n _customer_id: Option,\n _merchant_account: &domain::MerchantAccount,\n _payment_method_type: Option,\n _key_store: &domain::MerchantKeyStore,\n _billing_name: Option>,\n _payment_method_billing_address: Option<&api::Address>,\n _business_profile: &domain::Profile,\n _connector_mandate_request_reference_id: Option,\n) -> RouterResult\nwhere\n FData: mandate::MandateBehaviour + Clone,\n{\n todo!()\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use masking::{ExposeInterface, Secret};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};", + "use masking::{ExposeInterface, Secret};", + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::frm_incoming_webhook_flow", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn frm_incoming_webhook_flow(\n state: SessionState,\n req_state: ReqState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n object_ref_id: api::ObjectReferenceId,\n business_profile: domain::Profile,\n) -> CustomResult {\n if source_verified {\n let payment_attempt =\n get_payment_attempt_from_object_reference_id(&state, object_ref_id, &merchant_account)\n .await?;\n let payment_response = match event_type {\n webhooks::IncomingWebhookEvent::FrmApproved => {\n Box::pin(payments::payments_core::<\n api::Capture,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData,\n >(\n state.clone(),\n req_state,\n merchant_account.clone(),\n None,\n key_store.clone(),\n payments::PaymentApprove,\n api::PaymentsCaptureRequest {\n payment_id: payment_attempt.payment_id,\n amount_to_capture: payment_attempt.amount_to_capture,\n ..Default::default()\n },\n services::api::AuthFlow::Merchant,\n payments::CallConnectorAction::Trigger,\n None,\n HeaderPayload::default(),\n None, // Platform merchant account\n ))\n .await?\n }\n webhooks::IncomingWebhookEvent::FrmRejected => {\n Box::pin(payments::payments_core::<\n api::Void,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData,\n >(\n state.clone(),\n req_state,\n merchant_account.clone(),\n None,\n key_store.clone(),\n payments::PaymentReject,\n api::PaymentsCancelRequest {\n payment_id: payment_attempt.payment_id.clone(),\n cancellation_reason: Some(\n \"Rejected by merchant based on FRM decision\".to_string(),\n ),\n ..Default::default()\n },\n services::api::AuthFlow::Merchant,\n payments::CallConnectorAction::Trigger,\n None,\n HeaderPayload::default(),\n None, // Platform merchant account\n ))\n .await?\n }\n _ => Err(errors::ApiErrorResponse::EventNotFound)?,\n };\n match payment_response {\n services::ApplicationResponse::JsonWithHeaders((payments_response, _)) => {\n let payment_id = payments_response.payment_id.clone();\n let status = payments_response.status;\n let event_type: Option = payments_response.status.foreign_into();\n if let Some(outgoing_event_type) = event_type {\n let primary_object_created_at = payments_response.created;\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Payments,\n payment_id.get_string_repr().to_owned(),\n enums::EventObjectType::PaymentDetails,\n api::OutgoingWebhookContent::PaymentDetails(Box::new(payments_response)),\n primary_object_created_at,\n ))\n .await?;\n };\n let response = WebhookResponseTracker::Payment { payment_id, status };\n Ok(response)\n }\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure).attach_printable(\n \"Did not get payment id as object reference id in webhook payments flow\",\n )?,\n }\n } else {\n logger::error!(\"Webhook source verification failed for frm webhooks flow\");\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}", + "after_code": "async fn frm_incoming_webhook_flow(\n state: SessionState,\n req_state: ReqState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n object_ref_id: api::ObjectReferenceId,\n business_profile: domain::Profile,\n) -> CustomResult {\n if source_verified {\n let payment_attempt =\n get_payment_attempt_from_object_reference_id(&state, object_ref_id, &merchant_account)\n .await?;\n let payment_response = match event_type {\n webhooks::IncomingWebhookEvent::FrmApproved => {\n Box::pin(payments::payments_core::<\n api::Capture,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData,\n >(\n state.clone(),\n req_state,\n merchant_account.clone(),\n None,\n key_store.clone(),\n payments::PaymentApprove,\n api::PaymentsCaptureRequest {\n payment_id: payment_attempt.payment_id,\n amount_to_capture: payment_attempt.amount_to_capture,\n ..Default::default()\n },\n services::api::AuthFlow::Merchant,\n payments::CallConnectorAction::Trigger,\n None,\n HeaderPayload::default(),\n None, // Platform merchant account\n ))\n .await?\n }\n webhooks::IncomingWebhookEvent::FrmRejected => {\n Box::pin(payments::payments_core::<\n api::Void,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData,\n >(\n state.clone(),\n req_state,\n merchant_account.clone(),\n None,\n key_store.clone(),\n payments::PaymentReject,\n api::PaymentsCancelRequest {\n payment_id: payment_attempt.payment_id.clone(),\n cancellation_reason: Some(\n \"Rejected by merchant based on FRM decision\".to_string(),\n ),\n ..Default::default()\n },\n services::api::AuthFlow::Merchant,\n payments::CallConnectorAction::Trigger,\n None,\n HeaderPayload::default(),\n None, // Platform merchant account\n ))\n .await?\n }\n _ => Err(errors::ApiErrorResponse::EventNotFound)?,\n };\n match payment_response {\n services::ApplicationResponse::JsonWithHeaders((payments_response, _)) => {\n let payment_id = payments_response.payment_id.clone();\n let status = payments_response.status;\n let event_type: Option = payments_response.status.foreign_into();\n if let Some(outgoing_event_type) = event_type {\n let primary_object_created_at = payments_response.created;\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Payments,\n payment_id.get_string_repr().to_owned(),\n enums::EventObjectType::PaymentDetails,\n api::OutgoingWebhookContent::PaymentDetails(Box::new(payments_response)),\n primary_object_created_at,\n ))\n .await?;\n };\n let response = WebhookResponseTracker::Payment { payment_id, status };\n Ok(response)\n }\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure).attach_printable(\n \"Did not get payment id as object reference id in webhook payments flow\",\n )?,\n }\n } else {\n logger::error!(\"Webhook source verification failed for frm webhooks flow\");\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use error_stack::{report, ResultExt};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use error_stack::{report, ResultExt};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::update_connector_mandate_details", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn update_connector_mandate_details(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\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_account)\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 key_store,\n payment_method_id,\n 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().map_or(true, |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 updated_by: merchant_account.storage_scheme.to_string(),\n };\n\n state\n .store\n .update_payment_attempt_with_attempt_id(\n payment_attempt.clone(),\n attempt_update,\n 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 key_store,\n payment_method_info,\n pm_update,\n 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}", + "after_code": "async fn update_connector_mandate_details(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\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_account)\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 key_store,\n payment_method_id,\n 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().map_or(true, |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 updated_by: merchant_account.storage_scheme.to_string(),\n };\n\n state\n .store\n .update_payment_attempt_with_attempt_id(\n payment_attempt.clone(),\n attempt_update,\n 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 key_store,\n payment_method_info,\n pm_update,\n 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}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use diesel_models::ConnectorMandateReferenceId;", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use diesel_models::ConnectorMandateReferenceId;", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::impl::FlattenedPaymentMethodsEnabled", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl FlattenedPaymentMethodsEnabled {\n /// This functions flattens the payment methods enabled from the connector accounts\n /// Retains the connector name and payment method in every flattened element\n pub fn from_payment_connectors_list(payment_connectors: Vec) -> Self {\n let payment_methods_enabled_flattened_with_connector = payment_connectors\n .into_iter()\n .map(|connector| {\n (\n connector.payment_methods_enabled.unwrap_or_default(),\n connector.connector_name,\n )\n })\n .flat_map(|(payment_method_enabled, connector_name)| {\n payment_method_enabled\n .into_iter()\n .flat_map(move |payment_method| {\n let request_payment_methods_enabled =\n payment_method.payment_method_subtypes.unwrap_or_default();\n let length = request_payment_methods_enabled.len();\n request_payment_methods_enabled.into_iter().zip(\n std::iter::repeat((connector_name, payment_method.payment_method_type))\n .take(length),\n )\n })\n })\n .map(\n |(request_payment_methods, (connector_name, payment_method))| {\n PaymentMethodsEnabledForConnector {\n payment_methods_enabled: request_payment_methods,\n connector: connector_name,\n payment_method,\n }\n },\n )\n .collect();\n\n Self {\n payment_methods_enabled: payment_methods_enabled_flattened_with_connector,\n }\n }\n}", + "after_code": "impl FlattenedPaymentMethodsEnabled {\n /// This functions flattens the payment methods enabled from the connector accounts\n /// Retains the connector name and payment method in every flattened element\n pub fn from_payment_connectors_list(payment_connectors: Vec) -> Self {\n let payment_methods_enabled_flattened_with_connector = payment_connectors\n .into_iter()\n .map(|connector| {\n (\n connector.payment_methods_enabled.unwrap_or_default(),\n connector.connector_name,\n )\n })\n .flat_map(|(payment_method_enabled, connector_name)| {\n payment_method_enabled\n .into_iter()\n .flat_map(move |payment_method| {\n let request_payment_methods_enabled =\n payment_method.payment_method_subtypes.unwrap_or_default();\n let length = request_payment_methods_enabled.len();\n request_payment_methods_enabled.into_iter().zip(\n std::iter::repeat((connector_name, payment_method.payment_method_type))\n .take(length),\n )\n })\n })\n .map(\n |(request_payment_methods, (connector_name, payment_method))| {\n PaymentMethodsEnabledForConnector {\n payment_methods_enabled: request_payment_methods,\n connector: connector_name,\n payment_method,\n }\n },\n )\n .collect();\n\n Self {\n payment_methods_enabled: payment_methods_enabled_flattened_with_connector,\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::get_connector_by_connector_name", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn get_connector_by_connector_name(\n state: &SessionState,\n connector_name: &str,\n merchant_connector_id: Option,\n) -> CustomResult<(ConnectorEnum, String), errors::ApiErrorResponse> {\n let authentication_connector =\n api_models::enums::convert_authentication_connector(connector_name);\n #[cfg(feature = \"frm\")]\n {\n let frm_connector = api_models::enums::convert_frm_connector(connector_name);\n if frm_connector.is_some() {\n let frm_connector_data =\n api::FraudCheckConnectorData::get_connector_by_name(connector_name)?;\n return Ok((\n frm_connector_data.connector,\n frm_connector_data.connector_name.to_string(),\n ));\n }\n }\n\n let (connector, connector_name) = if authentication_connector.is_some() {\n let authentication_connector_data =\n api::AuthenticationConnectorData::get_connector_by_name(connector_name)?;\n (\n authentication_connector_data.connector,\n authentication_connector_data.connector_name.to_string(),\n )\n } else {\n let connector_data = ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n connector_name,\n GetToken::Connector,\n merchant_connector_id,\n )\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"invalid connector name received\".to_string(),\n })\n .attach_printable(\"Failed construction of ConnectorData\")?;\n (\n connector_data.connector,\n connector_data.connector_name.to_string(),\n )\n };\n Ok((connector, connector_name))\n}", + "after_code": "fn get_connector_by_connector_name(\n state: &SessionState,\n connector_name: &str,\n merchant_connector_id: Option,\n) -> CustomResult<(ConnectorEnum, String), errors::ApiErrorResponse> {\n let authentication_connector =\n api_models::enums::convert_authentication_connector(connector_name);\n #[cfg(feature = \"frm\")]\n {\n let frm_connector = api_models::enums::convert_frm_connector(connector_name);\n if frm_connector.is_some() {\n let frm_connector_data =\n api::FraudCheckConnectorData::get_connector_by_name(connector_name)?;\n return Ok((\n frm_connector_data.connector,\n frm_connector_data.connector_name.to_string(),\n ));\n }\n }\n\n let (connector, connector_name) = if authentication_connector.is_some() {\n let authentication_connector_data =\n api::AuthenticationConnectorData::get_connector_by_name(connector_name)?;\n (\n authentication_connector_data.connector,\n authentication_connector_data.connector_name.to_string(),\n )\n } else {\n let connector_data = ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n connector_name,\n GetToken::Connector,\n merchant_connector_id,\n )\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"invalid connector name received\".to_string(),\n })\n .attach_printable(\"Failed construction of ConnectorData\")?;\n (\n connector_data.connector,\n connector_data.connector_name.to_string(),\n )\n };\n Ok((connector, connector_name))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::should_update_connector_mandate_details", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn should_update_connector_mandate_details(\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n) -> bool {\n source_verified && event_type == webhooks::IncomingWebhookEvent::PaymentIntentSuccess\n}", + "after_code": "fn should_update_connector_mandate_details(\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n) -> bool {\n source_verified && event_type == webhooks::IncomingWebhookEvent::PaymentIntentSuccess\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::type::DstType", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "type_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "type DstType = diesel_models::payment_method::PaymentMethod;", + "after_code": "type DstType = diesel_models::payment_method::PaymentMethod;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::relay_refunds_incoming_webhook_flow", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn relay_refunds_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n merchant_key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n) -> CustomResult {\n let db = &*state.store;\n let key_manager_state = &(&state).into();\n\n let relay_record = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::RefundId(refund_id_type) => match refund_id_type {\n webhooks::RefundIdType::RefundId(refund_id) => {\n let relay_id = common_utils::id_type::RelayId::from_str(&refund_id)\n .change_context(errors::ValidationError::IncorrectValueProvided {\n field_name: \"relay_id\",\n })\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n db.find_relay_by_id(key_manager_state, &merchant_key_store, &relay_id)\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the relay record\")?\n }\n webhooks::RefundIdType::ConnectorRefundId(connector_refund_id) => db\n .find_relay_by_profile_id_connector_reference_id(\n key_manager_state,\n &merchant_key_store,\n business_profile.get_id(),\n &connector_refund_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the relay record\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-refund id when processing relay refund webhooks\")?,\n };\n\n // if source_verified then update relay status else trigger relay force sync\n let relay_response = if source_verified {\n let relay_update = hyperswitch_domain_models::relay::RelayUpdate::StatusUpdate {\n connector_reference_id: None,\n status: common_enums::RelayStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed relay refund status mapping from event type\")?,\n };\n db.update_relay(\n key_manager_state,\n &merchant_key_store,\n relay_record,\n relay_update,\n )\n .await\n .map(api_models::relay::RelayResponse::from)\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to update relay\")?\n } else {\n let relay_retrieve_request = api_models::relay::RelayRetrieveRequest {\n force_sync: true,\n id: relay_record.id,\n };\n let relay_force_sync_response = Box::pin(relay::relay_retrieve(\n state,\n merchant_account,\n Some(business_profile.get_id().clone()),\n merchant_key_store,\n relay_retrieve_request,\n ))\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to force sync relay\")?;\n\n if let hyperswitch_domain_models::api::ApplicationResponse::Json(response) =\n relay_force_sync_response\n {\n response\n } else {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unexpected response from force sync relay\")?\n }\n };\n\n Ok(WebhookResponseTracker::Relay {\n relay_id: relay_response.id,\n status: relay_response.status,\n })\n}", + "after_code": "async fn relay_refunds_incoming_webhook_flow(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n merchant_key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n) -> CustomResult {\n let db = &*state.store;\n let key_manager_state = &(&state).into();\n\n let relay_record = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::RefundId(refund_id_type) => match refund_id_type {\n webhooks::RefundIdType::RefundId(refund_id) => {\n let relay_id = common_utils::id_type::RelayId::from_str(&refund_id)\n .change_context(errors::ValidationError::IncorrectValueProvided {\n field_name: \"relay_id\",\n })\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n db.find_relay_by_id(key_manager_state, &merchant_key_store, &relay_id)\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the relay record\")?\n }\n webhooks::RefundIdType::ConnectorRefundId(connector_refund_id) => db\n .find_relay_by_profile_id_connector_reference_id(\n key_manager_state,\n &merchant_key_store,\n business_profile.get_id(),\n &connector_refund_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the relay record\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-refund id when processing relay refund webhooks\")?,\n };\n\n // if source_verified then update relay status else trigger relay force sync\n let relay_response = if source_verified {\n let relay_update = hyperswitch_domain_models::relay::RelayUpdate::StatusUpdate {\n connector_reference_id: None,\n status: common_enums::RelayStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed relay refund status mapping from event type\")?,\n };\n db.update_relay(\n key_manager_state,\n &merchant_key_store,\n relay_record,\n relay_update,\n )\n .await\n .map(api_models::relay::RelayResponse::from)\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to update relay\")?\n } else {\n let relay_retrieve_request = api_models::relay::RelayRetrieveRequest {\n force_sync: true,\n id: relay_record.id,\n };\n let relay_force_sync_response = Box::pin(relay::relay_retrieve(\n state,\n merchant_account,\n Some(business_profile.get_id().clone()),\n merchant_key_store,\n relay_retrieve_request,\n ))\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to force sync relay\")?;\n\n if let hyperswitch_domain_models::api::ApplicationResponse::Json(response) =\n relay_force_sync_response\n {\n response\n } else {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unexpected response from force sync relay\")?\n }\n };\n\n Ok(WebhookResponseTracker::Relay {\n relay_id: relay_response.id,\n status: relay_response.status,\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};", + "use api_models::webhooks::{self, WebhookResponseTracker};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::get_payment_attempt_from_object_reference_id", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn get_payment_attempt_from_object_reference_id(\n state: &SessionState,\n object_reference_id: webhooks::ObjectReferenceId,\n merchant_account: &domain::MerchantAccount,\n) -> CustomResult {\n let db = &*state.store;\n match object_reference_id {\n api::ObjectReferenceId::PaymentId(api::PaymentIdType::ConnectorTransactionId(ref id)) => db\n .find_payment_attempt_by_merchant_id_connector_txn_id(\n merchant_account.get_id(),\n id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound),\n api::ObjectReferenceId::PaymentId(api::PaymentIdType::PaymentAttemptId(ref id)) => db\n .find_payment_attempt_by_attempt_id_merchant_id(\n id,\n merchant_account.get_id(),\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound),\n api::ObjectReferenceId::PaymentId(api::PaymentIdType::PreprocessingId(ref id)) => db\n .find_payment_attempt_by_preprocessing_id_merchant_id(\n id,\n merchant_account.get_id(),\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound),\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payment id for retrieving payment\")?,\n }\n}", + "after_code": "async fn get_payment_attempt_from_object_reference_id(\n state: &SessionState,\n object_reference_id: webhooks::ObjectReferenceId,\n merchant_account: &domain::MerchantAccount,\n) -> CustomResult {\n let db = &*state.store;\n match object_reference_id {\n api::ObjectReferenceId::PaymentId(api::PaymentIdType::ConnectorTransactionId(ref id)) => db\n .find_payment_attempt_by_merchant_id_connector_txn_id(\n merchant_account.get_id(),\n id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound),\n api::ObjectReferenceId::PaymentId(api::PaymentIdType::PaymentAttemptId(ref id)) => db\n .find_payment_attempt_by_attempt_id_merchant_id(\n id,\n merchant_account.get_id(),\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound),\n api::ObjectReferenceId::PaymentId(api::PaymentIdType::PreprocessingId(ref id)) => db\n .find_payment_attempt_by_preprocessing_id_merchant_id(\n id,\n merchant_account.get_id(),\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound),\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payment id for retrieving payment\")?,\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::function::construct_new", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn construct_new(self) -> CustomResult {\n let now = date_time::now();\n Ok(Self::NewDstType {\n id: self.id,\n merchant_id: Some(self.merchant_id),\n connector_name: Some(self.connector_name),\n connector_account_details: Some(self.connector_account_details.into()),\n disabled: self.disabled,\n payment_methods_enabled: self.payment_methods_enabled,\n connector_type: Some(self.connector_type),\n metadata: self.metadata,\n frm_config: self.frm_configs,\n connector_label: self.connector_label,\n created_at: now,\n modified_at: now,\n connector_webhook_details: self.connector_webhook_details,\n profile_id: self.profile_id,\n applepay_verified_domains: self.applepay_verified_domains,\n pm_auth_config: self.pm_auth_config,\n status: self.status,\n connector_wallets_details: self.connector_wallets_details.map(Encryption::from),\n additional_merchant_data: self.additional_merchant_data.map(|data| data.into()),\n version: self.version,\n })\n }", + "after_code": "async fn construct_new(self) -> CustomResult {\n let now = date_time::now();\n Ok(Self::NewDstType {\n id: self.id,\n merchant_id: Some(self.merchant_id),\n connector_name: Some(self.connector_name),\n connector_account_details: Some(self.connector_account_details.into()),\n disabled: self.disabled,\n payment_methods_enabled: self.payment_methods_enabled,\n connector_type: Some(self.connector_type),\n metadata: self.metadata,\n frm_config: self.frm_configs,\n connector_label: self.connector_label,\n created_at: now,\n modified_at: now,\n connector_webhook_details: self.connector_webhook_details,\n profile_id: self.profile_id,\n applepay_verified_domains: self.applepay_verified_domains,\n pm_auth_config: self.pm_auth_config,\n status: self.status,\n connector_wallets_details: self.connector_wallets_details.map(Encryption::from),\n additional_merchant_data: self.additional_merchant_data.map(|data| data.into()),\n version: self.version,\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::fetch_optional_mca_and_connector", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn fetch_optional_mca_and_connector(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_name_or_mca_id: &str,\n key_store: &domain::MerchantKeyStore,\n) -> CustomResult<\n (\n Option,\n ConnectorEnum,\n String,\n ),\n errors::ApiErrorResponse,\n> {\n let db = &state.store;\n if connector_name_or_mca_id.starts_with(\"mca_\") {\n #[cfg(feature = \"v1\")]\n let mca = db\n .find_by_merchant_connector_account_merchant_id_merchant_connector_id(\n &state.into(),\n merchant_account.get_id(),\n &common_utils::id_type::MerchantConnectorAccountId::wrap(\n connector_name_or_mca_id.to_owned(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Error while converting MerchanConnectorAccountId from string\n \",\n )?,\n key_store,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: connector_name_or_mca_id.to_string(),\n })\n .attach_printable(\n \"error while fetching merchant_connector_account from connector_id\",\n )?;\n\n #[cfg(feature = \"v2\")]\n let mca: domain::MerchantConnectorAccount = {\n let _ = merchant_account;\n let _ = key_store;\n let _ = db;\n todo!()\n };\n\n let (connector, connector_name) =\n get_connector_by_connector_name(state, &mca.connector_name, Some(mca.get_id()))?;\n\n Ok((Some(mca), connector, connector_name))\n } else {\n // Merchant connector account is already being queried, it is safe to set connector id as None\n let (connector, connector_name) =\n get_connector_by_connector_name(state, connector_name_or_mca_id, None)?;\n Ok((None, connector, connector_name))\n }\n}", + "after_code": "async fn fetch_optional_mca_and_connector(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_name_or_mca_id: &str,\n key_store: &domain::MerchantKeyStore,\n) -> CustomResult<\n (\n Option,\n ConnectorEnum,\n String,\n ),\n errors::ApiErrorResponse,\n> {\n let db = &state.store;\n if connector_name_or_mca_id.starts_with(\"mca_\") {\n #[cfg(feature = \"v1\")]\n let mca = db\n .find_by_merchant_connector_account_merchant_id_merchant_connector_id(\n &state.into(),\n merchant_account.get_id(),\n &common_utils::id_type::MerchantConnectorAccountId::wrap(\n connector_name_or_mca_id.to_owned(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Error while converting MerchanConnectorAccountId from string\n \",\n )?,\n key_store,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: connector_name_or_mca_id.to_string(),\n })\n .attach_printable(\n \"error while fetching merchant_connector_account from connector_id\",\n )?;\n\n #[cfg(feature = \"v2\")]\n let mca: domain::MerchantConnectorAccount = {\n let _ = merchant_account;\n let _ = key_store;\n let _ = db;\n todo!()\n };\n\n let (connector, connector_name) =\n get_connector_by_connector_name(state, &mca.connector_name, Some(mca.get_id()))?;\n\n Ok((Some(mca), connector, connector_name))\n } else {\n // Merchant connector account is already being queried, it is safe to set connector id as None\n let (connector, connector_name) =\n get_connector_by_connector_name(state, connector_name_or_mca_id, None)?;\n Ok((None, connector, connector_name))\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::function::save_network_token_in_locker", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn save_network_token_in_locker(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n card_data: &domain::Card,\n payment_method_request: api::PaymentMethodCreate,\n) -> RouterResult<(\n Option,\n Option,\n Option,\n)> {\n let customer_id = payment_method_request\n .customer_id\n .clone()\n .get_required_value(\"customer_id\")?;\n let network_tokenization_supported_card_networks = &state\n .conf\n .network_tokenization_supported_card_networks\n .card_networks;\n\n if card_data\n .card_network\n .as_ref()\n .filter(|cn| network_tokenization_supported_card_networks.contains(cn))\n .is_some()\n {\n match network_tokenization::make_card_network_tokenization_request(\n state,\n card_data,\n &customer_id,\n )\n .await\n {\n Ok((token_response, network_token_requestor_ref_id)) => {\n // Only proceed if the tokenization was successful\n let network_token_data = api::CardDetail {\n card_number: token_response.token.clone(),\n card_exp_month: token_response.token_expiry_month.clone(),\n card_exp_year: token_response.token_expiry_year.clone(),\n card_holder_name: None,\n nick_name: None,\n card_issuing_country: None,\n card_network: Some(token_response.card_brand.clone()),\n card_issuer: None,\n card_type: None,\n };\n\n let (res, dc) = Box::pin(payment_methods::cards::add_card_to_locker(\n state,\n payment_method_request,\n &network_token_data,\n &customer_id,\n merchant_account,\n None,\n ))\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Add Network Token Failed\")?;\n\n Ok((Some(res), dc, network_token_requestor_ref_id))\n }\n Err(err) => {\n logger::error!(\"Failed to tokenize card: {:?}\", err);\n Ok((None, None, None)) //None will be returned in case of error when calling network tokenization service\n }\n }\n } else {\n Ok((None, None, None)) //None will be returned in case of unsupported card network.\n }\n}", + "after_code": "pub async fn save_network_token_in_locker(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n card_data: &domain::Card,\n payment_method_request: api::PaymentMethodCreate,\n) -> RouterResult<(\n Option,\n Option,\n Option,\n)> {\n let customer_id = payment_method_request\n .customer_id\n .clone()\n .get_required_value(\"customer_id\")?;\n let network_tokenization_supported_card_networks = &state\n .conf\n .network_tokenization_supported_card_networks\n .card_networks;\n\n if card_data\n .card_network\n .as_ref()\n .filter(|cn| network_tokenization_supported_card_networks.contains(cn))\n .is_some()\n {\n match network_tokenization::make_card_network_tokenization_request(\n state,\n card_data,\n &customer_id,\n )\n .await\n {\n Ok((token_response, network_token_requestor_ref_id)) => {\n // Only proceed if the tokenization was successful\n let network_token_data = api::CardDetail {\n card_number: token_response.token.clone(),\n card_exp_month: token_response.token_expiry_month.clone(),\n card_exp_year: token_response.token_expiry_year.clone(),\n card_holder_name: None,\n nick_name: None,\n card_issuing_country: None,\n card_network: Some(token_response.card_brand.clone()),\n card_issuer: None,\n card_type: None,\n };\n\n let (res, dc) = Box::pin(payment_methods::cards::add_card_to_locker(\n state,\n payment_method_request,\n &network_token_data,\n &customer_id,\n merchant_account,\n None,\n ))\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Add Network Token Failed\")?;\n\n Ok((Some(res), dc, network_token_requestor_ref_id))\n }\n Err(err) => {\n logger::error!(\"Failed to tokenize card: {:?}\", err);\n Ok((None, None, None)) //None will be returned in case of error when calling network tokenization service\n }\n }\n } else {\n Ok((None, None, None)) //None will be returned in case of unsupported card network.\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ], + "after_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::function::convert", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn convert(self) -> CustomResult {\n Ok(\n diesel_models::merchant_connector_account::MerchantConnectorAccount {\n id: self.id,\n merchant_id: self.merchant_id,\n connector_name: self.connector_name,\n connector_account_details: self.connector_account_details.into(),\n disabled: self.disabled,\n payment_methods_enabled: self.payment_methods_enabled,\n connector_type: self.connector_type,\n metadata: self.metadata,\n frm_config: self.frm_configs,\n connector_label: self.connector_label,\n created_at: self.created_at,\n modified_at: self.modified_at,\n connector_webhook_details: self.connector_webhook_details,\n profile_id: self.profile_id,\n applepay_verified_domains: self.applepay_verified_domains,\n pm_auth_config: self.pm_auth_config,\n status: self.status,\n connector_wallets_details: self.connector_wallets_details.map(Encryption::from),\n additional_merchant_data: self.additional_merchant_data.map(|data| data.into()),\n version: self.version,\n },\n )\n }", + "after_code": "async fn convert(self) -> CustomResult {\n Ok(\n diesel_models::merchant_connector_account::MerchantConnectorAccount {\n id: self.id,\n merchant_id: self.merchant_id,\n connector_name: self.connector_name,\n connector_account_details: self.connector_account_details.into(),\n disabled: self.disabled,\n payment_methods_enabled: self.payment_methods_enabled,\n connector_type: self.connector_type,\n metadata: self.metadata,\n frm_config: self.frm_configs,\n connector_label: self.connector_label,\n created_at: self.created_at,\n modified_at: self.modified_at,\n connector_webhook_details: self.connector_webhook_details,\n profile_id: self.profile_id,\n applepay_verified_domains: self.applepay_verified_domains,\n pm_auth_config: self.pm_auth_config,\n status: self.status,\n connector_wallets_details: self.connector_wallets_details.map(Encryption::from),\n additional_merchant_data: self.additional_merchant_data.map(|data| data.into()),\n version: self.version,\n },\n )\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::impl::PaymentMethod", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "impl super::behaviour::Conversion for PaymentMethod {\n type DstType = diesel_models::payment_method::PaymentMethod;\n type NewDstType = diesel_models::payment_method::PaymentMethodNew;\n async fn convert(self) -> CustomResult {\n Ok(Self::DstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }\n\n async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details,\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }\n\n async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }\n}", + "after_code": "impl super::behaviour::Conversion for PaymentMethod {\n type DstType = diesel_models::payment_method::PaymentMethod;\n type NewDstType = diesel_models::payment_method::PaymentMethodNew;\n async fn convert(self) -> CustomResult {\n Ok(Self::DstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }\n\n async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }\n\n async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }\n}", + "diff_span": { + "before": " locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }\n\n async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details,\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }\n\n async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,", + "after": " locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }\n\n async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }\n\n async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details.map(|cmd| cmd.into()),\n customer_acceptance: self.customer_acceptance,\n status: self.status," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use crate::type_encryption::{crypto_operation, AsyncLift, CryptoOperation};", + "use masking::{PeekInterface, Secret};" + ], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};", + "use masking::{PeekInterface, Secret};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::function::get_id", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_id(&self) -> id_type::MerchantConnectorAccountId {\n self.id.clone()\n }", + "after_code": "pub fn get_id(&self) -> id_type::MerchantConnectorAccountId {\n self.id.clone()\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::impl::SavePaymentMethodData", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl From<&types::RouterData>\n for SavePaymentMethodData\n{\n fn from(router_data: &types::RouterData) -> Self {\n Self {\n request: router_data.request.clone(),\n response: router_data.response.clone(),\n payment_method_token: router_data.payment_method_token.clone(),\n payment_method: router_data.payment_method,\n attempt_status: router_data.status,\n }\n }\n}", + "after_code": "impl From<&types::RouterData>\n for SavePaymentMethodData\n{\n fn from(router_data: &types::RouterData) -> Self {\n Self {\n request: router_data.request.clone(),\n response: router_data.response.clone(),\n payment_method_token: router_data.payment_method_token.clone(),\n payment_method: router_data.payment_method,\n attempt_status: router_data.status,\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ], + "after_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::function::is_disabled", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn is_disabled(&self) -> bool {\n self.disabled.unwrap_or(false)\n }", + "after_code": "pub fn is_disabled(&self) -> bool {\n self.disabled.unwrap_or(false)\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::function::get_connector_account_details", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_connector_account_details(\n &self,\n ) -> error_stack::Result\n {\n use common_utils::ext_traits::ValueExt;\n\n self.connector_account_details\n .get_inner()\n .clone()\n .parse_value(\"ConnectorAuthType\")\n }", + "after_code": "pub fn get_connector_account_details(\n &self,\n ) -> error_stack::Result\n {\n use common_utils::ext_traits::ValueExt;\n\n self.connector_account_details\n .get_inner()\n .clone()\n .parse_value(\"ConnectorAuthType\")\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::ext_traits::ValueExt;", + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use serde_json::Value;" + ], + "after_imports": [ + "use common_utils::ext_traits::ValueExt;", + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use serde_json::Value;", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccountUpdateInternal::function::from", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn from(merchant_connector_account_update: MerchantConnectorAccountUpdate) -> Self {\n match merchant_connector_account_update {\n MerchantConnectorAccountUpdate::Update {\n connector_type,\n connector_account_details,\n disabled,\n payment_methods_enabled,\n metadata,\n frm_configs,\n connector_webhook_details,\n applepay_verified_domains,\n pm_auth_config,\n connector_label,\n status,\n connector_wallets_details,\n additional_merchant_data,\n } => Self {\n connector_type,\n connector_account_details: connector_account_details.map(Encryption::from),\n disabled,\n payment_methods_enabled,\n metadata,\n frm_config: frm_configs,\n modified_at: Some(date_time::now()),\n connector_webhook_details,\n applepay_verified_domains,\n pm_auth_config: *pm_auth_config,\n connector_label,\n status,\n connector_wallets_details: connector_wallets_details.map(Encryption::from),\n additional_merchant_data: additional_merchant_data.map(Encryption::from),\n },\n MerchantConnectorAccountUpdate::ConnectorWalletDetailsUpdate {\n connector_wallets_details,\n } => Self {\n connector_wallets_details: Some(Encryption::from(connector_wallets_details)),\n connector_type: None,\n connector_account_details: None,\n connector_label: None,\n disabled: None,\n payment_methods_enabled: None,\n metadata: None,\n modified_at: None,\n connector_webhook_details: None,\n frm_config: None,\n applepay_verified_domains: None,\n pm_auth_config: None,\n status: None,\n additional_merchant_data: None,\n },\n }\n }", + "after_code": "fn from(merchant_connector_account_update: MerchantConnectorAccountUpdate) -> Self {\n match merchant_connector_account_update {\n MerchantConnectorAccountUpdate::Update {\n connector_type,\n connector_account_details,\n disabled,\n payment_methods_enabled,\n metadata,\n frm_configs,\n connector_webhook_details,\n applepay_verified_domains,\n pm_auth_config,\n connector_label,\n status,\n connector_wallets_details,\n additional_merchant_data,\n } => Self {\n connector_type,\n connector_account_details: connector_account_details.map(Encryption::from),\n disabled,\n payment_methods_enabled,\n metadata,\n frm_config: frm_configs,\n modified_at: Some(date_time::now()),\n connector_webhook_details,\n applepay_verified_domains,\n pm_auth_config: *pm_auth_config,\n connector_label,\n status,\n connector_wallets_details: connector_wallets_details.map(Encryption::from),\n additional_merchant_data: additional_merchant_data.map(Encryption::from),\n },\n MerchantConnectorAccountUpdate::ConnectorWalletDetailsUpdate {\n connector_wallets_details,\n } => Self {\n connector_wallets_details: Some(Encryption::from(connector_wallets_details)),\n connector_type: None,\n connector_account_details: None,\n connector_label: None,\n disabled: None,\n payment_methods_enabled: None,\n metadata: None,\n modified_at: None,\n connector_webhook_details: None,\n frm_config: None,\n applepay_verified_domains: None,\n pm_auth_config: None,\n status: None,\n additional_merchant_data: None,\n },\n }\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::function::get_connector_test_mode", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_connector_test_mode(&self) -> Option {\n todo!()\n }", + "after_code": "pub fn get_connector_test_mode(&self) -> Option {\n todo!()\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::struct::PaymentsMandateReferenceRecord", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub struct PaymentsMandateReferenceRecord {\n pub connector_mandate_id: String,\n pub payment_method_type: Option,\n pub original_payment_authorized_amount: Option,\n pub original_payment_authorized_currency: Option,\n pub mandate_metadata: Option,\n pub connector_mandate_status: Option,\n pub connector_mandate_request_reference_id: Option,\n}", + "after_code": "pub struct PaymentsMandateReferenceRecord {\n pub connector_mandate_id: String,\n pub payment_method_subtype: Option,\n pub original_payment_authorized_amount: Option,\n pub original_payment_authorized_currency: Option,\n pub mandate_metadata: Option,\n pub connector_mandate_status: Option,\n pub connector_mandate_request_reference_id: Option,\n}", + "diff_span": { + "before": "pub struct PaymentsMandateReferenceRecord {\n pub connector_mandate_id: String,\n pub payment_method_type: Option,\n pub original_payment_authorized_amount: Option,\n pub original_payment_authorized_currency: Option,", + "after": "pub struct PaymentsMandateReferenceRecord {\n pub connector_mandate_id: String,\n pub payment_method_subtype: Option,\n pub original_payment_authorized_amount: Option,\n pub original_payment_authorized_currency: Option," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::type::NewDstType", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "type_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "type NewDstType = diesel_models::payment_method::PaymentMethodNew;", + "after_code": "type NewDstType = diesel_models::payment_method::PaymentMethodNew;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::function::get_metadata", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_metadata(&self) -> Option {\n self.metadata.clone()\n }", + "after_code": "pub fn get_metadata(&self) -> Option {\n self.metadata.clone()\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};" + ], + "after_imports": [ + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::incoming_webhooks_core", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn incoming_webhooks_core(\n state: SessionState,\n req_state: ReqState,\n req: &actix_web::HttpRequest,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n connector_name_or_mca_id: &str,\n body: actix_web::web::Bytes,\n is_relay_webhook: bool,\n) -> errors::RouterResult<(\n services::ApplicationResponse,\n WebhookResponseTracker,\n serde_json::Value,\n)> {\n let key_manager_state = &(&state).into();\n\n metrics::WEBHOOK_INCOMING_COUNT.add(\n 1,\n router_env::metric_attributes!((MERCHANT_ID, merchant_account.get_id().clone())),\n );\n let mut request_details = IncomingWebhookRequestDetails {\n method: req.method().clone(),\n uri: req.uri().clone(),\n headers: req.headers(),\n query_params: req.query_string().to_string(),\n body: &body,\n };\n\n // Fetch the merchant connector account to get the webhooks source secret\n // `webhooks source secret` is a secret shared between the merchant and connector\n // This is used for source verification and webhooks integrity\n let (merchant_connector_account, connector, connector_name) = fetch_optional_mca_and_connector(\n &state,\n &merchant_account,\n connector_name_or_mca_id,\n &key_store,\n )\n .await?;\n\n let decoded_body = connector\n .decode_webhook_body(\n &request_details,\n merchant_account.get_id(),\n merchant_connector_account\n .clone()\n .and_then(|merchant_connector_account| {\n merchant_connector_account.connector_webhook_details\n }),\n connector_name.as_str(),\n )\n .await\n .switch()\n .attach_printable(\"There was an error in incoming webhook body decoding\")?;\n\n request_details.body = &decoded_body;\n\n let event_type = match connector\n .get_webhook_event_type(&request_details)\n .allow_webhook_event_type_not_found(\n state\n .clone()\n .conf\n .webhooks\n .ignore_error\n .event_type\n .unwrap_or(true),\n )\n .switch()\n .attach_printable(\"Could not find event type in incoming webhook body\")?\n {\n Some(event_type) => event_type,\n // Early return allows us to acknowledge the webhooks that we do not support\n None => {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n metrics::WEBHOOK_EVENT_TYPE_IDENTIFICATION_FAILURE_COUNT.add(\n 1,\n router_env::metric_attributes!(\n (MERCHANT_ID, merchant_account.get_id().clone()),\n (\"connector\", connector_name)\n ),\n );\n\n let response = connector\n .get_webhook_api_response(&request_details, None)\n .switch()\n .attach_printable(\"Failed while early return in case of event type parsing\")?;\n\n return Ok((\n response,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::Null,\n ));\n }\n };\n logger::info!(event_type=?event_type);\n\n let is_webhook_event_supported = !matches!(\n event_type,\n webhooks::IncomingWebhookEvent::EventNotSupported\n );\n let is_webhook_event_enabled = !utils::is_webhook_event_disabled(\n &*state.clone().store,\n connector_name.as_str(),\n merchant_account.get_id(),\n &event_type,\n )\n .await;\n\n //process webhook further only if webhook event is enabled and is not event_not_supported\n let process_webhook_further = is_webhook_event_enabled && is_webhook_event_supported;\n\n logger::info!(process_webhook=?process_webhook_further);\n\n let flow_type: api::WebhookFlow = event_type.into();\n let mut event_object: Box = Box::new(serde_json::Value::Null);\n let webhook_effect = if process_webhook_further\n && !matches!(flow_type, api::WebhookFlow::ReturnResponse)\n {\n let object_ref_id = connector\n .get_webhook_object_reference_id(&request_details)\n .switch()\n .attach_printable(\"Could not find object reference id in incoming webhook body\")?;\n let connector_enum = api_models::enums::Connector::from_str(&connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| {\n format!(\"unable to parse connector name {connector_name:?}\")\n })?;\n let connectors_with_source_verification_call = &state.conf.webhook_source_verification_call;\n\n let merchant_connector_account = match merchant_connector_account {\n Some(merchant_connector_account) => merchant_connector_account,\n None => {\n match Box::pin(helper_utils::get_mca_from_object_reference_id(\n &state,\n object_ref_id.clone(),\n &merchant_account,\n &connector_name,\n &key_store,\n ))\n .await\n {\n Ok(mca) => mca,\n Err(error) => {\n return handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &request_details,\n );\n }\n }\n }\n };\n\n let source_verified = if connectors_with_source_verification_call\n .connectors_with_webhook_source_verification_call\n .contains(&connector_enum)\n {\n verify_webhook_source_verification_call(\n connector.clone(),\n &state,\n &merchant_account,\n merchant_connector_account.clone(),\n &connector_name,\n &request_details,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n } else {\n connector\n .clone()\n .verify_webhook_source(\n &request_details,\n merchant_account.get_id(),\n merchant_connector_account.connector_webhook_details.clone(),\n merchant_connector_account.connector_account_details.clone(),\n connector_name.as_str(),\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n };\n\n if source_verified {\n metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(\n 1,\n router_env::metric_attributes!((MERCHANT_ID, merchant_account.get_id().clone())),\n );\n } else if connector.is_webhook_source_verification_mandatory() {\n // if webhook consumption is mandatory for connector, fail webhook\n // so that merchant can retrigger it after updating merchant_secret\n return Err(errors::ApiErrorResponse::WebhookAuthenticationFailed.into());\n }\n\n logger::info!(source_verified=?source_verified);\n\n event_object = connector\n .get_webhook_resource_object(&request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")?;\n\n let webhook_details = api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object: serde_json::to_vec(&event_object)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the incoming webhook body to bytes\",\n )?,\n };\n\n let profile_id = &merchant_connector_account.profile_id;\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(key_manager_state, &key_store, profile_id)\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n // If the incoming webhook is a relay webhook, then we need to trigger the relay webhook flow\n let result_response = if is_relay_webhook {\n let relay_webhook_response = Box::pin(relay_incoming_webhook_flow(\n state.clone(),\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay failed\");\n\n // Using early return ensures unsupported webhooks are acknowledged to the connector\n if let Some(errors::ApiErrorResponse::NotSupported { .. }) = relay_webhook_response\n .as_ref()\n .err()\n .map(|a| a.current_context())\n {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n let response = connector\n .get_webhook_api_response(&request_details, None)\n .switch()\n .attach_printable(\n \"Failed while early return in case of not supported event type in relay webhooks\",\n )?;\n\n return Ok((\n response,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::Null,\n ));\n };\n\n relay_webhook_response\n } else {\n match flow_type {\n api::WebhookFlow::Payment => Box::pin(payments_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n source_verified,\n &connector,\n &request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payments failed\"),\n\n api::WebhookFlow::Refund => Box::pin(refunds_incoming_webhook_flow(\n state.clone(),\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n connector_name.as_str(),\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for refunds failed\"),\n\n api::WebhookFlow::Dispute => Box::pin(disputes_incoming_webhook_flow(\n state.clone(),\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n source_verified,\n &connector,\n &request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for disputes failed\"),\n\n api::WebhookFlow::BankTransfer => Box::pin(bank_transfer_webhook_flow(\n state.clone(),\n req_state,\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming bank-transfer webhook flow failed\"),\n\n api::WebhookFlow::ReturnResponse => Ok(WebhookResponseTracker::NoEffect),\n\n api::WebhookFlow::Mandate => Box::pin(mandates_incoming_webhook_flow(\n state.clone(),\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for mandates failed\"),\n\n api::WebhookFlow::ExternalAuthentication => {\n Box::pin(external_authentication_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_account,\n key_store,\n source_verified,\n event_type,\n &request_details,\n &connector,\n object_ref_id,\n business_profile,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for external authentication failed\")\n }\n api::WebhookFlow::FraudCheck => Box::pin(frm_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_account,\n key_store,\n source_verified,\n event_type,\n object_ref_id,\n business_profile,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for fraud check failed\"),\n\n #[cfg(feature = \"payouts\")]\n api::WebhookFlow::Payout => Box::pin(payouts_incoming_webhook_flow(\n state.clone(),\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payouts failed\"),\n\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unsupported Flow Type received in incoming webhooks\"),\n }\n };\n\n match result_response {\n Ok(response) => response,\n Err(error) => {\n return handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &request_details,\n );\n }\n }\n } else {\n metrics::WEBHOOK_INCOMING_FILTERED_COUNT.add(\n 1,\n router_env::metric_attributes!((MERCHANT_ID, merchant_account.get_id().clone())),\n );\n WebhookResponseTracker::NoEffect\n };\n\n let response = connector\n .get_webhook_api_response(&request_details, None)\n .switch()\n .attach_printable(\"Could not get incoming webhook api response from connector\")?;\n\n let serialized_request = event_object\n .masked_serialize()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not convert webhook effect to string\")?;\n Ok((response, webhook_effect, serialized_request))\n}", + "after_code": "async fn incoming_webhooks_core(\n state: SessionState,\n req_state: ReqState,\n req: &actix_web::HttpRequest,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n connector_name_or_mca_id: &str,\n body: actix_web::web::Bytes,\n is_relay_webhook: bool,\n) -> errors::RouterResult<(\n services::ApplicationResponse,\n WebhookResponseTracker,\n serde_json::Value,\n)> {\n let key_manager_state = &(&state).into();\n\n metrics::WEBHOOK_INCOMING_COUNT.add(\n 1,\n router_env::metric_attributes!((MERCHANT_ID, merchant_account.get_id().clone())),\n );\n let mut request_details = IncomingWebhookRequestDetails {\n method: req.method().clone(),\n uri: req.uri().clone(),\n headers: req.headers(),\n query_params: req.query_string().to_string(),\n body: &body,\n };\n\n // Fetch the merchant connector account to get the webhooks source secret\n // `webhooks source secret` is a secret shared between the merchant and connector\n // This is used for source verification and webhooks integrity\n let (merchant_connector_account, connector, connector_name) = fetch_optional_mca_and_connector(\n &state,\n &merchant_account,\n connector_name_or_mca_id,\n &key_store,\n )\n .await?;\n\n let decoded_body = connector\n .decode_webhook_body(\n &request_details,\n merchant_account.get_id(),\n merchant_connector_account\n .clone()\n .and_then(|merchant_connector_account| {\n merchant_connector_account.connector_webhook_details\n }),\n connector_name.as_str(),\n )\n .await\n .switch()\n .attach_printable(\"There was an error in incoming webhook body decoding\")?;\n\n request_details.body = &decoded_body;\n\n let event_type = match connector\n .get_webhook_event_type(&request_details)\n .allow_webhook_event_type_not_found(\n state\n .clone()\n .conf\n .webhooks\n .ignore_error\n .event_type\n .unwrap_or(true),\n )\n .switch()\n .attach_printable(\"Could not find event type in incoming webhook body\")?\n {\n Some(event_type) => event_type,\n // Early return allows us to acknowledge the webhooks that we do not support\n None => {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n metrics::WEBHOOK_EVENT_TYPE_IDENTIFICATION_FAILURE_COUNT.add(\n 1,\n router_env::metric_attributes!(\n (MERCHANT_ID, merchant_account.get_id().clone()),\n (\"connector\", connector_name)\n ),\n );\n\n let response = connector\n .get_webhook_api_response(&request_details, None)\n .switch()\n .attach_printable(\"Failed while early return in case of event type parsing\")?;\n\n return Ok((\n response,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::Null,\n ));\n }\n };\n logger::info!(event_type=?event_type);\n\n let is_webhook_event_supported = !matches!(\n event_type,\n webhooks::IncomingWebhookEvent::EventNotSupported\n );\n let is_webhook_event_enabled = !utils::is_webhook_event_disabled(\n &*state.clone().store,\n connector_name.as_str(),\n merchant_account.get_id(),\n &event_type,\n )\n .await;\n\n //process webhook further only if webhook event is enabled and is not event_not_supported\n let process_webhook_further = is_webhook_event_enabled && is_webhook_event_supported;\n\n logger::info!(process_webhook=?process_webhook_further);\n\n let flow_type: api::WebhookFlow = event_type.into();\n let mut event_object: Box = Box::new(serde_json::Value::Null);\n let webhook_effect = if process_webhook_further\n && !matches!(flow_type, api::WebhookFlow::ReturnResponse)\n {\n let object_ref_id = connector\n .get_webhook_object_reference_id(&request_details)\n .switch()\n .attach_printable(\"Could not find object reference id in incoming webhook body\")?;\n let connector_enum = api_models::enums::Connector::from_str(&connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| {\n format!(\"unable to parse connector name {connector_name:?}\")\n })?;\n let connectors_with_source_verification_call = &state.conf.webhook_source_verification_call;\n\n let merchant_connector_account = match merchant_connector_account {\n Some(merchant_connector_account) => merchant_connector_account,\n None => {\n match Box::pin(helper_utils::get_mca_from_object_reference_id(\n &state,\n object_ref_id.clone(),\n &merchant_account,\n &connector_name,\n &key_store,\n ))\n .await\n {\n Ok(mca) => mca,\n Err(error) => {\n return handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &request_details,\n );\n }\n }\n }\n };\n\n let source_verified = if connectors_with_source_verification_call\n .connectors_with_webhook_source_verification_call\n .contains(&connector_enum)\n {\n verify_webhook_source_verification_call(\n connector.clone(),\n &state,\n &merchant_account,\n merchant_connector_account.clone(),\n &connector_name,\n &request_details,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n } else {\n connector\n .clone()\n .verify_webhook_source(\n &request_details,\n merchant_account.get_id(),\n merchant_connector_account.connector_webhook_details.clone(),\n merchant_connector_account.connector_account_details.clone(),\n connector_name.as_str(),\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n };\n\n if source_verified {\n metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(\n 1,\n router_env::metric_attributes!((MERCHANT_ID, merchant_account.get_id().clone())),\n );\n } else if connector.is_webhook_source_verification_mandatory() {\n // if webhook consumption is mandatory for connector, fail webhook\n // so that merchant can retrigger it after updating merchant_secret\n return Err(errors::ApiErrorResponse::WebhookAuthenticationFailed.into());\n }\n\n logger::info!(source_verified=?source_verified);\n\n event_object = connector\n .get_webhook_resource_object(&request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")?;\n\n let webhook_details = api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object: serde_json::to_vec(&event_object)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the incoming webhook body to bytes\",\n )?,\n };\n\n let profile_id = &merchant_connector_account.profile_id;\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(key_manager_state, &key_store, profile_id)\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n // If the incoming webhook is a relay webhook, then we need to trigger the relay webhook flow\n let result_response = if is_relay_webhook {\n let relay_webhook_response = Box::pin(relay_incoming_webhook_flow(\n state.clone(),\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay failed\");\n\n // Using early return ensures unsupported webhooks are acknowledged to the connector\n if let Some(errors::ApiErrorResponse::NotSupported { .. }) = relay_webhook_response\n .as_ref()\n .err()\n .map(|a| a.current_context())\n {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n let response = connector\n .get_webhook_api_response(&request_details, None)\n .switch()\n .attach_printable(\n \"Failed while early return in case of not supported event type in relay webhooks\",\n )?;\n\n return Ok((\n response,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::Null,\n ));\n };\n\n relay_webhook_response\n } else {\n match flow_type {\n api::WebhookFlow::Payment => Box::pin(payments_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n source_verified,\n &connector,\n &request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payments failed\"),\n\n api::WebhookFlow::Refund => Box::pin(refunds_incoming_webhook_flow(\n state.clone(),\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n connector_name.as_str(),\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for refunds failed\"),\n\n api::WebhookFlow::Dispute => Box::pin(disputes_incoming_webhook_flow(\n state.clone(),\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n source_verified,\n &connector,\n &request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for disputes failed\"),\n\n api::WebhookFlow::BankTransfer => Box::pin(bank_transfer_webhook_flow(\n state.clone(),\n req_state,\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming bank-transfer webhook flow failed\"),\n\n api::WebhookFlow::ReturnResponse => Ok(WebhookResponseTracker::NoEffect),\n\n api::WebhookFlow::Mandate => Box::pin(mandates_incoming_webhook_flow(\n state.clone(),\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for mandates failed\"),\n\n api::WebhookFlow::ExternalAuthentication => {\n Box::pin(external_authentication_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_account,\n key_store,\n source_verified,\n event_type,\n &request_details,\n &connector,\n object_ref_id,\n business_profile,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for external authentication failed\")\n }\n api::WebhookFlow::FraudCheck => Box::pin(frm_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_account,\n key_store,\n source_verified,\n event_type,\n object_ref_id,\n business_profile,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for fraud check failed\"),\n\n #[cfg(feature = \"payouts\")]\n api::WebhookFlow::Payout => Box::pin(payouts_incoming_webhook_flow(\n state.clone(),\n merchant_account,\n business_profile,\n key_store,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payouts failed\"),\n\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unsupported Flow Type received in incoming webhooks\"),\n }\n };\n\n match result_response {\n Ok(response) => response,\n Err(error) => {\n return handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &request_details,\n );\n }\n }\n } else {\n metrics::WEBHOOK_INCOMING_FILTERED_COUNT.add(\n 1,\n router_env::metric_attributes!((MERCHANT_ID, merchant_account.get_id().clone())),\n );\n WebhookResponseTracker::NoEffect\n };\n\n let response = connector\n .get_webhook_api_response(&request_details, None)\n .switch()\n .attach_printable(\"Could not get incoming webhook api response from connector\")?;\n\n let serialized_request = event_object\n .masked_serialize()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not convert webhook effect to string\")?;\n Ok((response, webhook_effect, serialized_request))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::should_create_connector_transfer_method", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn should_create_connector_transfer_method(\n payout_data: &PayoutData,\n connector_data: &api::ConnectorData,\n) -> RouterResult> {\n let connector_transfer_method_id = payout_data.payment_method.as_ref().and_then(|pm| {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n let common_mandate_reference = pm\n .get_common_mandate_reference()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to deserialize connector mandate details\")\n .ok()?;\n\n #[cfg(all(feature = \"v2\", feature = \"payment_methods_v2\"))]\n let common_mandate_reference = pm.connector_mandate_details.clone().unwrap_or_default();\n\n connector_data\n .merchant_connector_id\n .as_ref()\n .and_then(|merchant_connector_id| {\n common_mandate_reference\n .payouts\n .and_then(|payouts_mandate_reference| {\n payouts_mandate_reference\n .get(merchant_connector_id)\n .and_then(|payouts_mandate_reference_record| {\n payouts_mandate_reference_record.transfer_method_id.clone()\n })\n })\n })\n });\n\n Ok(connector_transfer_method_id)\n}", + "after_code": "pub fn should_create_connector_transfer_method(\n payout_data: &PayoutData,\n connector_data: &api::ConnectorData,\n) -> RouterResult> {\n let connector_transfer_method_id = payout_data.payment_method.as_ref().and_then(|pm| {\n let common_mandate_reference = pm\n .get_common_mandate_reference()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to deserialize connector mandate details\")\n .ok()?;\n\n connector_data\n .merchant_connector_id\n .as_ref()\n .and_then(|merchant_connector_id| {\n common_mandate_reference\n .payouts\n .and_then(|payouts_mandate_reference| {\n payouts_mandate_reference\n .get(merchant_connector_id)\n .and_then(|payouts_mandate_reference_record| {\n payouts_mandate_reference_record.transfer_method_id.clone()\n })\n })\n })\n });\n\n Ok(connector_transfer_method_id)\n}", + "diff_span": { + "before": ") -> RouterResult> {\n let connector_transfer_method_id = payout_data.payment_method.as_ref().and_then(|pm| {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n let common_mandate_reference = pm\n .get_common_mandate_reference()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to deserialize connector mandate details\")\n .ok()?;\n\n #[cfg(all(feature = \"v2\", feature = \"payment_methods_v2\"))]\n let common_mandate_reference = pm.connector_mandate_details.clone().unwrap_or_default();\n\n connector_data", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::MerchantConnectorAccount::type::NewDstType", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "type_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "type NewDstType = diesel_models::merchant_connector_account::MerchantConnectorAccountNew;", + "after_code": "type NewDstType = diesel_models::merchant_connector_account::MerchantConnectorAccountNew;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::function::update_connector_mandate_details_status", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub fn update_connector_mandate_details_status(\n merchant_connector_id: id_type::MerchantConnectorAccountId,\n mut payment_mandate_reference: diesel_models::PaymentsMandateReference,\n status: ConnectorMandateStatus,\n) -> RouterResult> {\n let mandate_reference = {\n payment_mandate_reference\n .entry(merchant_connector_id)\n .and_modify(|pm| {\n let update_rec = diesel_models::PaymentsMandateReferenceRecord {\n connector_mandate_id: pm.connector_mandate_id.clone(),\n payment_method_type: pm.payment_method_type,\n original_payment_authorized_amount: pm.original_payment_authorized_amount,\n original_payment_authorized_currency: pm.original_payment_authorized_currency,\n mandate_metadata: pm.mandate_metadata.clone(),\n connector_mandate_status: Some(status),\n connector_mandate_request_reference_id: pm\n .connector_mandate_request_reference_id\n .clone(),\n };\n *pm = update_rec\n });\n Some(payment_mandate_reference)\n };\n\n Ok(Some(diesel_models::CommonMandateReference {\n payments: mandate_reference,\n payouts: None,\n }))\n}", + "after_code": "pub fn update_connector_mandate_details_status(\n merchant_connector_id: id_type::MerchantConnectorAccountId,\n mut payment_mandate_reference: PaymentsMandateReference,\n status: ConnectorMandateStatus,\n) -> RouterResult> {\n let mandate_reference = {\n payment_mandate_reference\n .entry(merchant_connector_id)\n .and_modify(|pm| {\n let update_rec = PaymentsMandateReferenceRecord {\n connector_mandate_id: pm.connector_mandate_id.clone(),\n payment_method_type: pm.payment_method_type,\n original_payment_authorized_amount: pm.original_payment_authorized_amount,\n original_payment_authorized_currency: pm.original_payment_authorized_currency,\n mandate_metadata: pm.mandate_metadata.clone(),\n connector_mandate_status: Some(status),\n connector_mandate_request_reference_id: pm\n .connector_mandate_request_reference_id\n .clone(),\n };\n *pm = update_rec\n });\n Some(payment_mandate_reference)\n };\n\n Ok(Some(CommonMandateReference {\n payments: mandate_reference,\n payouts: None,\n }))\n}", + "diff_span": { + "before": "pub fn update_connector_mandate_details_status(\n merchant_connector_id: id_type::MerchantConnectorAccountId,\n mut payment_mandate_reference: diesel_models::PaymentsMandateReference,\n status: ConnectorMandateStatus,\n) -> RouterResult> {\n let mandate_reference = {\n payment_mandate_reference\n .entry(merchant_connector_id)\n .and_modify(|pm| {\n let update_rec = diesel_models::PaymentsMandateReferenceRecord {\n connector_mandate_id: pm.connector_mandate_id.clone(),\n payment_method_type: pm.payment_method_type,\n original_payment_authorized_amount: pm.original_payment_authorized_amount,\n original_payment_authorized_currency: pm.original_payment_authorized_currency,\n mandate_metadata: pm.mandate_metadata.clone(),\n connector_mandate_status: Some(status),\n connector_mandate_request_reference_id: pm\n .connector_mandate_request_reference_id\n .clone(),\n };\n *pm = update_rec\n });\n Some(payment_mandate_reference)\n };\n\n Ok(Some(diesel_models::CommonMandateReference {\n payments: mandate_reference,\n payouts: None,", + "after": "pub fn update_connector_mandate_details_status(\n merchant_connector_id: id_type::MerchantConnectorAccountId,\n mut payment_mandate_reference: PaymentsMandateReference,\n status: ConnectorMandateStatus,\n) -> RouterResult> {\n let mandate_reference = {\n payment_mandate_reference\n .entry(merchant_connector_id)\n .and_modify(|pm| {\n let update_rec = PaymentsMandateReferenceRecord {\n connector_mandate_id: pm.connector_mandate_id.clone(),\n payment_method_type: pm.payment_method_type,\n original_payment_authorized_amount: pm.original_payment_authorized_amount,\n original_payment_authorized_currency: pm.original_payment_authorized_currency,\n mandate_metadata: pm.mandate_metadata.clone(),\n connector_mandate_status: Some(status),\n connector_mandate_request_reference_id: pm\n .connector_mandate_request_reference_id\n .clone(),\n };\n *pm = update_rec\n });\n Some(payment_mandate_reference)\n };\n\n Ok(Some(CommonMandateReference {\n payments: mandate_reference,\n payouts: None," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ], + "after_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::function::skip_saving_card_in_locker", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn skip_saving_card_in_locker(\n merchant_account: &domain::MerchantAccount,\n payment_method_request: api::PaymentMethodCreate,\n) -> RouterResult<(\n api_models::payment_methods::PaymentMethodResponse,\n Option,\n)> {\n todo!()\n}", + "after_code": "async fn skip_saving_card_in_locker(\n merchant_account: &domain::MerchantAccount,\n payment_method_request: api::PaymentMethodCreate,\n) -> RouterResult<(\n api_models::payment_methods::PaymentMethodResponse,\n Option,\n)> {\n todo!()\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ], + "after_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::get_payment_method_type", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_payment_method_type(&self) -> Option {\n self.payment_method_type\n }", + "after_code": "pub fn get_payment_method_type(&self) -> Option {\n self.payment_method_type\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::handle_incoming_webhook_error", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn handle_incoming_webhook_error(\n error: error_stack::Report,\n connector: &ConnectorEnum,\n connector_name: &str,\n request_details: &IncomingWebhookRequestDetails<'_>,\n) -> errors::RouterResult<(\n services::ApplicationResponse,\n WebhookResponseTracker,\n serde_json::Value,\n)> {\n logger::error!(?error, \"Incoming webhook flow failed\");\n\n // fetch the connector enum from the connector name\n let connector_enum = api_models::connector_enums::Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n\n // get the error response from the connector\n if connector_enum.should_acknowledge_webhook_for_resource_not_found_errors() {\n let response = connector\n .get_webhook_api_response(\n request_details,\n Some(IncomingWebhookFlowError::from(error.current_context())),\n )\n .switch()\n .attach_printable(\"Failed to get incoming webhook api response from connector\")?;\n Ok((\n response,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::Null,\n ))\n } else {\n Err(error)\n }\n}", + "after_code": "fn handle_incoming_webhook_error(\n error: error_stack::Report,\n connector: &ConnectorEnum,\n connector_name: &str,\n request_details: &IncomingWebhookRequestDetails<'_>,\n) -> errors::RouterResult<(\n services::ApplicationResponse,\n WebhookResponseTracker,\n serde_json::Value,\n)> {\n logger::error!(?error, \"Incoming webhook flow failed\");\n\n // fetch the connector enum from the connector name\n let connector_enum = api_models::connector_enums::Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n\n // get the error response from the connector\n if connector_enum.should_acknowledge_webhook_for_resource_not_found_errors() {\n let response = connector\n .get_webhook_api_response(\n request_details,\n Some(IncomingWebhookFlowError::from(error.current_context())),\n )\n .switch()\n .attach_printable(\"Failed to get incoming webhook api response from connector\")?;\n Ok((\n response,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::Null,\n ))\n } else {\n Err(error)\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::impl::VaultId", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl VaultId {\n pub fn get_string_repr(&self) -> &String {\n &self.0\n }\n\n pub fn generate(id: String) -> Self {\n Self(id)\n }\n}", + "after_code": "impl VaultId {\n pub fn get_string_repr(&self) -> &String {\n &self.0\n }\n\n pub fn generate(id: String) -> Self {\n Self(id)\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::insert_mandate_details", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "fn insert_mandate_details(\n payment_attempt: &PaymentAttempt,\n webhook_mandate_details: &hyperswitch_domain_models::router_flow_types::ConnectorMandateDetails,\n payment_method_mandate_details: Option,\n) -> CustomResult, errors::ApiErrorResponse> {\n let (mandate_metadata, connector_mandate_request_reference_id) = payment_attempt\n .connector_mandate_detail\n .clone()\n .map(|mandate_reference| {\n (\n mandate_reference.mandate_metadata,\n mandate_reference.connector_mandate_request_reference_id,\n )\n })\n .unwrap_or((None, None));\n let connector_mandate_details = tokenization::update_connector_mandate_details(\n payment_method_mandate_details,\n payment_attempt.payment_method_type,\n Some(\n payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n ),\n payment_attempt.currency,\n payment_attempt.merchant_connector_id.clone(),\n Some(\n webhook_mandate_details\n .connector_mandate_id\n .peek()\n .to_string(),\n ),\n mandate_metadata,\n connector_mandate_request_reference_id,\n )?;\n Ok(connector_mandate_details)\n}", + "after_code": "fn insert_mandate_details(\n payment_attempt: &PaymentAttempt,\n webhook_mandate_details: &hyperswitch_domain_models::router_flow_types::ConnectorMandateDetails,\n payment_method_mandate_details: Option,\n) -> CustomResult, errors::ApiErrorResponse> {\n let (mandate_metadata, connector_mandate_request_reference_id) = payment_attempt\n .connector_mandate_detail\n .clone()\n .map(|mandate_reference| {\n (\n mandate_reference.mandate_metadata,\n mandate_reference.connector_mandate_request_reference_id,\n )\n })\n .unwrap_or((None, None));\n let connector_mandate_details = tokenization::update_connector_mandate_details(\n payment_method_mandate_details,\n payment_attempt.payment_method_type,\n Some(\n payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n ),\n payment_attempt.currency,\n payment_attempt.merchant_connector_id.clone(),\n Some(\n webhook_mandate_details\n .connector_mandate_id\n .peek()\n .to_string(),\n ),\n mandate_metadata,\n connector_mandate_request_reference_id,\n )?;\n Ok(connector_mandate_details)\n}", + "diff_span": { + "before": " payment_attempt: &PaymentAttempt,\n webhook_mandate_details: &hyperswitch_domain_models::router_flow_types::ConnectorMandateDetails,\n payment_method_mandate_details: Option,\n) -> CustomResult, errors::ApiErrorResponse> {\n let (mandate_metadata, connector_mandate_request_reference_id) = payment_attempt\n .connector_mandate_detail", + "after": " payment_attempt: &PaymentAttempt,\n webhook_mandate_details: &hyperswitch_domain_models::router_flow_types::ConnectorMandateDetails,\n payment_method_mandate_details: Option,\n) -> CustomResult, errors::ApiErrorResponse> {\n let (mandate_metadata, connector_mandate_request_reference_id) = payment_attempt\n .connector_mandate_detail" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::struct::PaymentMethod", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub struct PaymentMethod {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_type: Option,\n pub payment_method_subtype: Option,\n pub payment_method_data:\n OptionalEncryptableJsonType,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: OptionalEncryptableValue,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: OptionalEncryptableValue,\n}", + "after_code": "pub struct PaymentMethod {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_type: Option,\n pub payment_method_subtype: Option,\n pub payment_method_data:\n OptionalEncryptableJsonType,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: OptionalEncryptableValue,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: OptionalEncryptableValue,\n}", + "diff_span": { + "before": " pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,", + "after": " pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use time::PrimitiveDateTime;", + "use common_utils::crypto::Encryptable;", + "use crate::type_encryption::OptionalEncryptableJsonType;", + "use masking::{PeekInterface, Secret};" + ], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};", + "use crate::type_encryption::OptionalEncryptableJsonType;", + "use common_utils::crypto::Encryptable;", + "use masking::{PeekInterface, Secret};", + "use time::PrimitiveDateTime;" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::SavePaymentMethodData::function::from", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn from(router_data: &types::RouterData) -> Self {\n Self {\n request: router_data.request.clone(),\n response: router_data.response.clone(),\n payment_method_token: router_data.payment_method_token.clone(),\n payment_method: router_data.payment_method,\n attempt_status: router_data.status,\n }\n }", + "after_code": "fn from(router_data: &types::RouterData) -> Self {\n Self {\n request: router_data.request.clone(),\n response: router_data.response.clone(),\n payment_method_token: router_data.payment_method_token.clone(),\n payment_method: router_data.payment_method,\n attempt_status: router_data.status,\n }\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::verify_webhook_source_verification_call", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn verify_webhook_source_verification_call(\n connector: ConnectorEnum,\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n merchant_connector_account: domain::MerchantConnectorAccount,\n connector_name: &str,\n request_details: &IncomingWebhookRequestDetails<'_>,\n) -> CustomResult {\n let connector_data = ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n connector_name,\n GetToken::Connector,\n None,\n )\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)\n .attach_printable(\"invalid connector name received in payment attempt\")?;\n let connector_integration: services::BoxedWebhookSourceVerificationConnectorIntegrationInterface<\n hyperswitch_domain_models::router_flow_types::VerifyWebhookSource,\n VerifyWebhookSourceRequestData,\n VerifyWebhookSourceResponseData,\n > = connector_data.connector.get_connector_integration();\n let connector_webhook_secrets = connector\n .get_webhook_source_verification_merchant_secret(\n merchant_account.get_id(),\n connector_name,\n merchant_connector_account.connector_webhook_details.clone(),\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let router_data = construct_webhook_router_data(\n state,\n connector_name,\n merchant_connector_account,\n merchant_account,\n &connector_webhook_secrets,\n request_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)\n .attach_printable(\"Failed while constructing webhook router data\")?;\n\n let response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await?;\n\n let verification_result = response\n .response\n .map(|response| response.verify_webhook_status);\n match verification_result {\n Ok(VerifyWebhookStatus::SourceVerified) => Ok(true),\n _ => Ok(false),\n }\n}", + "after_code": "async fn verify_webhook_source_verification_call(\n connector: ConnectorEnum,\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n merchant_connector_account: domain::MerchantConnectorAccount,\n connector_name: &str,\n request_details: &IncomingWebhookRequestDetails<'_>,\n) -> CustomResult {\n let connector_data = ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n connector_name,\n GetToken::Connector,\n None,\n )\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)\n .attach_printable(\"invalid connector name received in payment attempt\")?;\n let connector_integration: services::BoxedWebhookSourceVerificationConnectorIntegrationInterface<\n hyperswitch_domain_models::router_flow_types::VerifyWebhookSource,\n VerifyWebhookSourceRequestData,\n VerifyWebhookSourceResponseData,\n > = connector_data.connector.get_connector_integration();\n let connector_webhook_secrets = connector\n .get_webhook_source_verification_merchant_secret(\n merchant_account.get_id(),\n connector_name,\n merchant_connector_account.connector_webhook_details.clone(),\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let router_data = construct_webhook_router_data(\n state,\n connector_name,\n merchant_connector_account,\n merchant_account,\n &connector_webhook_secrets,\n request_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)\n .attach_printable(\"Failed while constructing webhook router data\")?;\n\n let response = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await?;\n\n let verification_result = response\n .response\n .map(|response| response.verify_webhook_status);\n match verification_result {\n Ok(VerifyWebhookStatus::SourceVerified) => Ok(true),\n _ => Ok(false),\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};" + ] + }, + { + "id": "crates/router/src/core/payments/tokenization.rs::function::update_connector_mandate_details", + "file": "crates/router/src/core/payments/tokenization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub fn update_connector_mandate_details(\n mandate_details: Option,\n payment_method_type: Option,\n authorized_amount: Option,\n authorized_currency: Option,\n merchant_connector_id: Option,\n connector_mandate_id: Option,\n mandate_metadata: Option>,\n connector_mandate_request_reference_id: Option,\n) -> RouterResult> {\n let mandate_reference = match mandate_details\n .as_ref()\n .and_then(|common_mandate| common_mandate.payments.clone())\n {\n Some(mut payment_mandate_reference) => {\n if let Some((mca_id, connector_mandate_id)) =\n merchant_connector_id.clone().zip(connector_mandate_id)\n {\n let updated_record = diesel_models::PaymentsMandateReferenceRecord {\n connector_mandate_id: connector_mandate_id.clone(),\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata: mandate_metadata.clone(),\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id: connector_mandate_request_reference_id\n .clone(),\n };\n\n payment_mandate_reference\n .entry(mca_id)\n .and_modify(|pm| *pm = updated_record)\n .or_insert(diesel_models::PaymentsMandateReferenceRecord {\n connector_mandate_id,\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata: mandate_metadata.clone(),\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id,\n });\n\n let payout_data = mandate_details.and_then(|common_mandate| common_mandate.payouts);\n\n Some(diesel_models::CommonMandateReference {\n payments: Some(payment_mandate_reference),\n payouts: payout_data,\n })\n } else {\n None\n }\n }\n None => add_connector_mandate_details_in_payment_method(\n payment_method_type,\n authorized_amount,\n authorized_currency,\n merchant_connector_id,\n connector_mandate_id,\n mandate_metadata,\n connector_mandate_request_reference_id,\n ),\n };\n Ok(mandate_reference)\n}", + "after_code": "pub fn update_connector_mandate_details(\n mandate_details: Option,\n payment_method_type: Option,\n authorized_amount: Option,\n authorized_currency: Option,\n merchant_connector_id: Option,\n connector_mandate_id: Option,\n mandate_metadata: Option>,\n connector_mandate_request_reference_id: Option,\n) -> RouterResult> {\n let mandate_reference = match mandate_details\n .as_ref()\n .and_then(|common_mandate| common_mandate.payments.clone())\n {\n Some(mut payment_mandate_reference) => {\n if let Some((mca_id, connector_mandate_id)) =\n merchant_connector_id.clone().zip(connector_mandate_id)\n {\n let updated_record = PaymentsMandateReferenceRecord {\n connector_mandate_id: connector_mandate_id.clone(),\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata: mandate_metadata.clone(),\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id: connector_mandate_request_reference_id\n .clone(),\n };\n\n payment_mandate_reference\n .entry(mca_id)\n .and_modify(|pm| *pm = updated_record)\n .or_insert(PaymentsMandateReferenceRecord {\n connector_mandate_id,\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata: mandate_metadata.clone(),\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id,\n });\n\n let payout_data = mandate_details.and_then(|common_mandate| common_mandate.payouts);\n\n Some(CommonMandateReference {\n payments: Some(payment_mandate_reference),\n payouts: payout_data,\n })\n } else {\n None\n }\n }\n None => add_connector_mandate_details_in_payment_method(\n payment_method_type,\n authorized_amount,\n authorized_currency,\n merchant_connector_id,\n connector_mandate_id,\n mandate_metadata,\n connector_mandate_request_reference_id,\n ),\n };\n Ok(mandate_reference)\n}", + "diff_span": { + "before": "pub fn update_connector_mandate_details(\n mandate_details: Option,\n payment_method_type: Option,\n authorized_amount: Option,\n authorized_currency: Option,\n merchant_connector_id: Option,\n connector_mandate_id: Option,\n mandate_metadata: Option>,\n connector_mandate_request_reference_id: Option,\n) -> RouterResult> {\n let mandate_reference = match mandate_details\n .as_ref()\n .and_then(|common_mandate| common_mandate.payments.clone())\n {\n Some(mut payment_mandate_reference) => {\n if let Some((mca_id, connector_mandate_id)) =\n merchant_connector_id.clone().zip(connector_mandate_id)\n {\n let updated_record = diesel_models::PaymentsMandateReferenceRecord {\n connector_mandate_id: connector_mandate_id.clone(),\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata: mandate_metadata.clone(),\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id: connector_mandate_request_reference_id\n .clone(),\n };\n\n payment_mandate_reference\n .entry(mca_id)\n .and_modify(|pm| *pm = updated_record)\n .or_insert(diesel_models::PaymentsMandateReferenceRecord {\n connector_mandate_id,\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata: mandate_metadata.clone(),\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id,\n });\n\n let payout_data = mandate_details.and_then(|common_mandate| common_mandate.payouts);\n\n Some(diesel_models::CommonMandateReference {\n payments: Some(payment_mandate_reference),\n payouts: payout_data,", + "after": "pub fn update_connector_mandate_details(\n mandate_details: Option,\n payment_method_type: Option,\n authorized_amount: Option,\n authorized_currency: Option,\n merchant_connector_id: Option,\n connector_mandate_id: Option,\n mandate_metadata: Option>,\n connector_mandate_request_reference_id: Option,\n) -> RouterResult> {\n let mandate_reference = match mandate_details\n .as_ref()\n .and_then(|common_mandate| common_mandate.payments.clone())\n {\n Some(mut payment_mandate_reference) => {\n if let Some((mca_id, connector_mandate_id)) =\n merchant_connector_id.clone().zip(connector_mandate_id)\n {\n let updated_record = PaymentsMandateReferenceRecord {\n connector_mandate_id: connector_mandate_id.clone(),\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata: mandate_metadata.clone(),\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id: connector_mandate_request_reference_id\n .clone(),\n };\n\n payment_mandate_reference\n .entry(mca_id)\n .and_modify(|pm| *pm = updated_record)\n .or_insert(PaymentsMandateReferenceRecord {\n connector_mandate_id,\n payment_method_type,\n original_payment_authorized_amount: authorized_amount,\n original_payment_authorized_currency: authorized_currency,\n mandate_metadata: mandate_metadata.clone(),\n connector_mandate_status: Some(ConnectorMandateStatus::Active),\n connector_mandate_request_reference_id,\n });\n\n let payout_data = mandate_details.and_then(|common_mandate| common_mandate.payouts);\n\n Some(CommonMandateReference {\n payments: Some(payment_mandate_reference),\n payouts: payout_data," + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};", + "use masking::{ExposeInterface, Secret};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n ext_traits::{AsyncExt, Encode, ValueExt},\n id_type, pii,\n};", + "use hyperswitch_domain_models::mandates::{\n CommonMandateReference, PaymentsMandateReference, PaymentsMandateReferenceRecord,\n};", + "use masking::{ExposeInterface, Secret};", + "use common_enums::{ConnectorMandateStatus, PaymentMethod};", + "use crate::{\n consts,\n core::{\n errors::{self, ConnectorErrorExt, RouterResult, StorageErrorExt},\n mandate,\n payment_methods::{self, cards::create_encrypted_data, network_tokenization},\n payments,\n },\n logger,\n routes::{metrics, SessionState},\n services,\n types::{\n self,\n api::{self, CardDetailFromLocker, CardDetailsPaymentMethod, PaymentMethodCreateExt},\n domain,\n storage::enums as storage_enums,\n },\n utils::{generate_id, OptionExt},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs::struct::MerchantConnectorAccount", + "file": "crates/hyperswitch_domain_models/src/merchant_connector_account.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct MerchantConnectorAccount {\n pub id: id_type::MerchantConnectorAccountId,\n pub merchant_id: id_type::MerchantId,\n pub connector_name: common_enums::connector_enums::Connector,\n #[encrypt]\n pub connector_account_details: Encryptable>,\n pub disabled: Option,\n pub payment_methods_enabled: Option>,\n pub connector_type: enums::ConnectorType,\n pub metadata: Option,\n pub frm_configs: Option>,\n pub connector_label: Option,\n pub created_at: time::PrimitiveDateTime,\n pub modified_at: time::PrimitiveDateTime,\n pub connector_webhook_details: Option,\n pub profile_id: id_type::ProfileId,\n pub applepay_verified_domains: Option>,\n pub pm_auth_config: Option,\n pub status: enums::ConnectorStatus,\n #[encrypt]\n pub connector_wallets_details: Option>>,\n #[encrypt]\n pub additional_merchant_data: Option>>,\n pub version: common_enums::ApiVersion,\n}", + "after_code": "pub struct MerchantConnectorAccount {\n pub id: id_type::MerchantConnectorAccountId,\n pub merchant_id: id_type::MerchantId,\n pub connector_name: common_enums::connector_enums::Connector,\n #[encrypt]\n pub connector_account_details: Encryptable>,\n pub disabled: Option,\n pub payment_methods_enabled: Option>,\n pub connector_type: enums::ConnectorType,\n pub metadata: Option,\n pub frm_configs: Option>,\n pub connector_label: Option,\n pub created_at: time::PrimitiveDateTime,\n pub modified_at: time::PrimitiveDateTime,\n pub connector_webhook_details: Option,\n pub profile_id: id_type::ProfileId,\n pub applepay_verified_domains: Option>,\n pub pm_auth_config: Option,\n pub status: enums::ConnectorStatus,\n #[encrypt]\n pub connector_wallets_details: Option>>,\n #[encrypt]\n pub additional_merchant_data: Option>>,\n pub version: common_enums::ApiVersion,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use crate::{\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};" + ], + "after_imports": [ + "use crate::{\n mandates::CommonMandateReference,\n router_data,\n type_encryption::{crypto_operation, CryptoOperation},\n};", + "use common_utils::{\n crypto::Encryptable,\n date_time,\n encryption::Encryption,\n errors::{CustomResult, ValidationError},\n ext_traits::ValueExt,\n id_type, pii, type_name,\n types::keymanager::{Identifier, KeyManagerState, ToEncryptable},\n};", + "use serde_json::Value;", + "use masking::{PeekInterface, Secret};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::get_id", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_id(&self) -> &common_utils::id_type::GlobalPaymentMethodId {\n &self.id\n }", + "after_code": "pub fn get_id(&self) -> &common_utils::id_type::GlobalPaymentMethodId {\n &self.id\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [], + "after_imports": [ + "use crate::{\n mandates::{CommonMandateReference, PaymentsMandateReference},\n type_encryption::{crypto_operation, AsyncLift, CryptoOperation},\n};" + ] + }, + { + "id": "crates/router/src/core/webhooks/incoming.rs::function::payments_incoming_webhook_flow", + "file": "crates/router/src/core/webhooks/incoming.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn payments_incoming_webhook_flow(\n state: SessionState,\n req_state: ReqState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n source_verified: bool,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n event_type: webhooks::IncomingWebhookEvent,\n) -> CustomResult {\n let consume_or_trigger_flow = if source_verified {\n payments::CallConnectorAction::HandleResponse(webhook_details.resource_object)\n } else {\n payments::CallConnectorAction::Trigger\n };\n let payments_response = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PaymentId(ref id) => {\n let payment_id = get_payment_id(\n state.store.as_ref(),\n id,\n merchant_account.get_id(),\n merchant_account.storage_scheme,\n )\n .await?;\n\n let lock_action = api_locking::LockAction::Hold {\n input: api_locking::LockingInput {\n unique_locking_key: payment_id.get_string_repr().to_owned(),\n api_identifier: lock_utils::ApiIdentifier::Payments,\n override_lock_retries: None,\n },\n };\n\n lock_action\n .clone()\n .perform_locking_action(&state, merchant_account.get_id().to_owned())\n .await?;\n\n let response = Box::pin(payments::payments_core::<\n api::PSync,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData,\n >(\n state.clone(),\n req_state,\n merchant_account.clone(),\n None,\n key_store.clone(),\n payments::operations::PaymentStatus,\n api::PaymentsRetrieveRequest {\n resource_id: id.clone(),\n merchant_id: Some(merchant_account.get_id().clone()),\n force_sync: true,\n connector: None,\n param: None,\n merchant_connector_details: None,\n client_secret: None,\n expand_attempts: None,\n expand_captures: None,\n },\n services::AuthFlow::Merchant,\n consume_or_trigger_flow.clone(),\n None,\n HeaderPayload::default(),\n None, //Platform merchant account\n ))\n .await;\n // When mandate details are present in successful webhooks, and consuming webhooks are skipped during payment sync if the payment status is already updated to charged, this function is used to update the connector mandate details.\n if should_update_connector_mandate_details(source_verified, event_type) {\n update_connector_mandate_details(\n &state,\n &merchant_account,\n &key_store,\n webhook_details.object_reference_id.clone(),\n connector,\n request_details,\n )\n .await?\n };\n lock_action\n .free_lock_action(&state, merchant_account.get_id().to_owned())\n .await?;\n\n match response {\n Ok(value) => value,\n Err(err)\n if matches!(\n err.current_context(),\n &errors::ApiErrorResponse::PaymentNotFound\n ) && state\n .conf\n .webhooks\n .ignore_error\n .payment_not_found\n .unwrap_or(true) =>\n {\n metrics::WEBHOOK_PAYMENT_NOT_FOUND.add(\n 1,\n router_env::metric_attributes!((\n \"merchant_id\",\n merchant_account.get_id().clone()\n )),\n );\n return Ok(WebhookResponseTracker::NoEffect);\n }\n error @ Err(_) => error?,\n }\n }\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure).attach_printable(\n \"Did not get payment id as object reference id in webhook payments flow\",\n )?,\n };\n\n match payments_response {\n services::ApplicationResponse::JsonWithHeaders((payments_response, _)) => {\n let payment_id = payments_response.payment_id.clone();\n\n let status = payments_response.status;\n\n let event_type: Option = payments_response.status.foreign_into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let primary_object_created_at = payments_response.created;\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Payments,\n payment_id.get_string_repr().to_owned(),\n enums::EventObjectType::PaymentDetails,\n api::OutgoingWebhookContent::PaymentDetails(Box::new(payments_response)),\n primary_object_created_at,\n ))\n .await?;\n };\n\n let response = WebhookResponseTracker::Payment { payment_id, status };\n\n Ok(response)\n }\n\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received non-json response from payments core\")?,\n }\n}", + "after_code": "async fn payments_incoming_webhook_flow(\n state: SessionState,\n req_state: ReqState,\n merchant_account: domain::MerchantAccount,\n business_profile: domain::Profile,\n key_store: domain::MerchantKeyStore,\n webhook_details: api::IncomingWebhookDetails,\n source_verified: bool,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n event_type: webhooks::IncomingWebhookEvent,\n) -> CustomResult {\n let consume_or_trigger_flow = if source_verified {\n payments::CallConnectorAction::HandleResponse(webhook_details.resource_object)\n } else {\n payments::CallConnectorAction::Trigger\n };\n let payments_response = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PaymentId(ref id) => {\n let payment_id = get_payment_id(\n state.store.as_ref(),\n id,\n merchant_account.get_id(),\n merchant_account.storage_scheme,\n )\n .await?;\n\n let lock_action = api_locking::LockAction::Hold {\n input: api_locking::LockingInput {\n unique_locking_key: payment_id.get_string_repr().to_owned(),\n api_identifier: lock_utils::ApiIdentifier::Payments,\n override_lock_retries: None,\n },\n };\n\n lock_action\n .clone()\n .perform_locking_action(&state, merchant_account.get_id().to_owned())\n .await?;\n\n let response = Box::pin(payments::payments_core::<\n api::PSync,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData,\n >(\n state.clone(),\n req_state,\n merchant_account.clone(),\n None,\n key_store.clone(),\n payments::operations::PaymentStatus,\n api::PaymentsRetrieveRequest {\n resource_id: id.clone(),\n merchant_id: Some(merchant_account.get_id().clone()),\n force_sync: true,\n connector: None,\n param: None,\n merchant_connector_details: None,\n client_secret: None,\n expand_attempts: None,\n expand_captures: None,\n },\n services::AuthFlow::Merchant,\n consume_or_trigger_flow.clone(),\n None,\n HeaderPayload::default(),\n None, //Platform merchant account\n ))\n .await;\n // When mandate details are present in successful webhooks, and consuming webhooks are skipped during payment sync if the payment status is already updated to charged, this function is used to update the connector mandate details.\n if should_update_connector_mandate_details(source_verified, event_type) {\n update_connector_mandate_details(\n &state,\n &merchant_account,\n &key_store,\n webhook_details.object_reference_id.clone(),\n connector,\n request_details,\n )\n .await?\n };\n lock_action\n .free_lock_action(&state, merchant_account.get_id().to_owned())\n .await?;\n\n match response {\n Ok(value) => value,\n Err(err)\n if matches!(\n err.current_context(),\n &errors::ApiErrorResponse::PaymentNotFound\n ) && state\n .conf\n .webhooks\n .ignore_error\n .payment_not_found\n .unwrap_or(true) =>\n {\n metrics::WEBHOOK_PAYMENT_NOT_FOUND.add(\n 1,\n router_env::metric_attributes!((\n \"merchant_id\",\n merchant_account.get_id().clone()\n )),\n );\n return Ok(WebhookResponseTracker::NoEffect);\n }\n error @ Err(_) => error?,\n }\n }\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure).attach_printable(\n \"Did not get payment id as object reference id in webhook payments flow\",\n )?,\n };\n\n match payments_response {\n services::ApplicationResponse::JsonWithHeaders((payments_response, _)) => {\n let payment_id = payments_response.payment_id.clone();\n\n let status = payments_response.status;\n\n let event_type: Option = payments_response.status.foreign_into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let primary_object_created_at = payments_response.created;\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_account,\n business_profile,\n &key_store,\n outgoing_event_type,\n enums::EventClass::Payments,\n payment_id.get_string_repr().to_owned(),\n enums::EventObjectType::PaymentDetails,\n api::OutgoingWebhookContent::PaymentDetails(Box::new(payments_response)),\n primary_object_created_at,\n ))\n .await?;\n };\n\n let response = WebhookResponseTracker::Payment { payment_id, status };\n\n Ok(response)\n }\n\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received non-json response from payments core\")?,\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4", + "before_imports": [ + "use super::{types, utils, MERCHANT_ID};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_domain_models::{\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};" + ], + "after_imports": [ + "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};", + "use super::{types, utils, MERCHANT_ID};", + "use api_models::webhooks::{self, WebhookResponseTracker};", + "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::impl::PayoutsMandateReference", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl From for PayoutsMandateReference {\n fn from(value: diesel_models::PayoutsMandateReference) -> Self {\n Self(\n value\n .0\n .into_iter()\n .map(|(key, record)| (key, record.into()))\n .collect(),\n )\n }\n}", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::diesel_models::CommonMandateReference::function::from", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn from(value: CommonMandateReference) -> Self {\n Self {\n payments: value.payments.map(|payments| payments.into()),\n payouts: value.payouts.map(|payouts| payouts.into()),\n }\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::PayoutsMandateReferenceRecord::function::from", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn from(value: diesel_models::PayoutsMandateReferenceRecord) -> Self {\n Self {\n transfer_method_id: value.transfer_method_id,\n }\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::diesel_models::PayoutsMandateReference::function::from", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn from(value: PayoutsMandateReference) -> Self {\n Self(\n value\n .0\n .into_iter()\n .map(|(key, record)| (key, record.into()))\n .collect(),\n )\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::impl::diesel_models::PaymentsMandateReference", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl From for diesel_models::PaymentsMandateReference {\n fn from(value: PaymentsMandateReference) -> Self {\n Self(\n value\n .0\n .into_iter()\n .map(|(key, record)| (key, record.into()))\n .collect(),\n )\n }\n}", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::impl::diesel_models::CommonMandateReference", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl From for diesel_models::CommonMandateReference {\n fn from(value: CommonMandateReference) -> Self {\n Self {\n payments: value.payments.map(|payments| payments.into()),\n payouts: value.payouts.map(|payouts| payouts.into()),\n }\n }\n}", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::PaymentsMandateReference::function::from", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn from(value: diesel_models::PaymentsMandateReference) -> Self {\n Self(\n value\n .0\n .into_iter()\n .map(|(key, record)| (key, record.into()))\n .collect(),\n )\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::impl::PaymentsMandateReferenceRecord", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl From for PaymentsMandateReferenceRecord {\n fn from(value: diesel_models::PaymentsMandateReferenceRecord) -> Self {\n Self {\n connector_mandate_id: value.connector_mandate_id,\n payment_method_subtype: value.payment_method_subtype,\n original_payment_authorized_amount: value.original_payment_authorized_amount,\n original_payment_authorized_currency: value.original_payment_authorized_currency,\n mandate_metadata: value.mandate_metadata,\n connector_mandate_status: value.connector_mandate_status,\n connector_mandate_request_reference_id: value.connector_mandate_request_reference_id,\n }\n }\n}", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::diesel_models::PaymentsMandateReference::function::from", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn from(value: PaymentsMandateReference) -> Self {\n Self(\n value\n .0\n .into_iter()\n .map(|(key, record)| (key, record.into()))\n .collect(),\n )\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::impl::diesel_models::PayoutsMandateReferenceRecord", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl From for diesel_models::PayoutsMandateReferenceRecord {\n fn from(value: PayoutsMandateReferenceRecord) -> Self {\n Self {\n transfer_method_id: value.transfer_method_id,\n }\n }\n}", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::PayoutsMandateReference::type::Target", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "type_item", + "status": "added", + "before_code": null, + "after_code": "type Target =\n HashMap;", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::PayoutsMandateReference::function::from", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn from(value: diesel_models::PayoutsMandateReference) -> Self {\n Self(\n value\n .0\n .into_iter()\n .map(|(key, record)| (key, record.into()))\n .collect(),\n )\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::CommonMandateReference::function::get_mandate_details_value", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub fn get_mandate_details_value(&self) -> CustomResult {\n let mut payments = self\n .payments\n .as_ref()\n .map_or_else(|| Ok(serde_json::json!({})), serde_json::to_value)\n .change_context(ParsingError::StructParseFailure(\"payment mandate details\"))?;\n\n self.payouts\n .as_ref()\n .map(|payouts_mandate| {\n serde_json::to_value(payouts_mandate).map(|payouts_mandate_value| {\n payments.as_object_mut().map(|payments_object| {\n payments_object.insert(\"payouts\".to_string(), payouts_mandate_value);\n })\n })\n })\n .transpose()\n .change_context(ParsingError::StructParseFailure(\"payout mandate details\"))?;\n\n Ok(payments)\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::impl::diesel_models::PaymentsMandateReferenceRecord", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl From for diesel_models::PaymentsMandateReferenceRecord {\n fn from(value: PaymentsMandateReferenceRecord) -> Self {\n Self {\n connector_mandate_id: value.connector_mandate_id,\n payment_method_subtype: value.payment_method_subtype,\n original_payment_authorized_amount: value.original_payment_authorized_amount,\n original_payment_authorized_currency: value.original_payment_authorized_currency,\n mandate_metadata: value.mandate_metadata,\n connector_mandate_status: value.connector_mandate_status,\n connector_mandate_request_reference_id: value.connector_mandate_request_reference_id,\n }\n }\n}", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::PayoutsMandateReference::function::deref_mut", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn deref_mut(&mut self) -> &mut Self::Target {\n &mut self.0\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::PaymentsMandateReference::function::deref", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn deref(&self) -> &Self::Target {\n &self.0\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::impl::PaymentsMandateReference", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl From for PaymentsMandateReference {\n fn from(value: diesel_models::PaymentsMandateReference) -> Self {\n Self(\n value\n .0\n .into_iter()\n .map(|(key, record)| (key, record.into()))\n .collect(),\n )\n }\n}", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::impl::PayoutsMandateReferenceRecord", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl From for PayoutsMandateReferenceRecord {\n fn from(value: diesel_models::PayoutsMandateReferenceRecord) -> Self {\n Self {\n transfer_method_id: value.transfer_method_id,\n }\n }\n}", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::impl::CommonMandateReference", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl From for CommonMandateReference {\n fn from(value: diesel_models::CommonMandateReference) -> Self {\n Self {\n payments: value.payments.map(|payments| payments.into()),\n payouts: value.payouts.map(|payouts| payouts.into()),\n }\n }\n}", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::impl::diesel_models::PayoutsMandateReference", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl From for diesel_models::PayoutsMandateReference {\n fn from(value: PayoutsMandateReference) -> Self {\n Self(\n value\n .0\n .into_iter()\n .map(|(key, record)| (key, record.into()))\n .collect(),\n )\n }\n}", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::PaymentsMandateReferenceRecord::function::from", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn from(value: diesel_models::PaymentsMandateReferenceRecord) -> Self {\n Self {\n connector_mandate_id: value.connector_mandate_id,\n payment_method_subtype: value.payment_method_subtype,\n original_payment_authorized_amount: value.original_payment_authorized_amount,\n original_payment_authorized_currency: value.original_payment_authorized_currency,\n mandate_metadata: value.mandate_metadata,\n connector_mandate_status: value.connector_mandate_status,\n connector_mandate_request_reference_id: value.connector_mandate_request_reference_id,\n }\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::PaymentsMandateReference::function::deref_mut", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn deref_mut(&mut self) -> &mut Self::Target {\n &mut self.0\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::CommonMandateReference::function::from", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn from(value: diesel_models::CommonMandateReference) -> Self {\n Self {\n payments: value.payments.map(|payments| payments.into()),\n payouts: value.payouts.map(|payouts| payouts.into()),\n }\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::PayoutsMandateReference::function::deref", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn deref(&self) -> &Self::Target {\n &self.0\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::PaymentsMandateReference::type::Target", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "type_item", + "status": "added", + "before_code": null, + "after_code": "type Target =\n HashMap;", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::diesel_models::PayoutsMandateReferenceRecord::function::from", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn from(value: PayoutsMandateReferenceRecord) -> Self {\n Self {\n transfer_method_id: value.transfer_method_id,\n }\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + }, + { + "id": "crates/hyperswitch_domain_models/src/mandates.rs::diesel_models::PaymentsMandateReferenceRecord::function::from", + "file": "crates/hyperswitch_domain_models/src/mandates.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn from(value: PaymentsMandateReferenceRecord) -> Self {\n Self {\n connector_mandate_id: value.connector_mandate_id,\n payment_method_subtype: value.payment_method_subtype,\n original_payment_authorized_amount: value.original_payment_authorized_amount,\n original_payment_authorized_currency: value.original_payment_authorized_currency,\n mandate_metadata: value.mandate_metadata,\n connector_mandate_status: value.connector_mandate_status,\n connector_mandate_request_reference_id: value.connector_mandate_request_reference_id,\n }\n }", + "diff_span": null, + "commit_sha": "2ef1dfa20c8545aa8562c44e5d84c1e92a7966f4" + } + ] +} \ No newline at end of file