Replace trustpub::Config{Created,Deleted}Email structs with EmailMessage::from_template()

Author: Turbo87

src/controllers/trustpub/github_configs/create/mod.rs

@@ -1,9 +1,10 @@
 use crate::app::AppState;
 use crate::auth::AuthCheck;
 use crate::controllers::krate::load_crate;
-use crate::controllers::trustpub::github_configs::emails::ConfigCreatedEmail;
 use crate::controllers::trustpub::github_configs::json;
+use crate::email::EmailMessage;
 use crate::util::errors::{AppResult, bad_request, forbidden};
+use anyhow::Context;
 use axum::Json;
 use crates_io_database::models::OwnerKind;
 use crates_io_database::models::trustpub::NewGitHubConfig;
@@ -15,6 +16,7 @@ use crates_io_trustpub::github::validation::{
 use diesel::prelude::*;
 use diesel_async::RunQueryDsl;
 use http::request::Parts;
+use minijinja::context;
 use oauth2::AccessToken;
 use secrecy::ExposeSecret;
 
@@ -105,18 +107,18 @@ pub async fn create_trustpub_github_config(
         .collect::<Vec<_>>();
 
     for (recipient, email_address) in &recipients {
-        let email = ConfigCreatedEmail {
-            recipient,
-            user: &auth_user.gh_login,
-            krate: &krate.name,
-            repository_owner: &saved_config.repository_owner,
-            repository_name: &saved_config.repository_name,
-            workflow_filename: &saved_config.workflow_filename,
-            environment: saved_config.environment.as_deref().unwrap_or("(not set)"),
+        let context = context! {
+            recipient => recipient,
+            user => auth_user.gh_login,
+            krate => krate.name,
+            repository_owner => saved_config.repository_owner,
+            repository_name => saved_config.repository_name,
+            workflow_filename => saved_config.workflow_filename,
+            environment => saved_config.environment
         };
 
-        if let Err(err) = state.emails.send(email_address, email).await {
-            warn!("Failed to send trusted publishing notification to {email_address}: {err}")
+        if let Err(err) = send_notification_email(&state, email_address, context).await {
+            warn!("Failed to send trusted publishing notification to {email_address}: {err}");
         }
     }
 
@@ -133,3 +135,18 @@ pub async fn create_trustpub_github_config(
 
     Ok(Json(json::CreateResponse { github_config }))
 }
+
+async fn send_notification_email(
+    state: &AppState,
+    email_address: &str,
+    context: minijinja::Value,
+) -> anyhow::Result<()> {
+    let email = EmailMessage::from_template("config_created", context)
+        .context("Failed to render email template")?;
+
+    state
+        .emails
+        .send(email_address, email)
+        .await
+        .context("Failed to send email")
+}

src/controllers/trustpub/github_configs/delete/mod.rs

@@ -1,7 +1,8 @@
 use crate::app::AppState;
 use crate::auth::AuthCheck;
-use crate::controllers::trustpub::github_configs::emails::ConfigDeletedEmail;
+use crate::email::EmailMessage;
 use crate::util::errors::{AppResult, bad_request, not_found};
+use anyhow::Context;
 use axum::extract::Path;
 use crates_io_database::models::OwnerKind;
 use crates_io_database::models::trustpub::GitHubConfig;
@@ -10,6 +11,8 @@ use diesel::prelude::*;
 use diesel_async::RunQueryDsl;
 use http::StatusCode;
 use http::request::Parts;
+use minijinja::context;
+use tracing::warn;
 
 #[cfg(test)]
 mod tests;
@@ -76,20 +79,35 @@ pub async fn delete_trustpub_github_config(
         .collect::<Vec<_>>();
 
     for (recipient, email_address) in &recipients {
-        let email = ConfigDeletedEmail {
-            recipient,
-            user: &auth_user.gh_login,
-            krate: &crate_name,
-            repository_owner: &config.repository_owner,
-            repository_name: &config.repository_name,
-            workflow_filename: &config.workflow_filename,
-            environment: config.environment.as_deref().unwrap_or("(not set)"),
+        let context = context! {
+            recipient => recipient,
+            user => auth_user.gh_login,
+            krate => crate_name,
+            repository_owner => config.repository_owner,
+            repository_name => config.repository_name,
+            workflow_filename => config.workflow_filename,
+            environment => config.environment
         };
 
-        if let Err(err) = state.emails.send(email_address, email).await {
-            warn!("Failed to send trusted publishing notification to {email_address}: {err}")
+        if let Err(err) = send_notification_email(&state, email_address, context).await {
+            warn!("Failed to send trusted publishing notification to {email_address}: {err}");
         }
     }
 
     Ok(StatusCode::NO_CONTENT)
 }
+
+async fn send_notification_email(
+    state: &AppState,
+    email_address: &str,
+    context: minijinja::Value,
+) -> anyhow::Result<()> {
+    let email = EmailMessage::from_template("config_deleted", context)
+        .context("Failed to render email template")?;
+
+    state
+        .emails
+        .send(email_address, email)
+        .await
+        .context("Failed to send email")
+}

src/controllers/trustpub/github_configs/emails.rs

@@ -1,5 +1,4 @@
 pub mod create;
 pub mod delete;
-pub mod emails;
 pub mod json;
 pub mod list;

src/controllers/trustpub/github_configs/mod.rs

@@ -0,0 +1,14 @@
+Hello {{ recipient }}!
+
+crates.io user {{ user }} added a new "Trusted Publishing" configuration for GitHub Actions to a crate that you manage ({{ krate }}). Trusted publishers act as trusted users and can publish new versions of the crate automatically.
+
+Trusted Publishing configuration:
+
+- Repository owner: {{ repository_owner }}
+- Repository name: {{ repository_name }}
+- Workflow filename: {{ workflow_filename }}
+- Environment: {{ environment or "(not set)" }}
+
+If you did not make this change and you think it was made maliciously, you can remove the configuration from the crate via the "Settings" tab on the crate's page.
+
+If you are unable to revert the change and need to do so, you can email help@crates.io to communicate with the crates.io support team.

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

@@ -0,0 +1 @@
+crates.io: Trusted Publishing configuration added to {{ krate }}

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

@@ -0,0 +1,12 @@
+Hello {{ recipient }}!
+
+crates.io user {{ user }} removed a "Trusted Publishing" configuration for GitHub Actions from a crate that you manage ({{ krate }}).
+
+Trusted Publishing configuration:
+
+- Repository owner: {{ repository_owner }}
+- Repository name: {{ repository_name }}
+- Workflow filename: {{ workflow_filename }}
+- Environment: {{ environment or "(not set)" }}
+
+If you did not make this change and you think it was made maliciously, you can email help@crates.io to communicate with the crates.io support team.

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

@@ -0,0 +1 @@
+crates.io: Trusted Publishing configuration removed from {{ krate }}