Merge remote-tracking branch 'origin/main' into connector_events_v3

CHANGELOG.md

@@ -4,6 +4,34 @@ All notable changes to HyperSwitch will be documented here.
 
 - - -
 
+## 1.99.0 (2023-12-12)
+
+### Features
+
+- **connector:** [Placetopay] Add Connector Template Code  ([#3084](https://github.com/juspay/hyperswitch/pull/3084)) ([`a7b688a`](https://github.com/juspay/hyperswitch/commit/a7b688aac72e15f782046b9d108aca12f43a9994))
+- Add utility to convert TOML configuration file to list of environment variables ([#3096](https://github.com/juspay/hyperswitch/pull/3096)) ([`2c4599a`](https://github.com/juspay/hyperswitch/commit/2c4599a1cd7e244b6fb11948c88c55c5b8faad76))
+
+### Bug Fixes
+
+- **router:** Make `request_incremental_authorization` optional in payment_intent ([#3086](https://github.com/juspay/hyperswitch/pull/3086)) ([`f7da59d`](https://github.com/juspay/hyperswitch/commit/f7da59d06af11707e210b58a875c013d31c3ee17))
+
+### Refactors
+
+- **email:** Create client every time of sending email ([#3105](https://github.com/juspay/hyperswitch/pull/3105)) ([`fc2f163`](https://github.com/juspay/hyperswitch/commit/fc2f16392148cd66b3c3e67e3e0c782910e37e1f))
+
+### Testing
+
+- **postman:** Update postman collection files ([`aa97821`](https://github.com/juspay/hyperswitch/commit/aa9782164fb7846fe533c5057a17756dc82ede54))
+
+### Miscellaneous Tasks
+
+- **deps:** Update fred and moka ([#3088](https://github.com/juspay/hyperswitch/pull/3088)) ([`129b1e5`](https://github.com/juspay/hyperswitch/commit/129b1e55bd1cbad0243030fd25379f1400eb170c))
+
+**Full Changelog:** [`v1.98.0...v1.99.0`](https://github.com/juspay/hyperswitch/compare/v1.98.0...v1.99.0)
+
+- - -
+
+
 ## 1.98.0 (2023-12-11)
 
 ### Features

config/config.example.toml

@@ -216,6 +216,7 @@ payeezy.base_url = "https://api-cert.payeezy.com/"
 payme.base_url = "https://sandbox.payme.io/"
 paypal.base_url = "https://api-m.sandbox.paypal.com/"
 payu.base_url = "https://secure.snd.payu.com/"
+placetopay.base_url = "https://api-co-dev.placetopay.ws/gateway"
 powertranz.base_url = "https://staging.ptranz.com/api/"
 prophetpay.base_url = "https://ccm-thirdparty.cps.golf/"
 rapyd.base_url = "https://sandboxapi.rapyd.net"

config/development.toml

@@ -130,6 +130,7 @@ cards = [
     "payme",
     "paypal",
     "payu",
+    "placetopay",
     "powertranz",
     "prophetpay",
     "shift4",
@@ -202,6 +203,7 @@ payeezy.base_url = "https://api-cert.payeezy.com/"
 payme.base_url = "https://sandbox.payme.io/"
 paypal.base_url = "https://api-m.sandbox.paypal.com/"
 payu.base_url = "https://secure.snd.payu.com/"
+placetopay.base_url = "https://api-co-dev.placetopay.ws/gateway"
 powertranz.base_url = "https://staging.ptranz.com/api/"
 prophetpay.base_url = "https://ccm-thirdparty.cps.golf/"
 rapyd.base_url = "https://sandboxapi.rapyd.net"

config/docker_compose.toml

@@ -138,6 +138,7 @@ payeezy.base_url = "https://api-cert.payeezy.com/"
 payme.base_url = "https://sandbox.payme.io/"
 paypal.base_url = "https://api-m.sandbox.paypal.com/"
 payu.base_url = "https://secure.snd.payu.com/"
+placetopay.base_url = "https://api-co-dev.placetopay.ws/gateway"
 powertranz.base_url = "https://staging.ptranz.com/api/"
 prophetpay.base_url = "https://ccm-thirdparty.cps.golf/"
 rapyd.base_url = "https://sandboxapi.rapyd.net"
@@ -201,6 +202,7 @@ cards = [
     "payme",
     "paypal",
     "payu",
+    "placetopay",
     "powertranz",
     "prophetpay",
     "shift4",

connector-template/transformers.rs

@@ -42,7 +42,6 @@ pub struct {{project-name | downcase | pascal_case}}PaymentsRequest {
 
 #[derive(Default, Debug, Serialize, Eq, PartialEq)]
 pub struct {{project-name | downcase | pascal_case}}Card {
-    name: Secret<String>,
     number: cards::CardNumber,
     expiry_month: Secret<String>,
     expiry_year: Secret<String>,
@@ -56,7 +55,6 @@ impl TryFrom<&{{project-name | downcase | pascal_case}}RouterData<&types::Paymen
         match item.router_data.request.payment_method_data.clone() {
             api::PaymentMethodData::Card(req_card) => {
                 let card = {{project-name | downcase | pascal_case}}Card {
-                    name: req_card.card_holder_name,
                     number: req_card.card_number,
                     expiry_month: req_card.card_exp_month,
                     expiry_year: req_card.card_exp_year,

crates/api_models/src/enums.rs

@@ -109,6 +109,7 @@ pub enum Connector {
     Payme,
     Paypal,
     Payu,
+    Placetopay,
     Powertranz,
     Prophetpay,
     Rapyd,

crates/common_enums/src/enums.rs

@@ -142,6 +142,7 @@ pub enum RoutableConnectors {
     Payme,
     Paypal,
     Payu,
+    Placetopay,
     Powertranz,
     Prophetpay,
     Rapyd,

crates/data_models/src/payments.rs

@@ -50,7 +50,7 @@ pub struct PaymentIntent {
 
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
-    pub request_incremental_authorization: storage_enums::RequestIncrementalAuthorization,
+    pub request_incremental_authorization: Option<storage_enums::RequestIncrementalAuthorization>,
     pub incremental_authorization_allowed: Option<bool>,
     pub authorization_count: Option<i32>,
 }

crates/data_models/src/payments/payment_intent.rs

@@ -107,7 +107,7 @@ pub struct PaymentIntentNew {
 
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
-    pub request_incremental_authorization: storage_enums::RequestIncrementalAuthorization,
+    pub request_incremental_authorization: Option<storage_enums::RequestIncrementalAuthorization>,
     pub incremental_authorization_allowed: Option<bool>,
     pub authorization_count: Option<i32>,
 }

crates/diesel_models/src/payment_intent.rs

@@ -52,7 +52,7 @@ pub struct PaymentIntent {
 
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
-    pub request_incremental_authorization: RequestIncrementalAuthorization,
+    pub request_incremental_authorization: Option<RequestIncrementalAuthorization>,
     pub incremental_authorization_allowed: Option<bool>,
     pub authorization_count: Option<i32>,
 }
@@ -109,7 +109,7 @@ pub struct PaymentIntentNew {
     pub payment_confirm_source: Option<storage_enums::PaymentSource>,
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
-    pub request_incremental_authorization: RequestIncrementalAuthorization,
+    pub request_incremental_authorization: Option<RequestIncrementalAuthorization>,
     pub incremental_authorization_allowed: Option<bool>,
     pub authorization_count: Option<i32>,
 }

crates/diesel_models/src/schema.rs

@@ -703,7 +703,7 @@ diesel::table! {
         #[max_length = 32]
         updated_by -> Varchar,
         surcharge_applicable -> Nullable<Bool>,
-        request_incremental_authorization -> RequestIncrementalAuthorization,
+        request_incremental_authorization -> Nullable<RequestIncrementalAuthorization>,
         incremental_authorization_allowed -> Nullable<Bool>,
         authorization_count -> Nullable<Int4>,
     }

crates/external_services/src/email/ses.rs

@@ -12,14 +12,12 @@ use error_stack::{report, IntoReport, ResultExt};
 use hyper::Uri;
 use masking::PeekInterface;
 use router_env::logger;
-use tokio::sync::OnceCell;
 
 use crate::email::{EmailClient, EmailError, EmailResult, EmailSettings, IntermediateString};
 
 /// Client for AWS SES operation
 #[derive(Debug, Clone)]
 pub struct AwsSes {
-    ses_client: OnceCell<Client>,
     sender: String,
     settings: EmailSettings,
 }
@@ -70,13 +68,13 @@ pub enum AwsSesError {
 impl AwsSes {
     /// Constructs a new AwsSes client
     pub async fn create(conf: &EmailSettings, proxy_url: Option<impl AsRef<str>>) -> Self {
+        // Build the client initially which will help us know if the email configuration is correct
+        Self::create_client(conf, proxy_url)
+            .await
+            .map_err(|error| logger::error!(?error, "Failed to initialize SES Client"))
+            .ok();
+
         Self {
-            ses_client: OnceCell::new_with(
-                Self::create_client(conf, proxy_url)
-                    .await
-                    .map_err(|error| logger::error!(?error, "Failed to initialize SES Client"))
-                    .ok(),
-            ),
             sender: conf.sender_email.clone(),
             settings: conf.clone(),
         }
@@ -222,13 +220,13 @@ impl EmailClient for AwsSes {
         body: Self::RichText,
         proxy_url: Option<&String>,
     ) -> EmailResult<()> {
-        self.ses_client
-            .get_or_try_init(|| async {
-                Self::create_client(&self.settings, proxy_url)
-                    .await
-                    .change_context(EmailError::ClientBuildingFailure)
-            })
-            .await?
+        // Not using the same email client which was created at startup as the role session would expire
+        // Create a client every time when the email is being sent
+        let email_client = Self::create_client(&self.settings, proxy_url)
+            .await
+            .change_context(EmailError::ClientBuildingFailure)?;
+
+        email_client
             .send_email()
             .from_email_address(self.sender.to_owned())
             .destination(

crates/router/src/configs/settings.rs

@@ -614,6 +614,7 @@ pub struct Connectors {
     pub payme: ConnectorParams,
     pub paypal: ConnectorParams,
     pub payu: ConnectorParams,
+    pub placetopay: ConnectorParams,
     pub powertranz: ConnectorParams,
     pub prophetpay: ConnectorParams,
     pub rapyd: ConnectorParams,

crates/router/src/connector.rs

@@ -36,6 +36,7 @@ pub mod payeezy;
 pub mod payme;
 pub mod paypal;
 pub mod payu;
+pub mod placetopay;
 pub mod powertranz;
 pub mod prophetpay;
 pub mod rapyd;
@@ -63,8 +64,8 @@ pub use self::{
     globalpay::Globalpay, globepay::Globepay, gocardless::Gocardless, helcim::Helcim,
     iatapay::Iatapay, klarna::Klarna, mollie::Mollie, multisafepay::Multisafepay,
     nexinets::Nexinets, nmi::Nmi, noon::Noon, nuvei::Nuvei, opayo::Opayo, opennode::Opennode,
-    payeezy::Payeezy, payme::Payme, paypal::Paypal, payu::Payu, powertranz::Powertranz,
-    prophetpay::Prophetpay, rapyd::Rapyd, shift4::Shift4, signifyd::Signifyd, square::Square,
-    stax::Stax, stripe::Stripe, trustpay::Trustpay, tsys::Tsys, volt::Volt, wise::Wise,
-    worldline::Worldline, worldpay::Worldpay, zen::Zen,
+    payeezy::Payeezy, payme::Payme, paypal::Paypal, payu::Payu, placetopay::Placetopay,
+    powertranz::Powertranz, prophetpay::Prophetpay, rapyd::Rapyd, shift4::Shift4,
+    signifyd::Signifyd, square::Square, stax::Stax, stripe::Stripe, trustpay::Trustpay, tsys::Tsys,
+    volt::Volt, wise::Wise, worldline::Worldline, worldpay::Worldpay, zen::Zen,
 };