Merge pull request #57 from encryption4all/fix/issue-56-smtp-credentials-separate-fields

feat: accept smtp_username and smtp_password as separate config fields

Author: rubenhensen

conf/config.dev.toml

@@ -7,7 +7,8 @@ email_from = "noreply@postguard.local"
 smtp_url = "mailcrab"
 smtp_port = 1025
 smtp_tls = false
-# smtp_credentials = ["user", "pw"]
+# smtp_username = "user"
+# smtp_password = "pw"
 allowed_origins = "^https?://(localhost|127\\.0\\.0\\.1)(:[0-9]+)?$"
 # pkg_url = "https://postguard-main.cs.ru.nl/pkg"
 # pkg_url = "https://pkg.staging.yivi.app"

conf/config.toml

@@ -5,6 +5,7 @@ data_dir = "/tmp/data"
 email_from = "noreply@postguard.nl"
 smtp_url = "mailcrab"
 smtp_port = 1025
-# smtp_credentials = ["user", "pw"]
+# smtp_username = "user"
+# smtp_password = "pw"
 allowed_origins = "^https://postguard.(eu|nl)$"
 pkg_url = "https://postguard-main.cs.ru.nl/pkg" 

cryptify/src/config.rs

@@ -7,7 +7,8 @@ pub struct RawCryptifyConfig {
     email_from: String,
     smtp_url: String,
     smtp_port: u16,
-    smtp_credentials: Option<(String, String)>,
+    smtp_username: Option<String>,
+    smtp_password: Option<String>,
     smtp_tls: Option<bool>,
     allowed_origins: String,
     pkg_url: String,
@@ -21,7 +22,8 @@ pub struct CryptifyConfig {
     email_from: lettre::message::Mailbox,
     smtp_url: String,
     smtp_port: u16,
-    smtp_credentials: Option<(String, String)>,
+    smtp_username: Option<String>,
+    smtp_password: Option<String>,
     smtp_tls: bool,
     allowed_origins: String,
     pkg_url: String,
@@ -38,7 +40,8 @@ impl From<RawCryptifyConfig> for CryptifyConfig {
             }),
             smtp_url: config.smtp_url,
             smtp_port: config.smtp_port,
-            smtp_credentials: config.smtp_credentials,
+            smtp_username: config.smtp_username,
+            smtp_password: config.smtp_password,
             smtp_tls: config.smtp_tls.unwrap_or(true),
             allowed_origins: config.allowed_origins,
             pkg_url: config.pkg_url,
@@ -67,8 +70,12 @@ impl CryptifyConfig {
         self.smtp_port
     }
 
-    pub fn smtp_credentials(&self) -> Option<&(String, String)> {
-        self.smtp_credentials.as_ref()
+    pub fn smtp_username(&self) -> Option<&str> {
+        self.smtp_username.as_deref()
+    }
+
+    pub fn smtp_password(&self) -> Option<&str> {
+        self.smtp_password.as_deref()
     }
 
     pub fn smtp_tls(&self) -> bool {

cryptify/src/email.rs

@@ -172,7 +172,7 @@ pub async fn send_email(
         config.smtp_url(),
         config.smtp_port(),
         config.smtp_tls(),
-        config.smtp_credentials().is_some()
+        config.smtp_username().is_some()
     );
     let mut mailer_builder = if config.smtp_tls() {
         SmtpTransport::starttls_relay(config.smtp_url())?.port(config.smtp_port())
@@ -183,7 +183,7 @@ pub async fn send_email(
     mailer_builder = mailer_builder.timeout(Some(std::time::Duration::from_secs(10)));
 
     // add credentials, if present
-    if let Some((username, password)) = config.smtp_credentials() {
+    if let (Some(username), Some(password)) = (config.smtp_username(), config.smtp_password()) {
         let credentials = Credentials::new(username.to_owned(), password.to_owned());
         mailer_builder = mailer_builder.credentials(credentials);
     }