backend: only include smtp library when not testing.

Author: ffreddow

backend/src/lib.rs

@@ -86,7 +86,7 @@ pub struct BridgeState {
 pub struct AppState {
     pub pool: Pool,
     pub jwt_secret: String,
-    pub mailer: SmtpTransport,
+    pub mailer: Option<SmtpTransport>,
     pub frontend_url: String,
     pub sender_email: String,
     pub sender_name: String,
@@ -250,7 +250,6 @@ pub(crate) mod tests {
     };
     use diesel::r2d2::ConnectionManager;
     use ipnetwork::Ipv4Network;
-    use lettre::transport::smtp::authentication::Credentials;
     use lru::LruCache;
     use rand::TryRngCore;
     use rand_core::OsRng;
@@ -295,18 +294,10 @@ pub(crate) mod tests {
     ) -> web::Data<AppState> {
         let pool = pool.unwrap_or_else(|| db_connector::test_connection_pool());
 
-        let mail = std::env::var("EMAIL_USER").expect("EMAIL must be set");
-        let pass = std::env::var("EMAIL_PASS").expect("EMAIL_PASS must be set");
-        let mailer = SmtpTransport::relay("mail.tinkerforge.com")
-            .unwrap()
-            .port(465)
-            .credentials(Credentials::new(mail, pass))
-            .build();
-
         let state = AppState {
             pool: pool.clone(),
             jwt_secret: std::env::var("JWT_SECRET").expect("JWT_SECRET must be set!"),
-            mailer,
+            mailer: None,
             frontend_url: std::env::var("FRONTEND_URL").expect("FRONTEND_URL must be set!"),
             sender_email: String::new(),
             sender_name: String::new(),

backend/src/main.rs

@@ -131,26 +131,28 @@ async fn main() -> std::io::Result<()> {
 
     reset_wg_keys(&pool);
 
-    let email = std::env::var("EMAIL_USER").expect("EMAIL_USER must be set");
-    let pass = std::env::var("EMAIL_PASS").expect("EMAIL_PASS must be set");
-    let relay = std::env::var("EMAIL_RELAY").expect("EMAIL_RELAY must be set");
-    let port: u16 = std::env::var("EMAIL_RELAY_PORT")
-        .expect("EMAIL_RELAY_PORT must be set")
-        .parse()
-        .unwrap();
-    let mailer = SmtpTransport::starttls_relay(&relay)
-        .unwrap()
-        .port(port)
-        .credentials(Credentials::new(email, pass))
-        .build();
+    let mailer = {
+        let email = std::env::var("EMAIL_USER").expect("EMAIL_USER must be set");
+        let pass = std::env::var("EMAIL_PASS").expect("EMAIL_PASS must be set");
+        let relay = std::env::var("EMAIL_RELAY").expect("EMAIL_RELAY must be set");
+        let port: u16 = std::env::var("EMAIL_RELAY_PORT")
+            .expect("EMAIL_RELAY_PORT must be set")
+            .parse()
+            .unwrap();
+        SmtpTransport::starttls_relay(&relay)
+            .unwrap()
+            .port(port)
+            .credentials(Credentials::new(email, pass))
+            .build()
+    };
 
     let sender_email = std::env::var("SENDER_EMAIL").expect("SENDER_EMAIL must be set");
     let sender_name = std::env::var("SENDER_NAME").expect("SENDER_NAME must be set");
 
     let state = web::Data::new(AppState {
         pool: pool.clone(),
         jwt_secret: std::env::var("JWT_SECRET").expect("JWT_SECRET must be set!"),
-        mailer,
+        mailer: Some(mailer),
         frontend_url: std::env::var("FRONTEND_URL").expect("FRONTEND_URL must be set!"),
         sender_email,
         sender_name,

backend/src/utils.rs

@@ -28,7 +28,9 @@ use diesel::{
     result::Error::NotFound,
     PgConnection,
 };
+#[cfg(not(test))]
 use lettre::message::header::ContentType;
+#[cfg(not(test))]
 use lettre::{Message, Transport};
 use rand::Rng;
 
@@ -159,21 +161,35 @@ pub async fn validate_auth_token(
 }
 
 pub fn send_email(email: &str, subject: &str, body: String, state: &web::Data<AppState>) {
-    let email = Message::builder()
-        .from(
-            format!("{} <{}>", state.sender_name, state.sender_email)
-                .parse()
-                .unwrap(),
-        )
-        .to(email.parse().unwrap())
-        .subject(subject)
-        .header(ContentType::TEXT_HTML)
-        .body(body)
-        .unwrap();
-
-    match state.mailer.send(&email) {
-        Ok(_) => println!("Email sent successfully!"),
-        Err(e) => panic!("Could not send email: {e:?}"),
+    #[cfg(not(test))]
+    {
+        if let Some(ref mailer) = state.mailer {
+            let email = Message::builder()
+                .from(
+                    format!("{} <{}>", state.sender_name, state.sender_email)
+                        .parse()
+                        .unwrap(),
+                )
+                .to(email.parse().unwrap())
+                .subject(subject)
+                .header(ContentType::TEXT_HTML)
+                .body(body)
+                .unwrap();
+
+            match mailer.send(&email) {
+                Ok(_) => println!("Email sent successfully!"),
+                Err(e) => panic!("Could not send email: {e:?}"),
+            }
+        } else {
+            println!("No mailer configured, email not sent");
+        }
+    }
+
+    #[cfg(test)]
+    {
+        let _ = body;
+        let _ = state;
+        println!("Test mode: Email would be sent to {} with subject '{}'", email, subject);
     }
 }