Skip to content
Merged
2 changes: 1 addition & 1 deletion config/development.toml
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ host = "https://localhost:9200"
[opensearch.auth]
auth = "basic"
username = "admin"
password = "admin"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you revert this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this is a required change for running opensearch locally.

password = "0penS3arc#"
region = "eu-central-1"

[opensearch.indexes]
Expand Down
2 changes: 1 addition & 1 deletion config/docker_compose.toml
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ host = "https://opensearch:9200"
[opensearch.auth]
auth = "basic"
username = "admin"
password = "admin"
password = "0penS3arc#"
region = "eu-central-1"

[opensearch.indexes]
Expand Down
4 changes: 2 additions & 2 deletions crates/api_models/src/payments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ pub struct PaymentsRequest {

/// You can specify up to 50 keys, with key names up to 40 characters long and values up to 500 characters long. Metadata is useful for storing additional, structured information on an object.
#[schema(value_type = Option<Object>, example = r#"{ "udf1": "some-value", "udf2": "some-value" }"#)]
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd intentionally kept this a Secret since this was a field provided by the merchant, and to not expose possible sensitive information in application logs. If we're now removing the Secret, we may have to consider masking possible sensitive information to our best efforts, both in application logs and in ClickHouse events.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adding an issue for this #5227 .
we need to add consistency for this,
either by masking/hashing/encrypting it everywhere and deciding on a proper way for this


/// Some connectors like Apple pay, Airwallex and Noon might require some additional information, find specific details in the child attributes below.
pub connector_metadata: Option<ConnectorMetadata>,
Expand Down Expand Up @@ -3557,7 +3557,7 @@ pub struct PaymentsResponse {

/// You can specify up to 50 keys, with key names up to 40 characters long and values up to 500 characters long. Metadata is useful for storing additional, structured information on an object.
#[schema(value_type = Option<Object>, example = r#"{ "udf1": "some-value", "udf2": "some-value" }"#)]
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,

/// Additional data related to some connectors
#[schema(value_type = Option<ConnectorMetadata>)]
Expand Down
10 changes: 5 additions & 5 deletions crates/diesel_models/src/payment_intent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub struct PaymentIntent {
pub customer_id: Option<id_type::CustomerId>,
pub description: Option<String>,
pub return_url: Option<String>,
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
pub connector_id: Option<String>,
pub shipping_address_id: Option<String>,
pub billing_address_id: Option<String>,
Expand Down Expand Up @@ -77,7 +77,7 @@ pub struct PaymentIntentNew {
pub customer_id: Option<id_type::CustomerId>,
pub description: Option<String>,
pub return_url: Option<String>,
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
pub connector_id: Option<String>,
pub shipping_address_id: Option<String>,
pub billing_address_id: Option<String>,
Expand Down Expand Up @@ -131,7 +131,7 @@ pub enum PaymentIntentUpdate {
incremental_authorization_allowed: Option<bool>,
},
MetadataUpdate {
metadata: pii::SecretSerdeValue,
metadata: serde_json::Value,
updated_by: String,
},
PaymentCreateUpdate {
Expand Down Expand Up @@ -169,7 +169,7 @@ pub enum PaymentIntentUpdate {
statement_descriptor_name: Option<String>,
statement_descriptor_suffix: Option<String>,
order_details: Option<Vec<pii::SecretSerdeValue>>,
metadata: Option<pii::SecretSerdeValue>,
metadata: Option<serde_json::Value>,
payment_confirm_source: Option<storage_enums::PaymentSource>,
updated_by: String,
session_expiry: Option<PrimitiveDateTime>,
Expand Down Expand Up @@ -230,7 +230,7 @@ pub struct PaymentIntentUpdateInternal {
pub return_url: Option<String>,
pub setup_future_usage: Option<storage_enums::FutureUsage>,
pub off_session: Option<bool>,
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
pub billing_address_id: Option<String>,
pub shipping_address_id: Option<String>,
pub modified_at: Option<PrimitiveDateTime>,
Expand Down
2 changes: 1 addition & 1 deletion crates/hyperswitch_domain_models/src/payments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub struct PaymentIntent {
pub customer_id: Option<id_type::CustomerId>,
pub description: Option<String>,
pub return_url: Option<String>,
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
pub connector_id: Option<String>,
pub shipping_address_id: Option<String>,
pub billing_address_id: Option<String>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ pub struct PaymentIntentNew {
pub customer_id: Option<id_type::CustomerId>,
pub description: Option<String>,
pub return_url: Option<String>,
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
pub frm_metadata: Option<pii::SecretSerdeValue>,
pub connector_id: Option<String>,
pub shipping_address_id: Option<String>,
Expand Down Expand Up @@ -147,7 +147,7 @@ pub enum PaymentIntentUpdate {
incremental_authorization_allowed: Option<bool>,
},
MetadataUpdate {
metadata: pii::SecretSerdeValue,
metadata: serde_json::Value,
updated_by: String,
},
PaymentCreateUpdate {
Expand Down Expand Up @@ -185,7 +185,7 @@ pub enum PaymentIntentUpdate {
statement_descriptor_name: Option<String>,
statement_descriptor_suffix: Option<String>,
order_details: Option<Vec<pii::SecretSerdeValue>>,
metadata: Option<pii::SecretSerdeValue>,
metadata: Option<serde_json::Value>,
frm_metadata: Option<pii::SecretSerdeValue>,
payment_confirm_source: Option<storage_enums::PaymentSource>,
updated_by: String,
Expand Down Expand Up @@ -245,7 +245,7 @@ pub struct PaymentIntentUpdateInternal {
pub return_url: Option<String>,
pub setup_future_usage: Option<storage_enums::FutureUsage>,
pub off_session: Option<bool>,
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
pub billing_address_id: Option<String>,
pub shipping_address_id: Option<String>,
pub modified_at: Option<PrimitiveDateTime>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ pub struct PaymentsAuthorizeData {
pub surcharge_details: Option<SurchargeDetails>,
pub customer_id: Option<String>,
pub request_incremental_authorization: bool,
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
pub authentication_data: Option<AuthenticationData>,
pub charges: Option<PaymentCharges>,

Expand Down Expand Up @@ -102,7 +102,7 @@ pub struct PaymentsCaptureData {
pub multiple_capture_data: Option<MultipleCaptureRequestData>,
pub connector_meta: Option<serde_json::Value>,
pub browser_info: Option<BrowserInformation>,
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
// This metadata is used to store the metadata shared during the payment intent request.

// New amount for amount frame work
Expand Down Expand Up @@ -346,7 +346,7 @@ pub struct CompleteAuthorizeData {
pub connector_transaction_id: Option<String>,
pub connector_meta: Option<serde_json::Value>,
pub complete_authorize_url: Option<String>,
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
pub customer_acceptance: Option<mandates::CustomerAcceptance>,
// New amount for amount frame work
pub minor_amount: MinorUnit,
Expand Down Expand Up @@ -390,7 +390,7 @@ pub struct PaymentsCancelData {
pub cancellation_reason: Option<String>,
pub connector_meta: Option<serde_json::Value>,
pub browser_info: Option<BrowserInformation>,
pub metadata: Option<pii::SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
// This metadata is used to store the metadata shared during the payment intent request.

// minor amount data for amount framework
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ pub struct StripePaymentIntentRequest {
pub shipping: Option<Shipping>,
pub statement_descriptor: Option<String>,
pub statement_descriptor_suffix: Option<String>,
pub metadata: Option<SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
pub client_secret: Option<masking::Secret<String>>,
pub payment_method_options: Option<StripePaymentMethodOptions>,
pub merchant_connector_details: Option<admin::MerchantConnectorDetailsWrap>,
Expand Down Expand Up @@ -478,7 +478,7 @@ pub struct StripePaymentIntentResponse {
pub customer: Option<id_type::CustomerId>,
pub refunds: Option<Vec<stripe_refunds::StripeRefundResponse>>,
pub mandate: Option<String>,
pub metadata: Option<SecretSerdeValue>,
pub metadata: Option<serde_json::Value>,
pub charges: Charges,
pub connector: Option<String>,
pub description: Option<String>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ pub struct StripeSetupIntentResponse {
pub object: String,
pub status: StripeSetupStatus,
pub client_secret: Option<masking::Secret<String>>,
pub metadata: Option<secret::SecretSerdeValue>,
pub metadata: Option<Value>,
#[serde(with = "common_utils::custom_serde::iso8601::option")]
pub created: Option<time::PrimitiveDateTime>,
pub customer: Option<id_type::CustomerId>,
Expand Down
20 changes: 10 additions & 10 deletions crates/router/src/connector/adyen/transformers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2610,7 +2610,7 @@ impl<'a>
channel: None,
shopper_statement: item.router_data.request.statement_descriptor.clone(),
shopper_ip: item.router_data.request.get_ip_address_as_optional(),
metadata: item.router_data.request.metadata.clone(),
metadata: item.router_data.request.metadata.clone().map(Into::into),
merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),
})
}
Expand Down Expand Up @@ -2673,7 +2673,7 @@ impl<'a>
channel: None,
shopper_statement: item.router_data.request.statement_descriptor.clone(),
shopper_ip: item.router_data.request.get_ip_address_as_optional(),
metadata: item.router_data.request.metadata.clone(),
metadata: item.router_data.request.metadata.clone().map(Into::into),
merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),
})
}
Expand Down Expand Up @@ -2727,7 +2727,7 @@ impl<'a>
channel: None,
shopper_statement: item.router_data.request.statement_descriptor.clone(),
shopper_ip: item.router_data.request.get_ip_address_as_optional(),
metadata: item.router_data.request.metadata.clone(),
metadata: item.router_data.request.metadata.clone().map(Into::into),
merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),
};
Ok(request)
Expand Down Expand Up @@ -2782,7 +2782,7 @@ impl<'a>
channel: None,
shopper_statement: item.router_data.request.statement_descriptor.clone(),
shopper_ip: item.router_data.request.get_ip_address_as_optional(),
metadata: item.router_data.request.metadata.clone(),
metadata: item.router_data.request.metadata.clone().map(Into::into),
merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),
};
Ok(request)
Expand Down Expand Up @@ -2833,7 +2833,7 @@ impl<'a>
channel: None,
shopper_statement: item.router_data.request.statement_descriptor.clone(),
shopper_ip: item.router_data.request.get_ip_address_as_optional(),
metadata: item.router_data.request.metadata.clone(),
metadata: item.router_data.request.metadata.clone().map(Into::into),
merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),
};
Ok(request)
Expand Down Expand Up @@ -2884,7 +2884,7 @@ impl<'a>
social_security_number: None,
shopper_statement: item.router_data.request.statement_descriptor.clone(),
shopper_ip: item.router_data.request.get_ip_address_as_optional(),
metadata: item.router_data.request.metadata.clone(),
metadata: item.router_data.request.metadata.clone().map(Into::into),
merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),
};
Ok(request)
Expand Down Expand Up @@ -2945,7 +2945,7 @@ impl<'a>
channel: None,
shopper_statement: item.router_data.request.statement_descriptor.clone(),
shopper_ip: item.router_data.request.get_ip_address_as_optional(),
metadata: item.router_data.request.metadata.clone(),
metadata: item.router_data.request.metadata.clone().map(Into::into),
merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),
})
}
Expand Down Expand Up @@ -3041,7 +3041,7 @@ impl<'a>
channel,
shopper_statement: item.router_data.request.statement_descriptor.clone(),
shopper_ip: item.router_data.request.get_ip_address_as_optional(),
metadata: item.router_data.request.metadata.clone(),
metadata: item.router_data.request.metadata.clone().map(Into::into),
merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),
})
}
Expand Down Expand Up @@ -3117,7 +3117,7 @@ impl<'a>
channel: None,
shopper_statement: item.router_data.request.statement_descriptor.clone(),
shopper_ip: item.router_data.request.get_ip_address_as_optional(),
metadata: item.router_data.request.metadata.clone(),
metadata: item.router_data.request.metadata.clone().map(Into::into),
merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),
})
}
Expand Down Expand Up @@ -3176,7 +3176,7 @@ impl<'a>
social_security_number: None,
shopper_statement: item.router_data.request.statement_descriptor.clone(),
shopper_ip: item.router_data.request.get_ip_address_as_optional(),
metadata: item.router_data.request.metadata.clone(),
metadata: item.router_data.request.metadata.clone().map(Into::into),
merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),
})
}
Expand Down
Loading