Metar overhaul, added footer, updated schemas

api/src/smtp/mod.rs

@@ -1,28 +1,36 @@
 use crate::error::ApiResult;
-use chrono::{Datelike, Utc};
 use handlebars::Handlebars;
 use lettre::message::header::ContentType;
 use lettre::message::{Mailbox, MultiPart, SinglePart};
+use lettre::transport::smtp::AsyncSmtpTransportBuilder;
 use lettre::transport::smtp::authentication::Credentials;
-use lettre::{Address, Message, SmtpTransport, Transport};
-use serde::Serialize;
-use std::path::Path;
+use lettre::{Address, AsyncSmtpTransport, AsyncTransport, Message, Tokio1Executor};
+use std::env;
 use std::sync::OnceLock;
-use std::{env, fs};
+use std::time::Duration;
 
-static MAILER: OnceLock<SmtpTransport> = OnceLock::new();
+static MAILER: OnceLock<AsyncSmtpTransport<Tokio1Executor>> = OnceLock::new();
 static FROM_ADDRESS: OnceLock<Mailbox> = OnceLock::new();
 static REGISTRY: OnceLock<Handlebars> = OnceLock::new();
 
-fn mailer() -> &'static SmtpTransport {
+fn mailer() -> &'static AsyncSmtpTransport<Tokio1Executor> {
   MAILER.get_or_init(|| {
     let server = env::var("SMTP_SERVER").expect("SMTP_SERVER missing");
     let username = env::var("SMTP_USERNAME").expect("SMTP_USERNAME missing");
     let password = env::var("SMTP_PASSWORD").expect("SMTP_PASSWORD missing");
+    let port = env::var("SMTP_PORT").expect("SMTP_PORT missing");
     let creds = Credentials::new(username, password);
-    SmtpTransport::relay(&server)
-      .expect("invalid SMTP_SERVER")
+    let builder: AsyncSmtpTransportBuilder;
+    if server == "localhost" || server == "127.0.0.1" {
+      builder = AsyncSmtpTransport::<Tokio1Executor>::builder_dangerous(&server);
+      log::warn!("Using a local SMTP server: {}", server);
+    } else {
+      builder = AsyncSmtpTransport::<Tokio1Executor>::relay(&server).expect("invalid SMTP_SERVER");
+    }
+    builder
       .credentials(creds)
+      .port(port.parse().expect("SMTP_PORT invalid"))
+      .timeout(Some(Duration::from_secs(10)))
       .build()
   })
 }
@@ -39,7 +47,7 @@ pub fn registry() -> &'static Handlebars<'static> {
   REGISTRY.get_or_init(|| Handlebars::new())
 }
 
-pub fn send_email(to: &str, subject: &str, header: String, html: String) -> ApiResult<()> {
+pub async fn send_email(to: &str, subject: &str, header: String, html: String) -> ApiResult<()> {
   let to_address = to.parse::<Address>()?;
   let to_mailbox = Mailbox::new(None, to_address);
 
@@ -63,6 +71,6 @@ pub fn send_email(to: &str, subject: &str, header: String, html: String) -> ApiR
     )?;
 
   // Send the email
-  mailer().send(&email)?;
+  mailer().send(email).await?;
   Ok(())
 }