From d60f2ed50be429e38b4219b27c27992b585cef12 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Sat, 29 Mar 2025 15:02:59 -0400
Subject: [PATCH] =?UTF-8?q?=E2=9C=89=EF=B8=8F=20fix:=20Fallback=20For=20Us?=
 =?UTF-8?q?er=20Name=20In=20Email=20Templates=20(#6620)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/server/services/AuthService.js | 8 ++++----
 api/typedefs.js                    | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/api/server/services/AuthService.js b/api/server/services/AuthService.js
index 3c02b7eea..6ad4a3acf 100644
--- a/api/server/services/AuthService.js
+++ b/api/server/services/AuthService.js
@@ -91,7 +91,7 @@ const sendVerificationEmail = async (user) => {
     subject: 'Verify your email',
     payload: {
       appName: process.env.APP_TITLE || 'LibreChat',
-      name: user.name,
+      name: user.name || user.username || user.email,
       verificationLink: verificationLink,
       year: new Date().getFullYear(),
     },
@@ -278,7 +278,7 @@ const requestPasswordReset = async (req) => {
       subject: 'Password Reset Request',
       payload: {
         appName: process.env.APP_TITLE || 'LibreChat',
-        name: user.name,
+        name: user.name || user.username || user.email,
         link: link,
         year: new Date().getFullYear(),
       },
@@ -331,7 +331,7 @@ const resetPassword = async (userId, token, password) => {
       subject: 'Password Reset Successfully',
       payload: {
         appName: process.env.APP_TITLE || 'LibreChat',
-        name: user.name,
+        name: user.name || user.username || user.email,
         year: new Date().getFullYear(),
       },
       template: 'passwordReset.handlebars',
@@ -414,7 +414,7 @@ const resendVerificationEmail = async (req) => {
       subject: 'Verify your email',
       payload: {
         appName: process.env.APP_TITLE || 'LibreChat',
-        name: user.name,
+        name: user.name || user.username || user.email,
         verificationLink: verificationLink,
         year: new Date().getFullYear(),
       },
diff --git a/api/typedefs.js b/api/typedefs.js
index 74d9ef520..9d35c6458 100644
--- a/api/typedefs.js
+++ b/api/typedefs.js
@@ -765,12 +765,19 @@
  * @typedef {import('mongoose').Schema} MongooseSchema
  * @memberof typedefs
  */
+
 /**
  * @exports MongoFile
  * @typedef {import('@librechat/data-schemas').IMongoFile} MongoFile
  * @memberof typedefs
  */
 
+/**
+ * @exports MongoUser
+ * @typedef {import('@librechat/data-schemas').IUser} MongoUser
+ * @memberof typedefs
+ */
+
 /**
  * @exports ObjectId
  * @typedef {import('mongoose').Types.ObjectId} ObjectId