email: Simplify config_deleted context

Author: Turbo87

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

@@ -4,8 +4,8 @@ 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;
+use crates_io_database::models::{Crate, OwnerKind};
 use crates_io_database::schema::{crate_owners, crates, emails, trustpub_configs_github, users};
 use diesel::prelude::*;
 use diesel_async::RunQueryDsl;
@@ -39,12 +39,12 @@ pub async fn delete_trustpub_github_config(
     let auth_user = auth.user();
 
     // Check that a trusted publishing config with the given ID exists,
-    // and fetch the corresponding crate ID and name.
-    let (config, crate_name) = trustpub_configs_github::table
+    // and fetch the corresponding crate.
+    let (config, krate) = trustpub_configs_github::table
         .inner_join(crates::table)
         .filter(trustpub_configs_github::id.eq(id))
-        .select((GitHubConfig::as_select(), crates::name))
-        .first::<(GitHubConfig, String)>(&mut conn)
+        .select((GitHubConfig::as_select(), Crate::as_select()))
+        .first::<(GitHubConfig, Crate)>(&mut conn)
         .await
         .optional()?
         .ok_or_else(not_found)?;
@@ -79,15 +79,7 @@ pub async fn delete_trustpub_github_config(
         .collect::<Vec<_>>();
 
     for (recipient, email_address) in &recipients {
-        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
-        };
+        let context = context! { recipient, auth_user, krate, config };
 
         if let Err(err) = send_notification_email(&state, email_address, context).await {
             warn!("Failed to send trusted publishing notification to {email_address}: {err}");

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

@@ -3,14 +3,14 @@
 {% block content %}
 Hello {{ recipient }}!
 
-crates.io user {{ user }} removed a "Trusted Publishing" configuration for GitHub Actions from a crate that you manage ("{{ krate }}").
+crates.io user {{ auth_user.gh_login }} removed a "Trusted Publishing" configuration for GitHub Actions from a crate that you manage ("{{ krate.name }}").
 
 Trusted Publishing configuration:
 
-- Repository owner: {{ repository_owner }}
-- Repository name: {{ repository_name }}
-- Workflow filename: {{ workflow_filename }}
-- Environment: {{ environment or "(not set)" }}
+- Repository owner: {{ config.repository_owner }}
+- Repository name: {{ config.repository_name }}
+- Workflow filename: {{ config.workflow_filename }}
+- Environment: {{ config.environment or "(not set)" }}
 
 If you did not make this change and you think it was made maliciously, you can email [email protected] for assistance.
 {% endblock %}

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

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