Replace NewTokenEmail struct with EmailMessage::from_template()

Author: Turbo87

src/controllers/token.rs

@@ -1,3 +1,4 @@
+use crate::email::EmailMessage;
 use crate::models::ApiToken;
 use crate::schema::api_tokens;
 use crate::views::EncodableApiTokenWithToken;
@@ -20,6 +21,7 @@ use diesel::sql_types::Timestamptz;
 use diesel_async::RunQueryDsl;
 use http::StatusCode;
 use http::request::Parts;
+use minijinja::context;
 use secrecy::ExposeSecret;
 
 #[derive(Deserialize)]
@@ -171,17 +173,12 @@ pub async fn create_api_token(
         .build();
 
     if let Some(recipient) = recipient {
-        let email = NewTokenEmail {
-            token_name: &new.api_token.name,
-            user_name: &user.gh_login,
-            domain: &app.emails.domain,
-        };
-
         // At this point the token has been created so failing to send the
         // email should not cause an error response to be returned to the
         // caller.
-        let email_ret = app.emails.send(&recipient, email).await;
-        if let Err(e) = email_ret {
+        if let Err(e) =
+            send_creation_email(&app.emails, &recipient, &new.api_token.name, &user.gh_login).await
+        {
             error!("Failed to send token creation email: {e}")
         }
     }
@@ -286,28 +283,17 @@ pub async fn revoke_current_api_token(app: AppState, req: Parts) -> AppResult<Re
     Ok(StatusCode::NO_CONTENT.into_response())
 }
 
-struct NewTokenEmail<'a> {
-    token_name: &'a str,
-    user_name: &'a str,
-    domain: &'a str,
-}
-
-impl crate::email::Email for NewTokenEmail<'_> {
-    fn subject(&self) -> String {
-        format!("crates.io: New API token \"{}\" created", self.token_name)
-    }
-
-    fn body(&self) -> String {
-        format!(
-            "\
-Hello {user_name}!
-
-A new API token with the name \"{token_name}\" was recently added to your {domain} account.
-
-If this wasn't you, you should revoke the token immediately: https://{domain}/settings/tokens",
-            token_name = self.token_name,
-            user_name = self.user_name,
-            domain = self.domain,
-        )
-    }
+async fn send_creation_email(
+    emails: &crate::Emails,
+    recipient: &str,
+    token_name: &str,
+    user_name: &str,
+) -> anyhow::Result<()> {
+    let context = context! {
+        token_name,
+        user_name,
+        domain => emails.domain,
+    };
+    let email = EmailMessage::from_template("new_token", context)?;
+    Ok(emails.send(recipient, email).await?)
 }

src/email/templates/new_token/body.txt.j2

@@ -0,0 +1,5 @@
+Hello {{ user_name }}!
+
+A new API token with the name "{{ token_name }}" was recently added to your {{ domain }} account.
+
+If this wasn't you, you should revoke the token immediately: https://{{ domain }}/settings/tokens

src/email/templates/new_token/subject.txt.j2

@@ -0,0 +1 @@
+crates.io: New API token "{{ token_name }}" created