From 9dc56442644d8bd8ad2eb67f07cb2763b3a2fe30 Mon Sep 17 00:00:00 2001 From: Ken <131881470+Keniis0712@users.noreply.github.com> Date: Thu, 3 Jul 2025 23:41:13 +0800 Subject: [PATCH] fix: fixed wrong email address (#3884) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix wrong email address Signed-off-by: Ken <131881470+Keniis0712@users.noreply.github.com> * Decouple SMTP auth identity from message sender Signed-off-by: Ken <131881470+Keniis0712@users.noreply.github.com> * Add new configurations to .env file Signed-off-by: Ken <131881470+Keniis0712@users.noreply.github.com> * Update mod.rs Signed-off-by: Ken <131881470+Keniis0712@users.noreply.github.com> * Remove unused import Signed-off-by: Ken <131881470+Keniis0712@users.noreply.github.com> * Give SMTP_FROM_ADDRESS a default value Co-authored-by: Alejandro González <7822554+AlexTMjugador@users.noreply.github.com> Signed-off-by: Ken <131881470+Keniis0712@users.noreply.github.com> * Add the correct host name Signed-off-by: Ken <131881470+Keniis0712@users.noreply.github.com> * Fix CI failure Signed-off-by: Ken <131881470+Keniis0712@users.noreply.github.com> * Update mod.rs Signed-off-by: Ken <131881470+Keniis0712@users.noreply.github.com> --------- Signed-off-by: Ken <131881470+Keniis0712@users.noreply.github.com> Co-authored-by: Alejandro González <7822554+AlexTMjugador@users.noreply.github.com> Co-authored-by: Emma Alexia --- apps/labrinth/.env.local | 2 ++ apps/labrinth/src/auth/email/mod.rs | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/labrinth/.env.local b/apps/labrinth/.env.local index c66948fe1..09b6e719d 100644 --- a/apps/labrinth/.env.local +++ b/apps/labrinth/.env.local @@ -85,6 +85,8 @@ TREMENDOUS_CAMPAIGN_ID=none HCAPTCHA_SECRET=none +SMTP_FROM_NAME=Modrinth +SMTP_FROM_ADDRESS=no-reply@mail.modrinth.com SMTP_USERNAME=none SMTP_PASSWORD=none SMTP_HOST=none diff --git a/apps/labrinth/src/auth/email/mod.rs b/apps/labrinth/src/auth/email/mod.rs index 269578db3..2220f389d 100644 --- a/apps/labrinth/src/auth/email/mod.rs +++ b/apps/labrinth/src/auth/email/mod.rs @@ -2,7 +2,7 @@ use lettre::message::Mailbox; use lettre::message::header::ContentType; use lettre::transport::smtp::authentication::Credentials; use lettre::transport::smtp::client::{Tls, TlsParameters}; -use lettre::{Address, Message, SmtpTransport, Transport}; +use lettre::{Message, SmtpTransport, Transport}; use thiserror::Error; use tracing::warn; @@ -23,11 +23,13 @@ pub fn send_email_raw( subject: String, body: String, ) -> Result<(), MailError> { + let from_name = dotenvy::var("SMTP_FROM_NAME") + .unwrap_or_else(|_| "Modrinth".to_string()); + let from_address = dotenvy::var("SMTP_FROM_ADDRESS") + .unwrap_or_else(|_| "no-reply@mail.modrinth.com".to_string()); + let email = Message::builder() - .from(Mailbox::new( - Some("Modrinth".to_string()), - Address::new("no-reply", "mail.modrinth.com")?, - )) + .from(Mailbox::new(Some(from_name), from_address.parse()?)) .to(to.parse()?) .subject(subject) .header(ContentType::TEXT_HTML)