Fix blank email validation (#591)

Author: zupzup

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 * Add endpoints to fetch files as base64 for identity, contacts, companies and bills
 * Add option to remove files for identity, contacts and companies - if the file upload id in the payload is missing, it's ignored, if it's explicitly set to undefined, the file is removed
+* Fix blank email validation for contacts and identities
 
 # 0.4.2
 

crates/bcr-ebill-core/src/contact/validation.rs

@@ -25,13 +25,18 @@ pub fn validate_create_contact(
             // only node id and name need to be set
         }
         ContactType::Person | ContactType::Company => {
-            // email and address need to be set
+            // email and address need to be set and not blank
             if let Some(pa) = postal_address {
                 pa.validate()?;
             } else {
                 return Err(ValidationError::FieldEmpty(Field::Address));
             }
-            if email.is_none() {
+
+            if let Some(set_email) = email {
+                if set_email.trim().is_empty() {
+                    return Err(ValidationError::FieldEmpty(Field::Email));
+                }
+            } else {
                 return Err(ValidationError::FieldEmpty(Field::Email));
             }
             util::validate_file_upload_id(avatar_file_upload_id.as_deref())?;
@@ -99,6 +104,7 @@ mod tests {
     #[case::invalid_node_id(ContactType::Anon, node_id_regtest(), "some name", &None, &None, &None, &None, ValidationError::InvalidNodeId)]
     #[case::invalid_name(ContactType::Anon, node_id_test(), "", &None, &None, &None, &None, ValidationError::FieldEmpty(Field::Name))]
     #[case::invalid_email(ContactType::Person, node_id_test(), "some name", &None, &Some(valid_address()), &None, &None, ValidationError::FieldEmpty(Field::Email))]
+    #[case::invalid_email_blank(ContactType::Person, node_id_test(), "some name", &Some("".into()), &Some(valid_address()), &None, &None, ValidationError::FieldEmpty(Field::Email))]
     #[case::invalid_address(ContactType::Person, node_id_test(), "some name", &Some("[email protected]".into()), &None, &None, &None, ValidationError::FieldEmpty(Field::Address))]
     #[case::blank_city(ContactType::Person, node_id_test(), "some name", &Some("[email protected]".into()), &Some(PostalAddress { city: "".into(), ..valid_address()}), &None, &None, ValidationError::FieldEmpty(Field::City))]
     #[case::blank_country(ContactType::Person, node_id_test(), "some name", &Some("[email protected]".into()), &Some(PostalAddress { country: "".into(), ..valid_address()}), &None, &None, ValidationError::FieldEmpty(Field::Country))]

crates/bcr-ebill-core/src/identity/validation.rs

@@ -19,8 +19,12 @@ pub fn validate_create_identity(
             // only node id and name need to be set
         }
         IdentityType::Ident => {
-            // email needs to be set
-            if email.is_none() {
+            // email needs to be set and not blank
+            if let Some(set_email) = email {
+                if set_email.trim().is_empty() {
+                    return Err(ValidationError::FieldEmpty(Field::Email));
+                }
+            } else {
                 return Err(ValidationError::FieldEmpty(Field::Email));
             }
             postal_address.validate()?;
@@ -85,6 +89,7 @@ mod tests {
     #[rstest]
     #[case::invalid_name(IdentityType::Anon, "", &None, &OptionalPostalAddress::empty(), &None, &None, ValidationError::FieldEmpty(Field::Name))]
     #[case::ident_no_email(IdentityType::Ident, "some name", &None, &OptionalPostalAddress::empty(), &None, &None, ValidationError::FieldEmpty(Field::Email))]
+    #[case::ident_blank_email(IdentityType::Ident, "some name", &Some("".into()), &OptionalPostalAddress::empty(), &None, &None, ValidationError::FieldEmpty(Field::Email))]
     #[case::ident_blank_address(IdentityType::Ident, "some name", &Some("[email protected]".into()), &OptionalPostalAddress { country: None, city: None, zip: None, address: Some("".into()) }, &None, &None, ValidationError::FieldEmpty(Field::Address))]
     #[case::ident_blank_city(IdentityType::Ident, "some name", &Some("[email protected]".into()), &OptionalPostalAddress { country: None, address: None, zip: None, city: Some("".into()) }, &None, &None, ValidationError::FieldEmpty(Field::City))]
     #[case::ident_blank_country(IdentityType::Ident, "some name", &Some("[email protected]".into()), &OptionalPostalAddress { address: None, city: None, zip: None, country: Some("".into()) }, &None, &None, ValidationError::FieldEmpty(Field::Country))]