Merge branch 'main' into feat/profile_specific_fallback_routing

.typos.toml

@@ -40,4 +40,5 @@ afe = "afe" # Commit id
 extend-exclude = [
     "config/redis.conf", # `typos` also checked "AKE" in the file, which is present as a quoted string
     "openapi/open_api_spec.yaml", # no longer updated
+    "crates/router/src/utils/user/blocker_emails.txt", # this file contains various email domains
 ]

CHANGELOG.md

@@ -4,6 +4,29 @@ All notable changes to HyperSwitch will be documented here.
 
 - - -
 
+## 1.76.0 (2023-11-12)
+
+### Features
+
+- **analytics:** Analytics APIs  ([#2792](https://github.com/juspay/hyperswitch/pull/2792)) ([`f847802`](https://github.com/juspay/hyperswitch/commit/f847802339bfedb24cbaa47ad55e31d80cefddca))
+- **router:** Added Payment link new design ([#2731](https://github.com/juspay/hyperswitch/pull/2731)) ([`2a4f5d1`](https://github.com/juspay/hyperswitch/commit/2a4f5d13717a78dc2e2e4fc9a492a45b92151dbe))
+- **user:** Setup user tables ([#2803](https://github.com/juspay/hyperswitch/pull/2803)) ([`20c4226`](https://github.com/juspay/hyperswitch/commit/20c4226a36e4650a3ba8811b758ac5f7969bcfb3))
+
+### Refactors
+
+- **connector:** [Zen] change error message from NotSupported to NotImplemented ([#2831](https://github.com/juspay/hyperswitch/pull/2831)) ([`b5ea8db`](https://github.com/juspay/hyperswitch/commit/b5ea8db2d2b7e7544931704a7191b42d3a8299be))
+- **core:** Remove connector response table and use payment_attempt instead ([#2644](https://github.com/juspay/hyperswitch/pull/2644)) ([`966369b`](https://github.com/juspay/hyperswitch/commit/966369b6f2c205b59524c23ad3b21ebab547631f))
+- **events:** Update api events to follow snake case naming ([#2828](https://github.com/juspay/hyperswitch/pull/2828)) ([`b3d5062`](https://github.com/juspay/hyperswitch/commit/b3d5062dc07676ec12e903b1999fdd9138c0891d))
+
+### Documentation
+
+- **README:** Add bootstrap button for cloudformation deployment ([#2827](https://github.com/juspay/hyperswitch/pull/2827)) ([`e67e808`](https://github.com/juspay/hyperswitch/commit/e67e808d70d41c371fff168824e5a4dbb8b3a040))
+
+**Full Changelog:** [`v1.75.0...v1.76.0`](https://github.com/juspay/hyperswitch/compare/v1.75.0...v1.76.0)
+
+- - -
+
+
 ## 1.75.0 (2023-11-09)
 
 ### Features

crates/api_models/src/events.rs

@@ -5,6 +5,7 @@ pub mod payment;
 pub mod payouts;
 pub mod refund;
 pub mod routing;
+pub mod user;
 
 use common_utils::{
     events::{ApiEventMetric, ApiEventsType},

crates/api_models/src/events/user.rs

@@ -0,0 +1,14 @@
+use common_utils::events::{ApiEventMetric, ApiEventsType};
+
+use crate::user::{ConnectAccountRequest, ConnectAccountResponse};
+
+impl ApiEventMetric for ConnectAccountResponse {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::User {
+            merchant_id: self.merchant_id.clone(),
+            user_id: self.user_id.clone(),
+        })
+    }
+}
+
+impl ApiEventMetric for ConnectAccountRequest {}

crates/api_models/src/lib.rs

@@ -21,5 +21,6 @@ pub mod payments;
 pub mod payouts;
 pub mod refunds;
 pub mod routing;
+pub mod user;
 pub mod verifications;
 pub mod webhooks;

crates/api_models/src/user.rs

@@ -0,0 +1,21 @@
+use common_utils::pii;
+use masking::Secret;
+
+#[derive(serde::Deserialize, Debug, Clone, serde::Serialize)]
+pub struct ConnectAccountRequest {
+    pub email: pii::Email,
+    pub password: Secret<String>,
+}
+
+#[derive(serde::Serialize, Debug, Clone)]
+pub struct ConnectAccountResponse {
+    pub token: Secret<String>,
+    pub merchant_id: String,
+    pub name: Secret<String>,
+    pub email: pii::Email,
+    pub verification_days_left: Option<i64>,
+    pub user_role: String,
+    //this field is added for audit/debug reasons
+    #[serde(skip_serializing)]
+    pub user_id: String,
+}

crates/data_models/Cargo.toml

@@ -27,4 +27,4 @@ serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 strum  = { version = "0.25", features = [ "derive" ] }
 thiserror = "1.0.40"
-time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }
+time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }

crates/router/Cargo.toml

@@ -39,6 +39,7 @@ actix-cors = "0.6.4"
 actix-multipart = "0.6.0"
 actix-rt = "2.8.0"
 actix-web = "4.3.1"
+argon2 = { version = "0.5.0", features = ["std"] }
 async-bb8-diesel = "0.1.0"
 async-trait = "0.1.68"
 aws-config = { version = "0.55.3", optional = true }
@@ -90,10 +91,12 @@ thiserror = "1.0.40"
 time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }
 tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"] }
 tera = "1.19.1"
+unicode-segmentation = "1.10.1"
 url = { version = "2.4.0", features = ["serde"] }
 utoipa = { version = "3.3.0", features = ["preserve_order", "time"] }
 utoipa-swagger-ui = { version = "3.1.3", features = ["actix-web"] }
 uuid = { version = "1.3.3", features = ["serde", "v4"] }
+validator = "0.16.0"
 openssl = "0.10.55"
 x509-parser = "0.15.0"
 sha-1 = { version = "0.9"}

crates/router/src/consts.rs

@@ -1,3 +1,6 @@
+#[cfg(feature = "olap")]
+pub mod user;
+
 // ID generation
 pub(crate) const ID_LENGTH: usize = 20;
 pub(crate) const MAX_ID_LENGTH: usize = 64;
@@ -52,3 +55,6 @@ pub const ROUTING_CONFIG_ID_LENGTH: usize = 10;
 
 pub const LOCKER_REDIS_PREFIX: &str = "LOCKER_PM_TOKEN";
 pub const LOCKER_REDIS_EXPIRY_SECONDS: u32 = 60 * 15; // 15 minutes
+
+#[cfg(any(feature = "olap", feature = "oltp"))]
+pub const JWT_TOKEN_TIME_IN_SECS: u64 = 60 * 60 * 24 * 2; // 2 days

crates/router/src/consts/user.rs

@@ -0,0 +1,8 @@
+#[cfg(feature = "olap")]
+pub const MAX_NAME_LENGTH: usize = 70;
+#[cfg(feature = "olap")]
+pub const MAX_COMPANY_NAME_LENGTH: usize = 70;
+
+// USER ROLES
+#[cfg(any(feature = "olap", feature = "oltp"))]
+pub const ROLE_ID_ORGANIZATION_ADMIN: &str = "org_admin";

crates/router/src/core.rs

@@ -18,6 +18,8 @@ pub mod payments;
 pub mod payouts;
 pub mod refunds;
 pub mod routing;
+#[cfg(feature = "olap")]
+pub mod user;
 pub mod utils;
 #[cfg(all(feature = "olap", feature = "kms"))]
 pub mod verification;

crates/router/src/core/errors.rs

@@ -2,6 +2,8 @@ pub mod api_error_response;
 pub mod customers_error_response;
 pub mod error_handlers;
 pub mod transformers;
+#[cfg(feature = "olap")]
+pub mod user;
 pub mod utils;
 
 use std::fmt::Display;
@@ -13,6 +15,8 @@ use diesel_models::errors as storage_errors;
 pub use redis_interface::errors::RedisError;
 use scheduler::errors as sch_errors;
 use storage_impl::errors as storage_impl_errors;
+#[cfg(feature = "olap")]
+pub use user::*;
 
 pub use self::{
     api_error_response::ApiErrorResponse,

crates/router/src/core/errors/user.rs

@@ -0,0 +1,78 @@
+use common_utils::errors::CustomResult;
+
+use crate::services::ApplicationResponse;
+
+pub type UserResult<T> = CustomResult<T, UserErrors>;
+pub type UserResponse<T> = CustomResult<ApplicationResponse<T>, UserErrors>;
+
+#[derive(Debug, thiserror::Error)]
+pub enum UserErrors {
+    #[error("User InternalServerError")]
+    InternalServerError,
+    #[error("InvalidCredentials")]
+    InvalidCredentials,
+    #[error("UserExists")]
+    UserExists,
+    #[error("EmailParsingError")]
+    EmailParsingError,
+    #[error("NameParsingError")]
+    NameParsingError,
+    #[error("PasswordParsingError")]
+    PasswordParsingError,
+    #[error("CompanyNameParsingError")]
+    CompanyNameParsingError,
+    #[error("MerchantAccountCreationError: {0}")]
+    MerchantAccountCreationError(String),
+    #[error("InvalidEmailError")]
+    InvalidEmailError,
+    #[error("DuplicateOrganizationId")]
+    DuplicateOrganizationId,
+}
+
+impl common_utils::errors::ErrorSwitch<api_models::errors::types::ApiErrorResponse> for UserErrors {
+    fn switch(&self) -> api_models::errors::types::ApiErrorResponse {
+        use api_models::errors::types::{ApiError, ApiErrorResponse as AER};
+        let sub_code = "UR";
+        match self {
+            Self::InternalServerError => {
+                AER::InternalServerError(ApiError::new("HE", 0, "Something Went Wrong", None))
+            }
+            Self::InvalidCredentials => AER::Unauthorized(ApiError::new(
+                sub_code,
+                1,
+                "Incorrect email or password",
+                None,
+            )),
+            Self::UserExists => AER::BadRequest(ApiError::new(
+                sub_code,
+                3,
+                "An account already exists with this email",
+                None,
+            )),
+            Self::EmailParsingError => {
+                AER::BadRequest(ApiError::new(sub_code, 7, "Invalid Email", None))
+            }
+            Self::NameParsingError => {
+                AER::BadRequest(ApiError::new(sub_code, 8, "Invalid Name", None))
+            }
+            Self::PasswordParsingError => {
+                AER::BadRequest(ApiError::new(sub_code, 9, "Invalid Password", None))
+            }
+            Self::CompanyNameParsingError => {
+                AER::BadRequest(ApiError::new(sub_code, 14, "Invalid Company Name", None))
+            }
+            Self::MerchantAccountCreationError(error_message) => {
+                AER::InternalServerError(ApiError::new(sub_code, 15, error_message, None))
+            }
+            Self::InvalidEmailError => {
+                AER::BadRequest(ApiError::new(sub_code, 16, "Invalid Email", None))
+            }
+            Self::DuplicateOrganizationId => AER::InternalServerError(ApiError::new(
+                sub_code,
+                21,
+                "An Organization with the id already exists",
+                None,
+            )),
+        }
+    }
+}