handle smtp user & pass as trulty optional

Author: wojcik91

crates/defguard_mail/src/lib.rs

@@ -21,29 +21,28 @@ pub(crate) struct SmtpSettings {
     server: String,
     port: u16,
     encryption: SmtpEncryption,
-    user: String,
-    password: String,
+    user: Option<String>,
+    password: Option<String>,
     sender: String,
 }
 
 impl SmtpSettings {
     /// Constructs `SmtpSettings` from `Settings`. Returns error if `SmtpSettings` are incomplete.
     pub(crate) fn from_settings(settings: Settings) -> Result<SmtpSettings, MailError> {
-        if let (Some(server), Some(port), encryption, Some(user), Some(password), Some(sender)) = (
+        if let (Some(server), Some(port), Some(sender)) = (
             settings.smtp_server,
             settings.smtp_port,
-            settings.smtp_encryption,
-            settings.smtp_user,
-            settings.smtp_password,
             settings.smtp_sender,
         ) {
             let port = port.try_into().map_err(|_| MailError::InvalidPort(port))?;
             Ok(Self {
                 server,
                 port,
-                encryption,
-                user,
-                password: password.expose_secret().to_string(),
+                encryption: settings.smtp_encryption,
+                user: settings.smtp_user,
+                password: settings
+                    .smtp_password
+                    .map(|p| p.expose_secret().to_string()),
                 sender,
             })
         } else {

crates/defguard_mail/src/mail.rs

@@ -260,11 +260,11 @@ impl Mail {
         .timeout(Some(SMTP_TIMEOUT));
 
         // Skip credentials if any of them is empty
-        let builder = if settings.user.is_empty() || settings.password.is_empty() {
+        let builder = if let (Some(user), Some(password)) = (settings.user, settings.password) {
+            builder.credentials(Credentials::new(user, password))
+        } else {
             debug!("SMTP credentials were not provided, skipping username/password authentication");
             builder
-        } else {
-            builder.credentials(Credentials::new(settings.user, settings.password))
         };
 
         Ok(builder.build())