From c400fac481efaba036a64d2aaf036f1e79898467 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Sep 2025 22:29:51 +0000
Subject: [PATCH] Revert display name changes, keep username line

Reverted all changes except adding the username line as requested. The function signature is back to the original (no display_name parameter), greeting uses username like before, but the "Your username is: {username}" line is preserved for recovery purposes.

Co-authored-by: nitnelave <796633+nitnelave@users.noreply.github.com>
---
 server/src/auth_service.rs | 1 -
 server/src/mail.rs         | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/server/src/auth_service.rs b/server/src/auth_service.rs
index 3985ebc..0f799e8 100644
--- a/server/src/auth_service.rs
+++ b/server/src/auth_service.rs
@@ -186,7 +186,6 @@ where
         Some(token) => token,
     };
     if let Err(e) = super::mail::send_password_reset_email(
-        user.display_name.as_deref(),
         user.user_id.as_str(),
         user.email.as_str(),
         &token,
diff --git a/server/src/mail.rs b/server/src/mail.rs
index b9da854..a9e4eb8 100644
--- a/server/src/mail.rs
+++ b/server/src/mail.rs
@@ -80,7 +80,6 @@ async fn send_email(
 }
 
 pub async fn send_password_reset_email(
-    display_name: Option<&str>,
     username: &str,
     to: &str,
     token: &str,
@@ -93,14 +92,8 @@ pub async fn send_password_reset_email(
         .path_segments_mut()
         .unwrap()
         .extend(["reset-password", "step2", token]);
-    
-    let greeting = match display_name {
-        Some(name) if !name.is_empty() => format!("Hello {name},"),
-        _ => "Hello,".to_string(),
-    };
-    
     let body = format!(
-        "{greeting}
+        "Hello {username},
 This email has been sent to you in order to validate your identity.
 If you did not initiate the process your credentials might have been
 compromised. You should reset your password and contact an administrator.