add min requirements to mandatory profile fields

ambrosus · Feb 22, 2024 · 000cfaa · 000cfaa
1 parent 8b35c25
commit 000cfaa
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 42 deletions.
diff --git a/gov-portal-db/config/default.json b/gov-portal-db/config/default.json
@@ -9,12 +9,17 @@
         "lifetime": 600,
         "userProfileAttributes": {
             "nameMaxLength": 64,
+            "nameMinLength": 2,
             "roleMaxLength": 50,
+            "roleMinLength": 2,
             "emailMaxLength": 64,
+            "emailMinLength": 5,
             "telegramMaxLength": 32,
             "twitterMaxLength": 32,
             "bioMaxLength": 250,
-            "avatarUrlMaxLength": 250
+            "bioMinLength": 2,
+            "avatarUrlMaxLength": 250,
+            "avatarUrlMinLength": 7
         }
     },
     "mongo": {

diff --git a/gov-portal-db/src/users_manager/mod.rs b/gov-portal-db/src/users_manager/mod.rs
@@ -39,12 +39,36 @@ pub struct UsersManagerConfig {
 #[serde(rename_all = "camelCase")]
 pub struct UserProfileAttributes {
     pub name_max_length: usize,
+    pub name_min_length: usize,
     pub role_max_length: usize,
+    pub role_min_length: usize,
     pub email_max_length: usize,
+    pub email_min_length: usize,
     pub telegram_max_length: usize,
     pub twitter_max_length: usize,
     pub bio_max_length: usize,
+    pub bio_min_length: usize,
     pub avatar_url_max_length: usize,
+    pub avatar_url_min_length: usize,
+}
+
+impl Default for UserProfileAttributes {
+    fn default() -> Self {
+        Self {
+            name_max_length: 64,
+            name_min_length: 2,
+            role_max_length: 50,
+            role_min_length: 2,
+            email_max_length: 64,
+            email_min_length: 5, // length("[email protected]")
+            telegram_max_length: 32,
+            twitter_max_length: 32,
+            bio_max_length: 250,
+            bio_min_length: 2,
+            avatar_url_max_length: 250,
+            avatar_url_min_length: 7, // length("a://a.a")
+        }
+    }
 }
 
 #[derive(Debug, PartialEq)]
@@ -240,33 +264,35 @@ impl UsersManager {
 
     /// Verifies user profile [`User`] struct fields for correctness
     fn verify_user(&self, user: &UserInfo) -> Result<(), error::Error> {
-        if user
-            .name
-            .as_ref()
-            .is_some_and(|value| value.len() > self.config.user_profile_attributes.name_max_length)
-        {
+        if user.name.as_ref().is_some_and(|value| {
+            value.len() < self.config.user_profile_attributes.name_min_length
+                || value.len() > self.config.user_profile_attributes.name_max_length
+        }) {
             return Err(error::Error::InvalidInput(format!(
-                "Name too long (max: {})",
+                "Name doesn't met requirements (min: {}, max: {})",
+                self.config.user_profile_attributes.name_min_length,
                 self.config.user_profile_attributes.name_max_length
             )));
         }
 
-        if user
-            .role
-            .as_ref()
-            .is_some_and(|value| value.len() > self.config.user_profile_attributes.role_max_length)
-        {
+        if user.role.as_ref().is_some_and(|value| {
+            value.len() < self.config.user_profile_attributes.role_min_length
+                || value.len() > self.config.user_profile_attributes.role_max_length
+        }) {
             return Err(error::Error::InvalidInput(format!(
-                "Role too long (max: {})",
+                "Role doesn't met requirements (min: {}, max: {})",
+                self.config.user_profile_attributes.role_min_length,
                 self.config.user_profile_attributes.role_max_length
             )));
         }
 
         if user.email.as_ref().is_some_and(|value| {
-            value.as_str().len() > self.config.user_profile_attributes.email_max_length
+            value.as_str().len() < self.config.user_profile_attributes.email_min_length
+                || value.as_str().len() > self.config.user_profile_attributes.email_max_length
         }) {
             return Err(error::Error::InvalidInput(format!(
-                "Email too long (max: {})",
+                "Email doesn't met requirements (min: {}, max: {})",
+                self.config.user_profile_attributes.email_min_length,
                 self.config.user_profile_attributes.email_max_length
             )));
         }
@@ -289,22 +315,24 @@ impl UsersManager {
             )));
         }
 
-        if user
-            .bio
-            .as_ref()
-            .is_some_and(|value| value.len() > self.config.user_profile_attributes.bio_max_length)
-        {
+        if user.bio.as_ref().is_some_and(|value| {
+            value.len() < self.config.user_profile_attributes.bio_min_length
+                || value.len() > self.config.user_profile_attributes.bio_max_length
+        }) {
             return Err(error::Error::InvalidInput(format!(
-                "Bio too long (max: {})",
+                "Bio doesn't met requirements (min: {}, max: {})",
+                self.config.user_profile_attributes.bio_min_length,
                 self.config.user_profile_attributes.bio_max_length
             )));
         }
 
         if user.avatar.as_ref().is_some_and(|value| {
-            value.as_str().len() > self.config.user_profile_attributes.avatar_url_max_length
+            value.as_str().len() < self.config.user_profile_attributes.avatar_url_min_length
+                || value.as_str().len() > self.config.user_profile_attributes.avatar_url_max_length
         }) {
             return Err(error::Error::InvalidInput(format!(
-                "Avatar URL too long (max: {})",
+                "Avatar URL doesn't met requirements (min: {}, max: {})",
+                self.config.user_profile_attributes.avatar_url_min_length,
                 self.config.user_profile_attributes.avatar_url_max_length
             )));
         }
@@ -337,12 +365,17 @@ mod tests {
                 "lifetime": 600,
                 "userProfileAttributes": {
                     "nameMaxLength": 64,
+                    "nameMinLength": 2,
                     "roleMaxLength": 50,
+                    "roleMinLength": 2,
                     "emailMaxLength": 64,
+                    "emailMinLength": 5,
                     "telegramMaxLength": 32,
                     "twitterMaxLength": 32,
                     "bioMaxLength": 250,
-                    "avatarUrlMaxLength": 250
+                    "bioMinLength": 2,
+                    "avatarUrlMaxLength": 250,
+                    "avatarUrlMinLength": 7
                 }
             }
         "#,

diff --git a/gov-portal-db/tests/test_db.rs b/gov-portal-db/tests/test_db.rs
@@ -21,15 +21,7 @@ async fn test_register_user() -> Result<(), anyhow::Error> {
     let registration_config = UsersManagerConfig {
         secret: "IntegrationTestRegistrationSecretForJWT".to_owned(),
         lifetime: std::time::Duration::from_secs(600),
-        user_profile_attributes: UserProfileAttributes {
-            name_max_length: 64,
-            role_max_length: 50,
-            email_max_length: 64,
-            telegram_max_length: 32,
-            twitter_max_length: 32,
-            bio_max_length: 250,
-            avatar_url_max_length: 250,
-        },
+        user_profile_attributes: UserProfileAttributes::default(),
     };
 
     let users_manager = UsersManager::new(&mongo_config, registration_config).await?;
@@ -132,15 +124,7 @@ async fn test_complete_profile() -> Result<(), anyhow::Error> {
     let registration_config = UsersManagerConfig {
         secret: "IntegrationTestRegistrationSecretForJWT".to_owned(),
         lifetime: std::time::Duration::from_secs(600),
-        user_profile_attributes: UserProfileAttributes {
-            name_max_length: 64,
-            role_max_length: 50,
-            email_max_length: 64,
-            telegram_max_length: 32,
-            twitter_max_length: 32,
-            bio_max_length: 250,
-            avatar_url_max_length: 250,
-        },
+        user_profile_attributes: UserProfileAttributes::default(),
     };
 
     let users_manager = UsersManager::new(&mongo_config, registration_config).await?;