Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
📧 fix: Cancel Signup if Email Issuance Fails (#3010)
Danny Avila92232afacab6
diff --git a/api/models/userMethods.js b/api/models/userMethods.jsindex e84931da83..08d98045f5 100644--- a/api/models/userMethods.js+++ b/api/models/userMethods.js@@ -56,7 +56,7 @@ const updateUser = async function (userId, updateData) {* Creates a new user, optionally with a TTL of 1 week.* @param {MongoUser} data - The user data to be created, must contain user_id.* @param {boolean} [disableTTL=true] - Whether to disable the TTL. Defaults to `true`.- * @returns {Promise<string>} A promise that resolves to the created user document ID.+ * @returns {Promise<ObjectId>} A promise that resolves to the created user document ID.* @throws {Error} If a user with the same user_id already exists.*/const createUser = async (data, disableTTL = true) => {diff --git a/api/server/controllers/UserController.js b/api/server/controllers/UserController.jsindex d6ec102ddc..099ba68d87 100644--- a/api/server/controllers/UserController.js+++ b/api/server/controllers/UserController.js@@ -1,6 +1,7 @@const {Session,Balance,+ getFiles,deleteFiles,deleteConvos,deletePresets,@@ -10,6 +11,7 @@ const {const { updateUserPluginAuth, deleteUserPluginAuth } = require('~/server/services/PluginService');const { updateUserPluginsService, deleteUserKey } = require('~/server/services/UserService');const { verifyEmail, resendVerificationEmail } = require('~/server/services/AuthService');+const { processDeleteRequest } = require('~/server/services/Files/process');const { deleteAllSharedLinks } = require('~/models/Share');const { Transaction } = require('~/models/Transaction');const { logger } = require('~/config');@@ -18,6 +20,18 @@ const getUserController = async (req, res) => {res.status(200).send(req.user);};+const deleteUserFiles = async (req) => {+ try {+ const userFiles = await getFiles({ user: req.user.id });+ await processDeleteRequest({+ req,+ files: userFiles,+ });+ } catch (error) {+ logger.error('[deleteUserFiles]', error);+ }+};+const updateUserPluginsController = async (req, res) => {const { user } = req;const { pluginKey, action, auth, isAssistantTool } = req.body;@@ -75,11 +89,13 @@ const deleteUserController = async (req, res) => {await deleteUserKey({ userId: user.id, all: true }); // delete user keysawait Balance.deleteMany({ user: user._id }); // delete user balancesawait deletePresets(user.id); // delete user presets+ /* TODO: Delete Assistant Threads */await deleteConvos(user.id); // delete user convosawait deleteUserPluginAuth(user.id, null, true); // delete user plugin authawait deleteUserById(user.id); // delete user- await deleteFiles(null, user.id); // delete user filesawait deleteAllSharedLinks(user.id); // delete user shared links+ await deleteUserFiles(req); // delete user files+ await deleteFiles(null, user.id); // delete database files in case of orphaned files from previous steps/* TODO: queue job for cleaning actions and assistants of non-existant users */logger.info(`User deleted account. Email: ${user.email} ID: ${user.id}`);res.status(200).send({ message: 'User deleted' });diff --git a/api/server/index.js b/api/server/index.jsindex 7fa2f6f461..0aa8cb2760 100644--- a/api/server/index.js+++ b/api/server/index.js@@ -93,7 +93,7 @@ const startServer = async () => {app.use('/api/share', routes.share);app.use((req, res) => {- res.status(404).sendFile(path.join(app.locals.paths.dist, 'index.html'));+ res.sendFile(path.join(app.locals.paths.dist, 'index.html'));});app.listen(port, host, () => {diff --git a/api/server/services/AuthService.js b/api/server/services/AuthService.jsindex c335d2cab8..b7ab344884 100644--- a/api/server/services/AuthService.js+++ b/api/server/services/AuthService.js@@ -2,12 +2,13 @@ const crypto = require('crypto');const bcrypt = require('bcryptjs');const { errorsToString } = require('librechat-data-provider');const {+ findUser,countUsers,createUser,- findUser,updateUser,- generateToken,getUserById,+ generateToken,+ deleteUserById,} = require('~/models/userMethods');const { sendEmail, checkEmailConfig } = require('~/server/utils');const { registerSchema } = require('~/strategies/validators');@@ -61,6 +62,19 @@ const sendVerificationEmail = async (user) => {let verifyToken = crypto.randomBytes(32).toString('hex');const hash = bcrypt.hashSync(verifyToken, 10);+ const verificationLink = `${domains.client}/verify?token=${verifyToken}&email=${user.email}`;+ await sendEmail({+ email: user.email,+ subject: 'Verify your email',+ payload: {+ appName: process.env.APP_TITLE || 'LibreChat',+ name: user.name,+ verificationLink: verificationLink,+ year: new Date().getFullYear(),+ },+ template: 'verifyEmail.handlebars',+ });+await new Token({userId: user._id,email: user.email,@@ -68,21 +82,7 @@ const sendVerificationEmail = async (user) => {createdAt: Date.now(),}).save();- const verificationLink = `${domains.client}/verify?token=${verifyToken}&email=${user.email}`;logger.info(`[sendVerificationEmail] Verification link issued. [Email: ${user.email}]`);-- sendEmail(- user.email,- 'Verify your email',- {- appName: process.env.APP_TITLE || 'LibreChat',- name: user.name,- verificationLink: verificationLink,- year: new Date().getFullYear(),- },- 'verifyEmail.handlebars',- );- return;};/**@@ -136,6 +136,7 @@ const registerUser = async (user) => {const { email, password, name, username } = user;+ let newUserId;try {const existingUser = await findUser({ email }, 'email _id');@@ -173,7 +174,7 @@ const registerUser = async (user) => {};const emailEnabled = checkEmailConfig();- const newUserId = await createUser(newUserData, false);+ newUserId = await createUser(newUserData, false);if (emailEnabled) {await sendVerificationEmail({_id: newUserId,@@ -187,6 +188,12 @@ const registerUser = async (user) => {return { status: 200, message: genericVerificationMessage };} catch (err) {logger.error('[registerUser] Error in registering user:', err);+ if (newUserId) {+ const result = await deleteUserById(newUserId);+ logger.warn(+ `[registerUser] [Email: ${email}] [Temporary User deleted: ${JSON.stringify(result)}]`,+ );+ }return { status: 500, message: 'Something went wrong' };}};@@ -226,17 +233,17 @@ const requestPasswordReset = async (req) => {const link = `${domains.client}/reset-password?token=${resetToken}&userId=${user._id}`;if (emailEnabled) {- sendEmail(- user.email,- 'Password Reset Request',- {+ await sendEmail({+ email: user.email,+ subject: 'Password Reset Request',+ payload: {appName: process.env.APP_TITLE || 'LibreChat',name: user.name,link: link,year: new Date().getFullYear(),},- 'requestPasswordReset.handlebars',- );+ template: 'requestPasswordReset.handlebars',+ });logger.info(`[requestPasswordReset] Link emailed. [Email: ${email}] [ID: ${user._id}] [IP: ${req.ip}]`,);@@ -277,16 +284,16 @@ const resetPassword = async (userId, token, password) => {const user = await updateUser(userId, { password: hash });if (checkEmailConfig()) {- sendEmail(- user.email,- 'Password Reset Successfully',- {+ await sendEmail({+ email: user.email,+ subject: 'Password Reset Successfully',+ payload: {appName: process.env.APP_TITLE || 'LibreChat',name: user.name,year: new Date().getFullYear(),},- 'passwordReset.handlebars',- );+ template: 'passwordReset.handlebars',+ });}await passwordResetToken.deleteOne();@@ -356,6 +363,20 @@ const resendVerificationEmail = async (req) => {let verifyToken = crypto.randomBytes(32).toString('hex');const hash = bcrypt.hashSync(verifyToken, 10);+ const verificationLink = `${domains.client}/verify?token=${verifyToken}&email=${user.email}`;++ await sendEmail({+ email: user.email,+ subject: 'Verify your email',+ payload: {+ appName: process.env.APP_TITLE || 'LibreChat',+ name: user.name,+ verificationLink: verificationLink,+ year: new Date().getFullYear(),+ },+ template: 'verifyEmail.handlebars',+ });+await new Token({userId: user._id,email: user.email,@@ -363,21 +384,8 @@ const resendVerificationEmail = async (req) => {createdAt: Date.now(),}).save();- const verificationLink = `${domains.client}/verify?token=${verifyToken}&email=${user.email}`;logger.info(`[resendVerificationEmail] Verification link issued. [Email: ${user.email}]`);- sendEmail(- user.email,- 'Verify your email',- {- appName: process.env.APP_TITLE || 'LibreChat',- name: user.name,- verificationLink: verificationLink,- year: new Date().getFullYear(),- },- 'verifyEmail.handlebars',- );-return {status: 200,message: genericVerificationMessage,diff --git a/api/server/utils/sendEmail.js b/api/server/utils/sendEmail.jsindex 1ce3354929..59d75830f4 100644--- a/api/server/utils/sendEmail.js+++ b/api/server/utils/sendEmail.js@@ -5,7 +5,34 @@ const handlebars = require('handlebars');const { isEnabled } = require('~/server/utils/handleText');const logger = require('~/config/winston');-const sendEmail = async (email, subject, payload, template) => {+/**+ * Sends an email using the specified template, subject, and payload.+ *+ * @async+ * @function sendEmail+ * @param {Object} params - The parameters for sending the email.+ * @param {string} params.email - The recipient's email address.+ * @param {string} params.subject - The subject of the email.+ * @param {Record<string, string>} params.payload - The data to be used in the email template.+ * @param {string} params.template - The filename of the email template.+ * @param {boolean} [throwError=true] - Whether to throw an error if the email sending process fails.+ * @returns {Promise<Object>} - A promise that resolves to the info object of the sent email or the error if sending the email fails.+ *+ * @example+ * const emailData = {+ * email: '[email protected]',+ * subject: 'Welcome!',+ * payload: { name: 'Recipient' },+ * template: 'welcome.html'+ * };+ *+ * sendEmail(emailData)+ * .then(info => console.log('Email sent:', info))+ * .catch(error => console.error('Error sending email:', error));+ *+ * @throws Will throw an error if the email sending process fails and throwError is `true`.+ */+const sendEmail = async ({ email, subject, payload, template, throwError = true }) => {try {const transporterOptions = {// Use STARTTLS by default instead of obligatory TLS@@ -58,16 +85,11 @@ const sendEmail = async (email, subject, payload, template) => {};// Send email- transporter.sendMail(options(), (error, info) => {- if (error) {- logger.error('[sendEmail]', error);- return error;- } else {- logger.debug('[sendEmail]', info);- return info;- }- });+ return await transporter.sendMail(options());} catch (error) {+ if (throwError) {+ throw error;+ }logger.error('[sendEmail]', error);return error;}diff --git a/api/strategies/jwtStrategy.js b/api/strategies/jwtStrategy.jsindex 8d55baaed0..01eb8da2ca 100644--- a/api/strategies/jwtStrategy.js+++ b/api/strategies/jwtStrategy.js@@ -12,8 +12,8 @@ const jwtLogin = async () =>async (payload, done) => {try {const user = await getUserById(payload?.id, '-password -__v');- user.id = user._id.toString();if (user) {+ user.id = user._id.toString();done(null, user);} else {logger.warn('[jwtLogin] JwtStrategy => no user found: ' + payload?.id);diff --git a/client/src/components/Conversations/Conversations.tsx b/client/src/components/Conversations/Conversations.tsxindex 636c11763b..8aad82a76d 100644--- a/client/src/components/Conversations/Conversations.tsx+++ b/client/src/components/Conversations/Conversations.tsx@@ -21,7 +21,8 @@ const Conversations = ({);const firstTodayConvoId = useMemo(() =>- conversations.find((convo) => convo && isToday(parseISO(convo.updatedAt)))?.conversationId,+ conversations.find((convo) => convo && convo.updatedAt && isToday(parseISO(convo.updatedAt)))+ ?.conversationId,[conversations],);