email: Simplify config_created context

Author: Turbo87

crates/crates_io_database/src/models/krate.rs

@@ -12,6 +12,7 @@ use diesel::sql_types::{Bool, Integer, Text};
 use diesel_async::scoped_futures::ScopedFutureExt;
 use diesel_async::{AsyncConnection, AsyncPgConnection, RunQueryDsl};
 use secrecy::SecretString;
+use serde::Serialize;
 use thiserror::Error;
 use tracing::instrument;
 
@@ -35,7 +36,9 @@ pub struct CrateName {
     pub name: String,
 }
 
-#[derive(Debug, Clone, Queryable, Identifiable, AsChangeset, QueryableByName, Selectable)]
+#[derive(
+    Debug, Clone, Queryable, Identifiable, AsChangeset, QueryableByName, Selectable, Serialize,
+)]
 #[diesel(table_name = crates, check_for_backend(diesel::pg::Pg))]
 pub struct Crate {
     pub id: i32,

crates/crates_io_database/src/models/trustpub/github_config.rs

@@ -2,8 +2,9 @@ use crate::schema::trustpub_configs_github;
 use chrono::{DateTime, Utc};
 use diesel::prelude::*;
 use diesel_async::{AsyncPgConnection, RunQueryDsl};
+use serde::Serialize;
 
-#[derive(Debug, Identifiable, Queryable, Selectable)]
+#[derive(Debug, Identifiable, Queryable, Selectable, Serialize)]
 #[diesel(table_name = trustpub_configs_github, check_for_backend(diesel::pg::Pg))]
 pub struct GitHubConfig {
     pub id: i32,

crates/crates_io_database/src/models/user.rs

@@ -6,16 +6,18 @@ use diesel::sql_types::Integer;
 use diesel::upsert::excluded;
 use diesel_async::{AsyncPgConnection, RunQueryDsl};
 use secrecy::SecretString;
+use serde::Serialize;
 
 use crate::models::{Crate, CrateOwner, Email, Owner, OwnerKind};
 use crate::schema::{crate_owners, emails, users};
 use crates_io_diesel_helpers::lower;
 
 /// The model representing a row in the `users` database table.
-#[derive(Clone, Debug, Queryable, Identifiable, Selectable)]
+#[derive(Clone, Debug, Queryable, Identifiable, Selectable, Serialize)]
 pub struct User {
     pub id: i32,
     #[diesel(deserialize_as = String)]
+    #[serde(skip)]
     pub gh_access_token: SecretString,
     pub gh_login: String,
     pub name: Option<String>,

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

@@ -108,15 +108,7 @@ pub async fn create_trustpub_github_config(
         .collect::<Vec<_>>();
 
     for (recipient, email_address) in &recipients {
-        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
-        };
+        let context = context! { recipient, auth_user, krate, saved_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_created/body.txt.j2

@@ -3,14 +3,14 @@
 {% block content %}
 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.
+crates.io user {{ auth_user.gh_login }} added a new "Trusted Publishing" configuration for GitHub Actions to a crate that you manage ("{{ krate.name }}"). 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)" }}
+- Repository owner: {{ saved_config.repository_owner }}
+- Repository name: {{ saved_config.repository_name }}
+- Workflow filename: {{ saved_config.workflow_filename }}
+- Environment: {{ saved_config.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.
 

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

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