chore: azureAssistants ENDPOINTS exclusion warning

🎹 fix: Autocompletion Chrome Bug on Action API Key Input

chore: remove `useOriginNavigate`

chore: set correct OpenAI Storage Source

fix: azure file deletions, instantiate clients by source for deletion

update code interpret files info

feat: deleteResourceFileId

chore: increase poll interval as azure easily rate limits

fix: openai file deletions, TODO: evaluate rejected deletion settled promises to determine which to delete from db records

file source icons

update table file filters

chore: file search info and versioning

fix: retrieval update with necessary tool_resources if specified

fix(useMentions): add optional chaining in case listMap value is undefined

fix: force assistant avatar roundedness

fix: azure assistants, check correct flag

chore: bump data-provider

.env.example

@@ -64,8 +64,6 @@ PROXY=
 
 # ANYSCALE_API_KEY=
 # APIPIE_API_KEY=
-# COHERE_API_KEY=
-# DATABRICKS_API_KEY=
 # FIREWORKS_API_KEY=
 # GROQ_API_KEY=
 # HUGGINGFACE_TOKEN=
@@ -121,7 +119,7 @@ GOOGLE_KEY=user_provided
 # GOOGLE_MODELS=gemini-1.5-flash-latest,gemini-1.0-pro,gemini-1.0-pro-001,gemini-1.0-pro-latest,gemini-1.0-pro-vision-latest,gemini-1.5-pro-latest,gemini-pro,gemini-pro-vision
 
 # Vertex AI
-# GOOGLE_MODELS=gemini-1.5-flash-preview-0514,gemini-1.5-pro-preview-0514,gemini-1.0-pro-vision-001,gemini-1.0-pro-002,gemini-1.0-pro-001,gemini-pro-vision,gemini-1.0-pro
+# GOOGLE_MODELS=gemini-1.5-flash-preview-0514,gemini-1.5-pro-preview-0409,gemini-1.0-pro-vision-001,gemini-pro,gemini-pro-vision,chat-bison,chat-bison-32k,codechat-bison,codechat-bison-32k,text-bison,text-bison-32k,text-unicorn,code-gecko,code-bison,code-bison-32k
 
 # Google Gemini Safety Settings
 # NOTE (Vertex AI): You do not have access to the BLOCK_NONE setting by default.
@@ -259,14 +257,6 @@ MEILI_NO_ANALYTICS=true
 MEILI_HOST=http://0.0.0.0:7700
 MEILI_MASTER_KEY=DrhYf7zENyR6AlUCKmnz0eYASOQdl6zxH7s7MKFSfFCt
 
-
-#==================================================#
-#          Speech to Text & Text to Speech         #
-#==================================================#
-
-STT_API_KEY=
-TTS_API_KEY=
-
 #===================================================#
 #                    User System                    #
 #===================================================#
@@ -321,9 +311,6 @@ ALLOW_EMAIL_LOGIN=true
 ALLOW_REGISTRATION=true
 ALLOW_SOCIAL_LOGIN=false
 ALLOW_SOCIAL_REGISTRATION=false
-ALLOW_PASSWORD_RESET=false
-# ALLOW_ACCOUNT_DELETION=true # note: enabled by default if omitted/commented out
-ALLOW_UNVERIFIED_EMAIL_LOGIN=true
 
 SESSION_EXPIRY=1000 * 60 * 15
 REFRESH_TOKEN_EXPIRY=(1000 * 60 * 60 * 24) * 7
@@ -365,14 +352,6 @@ OPENID_REQUIRED_ROLE_PARAMETER_PATH=
 OPENID_BUTTON_LABEL=
 OPENID_IMAGE_URL=
 
-# LDAP
-LDAP_URL=
-LDAP_BIND_DN=
-LDAP_BIND_CREDENTIALS=
-LDAP_USER_SEARCH_BASE=
-LDAP_SEARCH_FILTER=mail={{username}}
-LDAP_CA_CERT_PATH=
-
 #========================#
 # Email Password Reset   #
 #========================#
@@ -399,13 +378,6 @@ FIREBASE_STORAGE_BUCKET=
 FIREBASE_MESSAGING_SENDER_ID=
 FIREBASE_APP_ID=
 
-#========================#
-# Shared Links           #
-#========================#
-
-ALLOW_SHARED_LINKS=true
-ALLOW_SHARED_LINKS_PUBLIC=true
-
 #===================================================#
 #                        UI                         #
 #===================================================#
@@ -416,9 +388,6 @@ HELP_AND_FAQ_URL=https://librechat.ai
 
 # SHOW_BIRTHDAY_ICON=true
 
-# Google tag manager id
-#ANALYTICS_GTM_ID=user provided google tag manager id
-
 #==================================================#
 #                      Others                      #
 #==================================================#

.github/CONTRIBUTING.md

@@ -126,18 +126,6 @@ Apply the following naming conventions to branches, labels, and other Git-relate
       
    - **Current Stance**: At present, this backend transition is of lower priority and might not be pursued.
 
-## 7. Module Import Conventions
-
-- `npm` packages first, 
-     - from shortest line (top) to longest (bottom)
-
-- Followed by typescript types (pertains to data-provider and client workspaces)
-     - longest line (top) to shortest (bottom)
-     - types from package come first
-
-- Lastly, local imports
-     - longest line (top) to shortest (bottom)
-     - imports with alias `~` treated the same as relative import with respect to line length
 
 ---
 

Dockerfile

@@ -1,4 +1,4 @@
-# v0.7.3
+# v0.7.2
 
 # Base node image
 FROM node:20-alpine AS node

Dockerfile.multi

@@ -1,4 +1,4 @@
-# v0.7.3
+# v0.7.2
 
 # Build API, Client and Data Provider
 FROM node:20-alpine AS base

README.md

@@ -58,13 +58,9 @@
 - 🌎 Multilingual UI:
   - English, 中文, Deutsch, Español, Français, Italiano, Polski, Português Brasileiro,
   - Русский, 日本語, Svenska, 한국어, Tiếng Việt, 繁體中文, العربية, Türkçe, Nederlands, עברית
-- 🎨 Customizable Dropdown & Interface: Adapts to both power users and newcomers
-- 📧 Verify your email to ensure secure access
-- 🗣️ Chat hands-free with Speech-to-Text and Text-to-Speech magic
-  - Automatically send and play Audio
-  - Supports OpenAI, Azure OpenAI, and Elevenlabs
+- 🎨 Customizable Dropdown & Interface: Adapts to both power users and newcomers.
 - 📥 Import Conversations from LibreChat, ChatGPT, Chatbot UI
-- 📤 Export conversations as screenshots, markdown, text, json
+- 📤 Export conversations as screenshots, markdown, text, json.
 - 🔍 Search all messages/conversations
 - 🔌 Plugins, including web access, image generation with DALL-E-3 and more
 - 👥 Multi-User, Secure Authentication with Moderation and Token spend tools
@@ -81,7 +77,7 @@ LibreChat brings together the future of assistant AIs with the revolutionary tec
 
 With LibreChat, you no longer need to opt for ChatGPT Plus and can instead use free or pay-per-call APIs. We welcome contributions, cloning, and forking to enhance the capabilities of this advanced chatbot platform.
 
-[![Watch the video](https://img.youtube.com/vi/bSVHEbVPNl4/maxresdefault.jpg)](https://www.youtube.com/watch?v=bSVHEbVPNl4)
+[![Watch the video](https://img.youtube.com/vi/YLVUW5UP9N0/maxresdefault.jpg)](https://www.youtube.com/watch?v=YLVUW5UP9N0)
 Click on the thumbnail to open the video☝️
 
 ---

api/app/clients/AnthropicClient.js

@@ -1,5 +1,4 @@
 const Anthropic = require('@anthropic-ai/sdk');
-const { HttpsProxyAgent } = require('https-proxy-agent');
 const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('tiktoken');
 const {
   getResponseSender,
@@ -124,14 +123,9 @@ class AnthropicClient extends BaseClient {
   getClient() {
     /** @type {Anthropic.default.RequestOptions} */
     const options = {
-      fetch: this.fetch,
       apiKey: this.apiKey,
     };
 
-    if (this.options.proxy) {
-      options.httpAgent = new HttpsProxyAgent(this.options.proxy);
-    }
-
     if (this.options.reverseProxyUrl) {
       options.baseURL = this.options.reverseProxyUrl;
     }

api/app/clients/BaseClient.js

@@ -1,5 +1,4 @@
 const crypto = require('crypto');
-const fetch = require('node-fetch');
 const { supportsBalanceCheck, Constants } = require('librechat-data-provider');
 const { getConvo, getMessages, saveMessage, updateMessage, saveConvo } = require('~/models');
 const { addSpaceIfNeeded, isEnabled } = require('~/server/utils');
@@ -18,7 +17,6 @@ class BaseClient {
       month: 'long',
       day: 'numeric',
     });
-    this.fetch = this.fetch.bind(this);
   }
 
   setOptions() {
@@ -56,25 +54,6 @@ class BaseClient {
     });
   }
 
-  /**
-   * Makes an HTTP request and logs the process.
-   *
-   * @param {RequestInfo} url - The URL to make the request to. Can be a string or a Request object.
-   * @param {RequestInit} [init] - Optional init options for the request.
-   * @returns {Promise<Response>} - A promise that resolves to the response of the fetch request.
-   */
-  async fetch(_url, init) {
-    let url = _url;
-    if (this.options.directEndpoint) {
-      url = this.options.reverseProxyUrl;
-    }
-    logger.debug(`Making request to ${url}`);
-    if (typeof Bun !== 'undefined') {
-      return await fetch(url, init);
-    }
-    return await fetch(url, init);
-  }
-
   getBuildMessagesOptions() {
     throw new Error('Subclasses must implement getBuildMessagesOptions');
   }
@@ -394,14 +373,6 @@ class BaseClient {
     const { user, head, isEdited, conversationId, responseMessageId, saveOptions, userMessage } =
       await this.handleStartMethods(message, opts);
 
-    if (opts.progressCallback) {
-      opts.onProgress = opts.progressCallback.call(null, {
-        ...(opts.progressOptions ?? {}),
-        parentMessageId: userMessage.messageId,
-        messageId: responseMessageId,
-      });
-    }
-
     const { generation = '' } = opts;
 
     // It's not necessary to push to currentMessages

api/app/clients/ChatGPTClient.js

@@ -438,17 +438,9 @@ class ChatGPTClient extends BaseClient {
 
       if (message.eventType === 'text-generation' && message.text) {
         onTokenProgress(message.text);
-        reply += message.text;
-      }
-      /*
-      Cohere API Chinese Unicode character replacement hotfix.
-      Should be un-commented when the following issue is resolved:
-      https://github.com/cohere-ai/cohere-typescript/issues/151
-
-      else if (message.eventType === 'stream-end' && message.response) {
+      } else if (message.eventType === 'stream-end' && message.response) {
         reply = message.response.text;
       }
-      */
     }
 
     return reply;

api/app/clients/OpenAIClient.js

@@ -27,7 +27,6 @@ const {
   createContextHandlers,
 } = require('./prompts');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
-const { updateTokenWebsocket } = require('~/server/services/Files/Audio');
 const { isEnabled, sleep } = require('~/server/utils');
 const { handleOpenAIErrors } = require('./tools/util');
 const spendTokens = require('~/models/spendTokens');
@@ -589,13 +588,12 @@ class OpenAIClient extends BaseClient {
     let streamResult = null;
     this.modelOptions.user = this.user;
     const invalidBaseUrl = this.completionsUrl && extractBaseURL(this.completionsUrl) === null;
-    const useOldMethod = !!(invalidBaseUrl || !this.isChatCompletion);
+    const useOldMethod = !!(invalidBaseUrl || !this.isChatCompletion || typeof Bun !== 'undefined');
     if (typeof opts.onProgress === 'function' && useOldMethod) {
       const completionResult = await this.getCompletion(
         payload,
         (progressMessage) => {
           if (progressMessage === '[DONE]') {
-            updateTokenWebsocket('[DONE]');
             return;
           }
 
@@ -829,7 +827,7 @@ class OpenAIClient extends BaseClient {
 
       const instructionsPayload = [
         {
-          role: this.options.titleMessageRole ?? 'system',
+          role: 'system',
           content: `Please generate ${titleInstruction}
 
 ${convo}
@@ -1108,12 +1106,7 @@ ${convo}
       }
 
       if (this.azure || this.options.azure) {
-        /* Azure Bug, extremely short default `max_tokens` response */
-        if (!modelOptions.max_tokens && modelOptions.model === 'gpt-4-vision-preview') {
-          modelOptions.max_tokens = 4000;
-        }
-
-        /* Azure does not accept `model` in the body, so we need to remove it. */
+        // Azure does not accept `model` in the body, so we need to remove it.
         delete modelOptions.model;
 
         opts.baseURL = this.langchainProxy
@@ -1134,7 +1127,6 @@ ${convo}
       let chatCompletion;
       /** @type {OpenAI} */
       const openai = new OpenAI({
-        fetch: this.fetch,
         apiKey: this.apiKey,
         ...opts,
       });
@@ -1224,7 +1216,6 @@ ${convo}
           });
 
         const azureDelay = this.modelOptions.model?.includes('gpt-4') ? 30 : 17;
-
         for await (const chunk of stream) {
           const token = chunk.choices[0]?.delta?.content || '';
           intermediateReply += token;

api/app/clients/PluginsClient.js

@@ -250,7 +250,6 @@ class PluginsClient extends OpenAIClient {
       this.setOptions(opts);
       return super.sendMessage(message, opts);
     }
-
     logger.debug('[PluginsClient] sendMessage', { userMessageText: message, opts });
     const {
       user,
@@ -265,14 +264,6 @@ class PluginsClient extends OpenAIClient {
       onToolEnd,
     } = await this.handleStartMethods(message, opts);
 
-    if (opts.progressCallback) {
-      opts.onProgress = opts.progressCallback.call(null, {
-        ...(opts.progressOptions ?? {}),
-        parentMessageId: userMessage.messageId,
-        messageId: responseMessageId,
-      });
-    }
-
     this.currentMessages.push(userMessage);
 
     let {

api/app/clients/prompts/createContextHandlers.js

@@ -8,6 +8,8 @@ In your response, remember to follow these guidelines:
 - If you don't know the answer, simply say that you don't know.
 - If you are unsure how to answer, ask for clarification.
 - Avoid mentioning that you obtained the information from the context.
+
+Answer appropriately in the user's language.
 `;
 
 function createContextHandlers(req, userMessageContent) {
@@ -92,40 +94,37 @@ function createContextHandlers(req, userMessageContent) {
 
       const resolvedQueries = await Promise.all(queryPromises);
 
-      const context =
-        resolvedQueries.length === 0
-          ? '\n\tThe semantic search did not return any results.'
-          : resolvedQueries
-            .map((queryResult, index) => {
-              const file = processedFiles[index];
-              let contextItems = queryResult.data;
+      const context = resolvedQueries
+        .map((queryResult, index) => {
+          const file = processedFiles[index];
+          let contextItems = queryResult.data;
 
-              const generateContext = (currentContext) =>
-                `
+          const generateContext = (currentContext) =>
+            `
           <file>
             <filename>${file.filename}</filename>
             <context>${currentContext}
             </context>
           </file>`;
 
-              if (useFullContext) {
-                return generateContext(`\n${contextItems}`);
-              }
+          if (useFullContext) {
+            return generateContext(`\n${contextItems}`);
+          }
 
-              contextItems = queryResult.data
-                .map((item) => {
-                  const pageContent = item[0].page_content;
-                  return `
+          contextItems = queryResult.data
+            .map((item) => {
+              const pageContent = item[0].page_content;
+              return `
             <contextItem>
               <![CDATA[${pageContent?.trim()}]]>
             </contextItem>`;
-                })
-                .join('');
-
-              return generateContext(contextItems);
             })
             .join('');
 
+          return generateContext(contextItems);
+        })
+        .join('');
+
       if (useFullContext) {
         const prompt = `${header}
           ${context}

api/app/clients/prompts/titlePrompts.js

@@ -28,7 +28,7 @@ ${convo}`,
 };
 
 const titleInstruction =
-  'a concise, 5-word-or-less title for the conversation, using its same language, with no punctuation. Apply title case conventions appropriate for the language. Never directly mention the language name or the word "title"';
+  'a concise, 5-word-or-less title for the conversation, using its same language, with no punctuation. Apply title case conventions appropriate for the language. For English, use AP Stylebook Title Case. Never directly mention the language name or the word "title"';
 const titleFunctionPrompt = `In this environment you have access to a set of tools you can use to generate the conversation title.
   
 You may call them like this:

api/app/clients/tools/structured/StableDiffusion.js

@@ -80,18 +80,13 @@ class StableDiffusionAPI extends StructuredTool {
     const payload = {
       prompt,
       negative_prompt,
+      sampler_index: 'DPM++ 2M Karras',
       cfg_scale: 4.5,
       steps: 22,
       width: 1024,
       height: 1024,
     };
-    let generationResponse;
-    try {
-      generationResponse = await axios.post(`${url}/sdapi/v1/txt2img`, payload);
-    } catch (error) {
-      logger.error('[StableDiffusion] Error while generating image:', error);
-      return 'Error making API request.';
-    }
+    const generationResponse = await axios.post(`${url}/sdapi/v1/txt2img`, payload);
     const image = generationResponse.data.images[0];
 
     /** @type {{ height: number, width: number, seed: number, infotexts: string[] }} */

api/cache/getLogStores.js

@@ -7,7 +7,6 @@ const keyvMongo = require('./keyvMongo');
 
 const { BAN_DURATION, USE_REDIS } = process.env ?? {};
 const THIRTY_MINUTES = 1800000;
-const TEN_MINUTES = 600000;
 
 const duration = math(BAN_DURATION, 7200000);
 
@@ -25,10 +24,6 @@ const config = isEnabled(USE_REDIS)
   ? new Keyv({ store: keyvRedis })
   : new Keyv({ namespace: CacheKeys.CONFIG_STORE });
 
-const audioRuns = isEnabled(USE_REDIS) // ttl: 30 minutes
-  ? new Keyv({ store: keyvRedis, ttl: TEN_MINUTES })
-  : new Keyv({ namespace: CacheKeys.AUDIO_RUNS, ttl: TEN_MINUTES });
-
 const tokenConfig = isEnabled(USE_REDIS) // ttl: 30 minutes
   ? new Keyv({ store: keyvRedis, ttl: THIRTY_MINUTES })
   : new Keyv({ namespace: CacheKeys.TOKEN_CONFIG, ttl: THIRTY_MINUTES });
@@ -60,13 +55,7 @@ const namespaces = {
   message_limit: createViolationInstance('message_limit'),
   token_balance: createViolationInstance(ViolationTypes.TOKEN_BALANCE),
   registrations: createViolationInstance('registrations'),
-  [ViolationTypes.TTS_LIMIT]: createViolationInstance(ViolationTypes.TTS_LIMIT),
-  [ViolationTypes.STT_LIMIT]: createViolationInstance(ViolationTypes.STT_LIMIT),
   [ViolationTypes.FILE_UPLOAD_LIMIT]: createViolationInstance(ViolationTypes.FILE_UPLOAD_LIMIT),
-  [ViolationTypes.VERIFY_EMAIL_LIMIT]: createViolationInstance(ViolationTypes.VERIFY_EMAIL_LIMIT),
-  [ViolationTypes.RESET_PASSWORD_LIMIT]: createViolationInstance(
-    ViolationTypes.RESET_PASSWORD_LIMIT,
-  ),
   [ViolationTypes.ILLEGAL_MODEL_REQUEST]: createViolationInstance(
     ViolationTypes.ILLEGAL_MODEL_REQUEST,
   ),
@@ -75,7 +64,6 @@ const namespaces = {
   [CacheKeys.TOKEN_CONFIG]: tokenConfig,
   [CacheKeys.GEN_TITLE]: genTitle,
   [CacheKeys.MODEL_QUERIES]: modelQueries,
-  [CacheKeys.AUDIO_RUNS]: audioRuns,
 };
 
 /**

api/cache/logViolation.js

@@ -1,6 +1,6 @@
-const { isEnabled } = require('~/server/utils');
 const getLogStores = require('./getLogStores');
 const banViolation = require('./banViolation');
+const { isEnabled } = require('../server/utils');
 
 /**
  * Logs the violation.

api/config/parsers.js

@@ -27,25 +27,26 @@ function getMatchingSensitivePatterns(valueStr) {
 }
 
 /**
- * Redacts sensitive information from a console message and trims it to a specified length if provided.
+ * Redacts sensitive information from a console message.
+ *
  * @param {string} str - The console message to be redacted.
- * @param {number} [trimLength] - The optional length at which to trim the redacted message.
- * @returns {string} - The redacted and optionally trimmed console message.
+ * @returns {string} - The redacted console message.
  */
-function redactMessage(str, trimLength) {
+function redactMessage(str) {
   if (!str) {
     return '';
   }
 
   const patterns = getMatchingSensitivePatterns(str);
+
+  if (patterns.length === 0) {
+    return str;
+  }
+
   patterns.forEach((pattern) => {
     str = str.replace(pattern, '$1[REDACTED]');
   });
 
-  if (trimLength !== undefined && str.length > trimLength) {
-    return `${str.substring(0, trimLength)}...`;
-  }
-
   return str;
 }
 

api/models/Assistant.js

@@ -14,7 +14,7 @@ const Assistant = mongoose.model('assistant', assistantSchema);
  * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).
  * @returns {Promise<Object>} The updated or newly created assistant document as a plain object.
  */
-const updateAssistantDoc = async (searchParams, updateData, session = null) => {
+const updateAssistant = async (searchParams, updateData, session = null) => {
   const options = { new: true, upsert: true, session };
   return await Assistant.findOneAndUpdate(searchParams, updateData, options).lean();
 };
@@ -52,7 +52,7 @@ const deleteAssistant = async (searchParams) => {
 };
 
 module.exports = {
-  updateAssistantDoc,
+  updateAssistant,
   deleteAssistant,
   getAssistants,
   getAssistant,

api/models/Conversation.js

@@ -21,7 +21,7 @@ module.exports = {
   Conversation,
   saveConvo: async (user, { conversationId, newConversationId, ...convo }) => {
     try {
-      const messages = await getMessages({ conversationId }, '_id');
+      const messages = await getMessages({ conversationId });
       const update = { ...convo, messages, user };
       if (newConversationId) {
         update.conversationId = newConversationId;

api/models/File.js

@@ -97,12 +97,8 @@ const deleteFileByFilter = async (filter) => {
  * @param {Array<string>} file_ids - The unique identifiers of the files to delete.
  * @returns {Promise<Object>} A promise that resolves to the result of the deletion operation.
  */
-const deleteFiles = async (file_ids, user) => {
-  let deleteQuery = { file_id: { $in: file_ids } };
-  if (user) {
-    deleteQuery = { user: user };
-  }
-  return await File.deleteMany(deleteQuery);
+const deleteFiles = async (file_ids) => {
+  return await File.deleteMany({ file_id: { $in: file_ids } });
 };
 
 module.exports = {

api/models/Message.js

@@ -129,14 +129,6 @@ module.exports = {
       throw new Error('Failed to save message.');
     }
   },
-  async updateMessageText({ messageId, text }) {
-    try {
-      await Message.updateOne({ messageId }, { text });
-    } catch (err) {
-      logger.error('Error updating message text:', err);
-      throw new Error('Failed to update message text.');
-    }
-  },
   async updateMessage(message) {
     try {
       const { messageId, ...update } = message;
@@ -179,18 +171,8 @@ module.exports = {
     }
   },
 
-  /**
-   * Retrieves messages from the database.
-   * @param {Record<string, unknown>} filter
-   * @param {string | undefined} [select]
-   * @returns
-   */
-  async getMessages(filter, select) {
+  async getMessages(filter) {
     try {
-      if (select) {
-        return await Message.find(filter).select(select).sort({ createdAt: 1 }).lean();
-      }
-
       return await Message.find(filter).sort({ createdAt: 1 }).lean();
     } catch (err) {
       logger.error('Error getting messages:', err);

api/models/Share.js

@@ -86,21 +86,4 @@ module.exports = {
     }
     return await SharedLink.findOneAndDelete({ shareId, user });
   },
-  /**
-   * Deletes all shared links for a specific user.
-   * @param {string} user - The user ID.
-   * @returns {Promise<{ message: string, deletedCount?: number }>} A result object indicating success or error message.
-   */
-  deleteAllSharedLinks: async (user) => {
-    try {
-      const result = await SharedLink.deleteMany({ user });
-      return {
-        message: 'All shared links have been deleted successfully',
-        deletedCount: result.deletedCount,
-      };
-    } catch (error) {
-      logger.error('[deleteAllSharedLinks] Error deleting shared links', error);
-      return { message: 'Error deleting shared links' };
-    }
-  },
 };

api/models/User.js

@@ -1,5 +1,61 @@
 const mongoose = require('mongoose');
-const userSchema = require('~/models/schema/userSchema');
+const bcrypt = require('bcryptjs');
+const signPayload = require('../server/services/signPayload');
+const userSchema = require('./schema/userSchema.js');
+const { SESSION_EXPIRY } = process.env ?? {};
+const expires = eval(SESSION_EXPIRY) ?? 1000 * 60 * 15;
+
+userSchema.methods.toJSON = function () {
+  return {
+    id: this._id,
+    provider: this.provider,
+    email: this.email,
+    name: this.name,
+    username: this.username,
+    avatar: this.avatar,
+    role: this.role,
+    emailVerified: this.emailVerified,
+    plugins: this.plugins,
+    createdAt: this.createdAt,
+    updatedAt: this.updatedAt,
+  };
+};
+
+userSchema.methods.generateToken = async function () {
+  return await signPayload({
+    payload: {
+      id: this._id,
+      username: this.username,
+      provider: this.provider,
+      email: this.email,
+    },
+    secret: process.env.JWT_SECRET,
+    expirationTime: expires / 1000,
+  });
+};
+
+userSchema.methods.comparePassword = function (candidatePassword, callback) {
+  bcrypt.compare(candidatePassword, this.password, (err, isMatch) => {
+    if (err) {
+      return callback(err);
+    }
+    callback(null, isMatch);
+  });
+};
+
+module.exports.hashPassword = async (password) => {
+  const hashedPassword = await new Promise((resolve, reject) => {
+    bcrypt.hash(password, 10, function (err, hash) {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(hash);
+      }
+    });
+  });
+
+  return hashedPassword;
+};
 
 const User = mongoose.model('User', userSchema);
 

api/models/index.js

@@ -6,18 +6,9 @@ const {
   deleteMessagesSince,
   deleteMessages,
 } = require('./Message');
-const {
-  comparePassword,
-  deleteUserById,
-  generateToken,
-  getUserById,
-  updateUser,
-  createUser,
-  countUsers,
-  findUser,
-} = require('./userMethods');
 const { getConvoTitle, getConvo, saveConvo, deleteConvos } = require('./Conversation');
 const { getPreset, getPresets, savePreset, deletePresets } = require('./Preset');
+const { hashPassword, getUser, updateUser } = require('./userMethods');
 const {
   findFileById,
   createFile,
@@ -38,14 +29,9 @@ module.exports = {
   Session,
   Balance,
 
-  comparePassword,
-  deleteUserById,
-  generateToken,
-  getUserById,
-  countUsers,
-  createUser,
+  hashPassword,
   updateUser,
-  findUser,
+  getUser,
 
   getMessages,
   saveMessage,

api/models/schema/fileSchema.js

@@ -3,9 +3,9 @@ const mongoose = require('mongoose');
 
 /**
  * @typedef {Object} MongoFile
- * @property {ObjectId} [_id] - MongoDB Document ID
+ * @property {mongoose.Schema.Types.ObjectId} [_id] - MongoDB Document ID
  * @property {number} [__v] - MongoDB Version Key
- * @property {ObjectId} user - User ID
+ * @property {mongoose.Schema.Types.ObjectId} user - User ID
  * @property {string} [conversationId] - Optional conversation ID
  * @property {string} file_id - File identifier
  * @property {string} [temp_file_id] - Temporary File identifier
@@ -14,19 +14,17 @@ const mongoose = require('mongoose');
  * @property {string} filepath - Location of the file
  * @property {'file'} object - Type of object, always 'file'
  * @property {string} type - Type of file
- * @property {number} [usage=0] - Number of uses of the file
+ * @property {number} usage - Number of uses of the file
  * @property {string} [context] - Context of the file origin
- * @property {boolean} [embedded=false] - Whether or not the file is embedded in vector db
+ * @property {boolean} [embedded] - Whether or not the file is embedded in vector db
  * @property {string} [model] - The model to identify the group region of the file (for Azure OpenAI hosting)
- * @property {string} [source] - The source of the file (e.g., from FileSources)
+ * @property {string} [source] - The source of the file
  * @property {number} [width] - Optional width of the file
  * @property {number} [height] - Optional height of the file
- * @property {Date} [expiresAt] - Optional expiration date of the file
+ * @property {Date} [expiresAt] - Optional height of the file
  * @property {Date} [createdAt] - Date when the file was created
  * @property {Date} [updatedAt] - Date when the file was updated
  */
-
-/** @type {MongooseSchema<MongoFile>} */
 const fileSchema = mongoose.Schema(
   {
     user: {
@@ -93,7 +91,7 @@ const fileSchema = mongoose.Schema(
     height: Number,
     expiresAt: {
       type: Date,
-      expires: 3600, // 1 hour in seconds
+      expires: 3600,
     },
   },
   {

api/models/schema/messageSchema.js

@@ -11,7 +11,6 @@ const messageSchema = mongoose.Schema(
     },
     conversationId: {
       type: String,
-      index: true,
       required: true,
       meiliIndex: true,
     },

api/models/schema/tokenSchema.js

@@ -7,9 +7,6 @@ const tokenSchema = new Schema({
     required: true,
     ref: 'user',
   },
-  email: {
-    type: String,
-  },
   token: {
     type: String,
     required: true,

api/models/schema/userSchema.js

@@ -1,35 +1,5 @@
 const mongoose = require('mongoose');
 
-/**
- * @typedef {Object} MongoSession
- * @property {string} [refreshToken] - The refresh token
- */
-
-/**
- * @typedef {Object} MongoUser
- * @property {ObjectId} [_id] - MongoDB Document ID
- * @property {string} [name] - The user's name
- * @property {string} [username] - The user's username, in lowercase
- * @property {string} email - The user's email address
- * @property {boolean} emailVerified - Whether the user's email is verified
- * @property {string} [password] - The user's password, trimmed with 8-128 characters
- * @property {string} [avatar] - The URL of the user's avatar
- * @property {string} provider - The provider of the user's account (e.g., 'local', 'google')
- * @property {string} [role='USER'] - The role of the user
- * @property {string} [googleId] - Optional Google ID for the user
- * @property {string} [facebookId] - Optional Facebook ID for the user
- * @property {string} [openidId] - Optional OpenID ID for the user
- * @property {string} [ldapId] - Optional LDAP ID for the user
- * @property {string} [githubId] - Optional GitHub ID for the user
- * @property {string} [discordId] - Optional Discord ID for the user
- * @property {Array} [plugins=[]] - List of plugins used by the user
- * @property {Array.<MongoSession>} [refreshToken] - List of sessions with refresh tokens
- * @property {Date} [expiresAt] - Optional expiration date of the file
- * @property {Date} [createdAt] - Date when the user was created (added by timestamps)
- * @property {Date} [updatedAt] - Date when the user was last updated (added by timestamps)
- */
-
-/** @type {MongooseSchema<MongoSession>} */
 const Session = mongoose.Schema({
   refreshToken: {
     type: String,
@@ -37,7 +7,6 @@ const Session = mongoose.Schema({
   },
 });
 
-/** @type {MongooseSchema<MongoUser>} */
 const userSchema = mongoose.Schema(
   {
     name: {
@@ -95,11 +64,6 @@ const userSchema = mongoose.Schema(
       unique: true,
       sparse: true,
     },
-    ldapId: {
-      type: String,
-      unique: true,
-      sparse: true,
-    },
     githubId: {
       type: String,
       unique: true,
@@ -117,10 +81,6 @@ const userSchema = mongoose.Schema(
     refreshToken: {
       type: [Session],
     },
-    expiresAt: {
-      type: Date,
-      expires: 604800, // 7 days in seconds
-    },
   },
   { timestamps: true },
 );

api/models/userMethods.js

@@ -1,37 +1,28 @@
 const bcrypt = require('bcryptjs');
-const signPayload = require('~/server/services/signPayload');
 const User = require('./User');
 
+const hashPassword = async (password) => {
+  const hashedPassword = await new Promise((resolve, reject) => {
+    bcrypt.hash(password, 10, function (err, hash) {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(hash);
+      }
+    });
+  });
+
+  return hashedPassword;
+};
+
 /**
  * Retrieve a user by ID and convert the found user document to a plain object.
  *
  * @param {string} userId - The ID of the user to find and return as a plain object.
- * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.
- * @returns {Promise<MongoUser>} A plain object representing the user document, or `null` if no user is found.
+ * @returns {Promise<Object>} A plain object representing the user document, or `null` if no user is found.
  */
-const getUserById = async function (userId, fieldsToSelect = null) {
-  const query = User.findById(userId);
-
-  if (fieldsToSelect) {
-    query.select(fieldsToSelect);
-  }
-
-  return await query.lean();
-};
-
-/**
- * Search for a single user based on partial data and return matching user document as plain object.
- * @param {Partial<MongoUser>} searchCriteria - The partial data to use for searching the user.
- * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.
- * @returns {Promise<MongoUser>} A plain object representing the user document, or `null` if no user is found.
- */
-const findUser = async function (searchCriteria, fieldsToSelect = null) {
-  const query = User.findOne(searchCriteria);
-  if (fieldsToSelect) {
-    query.select(fieldsToSelect);
-  }
-
-  return await query.lean();
+const getUser = async function (userId) {
+  return await User.findById(userId).lean();
 };
 
 /**
@@ -39,136 +30,17 @@ const findUser = async function (searchCriteria, fieldsToSelect = null) {
  *
  * @param {string} userId - The ID of the user to update.
  * @param {Object} updateData - An object containing the properties to update.
- * @returns {Promise<MongoUser>} The updated user document as a plain object, or `null` if no user is found.
+ * @returns {Promise<Object>} The updated user document as a plain object, or `null` if no user is found.
  */
 const updateUser = async function (userId, updateData) {
-  const updateOperation = {
-    $set: updateData,
-    $unset: { expiresAt: '' }, // Remove the expiresAt field to prevent TTL
-  };
-  return await User.findByIdAndUpdate(userId, updateOperation, {
+  return await User.findByIdAndUpdate(userId, updateData, {
     new: true,
     runValidators: true,
   }).lean();
 };
 
-/**
- * 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`.
- * @param {boolean} [returnUser=false] - Whether to disable the TTL. Defaults to `true`.
- * @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, returnUser = false) => {
-  const userData = {
-    ...data,
-    expiresAt: disableTTL ? null : new Date(Date.now() + 604800 * 1000), // 1 week in milliseconds
-  };
-
-  if (disableTTL) {
-    delete userData.expiresAt;
-  }
-
-  try {
-    const user = await User.create(userData);
-    if (returnUser) {
-      return user.toObject();
-    }
-    return user._id;
-  } catch (error) {
-    if (error.code === 11000) {
-      // Duplicate key error code
-      throw new Error(`User with \`_id\` ${data._id} already exists.`);
-    } else {
-      throw error;
-    }
-  }
-};
-
-/**
- * Count the number of user documents in the collection based on the provided filter.
- *
- * @param {Object} [filter={}] - The filter to apply when counting the documents.
- * @returns {Promise<number>} The count of documents that match the filter.
- */
-const countUsers = async function (filter = {}) {
-  return await User.countDocuments(filter);
-};
-
-/**
- * Delete a user by their unique ID.
- *
- * @param {string} userId - The ID of the user to delete.
- * @returns {Promise<{ deletedCount: number }>} An object indicating the number of deleted documents.
- */
-const deleteUserById = async function (userId) {
-  try {
-    const result = await User.deleteOne({ _id: userId });
-    if (result.deletedCount === 0) {
-      return { deletedCount: 0, message: 'No user found with that ID.' };
-    }
-    return { deletedCount: result.deletedCount, message: 'User was deleted successfully.' };
-  } catch (error) {
-    throw new Error('Error deleting user: ' + error.message);
-  }
-};
-
-const { SESSION_EXPIRY } = process.env ?? {};
-const expires = eval(SESSION_EXPIRY) ?? 1000 * 60 * 15;
-
-/**
- * Generates a JWT token for a given user.
- *
- * @param {MongoUser} user - ID of the user for whom the token is being generated.
- * @returns {Promise<string>} A promise that resolves to a JWT token.
- */
-const generateToken = async (user) => {
-  if (!user) {
-    throw new Error('No user provided');
-  }
-
-  return await signPayload({
-    payload: {
-      id: user._id,
-      username: user.username,
-      provider: user.provider,
-      email: user.email,
-    },
-    secret: process.env.JWT_SECRET,
-    expirationTime: expires / 1000,
-  });
-};
-
-/**
- * Compares the provided password with the user's password.
- *
- * @param {MongoUser} user - the user to compare password for.
- * @param {string} candidatePassword - The password to test against the user's password.
- * @returns {Promise<boolean>} A promise that resolves to a boolean indicating if the password matches.
- */
-const comparePassword = async (user, candidatePassword) => {
-  if (!user) {
-    throw new Error('No user provided');
-  }
-
-  return new Promise((resolve, reject) => {
-    bcrypt.compare(candidatePassword, user.password, (err, isMatch) => {
-      if (err) {
-        reject(err);
-      }
-      resolve(isMatch);
-    });
-  });
-};
-
 module.exports = {
-  comparePassword,
-  deleteUserById,
-  generateToken,
-  getUserById,
-  countUsers,
-  createUser,
+  hashPassword,
   updateUser,
-  findUser,
+  getUser,
 };

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/backend",
-  "version": "0.7.3",
+  "version": "0.7.2",
   "description": "",
   "scripts": {
     "start": "echo 'please run this from the root directory'",
@@ -40,7 +40,8 @@
     "@keyv/redis": "^2.8.1",
     "@langchain/community": "^0.0.46",
     "@langchain/google-genai": "^0.0.11",
-    "@langchain/google-vertexai": "^0.0.17",
+    "@langchain/google-vertexai": "^0.0.5",
+    "agenda": "^5.0.0",
     "axios": "^1.3.4",
     "bcryptjs": "^2.4.3",
     "cheerio": "^1.0.0-rc.12",
@@ -85,7 +86,6 @@
     "passport-github2": "^0.1.12",
     "passport-google-oauth20": "^2.0.0",
     "passport-jwt": "^4.0.1",
-    "passport-ldapauth": "^3.0.1",
     "passport-local": "^1.0.0",
     "pino": "^8.12.1",
     "sharp": "^0.32.6",
@@ -94,7 +94,6 @@
     "ua-parser-js": "^1.0.36",
     "winston": "^3.11.0",
     "winston-daily-rotate-file": "^4.7.1",
-    "ws": "^8.17.0",
     "zod": "^3.22.4"
   },
   "devDependencies": {

api/server/controllers/AskController.js

@@ -105,12 +105,11 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
       getReqData,
       onStart,
       abortController,
-      progressCallback,
-      progressOptions: {
+      onProgress: progressCallback.call(null, {
         res,
         text,
-        // parentMessageId: overrideParentMessageId || userMessageId,
-      },
+        parentMessageId: overrideParentMessageId || userMessageId,
+      }),
     };
 
     let response = await client.sendMessage(text, messageOptions);

api/server/controllers/AuthController.js

@@ -1,29 +1,45 @@
 const crypto = require('crypto');
 const cookies = require('cookie');
 const jwt = require('jsonwebtoken');
+const { Session, User } = require('~/models');
 const {
   registerUser,
   resetPassword,
   setAuthTokens,
   requestPasswordReset,
 } = require('~/server/services/AuthService');
-const { Session, getUserById } = require('~/models');
 const { logger } = require('~/config');
 
 const registrationController = async (req, res) => {
   try {
     const response = await registerUser(req.body);
-    const { status, message } = response;
-    res.status(status).send({ message });
+    if (response.status === 200) {
+      const { status, user } = response;
+      let newUser = await User.findOne({ _id: user._id });
+      if (!newUser) {
+        newUser = new User(user);
+        await newUser.save();
+      }
+      const token = await setAuthTokens(user._id, res);
+      res.setHeader('Authorization', `Bearer ${token}`);
+      res.status(status).send({ user });
+    } else {
+      const { status, message } = response;
+      res.status(status).send({ message });
+    }
   } catch (err) {
     logger.error('[registrationController]', err);
     return res.status(500).json({ message: err.message });
   }
 };
 
+const getUserController = async (req, res) => {
+  return res.status(200).send(req.user);
+};
+
 const resetPasswordRequestController = async (req, res) => {
   try {
-    const resetService = await requestPasswordReset(req);
+    const resetService = await requestPasswordReset(req.body.email);
     if (resetService instanceof Error) {
       return res.status(400).json(resetService);
     } else {
@@ -61,7 +77,7 @@ const refreshController = async (req, res) => {
 
   try {
     const payload = jwt.verify(refreshToken, process.env.JWT_REFRESH_SECRET);
-    const user = await getUserById(payload.id, '-password -__v');
+    const user = await User.findOne({ _id: payload.id });
     if (!user) {
       return res.status(401).redirect('/login');
     }
@@ -70,7 +86,8 @@ const refreshController = async (req, res) => {
 
     if (process.env.NODE_ENV === 'CI') {
       const token = await setAuthTokens(userId, res);
-      return res.status(200).send({ token, user });
+      const userObj = user.toJSON();
+      return res.status(200).send({ token, user: userObj });
     }
 
     // Hash the refresh token
@@ -81,7 +98,8 @@ const refreshController = async (req, res) => {
     const session = await Session.findOne({ user: userId, refreshTokenHash: hashedToken });
     if (session && session.expiration > new Date()) {
       const token = await setAuthTokens(userId, res, session._id);
-      res.status(200).send({ token, user });
+      const userObj = user.toJSON();
+      res.status(200).send({ token, user: userObj });
     } else if (req?.query?.retry) {
       // Retrying from a refresh token request that failed (401)
       res.status(403).send('No session found');
@@ -97,6 +115,7 @@ const refreshController = async (req, res) => {
 };
 
 module.exports = {
+  getUserController,
   refreshController,
   registrationController,
   resetPasswordController,

api/server/controllers/EditController.js

@@ -112,12 +112,11 @@ const EditController = async (req, res, next, initializeClient) => {
       getReqData,
       onStart,
       abortController,
-      progressCallback,
-      progressOptions: {
+      onProgress: progressCallback.call(null, {
         res,
         text,
-        // parentMessageId: overrideParentMessageId || userMessageId,
-      },
+        parentMessageId: overrideParentMessageId || userMessageId,
+      }),
     });
 
     const conversation = await getConvo(user, conversationId);

api/server/controllers/UserController.js

@@ -1,37 +1,11 @@
-const {
-  Session,
-  Balance,
-  getFiles,
-  deleteFiles,
-  deleteConvos,
-  deletePresets,
-  deleteMessages,
-  deleteUserById,
-} = require('~/models');
+const { updateUserPluginsService } = require('~/server/services/UserService');
 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');
 
 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,68 +49,11 @@ const updateUserPluginsController = async (req, res) => {
     res.status(200).send();
   } catch (err) {
     logger.error('[updateUserPluginsController]', err);
-    return res.status(500).json({ message: 'Something went wrong.' });
-  }
-};
-
-const deleteUserController = async (req, res) => {
-  const { user } = req;
-
-  try {
-    await deleteMessages({ user: user.id }); // delete user messages
-    await Session.deleteMany({ user: user.id }); // delete user sessions
-    await Transaction.deleteMany({ user: user.id }); // delete user transactions
-    await deleteUserKey({ userId: user.id, all: true }); // delete user keys
-    await Balance.deleteMany({ user: user._id }); // delete user balances
-    await deletePresets(user.id); // delete user presets
-    /* TODO: Delete Assistant Threads */
-    await deleteConvos(user.id); // delete user convos
-    await deleteUserPluginAuth(user.id, null, true); // delete user plugin auth
-    await deleteUserById(user.id); // delete user
-    await 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' });
-  } catch (err) {
-    logger.error('[deleteUserController]', err);
-    return res.status(500).json({ message: 'Something went wrong.' });
-  }
-};
-
-const verifyEmailController = async (req, res) => {
-  try {
-    const verifyEmailService = await verifyEmail(req);
-    if (verifyEmailService instanceof Error) {
-      return res.status(400).json(verifyEmailService);
-    } else {
-      return res.status(200).json(verifyEmailService);
-    }
-  } catch (e) {
-    logger.error('[verifyEmailController]', e);
-    return res.status(500).json({ message: 'Something went wrong.' });
-  }
-};
-
-const resendVerificationController = async (req, res) => {
-  try {
-    const result = await resendVerificationEmail(req);
-    if (result instanceof Error) {
-      return res.status(400).json(result);
-    } else {
-      return res.status(200).json(result);
-    }
-  } catch (e) {
-    logger.error('[verifyEmailController]', e);
-    return res.status(500).json({ message: 'Something went wrong.' });
+    res.status(500).json({ message: err.message });
   }
 };
 
 module.exports = {
   getUserController,
-  deleteUserController,
-  verifyEmailController,
   updateUserPluginsController,
-  resendVerificationController,
 };

api/server/controllers/assistants/chatV1.js

@@ -20,7 +20,6 @@ const {
 } = require('~/server/services/Threads');
 const { sendResponse, sendMessage, sleep, isEnabled, countTokens } = require('~/server/utils');
 const { runAssistant, createOnTextProgress } = require('~/server/services/AssistantService');
-const validateAuthor = require('~/server/middleware/assistants/validateAuthor');
 const { formatMessage, createVisionPrompt } = require('~/app/clients/prompts');
 const { createRun, StreamRunManager } = require('~/server/services/Runs');
 const { addTitle } = require('~/server/services/Endpoints/assistants');
@@ -32,14 +31,15 @@ const { getModelMaxTokens } = require('~/utils');
 const { getOpenAIClient } = require('./helpers');
 const { logger } = require('~/config');
 
+const { handleAbortError } = require('~/server/middleware');
+
 const ten_minutes = 1000 * 60 * 10;
 
 /**
  * @route POST /
  * @desc Chat with an assistant
  * @access Public
- * @param {object} req - The request object, containing the request data.
- * @param {object} req.body - The request payload.
+ * @param {Express.Request} req - The request object, containing the request data.
  * @param {Express.Response} res - The response object, used to send back a response.
  * @returns {void}
  */
@@ -60,6 +60,30 @@ const chatV1 = async (req, res) => {
     parentMessageId: _parentId = Constants.NO_PARENT,
   } = req.body;
 
+  /** @type {Partial<TAssistantEndpoint>} */
+  const assistantsConfig = req.app.locals?.[endpoint];
+
+  if (assistantsConfig) {
+    const { supportedIds, excludedIds } = assistantsConfig;
+    const error = { message: 'Assistant not supported' };
+    if (supportedIds?.length && !supportedIds.includes(assistant_id)) {
+      return await handleAbortError(res, req, error, {
+        sender: 'System',
+        conversationId: convoId,
+        messageId: v4(),
+        parentMessageId: _messageId,
+        error,
+      });
+    } else if (excludedIds?.length && excludedIds.includes(assistant_id)) {
+      return await handleAbortError(res, req, error, {
+        sender: 'System',
+        conversationId: convoId,
+        messageId: v4(),
+        parentMessageId: _messageId,
+      });
+    }
+  }
+
   /** @type {OpenAIClient} */
   let openai;
   /** @type {string|undefined} - the current thread id */
@@ -287,7 +311,6 @@ const chatV1 = async (req, res) => {
     });
 
     openai = _openai;
-    await validateAuthor({ req, openai });
 
     if (previousMessages.length) {
       parentMessageId = previousMessages[previousMessages.length - 1].messageId;

api/server/controllers/assistants/chatV2.js

@@ -20,7 +20,6 @@ const {
 } = require('~/server/services/Threads');
 const { sendResponse, sendMessage, sleep, isEnabled, countTokens } = require('~/server/utils');
 const { runAssistant, createOnTextProgress } = require('~/server/services/AssistantService');
-const validateAuthor = require('~/server/middleware/assistants/validateAuthor');
 const { createRun, StreamRunManager } = require('~/server/services/Runs');
 const { addTitle } = require('~/server/services/Endpoints/assistants');
 const { getTransactions } = require('~/models/Transaction');
@@ -31,6 +30,8 @@ const { getModelMaxTokens } = require('~/utils');
 const { getOpenAIClient } = require('./helpers');
 const { logger } = require('~/config');
 
+const { handleAbortError } = require('~/server/middleware');
+
 const ten_minutes = 1000 * 60 * 10;
 
 /**
@@ -59,6 +60,30 @@ const chatV2 = async (req, res) => {
     parentMessageId: _parentId = Constants.NO_PARENT,
   } = req.body;
 
+  /** @type {Partial<TAssistantEndpoint>} */
+  const assistantsConfig = req.app.locals?.[endpoint];
+
+  if (assistantsConfig) {
+    const { supportedIds, excludedIds } = assistantsConfig;
+    const error = { message: 'Assistant not supported' };
+    if (supportedIds?.length && !supportedIds.includes(assistant_id)) {
+      return await handleAbortError(res, req, error, {
+        sender: 'System',
+        conversationId: convoId,
+        messageId: v4(),
+        parentMessageId: _messageId,
+        error,
+      });
+    } else if (excludedIds?.length && excludedIds.includes(assistant_id)) {
+      return await handleAbortError(res, req, error, {
+        sender: 'System',
+        conversationId: convoId,
+        messageId: v4(),
+        parentMessageId: _messageId,
+      });
+    }
+  }
+
   /** @type {OpenAIClient} */
   let openai;
   /** @type {string|undefined} - the current thread id */
@@ -284,7 +309,6 @@ const chatV2 = async (req, res) => {
     });
 
     openai = _openai;
-    await validateAuthor({ req, openai });
 
     if (previousMessages.length) {
       parentMessageId = previousMessages[previousMessages.length - 1].messageId;
@@ -496,7 +520,6 @@ const chatV2 = async (req, res) => {
         handlers,
         thread_id,
         attachedFileIds,
-        parentMessageId: userMessageId,
         responseMessage: openai.responseMessage,
         // streamOptions: {
 
@@ -509,7 +532,6 @@ const chatV2 = async (req, res) => {
       });
 
       response = streamRunManager;
-      response.text = streamRunManager.intermediateText;
     };
 
     await processRun();
@@ -532,7 +554,6 @@ const chatV2 = async (req, res) => {
     /** @type {ResponseMessage} */
     const responseMessage = {
       ...(response.responseMessage ?? response.finalMessage),
-      text: response.text,
       parentMessageId: userMessageId,
       conversationId,
       user: req.user.id,

api/server/controllers/assistants/helpers.js

@@ -1,9 +1,4 @@
-const {
-  EModelEndpoint,
-  CacheKeys,
-  defaultAssistantsVersion,
-  defaultOrderQuery,
-} = require('librechat-data-provider');
+const { EModelEndpoint, CacheKeys, defaultAssistantsVersion } = require('librechat-data-provider');
 const {
   initializeClient: initAzureClient,
 } = require('~/server/services/Endpoints/azureAssistants');
@@ -40,7 +35,6 @@ const getCurrentVersion = async (req, endpoint) => {
  * Initializes the client with the current request and response objects and lists assistants
  * according to the query parameters. This function abstracts the logic for non-Azure paths.
  *
- * @deprecated
  * @async
  * @param {object} params - The parameters object.
  * @param {object} params.req - The request object, used for initializing the client.
@@ -49,65 +43,11 @@ const getCurrentVersion = async (req, endpoint) => {
  * @param {object} params.query - The query parameters to list assistants (e.g., limit, order).
  * @returns {Promise<object>} A promise that resolves to the response from the `openai.beta.assistants.list` method call.
  */
-const _listAssistants = async ({ req, res, version, query }) => {
+const listAssistants = async ({ req, res, version, query }) => {
   const { openai } = await getOpenAIClient({ req, res, version });
   return openai.beta.assistants.list(query);
 };
 
-/**
- * Fetches all assistants based on provided query params, until `has_more` is `false`.
- *
- * @async
- * @param {object} params - The parameters object.
- * @param {object} params.req - The request object, used for initializing the client.
- * @param {object} params.res - The response object, used for initializing the client.
- * @param {string} params.version - The API version to use.
- * @param {Omit<AssistantListParams, 'endpoint'>} params.query - The query parameters to list assistants (e.g., limit, order).
- * @returns {Promise<object>} A promise that resolves to the response from the `openai.beta.assistants.list` method call.
- */
-const listAllAssistants = async ({ req, res, version, query }) => {
-  /** @type {{ openai: OpenAIClient }} */
-  const { openai } = await getOpenAIClient({ req, res, version });
-  const allAssistants = [];
-
-  let first_id;
-  let last_id;
-  let afterToken = query.after;
-  let hasMore = true;
-
-  while (hasMore) {
-    const response = await openai.beta.assistants.list({
-      ...query,
-      after: afterToken,
-    });
-
-    const { body } = response;
-
-    allAssistants.push(...body.data);
-    hasMore = body.has_more;
-
-    if (!first_id) {
-      first_id = body.first_id;
-    }
-
-    if (hasMore) {
-      afterToken = body.last_id;
-    } else {
-      last_id = body.last_id;
-    }
-  }
-
-  return {
-    data: allAssistants,
-    body: {
-      data: allAssistants,
-      has_more: false,
-      first_id,
-      last_id,
-    },
-  };
-};
-
 /**
  * Asynchronously lists assistants for Azure configured groups.
  *
@@ -142,7 +82,7 @@ const listAssistantsForAzure = async ({ req, res, version, azureConfig = {}, que
     /* The specified model is only necessary to
     fetch assistants for the shared instance */
     req.body.model = currentModelTuples[0][0];
-    promises.push(listAllAssistants({ req, res, version, query }));
+    promises.push(listAssistants({ req, res, version, query }));
   }
 
   const resolvedQueries = await Promise.all(promises);
@@ -193,27 +133,8 @@ async function getOpenAIClient({ req, res, endpointOption, initAppClient, overri
   return result;
 }
 
-/**
- * Returns a list of assistants.
- * @param {object} params
- * @param {object} params.req - Express Request
- * @param {AssistantListParams} [params.req.query] - The assistant list parameters for pagination and sorting.
- * @param {object} params.res - Express Response
- * @param {string} [params.overrideEndpoint] - The endpoint to override the request endpoint.
- * @returns {Promise<AssistantListResponse>} 200 - success response - application/json
- */
-const fetchAssistants = async ({ req, res, overrideEndpoint }) => {
-  const {
-    limit = 100,
-    order = 'desc',
-    after,
-    before,
-    endpoint,
-  } = req.query ?? {
-    endpoint: overrideEndpoint,
-    ...defaultOrderQuery,
-  };
-
+const fetchAssistants = async (req, res) => {
+  const { limit = 100, order = 'desc', after, before, endpoint } = req.query;
   const version = await getCurrentVersion(req, endpoint);
   const query = { limit, order, after, before };
 
@@ -221,47 +142,15 @@ const fetchAssistants = async ({ req, res, overrideEndpoint }) => {
   let body;
 
   if (endpoint === EModelEndpoint.assistants) {
-    ({ body } = await listAllAssistants({ req, res, version, query }));
+    ({ body } = await listAssistants({ req, res, version, query }));
   } else if (endpoint === EModelEndpoint.azureAssistants) {
     const azureConfig = req.app.locals[EModelEndpoint.azureOpenAI];
     body = await listAssistantsForAzure({ req, res, version, azureConfig, query });
   }
 
-  if (req.user.role === 'ADMIN') {
-    return body;
-  } else if (!req.app.locals[endpoint]) {
-    return body;
-  }
-
-  body.data = filterAssistants({
-    userId: req.user.id,
-    assistants: body.data,
-    assistantsConfig: req.app.locals[endpoint],
-  });
   return body;
 };
 
-/**
- * Filter assistants based on configuration.
- *
- * @param {object} params - The parameters object.
- * @param {string} params.userId -  The user ID to filter private assistants.
- * @param {Assistant[]} params.assistants - The list of assistants to filter.
- * @param {Partial<TAssistantEndpoint>} params.assistantsConfig -  The assistant configuration.
- * @returns {Assistant[]} - The filtered list of assistants.
- */
-function filterAssistants({ assistants, userId, assistantsConfig }) {
-  const { supportedIds, excludedIds, privateAssistants } = assistantsConfig;
-  if (privateAssistants) {
-    return assistants.filter((assistant) => userId === assistant.metadata?.author);
-  } else if (supportedIds?.length) {
-    return assistants.filter((assistant) => supportedIds.includes(assistant.id));
-  } else if (excludedIds?.length) {
-    return assistants.filter((assistant) => !excludedIds.includes(assistant.id));
-  }
-  return assistants;
-}
-
 module.exports = {
   getOpenAIClient,
   fetchAssistants,

api/server/controllers/assistants/v1.js

@@ -1,9 +1,8 @@
 const { FileContext } = require('librechat-data-provider');
-const validateAuthor = require('~/server/middleware/assistants/validateAuthor');
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
 const { deleteAssistantActions } = require('~/server/services/ActionService');
-const { updateAssistantDoc, getAssistants } = require('~/models/Assistant');
 const { uploadImageBuffer } = require('~/server/services/Files/process');
+const { updateAssistant, getAssistants } = require('~/models/Assistant');
 const { getOpenAIClient, fetchAssistants } = require('./helpers');
 const { deleteFileByFilter } = require('~/models/File');
 const { logger } = require('~/config');
@@ -41,11 +40,9 @@ const createAssistant = async (req, res) => {
     };
 
     const assistant = await openai.beta.assistants.create(assistantData);
-    const promise = updateAssistantDoc({ assistant_id: assistant.id }, { user: req.user.id });
     if (azureModelIdentifier) {
       assistant.model = azureModelIdentifier;
     }
-    await promise;
     logger.debug('/assistants/', assistant);
     res.status(201).json(assistant);
   } catch (error) {
@@ -64,6 +61,7 @@ const retrieveAssistant = async (req, res) => {
   try {
     /* NOTE: not actually being used right now */
     const { openai } = await getOpenAIClient({ req, res });
+
     const assistant_id = req.params.id;
     const assistant = await openai.beta.assistants.retrieve(assistant_id);
     res.json(assistant);
@@ -85,7 +83,6 @@ const retrieveAssistant = async (req, res) => {
 const patchAssistant = async (req, res) => {
   try {
     const { openai } = await getOpenAIClient({ req, res });
-    await validateAuthor({ req, openai });
 
     const assistant_id = req.params.id;
     const { endpoint: _e, ...updateData } = req.body;
@@ -122,7 +119,6 @@ const patchAssistant = async (req, res) => {
 const deleteAssistant = async (req, res) => {
   try {
     const { openai } = await getOpenAIClient({ req, res });
-    await validateAuthor({ req, openai });
 
     const assistant_id = req.params.id;
     const deletionStatus = await openai.beta.assistants.del(assistant_id);
@@ -145,7 +141,19 @@ const deleteAssistant = async (req, res) => {
  */
 const listAssistants = async (req, res) => {
   try {
-    const body = await fetchAssistants({ req, res });
+    const body = await fetchAssistants(req, res);
+
+    if (req.app.locals?.[req.query.endpoint]) {
+      /** @type {Partial<TAssistantEndpoint>} */
+      const assistantsConfig = req.app.locals[req.query.endpoint];
+      const { supportedIds, excludedIds } = assistantsConfig;
+      if (supportedIds?.length) {
+        body.data = body.data.filter((assistant) => supportedIds.includes(assistant.id));
+      } else if (excludedIds?.length) {
+        body.data = body.data.filter((assistant) => !excludedIds.includes(assistant.id));
+      }
+    }
+
     res.json(body);
   } catch (error) {
     logger.error('[/assistants] Error listing assistants', error);
@@ -187,7 +195,6 @@ const uploadAssistantAvatar = async (req, res) => {
 
     let { metadata: _metadata = '{}' } = req.body;
     const { openai } = await getOpenAIClient({ req, res });
-    await validateAuthor({ req, openai });
 
     const image = await uploadImageBuffer({
       req,
@@ -222,7 +229,7 @@ const uploadAssistantAvatar = async (req, res) => {
 
     const promises = [];
     promises.push(
-      updateAssistantDoc(
+      updateAssistant(
         { assistant_id },
         {
           avatar: {

api/server/controllers/assistants/v2.js

@@ -1,7 +1,5 @@
 const { ToolCallTypes } = require('librechat-data-provider');
-const validateAuthor = require('~/server/middleware/assistants/validateAuthor');
 const { validateAndUpdateTool } = require('~/server/services/ActionService');
-const { updateAssistantDoc } = require('~/models/Assistant');
 const { getOpenAIClient } = require('./helpers');
 const { logger } = require('~/config');
 
@@ -39,11 +37,9 @@ const createAssistant = async (req, res) => {
     };
 
     const assistant = await openai.beta.assistants.create(assistantData);
-    const promise = updateAssistantDoc({ assistant_id: assistant.id }, { user: req.user.id });
     if (azureModelIdentifier) {
       assistant.model = azureModelIdentifier;
     }
-    await promise;
     logger.debug('/assistants/', assistant);
     res.status(201).json(assistant);
   } catch (error) {
@@ -62,7 +58,6 @@ const createAssistant = async (req, res) => {
  * @returns {Promise<Assistant>} The updated assistant.
  */
 const updateAssistant = async ({ req, openai, assistant_id, updateData }) => {
-  await validateAuthor({ req, openai });
   const tools = [];
 
   let hasFileSearch = false;

api/server/controllers/auth/LoginController.js

@@ -1,22 +1,26 @@
+const User = require('~/models/User');
 const { setAuthTokens } = require('~/server/services/AuthService');
 const { logger } = require('~/config');
 
 const loginController = async (req, res) => {
   try {
-    if (!req.user) {
+    const user = await User.findById(req.user._id);
+
+    // If user doesn't exist, return error
+    if (!user) {
+      // typeof user !== User) { // this doesn't seem to resolve the User type ??
       return res.status(400).json({ message: 'Invalid credentials' });
     }
 
-    const { password: _, __v, ...user } = req.user;
-    user.id = user._id.toString();
-
-    const token = await setAuthTokens(req.user._id, res);
+    const token = await setAuthTokens(user._id, res);
 
     return res.status(200).send({ token, user });
   } catch (err) {
     logger.error('[loginController]', err);
-    return res.status(500).json({ message: 'Something went wrong' });
   }
+
+  // Generic error messages are safer
+  return res.status(500).json({ message: 'Something went wrong' });
 };
 
 module.exports = {

api/server/index.js

@@ -6,16 +6,16 @@ const axios = require('axios');
 const express = require('express');
 const passport = require('passport');
 const mongoSanitize = require('express-mongo-sanitize');
-const { jwtLogin, passportLogin } = require('~/strategies');
-const { connectDb, indexSync } = require('~/lib/db');
-const { isEnabled } = require('~/server/utils');
-const { ldapLogin } = require('~/strategies');
-const { logger } = require('~/config');
 const validateImageRequest = require('./middleware/validateImageRequest');
 const errorController = require('./controllers/ErrorController');
+const { jwtLogin, passportLogin } = require('~/strategies');
 const configureSocialLogins = require('./socialLogins');
+const { connectDb, indexSync } = require('~/lib/db');
 const AppService = require('./services/AppService');
 const noIndex = require('./middleware/noIndex');
+const { isEnabled } = require('~/server/utils');
+const { logger } = require('~/config');
+
 const routes = require('./routes');
 
 const { PORT, HOST, ALLOW_SOCIAL_LOGIN } = process.env ?? {};
@@ -60,11 +60,6 @@ const startServer = async () => {
   passport.use(await jwtLogin());
   passport.use(passportLogin());
 
-  // LDAP Auth
-  if (process.env.LDAP_URL && process.env.LDAP_BIND_DN && process.env.LDAP_USER_SEARCH_BASE) {
-    passport.use(ldapLogin);
-  }
-
   if (isEnabled(ALLOW_SOCIAL_LOGIN)) {
     configureSocialLogins(app);
   }
@@ -93,7 +88,7 @@ const startServer = async () => {
   app.use('/api/share', routes.share);
 
   app.use((req, res) => {
-    res.sendFile(path.join(app.locals.paths.dist, 'index.html'));
+    res.status(404).sendFile(path.join(app.locals.paths.dist, 'index.html'));
   });
 
   app.listen(port, host, () => {

api/server/middleware/abortRun.js

@@ -1,7 +1,6 @@
 const { CacheKeys, RunStatus, isUUID } = require('librechat-data-provider');
 const { initializeClient } = require('~/server/services/Endpoints/assistants');
 const { checkMessageGaps, recordUsage } = require('~/server/services/Threads');
-const { deleteMessages } = require('~/models/Message');
 const { getConvo } = require('~/models/Conversation');
 const getLogStores = require('~/cache/getLogStores');
 const { sendMessage } = require('~/server/utils');
@@ -67,19 +66,13 @@ async function abortRun(req, res) {
     logger.error('[abortRun] Error fetching or processing run', error);
   }
 
-  /* TODO: a reconciling strategy between the existing intermediate message would be more optimal than deleting it */
-  await deleteMessages({
-    user: req.user.id,
-    unfinished: true,
-    conversationId,
-  });
   runMessages = await checkMessageGaps({
     openai,
-    run_id,
     endpoint,
     thread_id,
-    conversationId,
+    run_id,
     latestMessageId,
+    conversationId,
   });
 
   const finalEvent = {

api/server/middleware/assistants/validate.js

@@ -1,43 +0,0 @@
-const { v4 } = require('uuid');
-const { handleAbortError } = require('~/server/middleware/abortMiddleware');
-
-/**
- * Checks if the assistant is supported or excluded
- * @param {object} req - Express Request
- * @param {object} req.body - The request payload.
- * @param {object} res - Express Response
- * @param {function} next - Express next middleware function.
- * @returns {Promise<void>}
- */
-const validateAssistant = async (req, res, next) => {
-  const { endpoint, conversationId, assistant_id, messageId } = req.body;
-
-  /** @type {Partial<TAssistantEndpoint>} */
-  const assistantsConfig = req.app.locals?.[endpoint];
-  if (!assistantsConfig) {
-    return next();
-  }
-
-  const { supportedIds, excludedIds } = assistantsConfig;
-  const error = { message: 'Assistant not supported' };
-  if (supportedIds?.length && !supportedIds.includes(assistant_id)) {
-    return await handleAbortError(res, req, error, {
-      sender: 'System',
-      conversationId,
-      messageId: v4(),
-      parentMessageId: messageId,
-      error,
-    });
-  } else if (excludedIds?.length && excludedIds.includes(assistant_id)) {
-    return await handleAbortError(res, req, error, {
-      sender: 'System',
-      conversationId,
-      messageId: v4(),
-      parentMessageId: messageId,
-    });
-  }
-
-  return next();
-};
-
-module.exports = validateAssistant;

api/server/middleware/assistants/validateAuthor.js

@@ -1,42 +0,0 @@
-const { getAssistant } = require('~/models/Assistant');
-
-/**
- * Checks if the assistant is supported or excluded
- * @param {object} params
- * @param {object} params.req - Express Request
- * @param {object} params.req.body - The request payload.
- * @param {string} params.overrideEndpoint - The override endpoint
- * @param {string} params.overrideAssistantId - The override assistant ID
- * @param {OpenAIClient} params.openai - OpenAI API Client
- * @returns {Promise<void>}
- */
-const validateAuthor = async ({ req, openai, overrideEndpoint, overrideAssistantId }) => {
-  if (req.user.role === 'ADMIN') {
-    return;
-  }
-
-  const endpoint = overrideEndpoint ?? req.body.endpoint ?? req.query.endpoint;
-  const assistant_id =
-    overrideAssistantId ?? req.params.id ?? req.body.assistant_id ?? req.query.assistant_id;
-
-  /** @type {Partial<TAssistantEndpoint>} */
-  const assistantsConfig = req.app.locals?.[endpoint];
-  if (!assistantsConfig) {
-    return;
-  }
-
-  if (!assistantsConfig.privateAssistants) {
-    return;
-  }
-
-  const assistantDoc = await getAssistant({ assistant_id, user: req.user.id });
-  if (assistantDoc) {
-    return;
-  }
-  const assistant = await openai.beta.assistants.retrieve(assistant_id);
-  if (req.user.id !== assistant?.metadata?.author) {
-    throw new Error(`Assistant ${assistant_id} is not authored by the user.`);
-  }
-};
-
-module.exports = validateAuthor;

api/server/middleware/canDeleteAccount.js

@@ -1,27 +0,0 @@
-const { isEnabled } = require('~/server/utils');
-const { logger } = require('~/config');
-
-/**
- * Checks if the user can delete their account
- *
- * @async
- * @function
- * @param {Object} req - Express request object
- * @param {Object} res - Express response object
- * @param {Function} next - Next middleware function
- *
- * @returns {Promise<function|Object>} - Returns a Promise which when resolved calls next middleware if the user can delete their account
- */
-
-const canDeleteAccount = async (req, res, next = () => {}) => {
-  const { user } = req;
-  const { ALLOW_ACCOUNT_DELETION = true } = process.env;
-  if (user?.role === 'ADMIN' || isEnabled(ALLOW_ACCOUNT_DELETION)) {
-    return next();
-  } else {
-    logger.error(`[User] [Delete Account] [User cannot delete account] [User: ${user?.id}]`);
-    return res.status(403).send({ message: 'You do not have permission to delete this account' });
-  }
-};
-
-module.exports = canDeleteAccount;

api/server/middleware/checkBan.js

@@ -1,13 +1,15 @@
 const Keyv = require('keyv');
 const uap = require('ua-parser-js');
 const { ViolationTypes } = require('librechat-data-provider');
-const { isEnabled, removePorts } = require('~/server/utils');
-const keyvMongo = require('~/cache/keyvMongo');
+const { isEnabled, removePorts } = require('../utils');
+const keyvRedis = require('~/cache/keyvRedis');
 const denyRequest = require('./denyRequest');
 const { getLogStores } = require('~/cache');
-const { findUser } = require('~/models');
+const User = require('~/models/User');
 
-const banCache = new Keyv({ store: keyvMongo, namespace: ViolationTypes.BAN, ttl: 0 });
+const banCache = isEnabled(process.env.USE_REDIS)
+  ? new Keyv({ store: keyvRedis })
+  : new Keyv({ namespace: ViolationTypes.BAN, ttl: 0 });
 const message = 'Your account has been temporarily banned due to violations of our service.';
 
 /**
@@ -55,7 +57,7 @@ const checkBan = async (req, res, next = () => {}) => {
   let userId = req.user?.id ?? req.user?._id ?? null;
 
   if (!userId && req?.body?.email) {
-    const user = await findUser({ email: req.body.email }, '_id');
+    const user = await User.findOne({ email: req.body.email }, '_id').lean();
     userId = user?._id ? user._id.toString() : userId;
   }
 

api/server/middleware/index.js

@@ -1,43 +1,45 @@
-const validatePasswordReset = require('./validatePasswordReset');
+const abortMiddleware = require('./abortMiddleware');
+const checkBan = require('./checkBan');
+const checkDomainAllowed = require('./checkDomainAllowed');
+const uaParser = require('./uaParser');
+const setHeaders = require('./setHeaders');
+const loginLimiter = require('./loginLimiter');
+const validateModel = require('./validateModel');
+const requireJwtAuth = require('./requireJwtAuth');
+const uploadLimiters = require('./uploadLimiters');
+const registerLimiter = require('./registerLimiter');
+const messageLimiters = require('./messageLimiters');
+const requireLocalAuth = require('./requireLocalAuth');
+const validateEndpoint = require('./validateEndpoint');
+const concurrentLimiter = require('./concurrentLimiter');
+const validateMessageReq = require('./validateMessageReq');
+const buildEndpointOption = require('./buildEndpointOption');
 const validateRegistration = require('./validateRegistration');
 const validateImageRequest = require('./validateImageRequest');
-const buildEndpointOption = require('./buildEndpointOption');
-const validateMessageReq = require('./validateMessageReq');
-const checkDomainAllowed = require('./checkDomainAllowed');
-const concurrentLimiter = require('./concurrentLimiter');
-const validateEndpoint = require('./validateEndpoint');
-const requireLocalAuth = require('./requireLocalAuth');
-const canDeleteAccount = require('./canDeleteAccount');
-const requireLdapAuth = require('./requireLdapAuth');
-const abortMiddleware = require('./abortMiddleware');
-const requireJwtAuth = require('./requireJwtAuth');
-const validateModel = require('./validateModel');
 const moderateText = require('./moderateText');
-const setHeaders = require('./setHeaders');
-const limiters = require('./limiters');
-const uaParser = require('./uaParser');
-const checkBan = require('./checkBan');
 const noIndex = require('./noIndex');
+const importLimiters = require('./importLimiters');
 
 module.exports = {
+  ...uploadLimiters,
   ...abortMiddleware,
-  ...limiters,
-  noIndex,
+  ...messageLimiters,
   checkBan,
   uaParser,
   setHeaders,
-  moderateText,
-  validateModel,
+  loginLimiter,
   requireJwtAuth,
-  requireLdapAuth,
+  registerLimiter,
   requireLocalAuth,
-  canDeleteAccount,
   validateEndpoint,
   concurrentLimiter,
-  checkDomainAllowed,
   validateMessageReq,
   buildEndpointOption,
   validateRegistration,
   validateImageRequest,
-  validatePasswordReset,
+  validateModel,
+  moderateText,
+  noIndex,
+  ...importLimiters,
+  checkDomainAllowed,
 };

api/server/middleware/limiters/index.js

@@ -1,22 +0,0 @@
-const createTTSLimiters = require('./ttsLimiters');
-const createSTTLimiters = require('./sttLimiters');
-
-const loginLimiter = require('./loginLimiter');
-const importLimiters = require('./importLimiters');
-const uploadLimiters = require('./uploadLimiters');
-const registerLimiter = require('./registerLimiter');
-const messageLimiters = require('./messageLimiters');
-const verifyEmailLimiter = require('./verifyEmailLimiter');
-const resetPasswordLimiter = require('./resetPasswordLimiter');
-
-module.exports = {
-  ...uploadLimiters,
-  ...importLimiters,
-  ...messageLimiters,
-  loginLimiter,
-  registerLimiter,
-  createTTSLimiters,
-  createSTTLimiters,
-  verifyEmailLimiter,
-  resetPasswordLimiter,
-};

api/server/middleware/limiters/resetPasswordLimiter.js

@@ -1,35 +0,0 @@
-const rateLimit = require('express-rate-limit');
-const { ViolationTypes } = require('librechat-data-provider');
-const { removePorts } = require('~/server/utils');
-const { logViolation } = require('~/cache');
-
-const {
-  RESET_PASSWORD_WINDOW = 2,
-  RESET_PASSWORD_MAX = 2,
-  RESET_PASSWORD_VIOLATION_SCORE: score,
-} = process.env;
-const windowMs = RESET_PASSWORD_WINDOW * 60 * 1000;
-const max = RESET_PASSWORD_MAX;
-const windowInMinutes = windowMs / 60000;
-const message = `Too many attempts, please try again after ${windowInMinutes} minute(s)`;
-
-const handler = async (req, res) => {
-  const type = ViolationTypes.RESET_PASSWORD_LIMIT;
-  const errorMessage = {
-    type,
-    max,
-    windowInMinutes,
-  };
-
-  await logViolation(req, res, type, errorMessage, score);
-  return res.status(429).json({ message });
-};
-
-const resetPasswordLimiter = rateLimit({
-  windowMs,
-  max,
-  handler,
-  keyGenerator: removePorts,
-});
-
-module.exports = resetPasswordLimiter;

api/server/middleware/limiters/sttLimiters.js

@@ -1,68 +0,0 @@
-const rateLimit = require('express-rate-limit');
-const { ViolationTypes } = require('librechat-data-provider');
-const logViolation = require('~/cache/logViolation');
-
-const getEnvironmentVariables = () => {
-  const STT_IP_MAX = parseInt(process.env.STT_IP_MAX) || 100;
-  const STT_IP_WINDOW = parseInt(process.env.STT_IP_WINDOW) || 1;
-  const STT_USER_MAX = parseInt(process.env.STT_USER_MAX) || 50;
-  const STT_USER_WINDOW = parseInt(process.env.STT_USER_WINDOW) || 1;
-
-  const sttIpWindowMs = STT_IP_WINDOW * 60 * 1000;
-  const sttIpMax = STT_IP_MAX;
-  const sttIpWindowInMinutes = sttIpWindowMs / 60000;
-
-  const sttUserWindowMs = STT_USER_WINDOW * 60 * 1000;
-  const sttUserMax = STT_USER_MAX;
-  const sttUserWindowInMinutes = sttUserWindowMs / 60000;
-
-  return {
-    sttIpWindowMs,
-    sttIpMax,
-    sttIpWindowInMinutes,
-    sttUserWindowMs,
-    sttUserMax,
-    sttUserWindowInMinutes,
-  };
-};
-
-const createSTTHandler = (ip = true) => {
-  const { sttIpMax, sttIpWindowInMinutes, sttUserMax, sttUserWindowInMinutes } =
-    getEnvironmentVariables();
-
-  return async (req, res) => {
-    const type = ViolationTypes.STT_LIMIT;
-    const errorMessage = {
-      type,
-      max: ip ? sttIpMax : sttUserMax,
-      limiter: ip ? 'ip' : 'user',
-      windowInMinutes: ip ? sttIpWindowInMinutes : sttUserWindowInMinutes,
-    };
-
-    await logViolation(req, res, type, errorMessage);
-    res.status(429).json({ message: 'Too many STT requests. Try again later' });
-  };
-};
-
-const createSTTLimiters = () => {
-  const { sttIpWindowMs, sttIpMax, sttUserWindowMs, sttUserMax } = getEnvironmentVariables();
-
-  const sttIpLimiter = rateLimit({
-    windowMs: sttIpWindowMs,
-    max: sttIpMax,
-    handler: createSTTHandler(),
-  });
-
-  const sttUserLimiter = rateLimit({
-    windowMs: sttUserWindowMs,
-    max: sttUserMax,
-    handler: createSTTHandler(false),
-    keyGenerator: function (req) {
-      return req.user?.id; // Use the user ID or NULL if not available
-    },
-  });
-
-  return { sttIpLimiter, sttUserLimiter };
-};
-
-module.exports = createSTTLimiters;

api/server/middleware/limiters/ttsLimiters.js

@@ -1,68 +0,0 @@
-const rateLimit = require('express-rate-limit');
-const { ViolationTypes } = require('librechat-data-provider');
-const logViolation = require('~/cache/logViolation');
-
-const getEnvironmentVariables = () => {
-  const TTS_IP_MAX = parseInt(process.env.TTS_IP_MAX) || 100;
-  const TTS_IP_WINDOW = parseInt(process.env.TTS_IP_WINDOW) || 1;
-  const TTS_USER_MAX = parseInt(process.env.TTS_USER_MAX) || 50;
-  const TTS_USER_WINDOW = parseInt(process.env.TTS_USER_WINDOW) || 1;
-
-  const ttsIpWindowMs = TTS_IP_WINDOW * 60 * 1000;
-  const ttsIpMax = TTS_IP_MAX;
-  const ttsIpWindowInMinutes = ttsIpWindowMs / 60000;
-
-  const ttsUserWindowMs = TTS_USER_WINDOW * 60 * 1000;
-  const ttsUserMax = TTS_USER_MAX;
-  const ttsUserWindowInMinutes = ttsUserWindowMs / 60000;
-
-  return {
-    ttsIpWindowMs,
-    ttsIpMax,
-    ttsIpWindowInMinutes,
-    ttsUserWindowMs,
-    ttsUserMax,
-    ttsUserWindowInMinutes,
-  };
-};
-
-const createTTSHandler = (ip = true) => {
-  const { ttsIpMax, ttsIpWindowInMinutes, ttsUserMax, ttsUserWindowInMinutes } =
-    getEnvironmentVariables();
-
-  return async (req, res) => {
-    const type = ViolationTypes.TTS_LIMIT;
-    const errorMessage = {
-      type,
-      max: ip ? ttsIpMax : ttsUserMax,
-      limiter: ip ? 'ip' : 'user',
-      windowInMinutes: ip ? ttsIpWindowInMinutes : ttsUserWindowInMinutes,
-    };
-
-    await logViolation(req, res, type, errorMessage);
-    res.status(429).json({ message: 'Too many TTS requests. Try again later' });
-  };
-};
-
-const createTTSLimiters = () => {
-  const { ttsIpWindowMs, ttsIpMax, ttsUserWindowMs, ttsUserMax } = getEnvironmentVariables();
-
-  const ttsIpLimiter = rateLimit({
-    windowMs: ttsIpWindowMs,
-    max: ttsIpMax,
-    handler: createTTSHandler(),
-  });
-
-  const ttsUserLimiter = rateLimit({
-    windowMs: ttsUserWindowMs,
-    max: ttsUserMax,
-    handler: createTTSHandler(false),
-    keyGenerator: function (req) {
-      return req.user?.id; // Use the user ID or NULL if not available
-    },
-  });
-
-  return { ttsIpLimiter, ttsUserLimiter };
-};
-
-module.exports = createTTSLimiters;

api/server/middleware/limiters/verifyEmailLimiter.js

@@ -1,35 +0,0 @@
-const rateLimit = require('express-rate-limit');
-const { ViolationTypes } = require('librechat-data-provider');
-const { removePorts } = require('~/server/utils');
-const { logViolation } = require('~/cache');
-
-const {
-  VERIFY_EMAIL_WINDOW = 2,
-  VERIFY_EMAIL_MAX = 2,
-  VERIFY_EMAIL_VIOLATION_SCORE: score,
-} = process.env;
-const windowMs = VERIFY_EMAIL_WINDOW * 60 * 1000;
-const max = VERIFY_EMAIL_MAX;
-const windowInMinutes = windowMs / 60000;
-const message = `Too many attempts, please try again after ${windowInMinutes} minute(s)`;
-
-const handler = async (req, res) => {
-  const type = ViolationTypes.VERIFY_EMAIL_LIMIT;
-  const errorMessage = {
-    type,
-    max,
-    windowInMinutes,
-  };
-
-  await logViolation(req, res, type, errorMessage, score);
-  return res.status(429).json({ message });
-};
-
-const verifyEmailLimiter = rateLimit({
-  windowMs,
-  max,
-  handler,
-  keyGenerator: removePorts,
-});
-
-module.exports = verifyEmailLimiter;

api/server/middleware/loginLimiter.js

@@ -1,6 +1,6 @@
 const rateLimit = require('express-rate-limit');
-const { removePorts } = require('~/server/utils');
-const { logViolation } = require('~/cache');
+const { logViolation } = require('../../cache');
+const { removePorts } = require('../utils');
 
 const { LOGIN_WINDOW = 5, LOGIN_MAX = 7, LOGIN_VIOLATION_SCORE: score } = process.env;
 const windowMs = LOGIN_WINDOW * 60 * 1000;

api/server/middleware/messageLimiters.js

@@ -1,6 +1,6 @@
 const rateLimit = require('express-rate-limit');
-const denyRequest = require('~/server/middleware/denyRequest');
-const { logViolation } = require('~/cache');
+const { logViolation } = require('../../cache');
+const denyRequest = require('./denyRequest');
 
 const {
   MESSAGE_IP_MAX = 40,

api/server/middleware/registerLimiter.js

@@ -1,6 +1,6 @@
 const rateLimit = require('express-rate-limit');
-const { removePorts } = require('~/server/utils');
-const { logViolation } = require('~/cache');
+const { logViolation } = require('../../cache');
+const { removePorts } = require('../utils');
 
 const { REGISTER_WINDOW = 60, REGISTER_MAX = 5, REGISTRATION_VIOLATION_SCORE: score } = process.env;
 const windowMs = REGISTER_WINDOW * 60 * 1000;

api/server/middleware/requireLdapAuth.js

@@ -1,22 +0,0 @@
-const passport = require('passport');
-
-const requireLdapAuth = (req, res, next) => {
-  passport.authenticate('ldapauth', (err, user, info) => {
-    if (err) {
-      console.log({
-        title: '(requireLdapAuth) Error at passport.authenticate',
-        parameters: [{ name: 'error', value: err }],
-      });
-      return next(err);
-    }
-    if (!user) {
-      console.log({
-        title: '(requireLdapAuth) Error: No user',
-      });
-      return res.status(422).send(info);
-    }
-    req.user = user;
-    next();
-  })(req, res, next);
-};
-module.exports = requireLdapAuth;

api/server/middleware/requireLocalAuth.js

@@ -21,13 +21,7 @@ const requireLocalAuth = (req, res, next) => {
       log({
         title: '(requireLocalAuth) Error: No user',
       });
-      return res.status(404).send(info);
-    }
-    if (info && info.message) {
-      log({
-        title: '(requireLocalAuth) Error: ' + info.message,
-      });
-      return res.status(422).send({ message: info.message });
+      return res.status(422).send(info);
     }
     req.user = user;
     next();

api/server/middleware/validatePasswordReset.js

@@ -1,13 +0,0 @@
-const { isEnabled } = require('~/server/utils');
-const { logger } = require('~/config');
-
-function validatePasswordReset(req, res, next) {
-  if (isEnabled(process.env.ALLOW_PASSWORD_RESET)) {
-    next();
-  } else {
-    logger.warn(`Password reset attempt while not allowed. IP: ${req.ip}`);
-    res.status(403).send('Password reset is not allowed.');
-  }
-}
-
-module.exports = validatePasswordReset;

api/server/middleware/validateRegistration.js

@@ -1,7 +1,6 @@
-const { isEnabled } = require('~/server/utils');
-
 function validateRegistration(req, res, next) {
-  if (isEnabled(process.env.ALLOW_REGISTRATION)) {
+  const setting = process.env.ALLOW_REGISTRATION?.toLowerCase();
+  if (setting === 'true') {
     next();
   } else {
     res.status(403).send('Registration is not allowed.');

api/server/routes/__tests__/config.spec.js

@@ -25,12 +25,6 @@ afterEach(() => {
   delete process.env.DOMAIN_SERVER;
   delete process.env.ALLOW_REGISTRATION;
   delete process.env.ALLOW_SOCIAL_LOGIN;
-  delete process.env.ALLOW_PASSWORD_RESET;
-  delete process.env.LDAP_URL;
-  delete process.env.LDAP_BIND_DN;
-  delete process.env.LDAP_BIND_CREDENTIALS;
-  delete process.env.LDAP_USER_SEARCH_BASE;
-  delete process.env.LDAP_SEARCH_FILTER;
 });
 
 //TODO: This works/passes locally but http request tests fail with 404 in CI. Need to figure out why.
@@ -56,12 +50,6 @@ describe.skip('GET /', () => {
     process.env.DOMAIN_SERVER = 'http://test-server.com';
     process.env.ALLOW_REGISTRATION = 'true';
     process.env.ALLOW_SOCIAL_LOGIN = 'true';
-    process.env.ALLOW_PASSWORD_RESET = 'true';
-    process.env.LDAP_URL = 'Test LDAP URL';
-    process.env.LDAP_BIND_DN = 'Test LDAP Bind DN';
-    process.env.LDAP_BIND_CREDENTIALS = 'Test LDAP Bind Credentials';
-    process.env.LDAP_USER_SEARCH_BASE = 'Test LDAP User Search Base';
-    process.env.LDAP_SEARCH_FILTER = 'Test LDAP Search Filter';
 
     const response = await request(app).get('/');
 
@@ -76,11 +64,9 @@ describe.skip('GET /', () => {
       openidLoginEnabled: true,
       openidLabel: 'Test OpenID',
       openidImageUrl: 'http://test-server.com',
-      ldapLoginEnabled: true,
       serverDomain: 'http://test-server.com',
       emailLoginEnabled: 'true',
       registrationEnabled: 'true',
-      passwordResetEnabled: 'true',
       socialLoginEnabled: 'true',
     });
   });

api/server/routes/ask/gptPlugins.js

@@ -106,11 +106,7 @@ router.post(
     const pluginMap = new Map();
     const onAgentAction = async (action, runId) => {
       pluginMap.set(runId, action.tool);
-      sendIntermediateMessage(res, {
-        plugins,
-        parentMessageId: userMessage.messageId,
-        messageId: responseMessageId,
-      });
+      sendIntermediateMessage(res, { plugins });
     };
 
     const onToolStart = async (tool, input, runId, parentRunId) => {
@@ -128,11 +124,7 @@ router.post(
       }
       const extraTokens = ':::plugin:::\n';
       plugins.push(latestPlugin);
-      sendIntermediateMessage(
-        res,
-        { plugins, parentMessageId: userMessage.messageId, messageId: responseMessageId },
-        extraTokens,
-      );
+      sendIntermediateMessage(res, { plugins }, extraTokens);
     };
 
     const onToolEnd = async (output, runId) => {
@@ -150,11 +142,7 @@ router.post(
 
     const onChainEnd = () => {
       saveMessage({ ...userMessage, user });
-      sendIntermediateMessage(res, {
-        plugins,
-        parentMessageId: userMessage.messageId,
-        messageId: responseMessageId,
-      });
+      sendIntermediateMessage(res, { plugins });
     };
 
     const getAbortData = () => ({
@@ -186,13 +174,12 @@ router.post(
         onStart,
         getPartialText,
         ...endpointOption,
-        progressCallback,
-        progressOptions: {
+        onProgress: progressCallback.call(null, {
           res,
           text,
-          // parentMessageId: overrideParentMessageId || userMessageId,
+          parentMessageId: overrideParentMessageId || userMessageId,
           plugins,
-        },
+        }),
         abortController,
       });
 

api/server/routes/assistants/actions.js

@@ -4,7 +4,7 @@ const { encryptMetadata, domainParser } = require('~/server/services/ActionServi
 const { actionDelimiter, EModelEndpoint } = require('librechat-data-provider');
 const { getOpenAIClient } = require('~/server/controllers/assistants/helpers');
 const { updateAction, getActions, deleteAction } = require('~/models/Action');
-const { updateAssistantDoc, getAssistant } = require('~/models/Assistant');
+const { updateAssistant, getAssistant } = require('~/models/Assistant');
 const { logger } = require('~/config');
 
 const router = express.Router();
@@ -109,7 +109,7 @@ router.post('/:assistant_id', async (req, res) => {
     let updatedAssistant = await openai.beta.assistants.update(assistant_id, { tools });
     const promises = [];
     promises.push(
-      updateAssistantDoc(
+      updateAssistant(
         { assistant_id },
         {
           actions,
@@ -186,7 +186,7 @@ router.delete('/:assistant_id/:action_id/:model', async (req, res) => {
 
     const promises = [];
     promises.push(
-      updateAssistantDoc(
+      updateAssistant(
         { assistant_id },
         {
           actions: updatedActions,

api/server/routes/assistants/chatV1.js

@@ -8,7 +8,6 @@ const {
   // validateEndpoint,
   buildEndpointOption,
 } = require('~/server/middleware');
-const validateAssistant = require('~/server/middleware/assistants/validate');
 const chatController = require('~/server/controllers/assistants/chatV1');
 
 router.post('/abort', handleAbort());
@@ -21,6 +20,6 @@ router.post('/abort', handleAbort());
  * @param {express.Response} res - The response object, used to send back a response.
  * @returns {void}
  */
-router.post('/', validateModel, buildEndpointOption, validateAssistant, setHeaders, chatController);
+router.post('/', validateModel, buildEndpointOption, setHeaders, chatController);
 
 module.exports = router;

api/server/routes/assistants/chatV2.js

@@ -8,7 +8,6 @@ const {
   // validateEndpoint,
   buildEndpointOption,
 } = require('~/server/middleware');
-const validateAssistant = require('~/server/middleware/assistants/validate');
 const chatController = require('~/server/controllers/assistants/chatV2');
 
 router.post('/abort', handleAbort());
@@ -21,6 +20,6 @@ router.post('/abort', handleAbort());
  * @param {express.Response} res - The response object, used to send back a response.
  * @returns {void}
  */
-router.post('/', validateModel, buildEndpointOption, validateAssistant, setHeaders, chatController);
+router.post('/', validateModel, buildEndpointOption, setHeaders, chatController);
 
 module.exports = router;

api/server/routes/auth.js

@@ -1,46 +1,29 @@
 const express = require('express');
 const {
+  resetPasswordRequestController,
+  resetPasswordController,
   refreshController,
   registrationController,
-  resetPasswordController,
-  resetPasswordRequestController,
-} = require('~/server/controllers/AuthController');
-const { loginController } = require('~/server/controllers/auth/LoginController');
-const { logoutController } = require('~/server/controllers/auth/LogoutController');
+} = require('../controllers/AuthController');
+const { loginController } = require('../controllers/auth/LoginController');
+const { logoutController } = require('../controllers/auth/LogoutController');
 const {
   checkBan,
   loginLimiter,
-  requireJwtAuth,
   registerLimiter,
-  requireLdapAuth,
+  requireJwtAuth,
   requireLocalAuth,
-  resetPasswordLimiter,
   validateRegistration,
-  validatePasswordReset,
-} = require('~/server/middleware');
+} = require('../middleware');
 
 const router = express.Router();
 
-const ldapAuth =
-  !!process.env.LDAP_URL && !!process.env.LDAP_BIND_DN && !!process.env.LDAP_USER_SEARCH_BASE;
 //Local
 router.post('/logout', requireJwtAuth, logoutController);
-router.post(
-  '/login',
-  loginLimiter,
-  checkBan,
-  ldapAuth ? requireLdapAuth : requireLocalAuth,
-  loginController,
-);
+router.post('/login', loginLimiter, checkBan, requireLocalAuth, loginController);
 router.post('/refresh', refreshController);
 router.post('/register', registerLimiter, checkBan, validateRegistration, registrationController);
-router.post(
-  '/requestPasswordReset',
-  resetPasswordLimiter,
-  checkBan,
-  validatePasswordReset,
-  resetPasswordRequestController,
-);
-router.post('/resetPassword', checkBan, validatePasswordReset, resetPasswordController);
+router.post('/requestPasswordReset', resetPasswordRequestController);
+router.post('/resetPassword', resetPasswordController);
 
 module.exports = router;

api/server/routes/config.js

@@ -6,15 +6,6 @@ const { logger } = require('~/config');
 const router = express.Router();
 const emailLoginEnabled =
   process.env.ALLOW_EMAIL_LOGIN === undefined || isEnabled(process.env.ALLOW_EMAIL_LOGIN);
-const passwordResetEnabled = isEnabled(process.env.ALLOW_PASSWORD_RESET);
-
-const sharedLinksEnabled =
-  process.env.ALLOW_SHARED_LINKS === undefined || isEnabled(process.env.ALLOW_SHARED_LINKS);
-
-const publicSharedLinksEnabled =
-  sharedLinksEnabled &&
-  (process.env.ALLOW_SHARED_LINKS_PUBLIC === undefined ||
-    isEnabled(process.env.ALLOW_SHARED_LINKS_PUBLIC));
 
 router.get('/', async function (req, res) {
   const isBirthday = () => {
@@ -22,8 +13,6 @@ router.get('/', async function (req, res) {
     return today.getMonth() === 1 && today.getDate() === 11;
   };
 
-  const ldapLoginEnabled =
-    !!process.env.LDAP_URL && !!process.env.LDAP_BIND_DN && !!process.env.LDAP_USER_SEARCH_BASE;
   try {
     /** @type {TStartupConfig} */
     const payload = {
@@ -41,17 +30,15 @@ router.get('/', async function (req, res) {
         !!process.env.OPENID_SESSION_SECRET,
       openidLabel: process.env.OPENID_BUTTON_LABEL || 'Continue with OpenID',
       openidImageUrl: process.env.OPENID_IMAGE_URL,
-      ldapLoginEnabled,
       serverDomain: process.env.DOMAIN_SERVER || 'http://localhost:3080',
       emailLoginEnabled,
-      registrationEnabled: !ldapLoginEnabled && isEnabled(process.env.ALLOW_REGISTRATION),
+      registrationEnabled: isEnabled(process.env.ALLOW_REGISTRATION),
       socialLoginEnabled: isEnabled(process.env.ALLOW_SOCIAL_LOGIN),
       emailEnabled:
         (!!process.env.EMAIL_SERVICE || !!process.env.EMAIL_HOST) &&
         !!process.env.EMAIL_USERNAME &&
         !!process.env.EMAIL_PASSWORD &&
         !!process.env.EMAIL_FROM,
-      passwordResetEnabled,
       checkBalance: isEnabled(process.env.CHECK_BALANCE),
       showBirthdayIcon:
         isBirthday() ||
@@ -60,9 +47,6 @@ router.get('/', async function (req, res) {
       helpAndFaqURL: process.env.HELP_AND_FAQ_URL || 'https://librechat.ai',
       interface: req.app.locals.interfaceConfig,
       modelSpecs: req.app.locals.modelSpecs,
-      sharedLinksEnabled,
-      publicSharedLinksEnabled,
-      analyticsGtmId: process.env.ANALYTICS_GTM_ID,
     };
 
     if (typeof process.env.CUSTOM_FOOTER === 'string') {

api/server/routes/convos.js

@@ -3,11 +3,12 @@ const express = require('express');
 const { CacheKeys } = require('librechat-data-provider');
 const { initializeClient } = require('~/server/services/Endpoints/assistants');
 const { getConvosByPage, deleteConvos, getConvo, saveConvo } = require('~/models/Conversation');
+const { IMPORT_CONVERSATION_JOB_NAME } = require('~/server/utils/import/jobDefinition');
 const { storage, importFileFilter } = require('~/server/routes/files/multer');
 const requireJwtAuth = require('~/server/middleware/requireJwtAuth');
 const { forkConversation } = require('~/server/utils/import/fork');
-const { importConversations } = require('~/server/utils/import');
 const { createImportLimiters } = require('~/server/middleware');
+const jobScheduler = require('~/server/utils/jobScheduler');
 const getLogStores = require('~/cache/getLogStores');
 const { sleep } = require('~/server/utils');
 const { logger } = require('~/config');
@@ -128,9 +129,10 @@ router.post(
   upload.single('file'),
   async (req, res) => {
     try {
-      /* TODO: optimize to return imported conversations and add manually */
-      await importConversations({ filepath: req.file.path, requestUserId: req.user.id });
-      res.status(201).json({ message: 'Conversation(s) imported successfully' });
+      const filepath = req.file.path;
+      const job = await jobScheduler.now(IMPORT_CONVERSATION_JOB_NAME, filepath, req.user.id);
+
+      res.status(201).json({ message: 'Import started', jobId: job.id });
     } catch (error) {
       logger.error('Error processing file', error);
       res.status(500).send('Error processing file');
@@ -167,4 +169,24 @@ router.post('/fork', async (req, res) => {
   }
 });
 
+// Get the status of an import job for polling
+router.get('/import/jobs/:jobId', async (req, res) => {
+  try {
+    const { jobId } = req.params;
+    const { userId, ...jobStatus } = await jobScheduler.getJobStatus(jobId);
+    if (!jobStatus) {
+      return res.status(404).json({ message: 'Job not found.' });
+    }
+
+    if (userId !== req.user.id) {
+      return res.status(403).json({ message: 'Unauthorized' });
+    }
+
+    res.json(jobStatus);
+  } catch (error) {
+    logger.error('Error getting job details', error);
+    res.status(500).send('Error getting job details');
+  }
+});
+
 module.exports = router;

api/server/routes/edit/gptPlugins.js

@@ -110,11 +110,7 @@ router.post(
       if (!start) {
         saveMessage({ ...userMessage, user });
       }
-      sendIntermediateMessage(res, {
-        plugin,
-        parentMessageId: userMessage.messageId,
-        messageId: responseMessageId,
-      });
+      sendIntermediateMessage(res, { plugin });
       // logger.debug('PLUGIN ACTION', formattedAction);
     };
 
@@ -123,11 +119,7 @@ router.post(
       plugin.outputs = steps && steps[0].action ? formatSteps(steps) : 'An error occurred.';
       plugin.loading = false;
       saveMessage({ ...userMessage, user });
-      sendIntermediateMessage(res, {
-        plugin,
-        parentMessageId: userMessage.messageId,
-        messageId: responseMessageId,
-      });
+      sendIntermediateMessage(res, { plugin });
       // logger.debug('CHAIN END', plugin.outputs);
     };
 
@@ -161,13 +153,12 @@ router.post(
         onChainEnd,
         onStart,
         ...endpointOption,
-        progressCallback,
-        progressOptions: {
+        onProgress: progressCallback.call(null, {
           res,
           text,
           plugin,
-          // parentMessageId: overrideParentMessageId || userMessageId,
-        },
+          parentMessageId: overrideParentMessageId || userMessageId,
+        }),
         abortController,
       });
 

api/server/routes/files/index.js

@@ -1,19 +1,10 @@
 const express = require('express');
-const {
-  uaParser,
-  checkBan,
-  requireJwtAuth,
-  createFileLimiters,
-  createTTSLimiters,
-  createSTTLimiters,
-} = require('~/server/middleware');
+const { uaParser, checkBan, requireJwtAuth, createFileLimiters } = require('~/server/middleware');
 const { createMulterInstance } = require('./multer');
 
 const files = require('./files');
 const images = require('./images');
 const avatar = require('./avatar');
-const stt = require('./stt');
-const tts = require('./tts');
 
 const initialize = async () => {
   const router = express.Router();
@@ -21,12 +12,6 @@ const initialize = async () => {
   router.use(checkBan);
   router.use(uaParser);
 
-  /* Important: stt/tts routes must be added before the upload limiters */
-  const { sttIpLimiter, sttUserLimiter } = createSTTLimiters();
-  const { ttsIpLimiter, ttsUserLimiter } = createTTSLimiters();
-  router.use('/stt', sttIpLimiter, sttUserLimiter, stt);
-  router.use('/tts', ttsIpLimiter, ttsUserLimiter, tts);
-
   const upload = await createMulterInstance();
   const { fileUploadIpLimiter, fileUploadUserLimiter } = createFileLimiters();
   router.post('*', fileUploadIpLimiter, fileUploadUserLimiter);

api/server/routes/files/stt.js

@@ -1,13 +0,0 @@
-const express = require('express');
-const router = express.Router();
-const multer = require('multer');
-const { requireJwtAuth } = require('~/server/middleware/');
-const { speechToText } = require('~/server/services/Files/Audio');
-
-const upload = multer();
-
-router.post('/', requireJwtAuth, upload.single('audio'), async (req, res) => {
-  await speechToText(req, res);
-});
-
-module.exports = router;

api/server/routes/files/tts.js

@@ -1,42 +0,0 @@
-const multer = require('multer');
-const express = require('express');
-const { CacheKeys } = require('librechat-data-provider');
-const { getVoices, streamAudio, textToSpeech } = require('~/server/services/Files/Audio');
-const { getLogStores } = require('~/cache');
-const { logger } = require('~/config');
-
-const router = express.Router();
-const upload = multer();
-
-router.post('/manual', upload.none(), async (req, res) => {
-  await textToSpeech(req, res);
-});
-
-const logDebugMessage = (req, message) =>
-  logger.debug(`[streamAudio] user: ${req?.user?.id ?? 'UNDEFINED_USER'} | ${message}`);
-
-// TODO: test caching
-router.post('/', async (req, res) => {
-  try {
-    const audioRunsCache = getLogStores(CacheKeys.AUDIO_RUNS);
-    const audioRun = await audioRunsCache.get(req.body.runId);
-    logDebugMessage(req, 'start stream audio');
-    if (audioRun) {
-      logDebugMessage(req, 'stream audio already running');
-      return res.status(401).json({ error: 'Audio stream already running' });
-    }
-    audioRunsCache.set(req.body.runId, true);
-    await streamAudio(req, res);
-    logDebugMessage(req, 'end stream audio');
-    res.status(200).end();
-  } catch (error) {
-    logger.error(`[streamAudio] user: ${req.user.id} | Failed to stream audio: ${error}`);
-    res.status(500).json({ error: 'Failed to stream audio' });
-  }
-});
-
-router.get('/voices', async (req, res) => {
-  await getVoices(req, res);
-});
-
-module.exports = router;

api/server/routes/messages.js

@@ -14,7 +14,7 @@ router.use(requireJwtAuth);
 
 router.get('/:conversationId', validateMessageReq, async (req, res) => {
   const { conversationId } = req.params;
-  res.status(200).send(await getMessages({ conversationId }, '-_id -__v -user'));
+  res.status(200).send(await getMessages({ conversationId }));
 });
 
 // CREATE
@@ -28,7 +28,7 @@ router.post('/:conversationId', validateMessageReq, async (req, res) => {
 // READ
 router.get('/:conversationId/:messageId', validateMessageReq, async (req, res) => {
   const { conversationId, messageId } = req.params;
-  res.status(200).send(await getMessages({ conversationId, messageId }, '-_id -__v -user'));
+  res.status(200).send(await getMessages({ conversationId, messageId }));
 });
 
 // UPDATE

api/server/routes/oauth.js

@@ -1,11 +1,11 @@
 // file deepcode ignore NoRateLimitingForLogin: Rate limiting is handled by the `loginLimiter` middleware
-const express = require('express');
-const passport = require('passport');
-const { loginLimiter, checkBan, checkDomainAllowed } = require('~/server/middleware');
-const { setAuthTokens } = require('~/server/services/AuthService');
-const { logger } = require('~/config');
 
+const passport = require('passport');
+const express = require('express');
 const router = express.Router();
+const { setAuthTokens } = require('~/server/services/AuthService');
+const { loginLimiter, checkBan, checkDomainAllowed } = require('~/server/middleware');
+const { logger } = require('~/config');
 
 const domains = {
   client: process.env.DOMAIN_CLIENT,

api/server/routes/share.js

@@ -8,33 +8,21 @@ const {
   deleteSharedLink,
 } = require('~/models/Share');
 const requireJwtAuth = require('~/server/middleware/requireJwtAuth');
-const { isEnabled } = require('~/server/utils');
 const router = express.Router();
 
 /**
  * Shared messages
+ * this route does not require authentication
  */
-const allowSharedLinks =
-  process.env.ALLOW_SHARED_LINKS === undefined || isEnabled(process.env.ALLOW_SHARED_LINKS);
+router.get('/:shareId', async (req, res) => {
+  const share = await getSharedMessages(req.params.shareId);
 
-if (allowSharedLinks) {
-  const allowSharedLinksPublic =
-    process.env.ALLOW_SHARED_LINKS_PUBLIC === undefined ||
-    isEnabled(process.env.ALLOW_SHARED_LINKS_PUBLIC);
-  router.get(
-    '/:shareId',
-    allowSharedLinksPublic ? (req, res, next) => next() : requireJwtAuth,
-    async (req, res) => {
-      const share = await getSharedMessages(req.params.shareId);
-
-      if (share) {
-        res.status(200).json(share);
-      } else {
-        res.status(404).end();
-      }
-    },
-  );
-}
+  if (share) {
+    res.status(200).json(share);
+  } else {
+    res.status(404).end();
+  }
+});
 
 /**
  * Shared links

api/server/routes/user.js

@@ -1,19 +1,10 @@
 const express = require('express');
-const { requireJwtAuth, canDeleteAccount, verifyEmailLimiter } = require('~/server/middleware');
-const {
-  getUserController,
-  deleteUserController,
-  verifyEmailController,
-  updateUserPluginsController,
-  resendVerificationController,
-} = require('~/server/controllers/UserController');
+const requireJwtAuth = require('../middleware/requireJwtAuth');
+const { getUserController, updateUserPluginsController } = require('../controllers/UserController');
 
 const router = express.Router();
 
 router.get('/', requireJwtAuth, getUserController);
 router.post('/plugins', requireJwtAuth, updateUserPluginsController);
-router.delete('/delete', requireJwtAuth, canDeleteAccount, deleteUserController);
-router.post('/verify', verifyEmailController);
-router.post('/verify/resend', verifyEmailLimiter, resendVerificationController);
 
 module.exports = router;

api/server/services/AppService.js

@@ -78,7 +78,6 @@ const AppService = async (app) => {
   if (config?.endpoints?.[EModelEndpoint.azureAssistants]) {
     endpointLocals[EModelEndpoint.azureAssistants] = assistantsConfigSetup(
       config,
-      EModelEndpoint.azureAssistants,
       endpointLocals[EModelEndpoint.azureAssistants],
     );
   }
@@ -86,7 +85,6 @@ const AppService = async (app) => {
   if (config?.endpoints?.[EModelEndpoint.assistants]) {
     endpointLocals[EModelEndpoint.assistants] = assistantsConfigSetup(
       config,
-      EModelEndpoint.assistants,
       endpointLocals[EModelEndpoint.assistants],
     );
   }

api/server/services/AppService.spec.js

@@ -218,7 +218,6 @@ describe('AppService', () => {
             pollIntervalMs: 5000,
             timeoutMs: 30000,
             supportedIds: ['id1', 'id2'],
-            privateAssistants: false,
           },
         },
       }),
@@ -233,7 +232,6 @@ describe('AppService', () => {
         pollIntervalMs: 5000,
         timeoutMs: 30000,
         supportedIds: expect.arrayContaining(['id1', 'id2']),
-        privateAssistants: false,
       }),
     );
   });
@@ -507,31 +505,7 @@ describe('AppService updating app.locals and issuing warnings', () => {
 
     const { logger } = require('~/config');
     expect(logger.warn).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'The \'assistants\' endpoint has both \'supportedIds\' and \'excludedIds\' defined.',
-      ),
-    );
-  });
-
-  it('should log a warning when privateAssistants and supportedIds or excludedIds are provided', async () => {
-    const mockConfig = {
-      endpoints: {
-        assistants: {
-          privateAssistants: true,
-          supportedIds: ['id1'],
-        },
-      },
-    };
-    require('./Config/loadCustomConfig').mockImplementationOnce(() => Promise.resolve(mockConfig));
-
-    const app = { locals: {} };
-    await require('./AppService')(app);
-
-    const { logger } = require('~/config');
-    expect(logger.warn).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'The \'assistants\' endpoint has both \'privateAssistants\' and \'supportedIds\' or \'excludedIds\' defined.',
-      ),
+      expect.stringContaining('Both `supportedIds` and `excludedIds` are defined'),
     );
   });
 

api/server/services/AuthService.js

@@ -1,21 +1,13 @@
 const crypto = require('crypto');
 const bcrypt = require('bcryptjs');
 const { errorsToString } = require('librechat-data-provider');
-const {
-  findUser,
-  countUsers,
-  createUser,
-  updateUser,
-  getUserById,
-  generateToken,
-  deleteUserById,
-} = require('~/models/userMethods');
-const { sendEmail, checkEmailConfig } = require('~/server/utils');
 const { registerSchema } = require('~/strategies/validators');
 const isDomainAllowed = require('./isDomainAllowed');
 const Token = require('~/models/schema/tokenSchema');
+const { sendEmail } = require('~/server/utils');
 const Session = require('~/models/Session');
 const { logger } = require('~/config');
+const User = require('~/models/User');
 
 const domains = {
   client: process.env.DOMAIN_CLIENT,
@@ -23,7 +15,6 @@ const domains = {
 };
 
 const isProduction = process.env.NODE_ENV === 'production';
-const genericVerificationMessage = 'Please check your email to verify your email address.';
 
 /**
  * Logout user
@@ -54,72 +45,10 @@ const logoutUser = async (userId, refreshToken) => {
 };
 
 /**
- * Send Verification Email
- * @param {Partial<MongoUser> & { _id: ObjectId, email: string, name: string}} user
- * @returns {Promise<void>}
- */
-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=${encodeURIComponent(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,
-    token: hash,
-    createdAt: Date.now(),
-  }).save();
-
-  logger.info(`[sendVerificationEmail] Verification link issued. [Email: ${user.email}]`);
-};
-
-/**
- * Verify Email
- * @param {Express.Request} req
- */
-const verifyEmail = async (req) => {
-  const { email, token } = req.body;
-  let emailVerificationData = await Token.findOne({ email: decodeURIComponent(email) });
-
-  if (!emailVerificationData) {
-    logger.warn(`[verifyEmail] [No email verification data found] [Email: ${email}]`);
-    return new Error('Invalid or expired password reset token');
-  }
-
-  const isValid = bcrypt.compareSync(token, emailVerificationData.token);
-
-  if (!isValid) {
-    logger.warn(`[verifyEmail] [Invalid or expired email verification token] [Email: ${email}]`);
-    return new Error('Invalid or expired email verification token');
-  }
-
-  const updatedUser = await updateUser(emailVerificationData.userId, { emailVerified: true });
-  if (!updatedUser) {
-    logger.warn(`[verifyEmail] [User not found] [Email: ${email}]`);
-    return new Error('User not found');
-  }
-
-  await emailVerificationData.deleteOne();
-  logger.info(`[verifyEmail] Email verification successful. [Email: ${email}]`);
-  return { message: 'Email verification was successful' };
-};
-
-/**
- * Register a new user.
- * @param {MongoUser} user <email, password, name, username>
- * @returns {Promise<{status: number, message: string, user?: MongoUser}>}
+ * Register a new user
+ *
+ * @param {Object} user <email, password, name, username>
+ * @returns
  */
 const registerUser = async (user) => {
   const { error } = registerSchema.safeParse(user);
@@ -131,14 +60,13 @@ const registerUser = async (user) => {
       { name: 'Validation error:', value: errorMessage },
     );
 
-    return { status: 404, message: errorMessage };
+    return { status: 422, message: errorMessage };
   }
 
   const { email, password, name, username } = user;
 
-  let newUserId;
   try {
-    const existingUser = await findUser({ email }, 'email _id');
+    const existingUser = await User.findOne({ email }).lean();
 
     if (existingUser) {
       logger.info(
@@ -149,71 +77,51 @@ const registerUser = async (user) => {
 
       // Sleep for 1 second
       await new Promise((resolve) => setTimeout(resolve, 1000));
-      return { status: 200, message: genericVerificationMessage };
+
+      // TODO: We should change the process to always email and be generic is signup works or fails (user enum)
+      return { status: 500, message: 'Something went wrong' };
     }
 
     if (!(await isDomainAllowed(email))) {
-      const errorMessage =
-        'The email address provided cannot be used. Please use a different email address.';
+      const errorMessage = 'Registration from this domain is not allowed.';
       logger.error(`[registerUser] [Registration not allowed] [Email: ${user.email}]`);
       return { status: 403, message: errorMessage };
     }
 
     //determine if this is the first registered user (not counting anonymous_user)
-    const isFirstRegisteredUser = (await countUsers()) === 0;
+    const isFirstRegisteredUser = (await User.countDocuments({})) === 0;
 
-    const salt = bcrypt.genSaltSync(10);
-    const newUserData = {
+    const newUser = await new User({
       provider: 'local',
       email,
+      password,
       username,
       name,
       avatar: null,
       role: isFirstRegisteredUser ? 'ADMIN' : 'USER',
-      password: bcrypt.hashSync(password, salt),
-    };
+    });
 
-    const emailEnabled = checkEmailConfig();
-    newUserId = await createUser(newUserData, false);
-    if (emailEnabled) {
-      await sendVerificationEmail({
-        _id: newUserId,
-        email,
-        name,
-      });
-    } else {
-      await updateUser(newUserId, { emailVerified: true });
-    }
+    const salt = bcrypt.genSaltSync(10);
+    const hash = bcrypt.hashSync(newUser.password, salt);
+    newUser.password = hash;
+    await newUser.save();
 
-    return { status: 200, message: genericVerificationMessage };
+    return { status: 200, user: newUser };
   } 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' };
+    return { status: 500, message: err?.message || 'Something went wrong' };
   }
 };
 
 /**
  * Request password reset
- * @param {Express.Request} req
+ *
+ * @param {String} email
+ * @returns
  */
-const requestPasswordReset = async (req) => {
-  const { email } = req.body;
-  const user = await findUser({ email }, 'email _id');
-  const emailEnabled = checkEmailConfig();
-
-  logger.warn(`[requestPasswordReset] [Password reset request initiated] [Email: ${email}]`);
-
+const requestPasswordReset = async (email) => {
+  const user = await User.findOne({ email }).lean();
   if (!user) {
-    logger.warn(`[requestPasswordReset] [No user found] [Email: ${email}] [IP: ${req.ip}]`);
-    return {
-      message: 'If an account with that email exists, a password reset link has been sent to it.',
-    };
+    return new Error('Email does not exist');
   }
 
   let token = await Token.findOne({ userId: user._id });
@@ -232,31 +140,28 @@ const requestPasswordReset = async (req) => {
 
   const link = `${domains.client}/reset-password?token=${resetToken}&userId=${user._id}`;
 
+  const emailEnabled =
+    (!!process.env.EMAIL_SERVICE || !!process.env.EMAIL_HOST) &&
+    !!process.env.EMAIL_USERNAME &&
+    !!process.env.EMAIL_PASSWORD &&
+    !!process.env.EMAIL_FROM;
+
   if (emailEnabled) {
-    await sendEmail({
-      email: user.email,
-      subject: 'Password Reset Request',
-      payload: {
+    sendEmail(
+      user.email,
+      'Password Reset Request',
+      {
         appName: process.env.APP_TITLE || 'LibreChat',
         name: user.name,
         link: link,
         year: new Date().getFullYear(),
       },
-      template: 'requestPasswordReset.handlebars',
-    });
-    logger.info(
-      `[requestPasswordReset] Link emailed. [Email: ${email}] [ID: ${user._id}] [IP: ${req.ip}]`,
+      'requestPasswordReset.handlebars',
     );
+    return { link: '' };
   } else {
-    logger.info(
-      `[requestPasswordReset] Link issued. [Email: ${email}] [ID: ${user._id}] [IP: ${req.ip}]`,
-    );
     return { link };
   }
-
-  return {
-    message: 'If an account with that email exists, a password reset link has been sent to it.',
-  };
 };
 
 /**
@@ -281,38 +186,39 @@ const resetPassword = async (userId, token, password) => {
   }
 
   const hash = bcrypt.hashSync(password, 10);
-  const user = await updateUser(userId, { password: hash });
 
-  if (checkEmailConfig()) {
-    await sendEmail({
-      email: user.email,
-      subject: 'Password Reset Successfully',
-      payload: {
-        appName: process.env.APP_TITLE || 'LibreChat',
-        name: user.name,
-        year: new Date().getFullYear(),
-      },
-      template: 'passwordReset.handlebars',
-    });
-  }
+  await User.updateOne({ _id: userId }, { $set: { password: hash } }, { new: true });
+
+  const user = await User.findById({ _id: userId });
+
+  sendEmail(
+    user.email,
+    'Password Reset Successfully',
+    {
+      appName: process.env.APP_TITLE || 'LibreChat',
+      name: user.name,
+      year: new Date().getFullYear(),
+    },
+    'passwordReset.handlebars',
+  );
 
   await passwordResetToken.deleteOne();
-  logger.info(`[resetPassword] Password reset successful. [Email: ${user.email}]`);
+
   return { message: 'Password reset was successful' };
 };
 
 /**
  * Set Auth Tokens
  *
- * @param {String | ObjectId} userId
+ * @param {String} userId
  * @param {Object} res
  * @param {String} sessionId
  * @returns
  */
 const setAuthTokens = async (userId, res, sessionId = null) => {
   try {
-    const user = await getUserById(userId);
-    const token = await generateToken(user);
+    const user = await User.findOne({ _id: userId });
+    const token = await user.generateToken();
 
     let session;
     let refreshTokenExpires;
@@ -342,70 +248,11 @@ const setAuthTokens = async (userId, res, sessionId = null) => {
   }
 };
 
-/**
- * Resend Verification Email
- * @param {Object} req
- * @param {Object} req.body
- * @param {String} req.body.email
- * @returns {Promise<{status: number, message: string}>}
- */
-const resendVerificationEmail = async (req) => {
-  try {
-    const { email } = req.body;
-    await Token.deleteMany({ email });
-    const user = await findUser({ email }, 'email _id name');
-
-    if (!user) {
-      logger.warn(`[resendVerificationEmail] [No user found] [Email: ${email}]`);
-      return { status: 200, message: genericVerificationMessage };
-    }
-
-    let verifyToken = crypto.randomBytes(32).toString('hex');
-    const hash = bcrypt.hashSync(verifyToken, 10);
-
-    const verificationLink = `${domains.client}/verify?token=${verifyToken}&email=${encodeURIComponent(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,
-      token: hash,
-      createdAt: Date.now(),
-    }).save();
-
-    logger.info(`[resendVerificationEmail] Verification link issued. [Email: ${user.email}]`);
-
-    return {
-      status: 200,
-      message: genericVerificationMessage,
-    };
-  } catch (error) {
-    logger.error(`[resendVerificationEmail] Error resending verification email: ${error.message}`);
-    return {
-      status: 500,
-      message: 'Something went wrong.',
-    };
-  }
-};
-
 module.exports = {
-  logoutUser,
-  verifyEmail,
   registerUser,
-  setAuthTokens,
-  resetPassword,
+  logoutUser,
   isDomainAllowed,
   requestPasswordReset,
-  resendVerificationEmail,
+  resetPassword,
+  setAuthTokens,
 };

api/server/services/Config/handleRateLimits.js

@@ -1,5 +1,3 @@
-const { RateLimitPrefix } = require('librechat-data-provider');
-
 /**
  *
  * @param {TCustomConfig['rateLimits'] | undefined} rateLimits
@@ -8,41 +6,24 @@ const handleRateLimits = (rateLimits) => {
   if (!rateLimits) {
     return;
   }
+  const { fileUploads, conversationsImport } = rateLimits;
+  if (fileUploads) {
+    process.env.FILE_UPLOAD_IP_MAX = fileUploads.ipMax ?? process.env.FILE_UPLOAD_IP_MAX;
+    process.env.FILE_UPLOAD_IP_WINDOW =
+      fileUploads.ipWindowInMinutes ?? process.env.FILE_UPLOAD_IP_WINDOW;
+    process.env.FILE_UPLOAD_USER_MAX = fileUploads.userMax ?? process.env.FILE_UPLOAD_USER_MAX;
+    process.env.FILE_UPLOAD_USER_WINDOW =
+      fileUploads.userWindowInMinutes ?? process.env.FILE_UPLOAD_USER_WINDOW;
+  }
 
-  const rateLimitKeys = {
-    fileUploads: RateLimitPrefix.FILE_UPLOAD,
-    conversationsImport: RateLimitPrefix.IMPORT,
-    tts: RateLimitPrefix.TTS,
-    stt: RateLimitPrefix.STT,
-  };
-
-  Object.entries(rateLimitKeys).forEach(([key, prefix]) => {
-    const rateLimit = rateLimits[key];
-    if (rateLimit) {
-      setRateLimitEnvVars(prefix, rateLimit);
-    }
-  });
-};
-
-/**
- * Set environment variables for rate limit configurations
- *
- * @param {string} prefix - Prefix for environment variable names
- * @param {object} rateLimit - Rate limit configuration object
- */
-const setRateLimitEnvVars = (prefix, rateLimit) => {
-  const envVarsMapping = {
-    ipMax: `${prefix}_IP_MAX`,
-    ipWindowInMinutes: `${prefix}_IP_WINDOW`,
-    userMax: `${prefix}_USER_MAX`,
-    userWindowInMinutes: `${prefix}_USER_WINDOW`,
-  };
-
-  Object.entries(envVarsMapping).forEach(([key, envVar]) => {
-    if (rateLimit[key] !== undefined) {
-      process.env[envVar] = rateLimit[key];
-    }
-  });
+  if (conversationsImport) {
+    process.env.IMPORT_IP_MAX = conversationsImport.ipMax ?? process.env.IMPORT_IP_MAX;
+    process.env.IMPORT_IP_WINDOW =
+      conversationsImport.ipWindowInMinutes ?? process.env.IMPORT_IP_WINDOW;
+    process.env.IMPORT_USER_MAX = conversationsImport.userMax ?? process.env.IMPORT_USER_MAX;
+    process.env.IMPORT_USER_WINDOW =
+      conversationsImport.userWindowInMinutes ?? process.env.IMPORT_USER_WINDOW;
+  }
 };
 
 module.exports = handleRateLimits;

api/server/services/Endpoints/custom/initializeClient.js

@@ -112,8 +112,6 @@ const initializeClient = async ({ req, res, endpointOption }) => {
     modelDisplayLabel: endpointConfig.modelDisplayLabel,
     titleMethod: endpointConfig.titleMethod ?? 'completion',
     contextStrategy: endpointConfig.summarize ? 'summarize' : null,
-    directEndpoint: endpointConfig.directEndpoint,
-    titleMessageRole: endpointConfig.titleMessageRole,
     endpointTokenConfig,
   };
 

api/server/services/Files/Audio/getVoices.js

@@ -1,48 +0,0 @@
-const { logger } = require('~/config');
-const getCustomConfig = require('~/server/services/Config/getCustomConfig');
-const { getProvider } = require('./textToSpeech');
-
-/**
- * This function retrieves the available voices for the current TTS provider
- * It first fetches the TTS configuration and determines the provider
- * Then, based on the provider, it sends the corresponding voices as a JSON response
- *
- * @param {Object} req - The request object
- * @param {Object} res - The response object
- * @returns {Promise<void>}
- * @throws {Error} - If the provider is not 'openai' or 'elevenlabs', an error is thrown
- */
-async function getVoices(req, res) {
-  try {
-    const customConfig = await getCustomConfig();
-
-    if (!customConfig || !customConfig?.tts) {
-      throw new Error('Configuration or TTS schema is missing');
-    }
-
-    const ttsSchema = customConfig?.tts;
-    const provider = getProvider(ttsSchema);
-    let voices;
-
-    switch (provider) {
-      case 'openai':
-        voices = ttsSchema.openai?.voices;
-        break;
-      case 'elevenlabs':
-        voices = ttsSchema.elevenlabs?.voices;
-        break;
-      case 'localai':
-        voices = ttsSchema.localai?.voices;
-        break;
-      default:
-        throw new Error('Invalid provider');
-    }
-
-    res.json(voices);
-  } catch (error) {
-    logger.error(`Failed to get voices: ${error.message}`);
-    res.status(500).json({ error: 'Failed to get voices' });
-  }
-}
-
-module.exports = getVoices;

api/server/services/Files/Audio/index.js

@@ -1,11 +0,0 @@
-const getVoices = require('./getVoices');
-const textToSpeech = require('./textToSpeech');
-const speechToText = require('./speechToText');
-const { updateTokenWebsocket } = require('./webSocket');
-
-module.exports = {
-  getVoices,
-  speechToText,
-  ...textToSpeech,
-  updateTokenWebsocket,
-};

api/server/services/Files/Audio/speechToText.js

@@ -1,211 +0,0 @@
-const axios = require('axios');
-const { Readable } = require('stream');
-const { logger } = require('~/config');
-const getCustomConfig = require('~/server/services/Config/getCustomConfig');
-const { extractEnvVariable } = require('librechat-data-provider');
-
-/**
- * Handle the response from the STT API
- * @param {Object} response - The response from the STT API
- *
- * @returns {string} The text from the response data
- *
- * @throws Will throw an error if the response status is not 200 or the response data is missing
- */
-async function handleResponse(response) {
-  if (response.status !== 200) {
-    throw new Error('Invalid response from the STT API');
-  }
-
-  if (!response.data || !response.data.text) {
-    throw new Error('Missing data in response from the STT API');
-  }
-
-  return response.data.text.trim();
-}
-
-function getProvider(sttSchema) {
-  if (sttSchema.openai) {
-    return 'openai';
-  }
-
-  throw new Error('Invalid provider');
-}
-
-function removeUndefined(obj) {
-  Object.keys(obj).forEach((key) => {
-    if (obj[key] && typeof obj[key] === 'object') {
-      removeUndefined(obj[key]);
-      if (Object.keys(obj[key]).length === 0) {
-        delete obj[key];
-      }
-    } else if (obj[key] === undefined) {
-      delete obj[key];
-    }
-  });
-}
-
-/**
- * This function prepares the necessary data and headers for making a request to the OpenAI API
- * It uses the provided speech-to-text schema and audio stream to create the request
- *
- * @param {Object} sttSchema - The speech-to-text schema containing the OpenAI configuration
- * @param {Stream} audioReadStream - The audio data to be transcribed
- *
- * @returns {Array} An array containing the URL for the API request, the data to be sent, and the headers for the request
- * If an error occurs, it returns an array with three null values and logs the error with logger
- */
-function openAIProvider(sttSchema, audioReadStream) {
-  try {
-    const url = sttSchema.openai?.url || 'https://api.openai.com/v1/audio/transcriptions';
-    const apiKey = sttSchema.openai.apiKey ? extractEnvVariable(sttSchema.openai.apiKey) : '';
-
-    let data = {
-      file: audioReadStream,
-      model: sttSchema.openai.model,
-    };
-
-    let headers = {
-      'Content-Type': 'multipart/form-data',
-    };
-
-    [headers].forEach(removeUndefined);
-
-    if (apiKey) {
-      headers.Authorization = 'Bearer ' + apiKey;
-    }
-
-    return [url, data, headers];
-  } catch (error) {
-    logger.error('An error occurred while preparing the OpenAI API STT request: ', error);
-    return [null, null, null];
-  }
-}
-
-/**
- * This function prepares the necessary data and headers for making a request to the Azure API
- * It uses the provided request and audio stream to create the request
- *
- * @param {Object} req - The request object, which should contain the endpoint in its body
- * @param {Stream} audioReadStream - The audio data to be transcribed
- *
- * @returns {Array} An array containing the URL for the API request, the data to be sent, and the headers for the request
- * If an error occurs, it returns an array with three null values and logs the error with logger
- */
-function azureProvider(req, audioReadStream) {
-  try {
-    const { endpoint } = req.body;
-    const azureConfig = req.app.locals[endpoint];
-
-    if (!azureConfig) {
-      throw new Error(`No configuration found for endpoint: ${endpoint}`);
-    }
-
-    const { apiKey, instanceName, whisperModel, apiVersion } = Object.entries(
-      azureConfig.groupMap,
-    ).reduce((acc, [, value]) => {
-      if (acc) {
-        return acc;
-      }
-
-      const whisperKey = Object.keys(value.models).find((modelKey) =>
-        modelKey.startsWith('whisper'),
-      );
-
-      if (whisperKey) {
-        return {
-          apiVersion: value.version,
-          apiKey: value.apiKey,
-          instanceName: value.instanceName,
-          whisperModel: value.models[whisperKey]['deploymentName'],
-        };
-      }
-
-      return null;
-    }, null);
-
-    if (!apiKey || !instanceName || !whisperModel || !apiVersion) {
-      throw new Error('Required Azure configuration values are missing');
-    }
-
-    const baseURL = `https://${instanceName}.openai.azure.com`;
-
-    const url = `${baseURL}/openai/deployments/${whisperModel}/audio/transcriptions?api-version=${apiVersion}`;
-
-    let data = {
-      file: audioReadStream,
-      filename: 'audio.wav',
-      contentType: 'audio/wav',
-      knownLength: audioReadStream.length,
-    };
-
-    const headers = {
-      ...data.getHeaders(),
-      'Content-Type': 'multipart/form-data',
-      'api-key': apiKey,
-    };
-
-    return [url, data, headers];
-  } catch (error) {
-    logger.error('An error occurred while preparing the Azure API STT request: ', error);
-    return [null, null, null];
-  }
-}
-
-/**
- * Convert speech to text
- * @param {Object} req - The request object
- * @param {Object} res - The response object
- *
- * @returns {Object} The response object with the text from the STT API
- *
- * @throws Will throw an error if an error occurs while processing the audio
- */
-
-async function speechToText(req, res) {
-  const customConfig = await getCustomConfig();
-  if (!customConfig) {
-    return res.status(500).send('Custom config not found');
-  }
-
-  if (!req.file || !req.file.buffer) {
-    return res.status(400).json({ message: 'No audio file provided in the FormData' });
-  }
-
-  const audioBuffer = req.file.buffer;
-  const audioReadStream = Readable.from(audioBuffer);
-  audioReadStream.path = 'audio.wav';
-
-  const provider = getProvider(customConfig.stt);
-
-  let [url, data, headers] = [];
-
-  switch (provider) {
-    case 'openai':
-      [url, data, headers] = openAIProvider(customConfig.stt, audioReadStream);
-      break;
-    case 'azure':
-      [url, data, headers] = azureProvider(req, audioReadStream);
-      break;
-    default:
-      throw new Error('Invalid provider');
-  }
-
-  if (!Readable.from) {
-    const audioBlob = new Blob([audioBuffer], { type: req.file.mimetype });
-    delete data['file'];
-    data['file'] = audioBlob;
-  }
-
-  try {
-    const response = await axios.post(url, data, { headers: headers });
-    const text = await handleResponse(response);
-
-    res.json({ text });
-  } catch (error) {
-    logger.error('An error occurred while processing the audio:', error);
-    res.sendStatus(500);
-  }
-}
-
-module.exports = speechToText;

api/server/services/Files/Audio/streamAudio.js

@@ -1,371 +0,0 @@
-const WebSocket = require('ws');
-const { Message } = require('~/models/Message');
-
-/**
- * @param {string[]} voiceIds - Array of voice IDs
- * @returns {string}
- */
-function getRandomVoiceId(voiceIds) {
-  const randomIndex = Math.floor(Math.random() * voiceIds.length);
-  return voiceIds[randomIndex];
-}
-
-/**
- * @typedef {Object} VoiceSettings
- * @property {number} similarity_boost
- * @property {number} stability
- * @property {boolean} use_speaker_boost
- */
-
-/**
- * @typedef {Object} GenerateAudioBulk
- * @property {string} model_id
- * @property {string} text
- * @property {VoiceSettings} voice_settings
- */
-
-/**
- * @typedef {Object} TextToSpeechClient
- * @property {function(Object): Promise<stream.Readable>} generate
- */
-
-/**
- * @typedef {Object} AudioChunk
- * @property {string} audio
- * @property {boolean} isFinal
- * @property {Object} alignment
- * @property {number[]} alignment.char_start_times_ms
- * @property {number[]} alignment.chars_durations_ms
- * @property {string[]} alignment.chars
- * @property {Object} normalizedAlignment
- * @property {number[]} normalizedAlignment.char_start_times_ms
- * @property {number[]} normalizedAlignment.chars_durations_ms
- * @property {string[]} normalizedAlignment.chars
- */
-
-/**
- *
- * @param {Record<string, unknown | undefined>} parameters
- * @returns
- */
-function assembleQuery(parameters) {
-  let query = '';
-  let hasQuestionMark = false;
-
-  for (const [key, value] of Object.entries(parameters)) {
-    if (value == null) {
-      continue;
-    }
-
-    if (!hasQuestionMark) {
-      query += '?';
-      hasQuestionMark = true;
-    } else {
-      query += '&';
-    }
-
-    query += `${key}=${value}`;
-  }
-
-  return query;
-}
-
-const SEPARATORS = ['.', '?', '!', '۔', '。', '‥', ';', '¡', '¿', '\n'];
-
-/**
- *
- * @param {string} text
- * @param {string[] | undefined} [separators]
- * @returns
- */
-function findLastSeparatorIndex(text, separators = SEPARATORS) {
-  let lastIndex = -1;
-  for (const separator of separators) {
-    const index = text.lastIndexOf(separator);
-    if (index > lastIndex) {
-      lastIndex = index;
-    }
-  }
-  return lastIndex;
-}
-
-const MAX_NOT_FOUND_COUNT = 6;
-const MAX_NO_CHANGE_COUNT = 10;
-
-/**
- * @param {string} messageId
- * @returns {() => Promise<{ text: string, isFinished: boolean }[]>}
- */
-function createChunkProcessor(messageId) {
-  let notFoundCount = 0;
-  let noChangeCount = 0;
-  let processedText = '';
-  if (!messageId) {
-    throw new Error('Message ID is required');
-  }
-
-  /**
-   * @returns {Promise<{ text: string, isFinished: boolean }[] | string>}
-   */
-  async function processChunks() {
-    if (notFoundCount >= MAX_NOT_FOUND_COUNT) {
-      return `Message not found after ${MAX_NOT_FOUND_COUNT} attempts`;
-    }
-
-    if (noChangeCount >= MAX_NO_CHANGE_COUNT) {
-      return `No change in message after ${MAX_NO_CHANGE_COUNT} attempts`;
-    }
-
-    const message = await Message.findOne({ messageId }, 'text unfinished').lean();
-
-    if (!message || !message.text) {
-      notFoundCount++;
-      return [];
-    }
-
-    const { text, unfinished } = message;
-    if (text === processedText) {
-      noChangeCount++;
-    }
-
-    const remainingText = text.slice(processedText.length);
-    const chunks = [];
-
-    if (unfinished && remainingText.length >= 20) {
-      const separatorIndex = findLastSeparatorIndex(remainingText);
-      if (separatorIndex !== -1) {
-        const chunkText = remainingText.slice(0, separatorIndex + 1);
-        chunks.push({ text: chunkText, isFinished: false });
-        processedText += chunkText;
-      } else {
-        chunks.push({ text: remainingText, isFinished: false });
-        processedText = text;
-      }
-    } else if (!unfinished && remainingText.trim().length > 0) {
-      chunks.push({ text: remainingText.trim(), isFinished: true });
-      processedText = text;
-    }
-
-    return chunks;
-  }
-
-  return processChunks;
-}
-
-/**
- * @param {string} text
- * @param {number} [chunkSize=4000]
- * @returns {{ text: string, isFinished: boolean }[]}
- */
-function splitTextIntoChunks(text, chunkSize = 4000) {
-  if (!text) {
-    throw new Error('Text is required');
-  }
-
-  const chunks = [];
-  let startIndex = 0;
-  const textLength = text.length;
-
-  while (startIndex < textLength) {
-    let endIndex = Math.min(startIndex + chunkSize, textLength);
-    let chunkText = text.slice(startIndex, endIndex);
-
-    if (endIndex < textLength) {
-      let lastSeparatorIndex = -1;
-      for (const separator of SEPARATORS) {
-        const index = chunkText.lastIndexOf(separator);
-        if (index !== -1) {
-          lastSeparatorIndex = Math.max(lastSeparatorIndex, index);
-        }
-      }
-
-      if (lastSeparatorIndex !== -1) {
-        endIndex = startIndex + lastSeparatorIndex + 1;
-        chunkText = text.slice(startIndex, endIndex);
-      } else {
-        const nextSeparatorIndex = text.slice(endIndex).search(/\S/);
-        if (nextSeparatorIndex !== -1) {
-          endIndex += nextSeparatorIndex;
-          chunkText = text.slice(startIndex, endIndex);
-        }
-      }
-    }
-
-    chunkText = chunkText.trim();
-    if (chunkText) {
-      chunks.push({
-        text: chunkText,
-        isFinished: endIndex >= textLength,
-      });
-    } else if (chunks.length > 0) {
-      chunks[chunks.length - 1].isFinished = true;
-    }
-
-    startIndex = endIndex;
-    while (startIndex < textLength && text[startIndex].trim() === '') {
-      startIndex++;
-    }
-  }
-
-  return chunks;
-}
-
-/**
- * Input stream text to speech
- * @param {Express.Response} res
- * @param {AsyncIterable<string>} textStream
- * @param {(token: string) => Promise<boolean>} callback - Whether to continue the stream or not
- * @returns {AsyncGenerator<AudioChunk>}
- */
-function inputStreamTextToSpeech(res, textStream, callback) {
-  const model = 'eleven_monolingual_v1';
-  const wsUrl = `wss://api.elevenlabs.io/v1/text-to-speech/${getRandomVoiceId()}/stream-input${assembleQuery(
-    {
-      model_id: model,
-      // flush: true,
-      // optimize_streaming_latency: this.settings.optimizeStreamingLatency,
-      optimize_streaming_latency: 1,
-      // output_format: this.settings.outputFormat,
-    },
-  )}`;
-  const socket = new WebSocket(wsUrl);
-
-  socket.onopen = function () {
-    const streamStart = {
-      text: ' ',
-      voice_settings: {
-        stability: 0.5,
-        similarity_boost: 0.8,
-      },
-      xi_api_key: process.env.ELEVENLABS_API_KEY,
-      // generation_config: { chunk_length_schedule: [50, 90, 120, 150, 200] },
-    };
-
-    socket.send(JSON.stringify(streamStart));
-
-    // send stream until done
-    const streamComplete = new Promise((resolve, reject) => {
-      (async () => {
-        let textBuffer = '';
-        let shouldContinue = true;
-        for await (const textDelta of textStream) {
-          textBuffer += textDelta;
-
-          // using ". " as separator: sending in full sentences improves the quality
-          // of the audio output significantly.
-          const separatorIndex = findLastSeparatorIndex(textBuffer);
-
-          // Callback for textStream (will return false if signal is aborted)
-          shouldContinue = await callback(textDelta);
-
-          if (separatorIndex === -1) {
-            continue;
-          }
-
-          if (!shouldContinue) {
-            break;
-          }
-
-          const textToProcess = textBuffer.slice(0, separatorIndex);
-          textBuffer = textBuffer.slice(separatorIndex + 1);
-
-          const request = {
-            text: textToProcess,
-            try_trigger_generation: true,
-          };
-
-          socket.send(JSON.stringify(request));
-        }
-
-        // send remaining text:
-        if (shouldContinue && textBuffer.length > 0) {
-          socket.send(
-            JSON.stringify({
-              text: `${textBuffer} `, // append space
-              try_trigger_generation: true,
-            }),
-          );
-        }
-      })()
-        .then(resolve)
-        .catch(reject);
-    });
-
-    streamComplete
-      .then(() => {
-        const endStream = {
-          text: '',
-        };
-
-        socket.send(JSON.stringify(endStream));
-      })
-      .catch((e) => {
-        console.error('Error streaming text to speech:', e);
-        throw e;
-      });
-  };
-
-  return (async function* audioStream() {
-    let isDone = false;
-    let chunks = [];
-    let resolve;
-    let waitForMessage = new Promise((r) => (resolve = r));
-
-    socket.onmessage = function (event) {
-      // console.log(event);
-      const audioChunk = JSON.parse(event.data);
-      if (audioChunk.audio && audioChunk.alignment) {
-        res.write(`event: audio\ndata: ${event.data}\n\n`);
-        chunks.push(audioChunk);
-        resolve(null);
-        waitForMessage = new Promise((r) => (resolve = r));
-      } else if (audioChunk.isFinal) {
-        isDone = true;
-        resolve(null);
-      } else if (audioChunk.message) {
-        console.warn('Received Elevenlabs message:', audioChunk.message);
-        resolve(null);
-      }
-    };
-
-    socket.onerror = function (error) {
-      console.error('WebSocket error:', error);
-      // throw error;
-    };
-
-    socket.onclose = function () {
-      isDone = true;
-      resolve(null);
-    };
-
-    while (!isDone) {
-      await waitForMessage;
-      yield* chunks;
-      chunks = [];
-    }
-
-    res.write('event: end\ndata: \n\n');
-  })();
-}
-
-/**
- *
- * @param {AsyncIterable<string>} llmStream
- */
-async function* llmMessageSource(llmStream) {
-  for await (const chunk of llmStream) {
-    const message = chunk.choices[0].delta.content;
-    if (message) {
-      yield message;
-    }
-  }
-}
-
-module.exports = {
-  inputStreamTextToSpeech,
-  findLastSeparatorIndex,
-  createChunkProcessor,
-  splitTextIntoChunks,
-  llmMessageSource,
-  getRandomVoiceId,
-};

api/server/services/Files/Audio/streamAudio.spec.js

@@ -1,137 +0,0 @@
-const { createChunkProcessor, splitTextIntoChunks } = require('./streamAudio');
-const { Message } = require('~/models/Message');
-
-jest.mock('~/models/Message', () => ({
-  Message: {
-    findOne: jest.fn().mockReturnValue({
-      lean: jest.fn(),
-    }),
-  },
-}));
-
-describe('processChunks', () => {
-  let processChunks;
-
-  beforeEach(() => {
-    processChunks = createChunkProcessor('message-id');
-    Message.findOne.mockClear();
-    Message.findOne().lean.mockClear();
-  });
-
-  it('should return an empty array when the message is not found', async () => {
-    Message.findOne().lean.mockResolvedValueOnce(null);
-
-    const result = await processChunks();
-
-    expect(result).toEqual([]);
-    expect(Message.findOne).toHaveBeenCalledWith({ messageId: 'message-id' }, 'text unfinished');
-    expect(Message.findOne().lean).toHaveBeenCalled();
-  });
-
-  it('should return an empty array when the message does not have a text property', async () => {
-    Message.findOne().lean.mockResolvedValueOnce({ unfinished: true });
-
-    const result = await processChunks();
-
-    expect(result).toEqual([]);
-    expect(Message.findOne).toHaveBeenCalledWith({ messageId: 'message-id' }, 'text unfinished');
-    expect(Message.findOne().lean).toHaveBeenCalled();
-  });
-
-  it('should return chunks for an unfinished message with separators', async () => {
-    const messageText = 'This is a long message. It should be split into chunks. Lol hi mom';
-    Message.findOne().lean.mockResolvedValueOnce({ text: messageText, unfinished: true });
-
-    const result = await processChunks();
-
-    expect(result).toEqual([
-      { text: 'This is a long message. It should be split into chunks.', isFinished: false },
-    ]);
-    expect(Message.findOne).toHaveBeenCalledWith({ messageId: 'message-id' }, 'text unfinished');
-    expect(Message.findOne().lean).toHaveBeenCalled();
-  });
-
-  it('should return chunks for an unfinished message without separators', async () => {
-    const messageText = 'This is a long message without separators hello there my friend';
-    Message.findOne().lean.mockResolvedValueOnce({ text: messageText, unfinished: true });
-
-    const result = await processChunks();
-
-    expect(result).toEqual([{ text: messageText, isFinished: false }]);
-    expect(Message.findOne).toHaveBeenCalledWith({ messageId: 'message-id' }, 'text unfinished');
-    expect(Message.findOne().lean).toHaveBeenCalled();
-  });
-
-  it('should return the remaining text as a chunk for a finished message', async () => {
-    const messageText = 'This is a finished message.';
-    Message.findOne().lean.mockResolvedValueOnce({ text: messageText, unfinished: false });
-
-    const result = await processChunks();
-
-    expect(result).toEqual([{ text: messageText, isFinished: true }]);
-    expect(Message.findOne).toHaveBeenCalledWith({ messageId: 'message-id' }, 'text unfinished');
-    expect(Message.findOne().lean).toHaveBeenCalled();
-  });
-
-  it('should return an empty array for a finished message with no remaining text', async () => {
-    const messageText = 'This is a finished message.';
-    Message.findOne().lean.mockResolvedValueOnce({ text: messageText, unfinished: false });
-
-    await processChunks();
-    Message.findOne().lean.mockResolvedValueOnce({ text: messageText, unfinished: false });
-    const result = await processChunks();
-
-    expect(result).toEqual([]);
-    expect(Message.findOne).toHaveBeenCalledWith({ messageId: 'message-id' }, 'text unfinished');
-    expect(Message.findOne().lean).toHaveBeenCalledTimes(2);
-  });
-});
-
-describe('splitTextIntoChunks', () => {
-  test('splits text into chunks of specified size with default separators', () => {
-    const text = 'This is a test. This is only a test! Make sure it works properly? Okay.';
-    const chunkSize = 20;
-    const expectedChunks = [
-      { text: 'This is a test.', isFinished: false },
-      { text: 'This is only a test!', isFinished: false },
-      { text: 'Make sure it works p', isFinished: false },
-      { text: 'roperly? Okay.', isFinished: true },
-    ];
-
-    const result = splitTextIntoChunks(text, chunkSize);
-    expect(result).toEqual(expectedChunks);
-  });
-
-  test('splits text into chunks with default size', () => {
-    const text = 'A'.repeat(8000) + '. The end.';
-    const expectedChunks = [
-      { text: 'A'.repeat(4000), isFinished: false },
-      { text: 'A'.repeat(4000), isFinished: false },
-      { text: '. The end.', isFinished: true },
-    ];
-
-    const result = splitTextIntoChunks(text);
-    expect(result).toEqual(expectedChunks);
-  });
-
-  test('returns a single chunk if text length is less than chunk size', () => {
-    const text = 'Short text.';
-    const expectedChunks = [{ text: 'Short text.', isFinished: true }];
-
-    const result = splitTextIntoChunks(text, 4000);
-    expect(result).toEqual(expectedChunks);
-  });
-
-  test('handles text with no separators correctly', () => {
-    const text = 'ThisTextHasNoSeparatorsAndIsVeryLong'.repeat(100);
-    const chunkSize = 4000;
-    const expectedChunks = [{ text: text, isFinished: true }];
-
-    const result = splitTextIntoChunks(text, chunkSize);
-    expect(result).toEqual(expectedChunks);
-  });
-
-  test('throws an error when text is empty', () => {
-    expect(() => splitTextIntoChunks('')).toThrow('Text is required');
-  });
-});

api/server/services/Files/Audio/textToSpeech.js

@@ -1,416 +0,0 @@
-const axios = require('axios');
-const getCustomConfig = require('~/server/services/Config/getCustomConfig');
-const { getRandomVoiceId, createChunkProcessor, splitTextIntoChunks } = require('./streamAudio');
-const { extractEnvVariable } = require('librechat-data-provider');
-const { logger } = require('~/config');
-
-/**
- * getProvider function
- * This function takes the ttsSchema object and returns the name of the provider
- * If more than one provider is set or no provider is set, it throws an error
- *
- * @param {Object} ttsSchema - The TTS schema containing the provider configuration
- * @returns {string} The name of the provider
- * @throws {Error} Throws an error if multiple providers are set or no provider is set
- */
-function getProvider(ttsSchema) {
-  if (!ttsSchema) {
-    throw new Error(`No TTS schema is set. Did you configure TTS in the custom config (librechat.yaml)?
-    
-    https://www.librechat.ai/docs/configuration/stt_tts#tts`);
-  }
-  const providers = Object.entries(ttsSchema).filter(([, value]) => Object.keys(value).length > 0);
-
-  if (providers.length > 1) {
-    throw new Error('Multiple providers are set. Please set only one provider.');
-  } else if (providers.length === 0) {
-    throw new Error('No provider is set. Please set a provider.');
-  } else {
-    return providers[0][0];
-  }
-}
-
-/**
- * removeUndefined function
- * This function takes an object and removes all keys with undefined values
- * It also removes keys with empty objects as values
- *
- * @param {Object} obj - The object to be cleaned
- * @returns {void} This function does not return a value. It modifies the input object directly
- */
-function removeUndefined(obj) {
-  Object.keys(obj).forEach((key) => {
-    if (obj[key] && typeof obj[key] === 'object') {
-      removeUndefined(obj[key]);
-      if (Object.keys(obj[key]).length === 0) {
-        delete obj[key];
-      }
-    } else if (obj[key] === undefined) {
-      delete obj[key];
-    }
-  });
-}
-
-/**
- * This function prepares the necessary data and headers for making a request to the OpenAI TTS
- * It uses the provided TTS schema, input text, and voice to create the request
- *
- * @param {TCustomConfig['tts']['openai']} ttsSchema - The TTS schema containing the OpenAI configuration
- * @param {string} input - The text to be converted to speech
- * @param {string} voice - The voice to be used for the speech
- *
- * @returns {Array} An array containing the URL for the API request, the data to be sent, and the headers for the request
- * If an error occurs, it throws an error with a message indicating that the selected voice is not available
- */
-function openAIProvider(ttsSchema, input, voice) {
-  const url = ttsSchema?.url || 'https://api.openai.com/v1/audio/speech';
-
-  if (
-    ttsSchema?.voices &&
-    ttsSchema.voices.length > 0 &&
-    !ttsSchema.voices.includes(voice) &&
-    !ttsSchema.voices.includes('ALL')
-  ) {
-    throw new Error(`Voice ${voice} is not available.`);
-  }
-
-  let data = {
-    input,
-    model: ttsSchema?.model,
-    voice: ttsSchema?.voices && ttsSchema.voices.length > 0 ? voice : undefined,
-    backend: ttsSchema?.backend,
-  };
-
-  let headers = {
-    'Content-Type': 'application/json',
-    Authorization: 'Bearer ' + extractEnvVariable(ttsSchema?.apiKey),
-  };
-
-  [data, headers].forEach(removeUndefined);
-
-  return [url, data, headers];
-}
-
-/**
- * elevenLabsProvider function
- * This function prepares the necessary data and headers for making a request to the Eleven Labs TTS
- * It uses the provided TTS schema, input text, and voice to create the request
- *
- * @param {TCustomConfig['tts']['elevenLabs']} ttsSchema - The TTS schema containing the Eleven Labs configuration
- * @param {string} input - The text to be converted to speech
- * @param {string} voice - The voice to be used for the speech
- * @param {boolean} stream - Whether to stream the audio or not
- *
- * @returns {Array} An array containing the URL for the API request, the data to be sent, and the headers for the request
- * @throws {Error} Throws an error if the selected voice is not available
- */
-function elevenLabsProvider(ttsSchema, input, voice, stream) {
-  let url =
-    ttsSchema?.url ||
-    `https://api.elevenlabs.io/v1/text-to-speech/{voice_id}${stream ? '/stream' : ''}`;
-
-  if (!ttsSchema?.voices.includes(voice) && !ttsSchema?.voices.includes('ALL')) {
-    throw new Error(`Voice ${voice} is not available.`);
-  }
-
-  url = url.replace('{voice_id}', voice);
-
-  let data = {
-    model_id: ttsSchema?.model,
-    text: input,
-    // voice_id: voice,
-    voice_settings: {
-      similarity_boost: ttsSchema?.voice_settings?.similarity_boost,
-      stability: ttsSchema?.voice_settings?.stability,
-      style: ttsSchema?.voice_settings?.style,
-      use_speaker_boost: ttsSchema?.voice_settings?.use_speaker_boost || undefined,
-    },
-    pronunciation_dictionary_locators: ttsSchema?.pronunciation_dictionary_locators,
-  };
-
-  let headers = {
-    'Content-Type': 'application/json',
-    'xi-api-key': extractEnvVariable(ttsSchema?.apiKey),
-    Accept: 'audio/mpeg',
-  };
-
-  [data, headers].forEach(removeUndefined);
-
-  return [url, data, headers];
-}
-
-/**
- * localAIProvider function
- * This function prepares the necessary data and headers for making a request to the LocalAI TTS
- * It uses the provided TTS schema, input text, and voice to create the request
- *
- * @param {TCustomConfig['tts']['localai']} ttsSchema - The TTS schema containing the LocalAI configuration
- * @param {string} input - The text to be converted to speech
- * @param {string} voice - The voice to be used for the speech
- *
- * @returns {Array} An array containing the URL for the API request, the data to be sent, and the headers for the request
- * @throws {Error} Throws an error if the selected voice is not available
- */
-function localAIProvider(ttsSchema, input, voice) {
-  let url = ttsSchema?.url;
-
-  if (
-    ttsSchema?.voices &&
-    ttsSchema.voices.length > 0 &&
-    !ttsSchema.voices.includes(voice) &&
-    !ttsSchema.voices.includes('ALL')
-  ) {
-    throw new Error(`Voice ${voice} is not available.`);
-  }
-
-  let data = {
-    input,
-    model: ttsSchema?.voices && ttsSchema.voices.length > 0 ? voice : undefined,
-    backend: ttsSchema?.backend,
-  };
-
-  let headers = {
-    'Content-Type': 'application/json',
-    Authorization: 'Bearer ' + extractEnvVariable(ttsSchema?.apiKey),
-  };
-
-  [data, headers].forEach(removeUndefined);
-
-  if (extractEnvVariable(ttsSchema.apiKey) === '') {
-    delete headers.Authorization;
-  }
-
-  return [url, data, headers];
-}
-
-/**
- *
- * Returns provider and its schema for use with TTS requests
- * @param {TCustomConfig} customConfig
- * @param {string} _voice
- * @returns {Promise<[string, TProviderSchema]>}
- */
-async function getProviderSchema(customConfig) {
-  const provider = getProvider(customConfig.tts);
-  return [provider, customConfig.tts[provider]];
-}
-
-/**
- *
- * Returns a tuple of the TTS schema as well as the voice for the TTS request
- * @param {TProviderSchema} providerSchema
- * @param {string} requestVoice
- * @returns {Promise<string>}
- */
-async function getVoice(providerSchema, requestVoice) {
-  const voices = providerSchema.voices.filter((voice) => voice && voice.toUpperCase() !== 'ALL');
-  let voice = requestVoice;
-  if (!voice || !voices.includes(voice) || (voice.toUpperCase() === 'ALL' && voices.length > 1)) {
-    voice = getRandomVoiceId(voices);
-  }
-
-  return voice;
-}
-
-/**
- *
- * @param {string} provider
- * @param {TProviderSchema} ttsSchema
- * @param {object} params
- * @param {string} params.voice
- * @param {string} params.input
- * @param {boolean} [params.stream]
- * @returns {Promise<ArrayBuffer>}
- */
-async function ttsRequest(provider, ttsSchema, { input, voice, stream = true } = { stream: true }) {
-  let [url, data, headers] = [];
-  switch (provider) {
-    case 'openai':
-      [url, data, headers] = openAIProvider(ttsSchema, input, voice);
-      break;
-    case 'elevenlabs':
-      [url, data, headers] = elevenLabsProvider(ttsSchema, input, voice, stream);
-      break;
-    case 'localai':
-      [url, data, headers] = localAIProvider(ttsSchema, input, voice);
-      break;
-    default:
-      throw new Error('Invalid provider');
-  }
-
-  if (stream) {
-    return await axios.post(url, data, { headers, responseType: 'stream' });
-  }
-
-  return await axios.post(url, data, { headers, responseType: 'arraybuffer' });
-}
-
-/**
- * Handles a text-to-speech request. Extracts input and voice from the request, retrieves the TTS configuration,
- * and sends a request to the appropriate provider. The resulting audio data is sent in the response
- *
- * @param {Object} req - The request object, which should contain the input text and voice in its body
- * @param {Object} res - The response object, used to send the audio data or an error message
- *
- * @returns {Promise<void>} This function does not return a value. It sends the audio data or an error message in the response
- *
- * @throws {Error} Throws an error if the provider is invalid
- */
-async function textToSpeech(req, res) {
-  const { input } = req.body;
-
-  if (!input) {
-    return res.status(400).send('Missing text in request body');
-  }
-
-  const customConfig = await getCustomConfig();
-  if (!customConfig) {
-    res.status(500).send('Custom config not found');
-  }
-
-  try {
-    res.setHeader('Content-Type', 'audio/mpeg');
-    const [provider, ttsSchema] = await getProviderSchema(customConfig);
-    const voice = await getVoice(ttsSchema, req.body.voice);
-    if (input.length < 4096) {
-      const response = await ttsRequest(provider, ttsSchema, { input, voice });
-      response.data.pipe(res);
-      return;
-    }
-
-    const textChunks = splitTextIntoChunks(input, 1000);
-
-    for (const chunk of textChunks) {
-      try {
-        const response = await ttsRequest(provider, ttsSchema, {
-          voice,
-          input: chunk.text,
-          stream: true,
-        });
-
-        logger.debug(`[textToSpeech] user: ${req?.user?.id} | writing audio stream`);
-        await new Promise((resolve) => {
-          response.data.pipe(res, { end: chunk.isFinished });
-          response.data.on('end', () => {
-            resolve();
-          });
-        });
-
-        if (chunk.isFinished) {
-          break;
-        }
-      } catch (innerError) {
-        logger.error('Error processing manual update:', chunk, innerError);
-        if (!res.headersSent) {
-          res.status(500).end();
-        }
-        return;
-      }
-    }
-
-    if (!res.headersSent) {
-      res.end();
-    }
-  } catch (error) {
-    logger.error(
-      'Error creating the audio stream. Suggestion: check your provider quota. Error:',
-      error,
-    );
-    res.status(500).send('An error occurred');
-  }
-}
-
-async function streamAudio(req, res) {
-  res.setHeader('Content-Type', 'audio/mpeg');
-  const customConfig = await getCustomConfig();
-  if (!customConfig) {
-    return res.status(500).send('Custom config not found');
-  }
-
-  const [provider, ttsSchema] = await getProviderSchema(customConfig);
-  const voice = await getVoice(ttsSchema, req.body.voice);
-
-  try {
-    let shouldContinue = true;
-
-    req.on('close', () => {
-      logger.warn('[streamAudio] Audio Stream Request closed by client');
-      shouldContinue = false;
-    });
-
-    const processChunks = createChunkProcessor(req.body.messageId);
-
-    while (shouldContinue) {
-      // example updates
-      // const updates = [
-      //   { text: 'This is a test.', isFinished: false },
-      //   { text: 'This is only a test.', isFinished: false },
-      //   { text: 'Your voice is like a combination of Fergie and Jesus!', isFinished: true },
-      // ];
-
-      const updates = await processChunks();
-      if (typeof updates === 'string') {
-        logger.error(`Error processing audio stream updates: ${JSON.stringify(updates)}`);
-        res.status(500).end();
-        return;
-      }
-
-      if (updates.length === 0) {
-        await new Promise((resolve) => setTimeout(resolve, 1250));
-        continue;
-      }
-
-      for (const update of updates) {
-        try {
-          const response = await ttsRequest(provider, ttsSchema, {
-            voice,
-            input: update.text,
-            stream: true,
-          });
-
-          if (!shouldContinue) {
-            break;
-          }
-
-          logger.debug(`[streamAudio] user: ${req?.user?.id} | writing audio stream`);
-          await new Promise((resolve) => {
-            response.data.pipe(res, { end: update.isFinished });
-            response.data.on('end', () => {
-              resolve();
-            });
-          });
-
-          if (update.isFinished) {
-            shouldContinue = false;
-            break;
-          }
-        } catch (innerError) {
-          logger.error('Error processing update:', update, innerError);
-          if (!res.headersSent) {
-            res.status(500).end();
-          }
-          return;
-        }
-      }
-
-      if (!shouldContinue) {
-        break;
-      }
-    }
-
-    if (!res.headersSent) {
-      res.end();
-    }
-  } catch (error) {
-    logger.error('Failed to fetch audio:', error);
-    if (!res.headersSent) {
-      res.status(500).end();
-    }
-  }
-}
-
-module.exports = {
-  textToSpeech,
-  getProvider,
-  streamAudio,
-};

api/server/services/Files/Audio/webSocket.js

@@ -1,31 +0,0 @@
-let token = '';
-
-function updateTokenWebsocket(newToken) {
-  console.log('Token:', newToken);
-  token = newToken;
-}
-
-function sendTextToWebsocket(ws, onDataReceived) {
-  if (token === '[DONE]') {
-    ws.send(' ');
-    return;
-  }
-
-  if (ws.readyState === WebSocket.OPEN) {
-    ws.send(token);
-
-    ws.onmessage = function (event) {
-      console.log('Received:', event.data);
-      if (onDataReceived) {
-        onDataReceived(event.data); // Pass the received data to the callback function
-      }
-    };
-  } else {
-    console.error('WebSocket is not open. Ready state is: ' + ws.readyState);
-  }
-}
-
-module.exports = {
-  updateTokenWebsocket,
-  sendTextToWebsocket,
-};

api/server/services/PluginService.js

@@ -88,17 +88,7 @@ const updateUserPluginAuth = async (userId, authField, pluginKey, value) => {
   }
 };
 
-const deleteUserPluginAuth = async (userId, authField, all = false) => {
-  if (all) {
-    try {
-      const response = await PluginAuth.deleteMany({ userId });
-      return response;
-    } catch (err) {
-      logger.error('[deleteUserPluginAuth]', err);
-      return err;
-    }
-  }
-
+const deleteUserPluginAuth = async (userId, authField) => {
   try {
     return await PluginAuth.deleteOne({ userId, authField });
   } catch (err) {

api/server/services/Runs/StreamRunManager.js

@@ -1,4 +1,3 @@
-const throttle = require('lodash/throttle');
 const {
   StepTypes,
   ContentTypes,
@@ -9,7 +8,6 @@ const {
 } = require('librechat-data-provider');
 const { retrieveAndProcessFile } = require('~/server/services/Files/process');
 const { processRequiredActions } = require('~/server/services/ToolService');
-const { saveMessage, updateMessageText } = require('~/models/Message');
 const { createOnProgress, sendMessage } = require('~/server/utils');
 const { processMessages } = require('~/server/services/Threads');
 const { logger } = require('~/config');
@@ -45,8 +43,6 @@ class StreamRunManager {
     /** @type {string} */
     this.apiKey = this.openai.apiKey;
     /** @type {string} */
-    this.parentMessageId = fields.parentMessageId;
-    /** @type {string} */
     this.thread_id = fields.thread_id;
     /** @type {RunCreateAndStreamParams} */
     this.initialRunBody = fields.runBody;
@@ -62,14 +58,10 @@ class StreamRunManager {
     this.messages = [];
     /** @type {string} */
     this.text = '';
-    /** @type {string} */
-    this.intermediateText = '';
     /** @type {Set<string>} */
     this.attachedFileIds = fields.attachedFileIds;
     /** @type {undefined | Promise<ChatCompletion>} */
     this.visionPromise = fields.visionPromise;
-    /** @type {boolean} */
-    this.savedInitialMessage = false;
 
     /**
      * @type {Object.<AssistantStreamEvents, (event: AssistantStreamEvent) => Promise<void>>}
@@ -131,33 +123,6 @@ class StreamRunManager {
     sendMessage(this.res, contentData);
   }
 
-  /* <------------------ Misc. Helpers ------------------> */
-  /** Returns the latest intermediate text
-   * @returns {string}
-   */
-  getText() {
-    return this.intermediateText;
-  }
-
-  /** Saves the initial intermediate message
-   * @returns {Promise<void>}
-   */
-  async saveInitialMessage() {
-    return saveMessage({
-      conversationId: this.finalMessage.conversationId,
-      messageId: this.finalMessage.messageId,
-      parentMessageId: this.parentMessageId,
-      model: this.req.body.assistant_id,
-      endpoint: this.req.body.endpoint,
-      isCreatedByUser: false,
-      user: this.req.user.id,
-      text: this.getText(),
-      sender: 'Assistant',
-      unfinished: true,
-      error: false,
-    });
-  }
-
   /* <------------------ Main Event Handlers ------------------> */
 
   /**
@@ -442,7 +407,6 @@ class StreamRunManager {
     const content = message.delta.content?.[0];
 
     if (content && content.type === MessageContentTypes.TEXT) {
-      this.intermediateText += content.text.value;
       onProgress(content.text.value);
     }
   }
@@ -497,34 +461,6 @@ class StreamRunManager {
     return `${stepId}_tool_call_${toolCall.index}_${toolCall.type}`;
   }
 
-  /**
-   * Check Missing Outputs
-   * @param {ToolOutput[]} tool_outputs - The tool outputs.
-   * @param {RequiredAction[]} actions - The required actions.
-   * @returns {ToolOutput[]} completeOutputs - The complete outputs.
-   */
-  checkMissingOutputs(tool_outputs, actions) {
-    const missingOutputs = [];
-
-    for (const item of actions) {
-      const { tool, toolCallId, run_id, thread_id } = item;
-      const outputExists = tool_outputs.some((output) => output.tool_call_id === toolCallId);
-
-      if (!outputExists) {
-        logger.warn(
-          `The "${tool}" tool (ID: ${toolCallId}) failed to produce an output. run_id: ${run_id} thread_id: ${thread_id}`,
-        );
-        missingOutputs.push({
-          tool_call_id: toolCallId,
-          output:
-            'The tool failed to produce an output. The tool may not be currently available or experienced an unhandled error.',
-        });
-      }
-    }
-
-    return [...tool_outputs, ...missingOutputs];
-  }
-
   /* <------------------ Run Event handlers ------------------> */
 
   /**
@@ -547,8 +483,7 @@ class StreamRunManager {
       };
     });
 
-    const { tool_outputs: preliminaryOutputs } = await processRequiredActions(this, actions);
-    const tool_outputs = this.checkMissingOutputs(preliminaryOutputs, actions);
+    const { tool_outputs } = await processRequiredActions(this, actions);
     /** @type {AssistantStream | undefined} */
     let toolRun;
     try {
@@ -588,24 +523,10 @@ class StreamRunManager {
       const stepKey = message_creation.message_id;
       const index = this.getStepIndex(stepKey);
       this.orderedRunSteps.set(index, message_creation);
-
       // Create the Factory Function to stream the message
       const { onProgress: progressCallback } = createOnProgress({
-        onProgress: throttle(
-          () => {
-            if (!this.savedInitialMessage) {
-              this.saveInitialMessage();
-              this.savedInitialMessage = true;
-            } else {
-              updateMessageText({
-                messageId: this.finalMessage.messageId,
-                text: this.getText(),
-              });
-            }
-          },
-          2000,
-          { trailing: false },
-        ),
+        // todo: add option to save partialText to db
+        // onProgress: () => {},
       });
 
       // This creates a function that attaches all of the parameters

api/server/services/Threads/manage.js

@@ -121,7 +121,6 @@ async function saveUserMessage(params) {
  * @param {Object} params - The parameters of the Assistant message
  * @param {string} params.user - The user's ID.
  * @param {string} params.messageId - The message Id.
- * @param {string} params.text - The concatenated text of the message.
  * @param {string} params.assistant_id - The assistant Id.
  * @param {string} params.thread_id - The thread Id.
  * @param {string} params.model - The model used by the assistant.
@@ -135,6 +134,14 @@ async function saveUserMessage(params) {
  * @return {Promise<Run>} A promise that resolves to the created run object.
  */
 async function saveAssistantMessage(params) {
+  const text = params.content.reduce((acc, part) => {
+    if (!part.value) {
+      return acc;
+    }
+
+    return acc + ' ' + part.value;
+  }, '');
+
   // const tokenCount = // TODO: need to count each content part
 
   const message = await recordMessage({
@@ -149,8 +156,7 @@ async function saveAssistantMessage(params) {
     content: params.content,
     sender: 'Assistant',
     isCreatedByUser: false,
-    text: params.text,
-    unfinished: false,
+    text: text.trim(),
     // tokenCount,
   });
 
@@ -296,7 +302,6 @@ async function syncMessages({
         aggregateMessages: [{ id: apiMessage.id }],
         model: apiMessage.role === 'user' ? null : apiMessage.assistant_id,
         user: openai.req.user.id,
-        unfinished: false,
       };
 
       if (apiMessage.file_ids?.length) {

api/server/services/ToolService.js

@@ -340,26 +340,29 @@ async function processRequiredActions(client, requiredActions) {
       currentAction.toolInput = currentAction.toolInput.input;
     }
 
-    const handleToolError = (error) => {
-      logger.error(
-        `tool_call_id: ${currentAction.toolCallId} | Error processing tool ${currentAction.tool}`,
-        error,
-      );
-      return {
-        tool_call_id: currentAction.toolCallId,
-        output: `Error processing tool ${currentAction.tool}: ${redactMessage(error.message, 256)}`,
-      };
-    };
-
     try {
       const promise = tool
         ._call(currentAction.toolInput)
         .then(handleToolOutput)
-        .catch(handleToolError);
+        .catch((error) => {
+          logger.error(`Error processing tool ${currentAction.tool}`, error);
+          return {
+            tool_call_id: currentAction.toolCallId,
+            output: `Error processing tool ${currentAction.tool}: ${redactMessage(error.message)}`,
+          };
+        });
       promises.push(promise);
     } catch (error) {
-      const toolOutputError = handleToolError(error);
-      promises.push(Promise.resolve(toolOutputError));
+      logger.error(
+        `tool_call_id: ${currentAction.toolCallId} | Error processing tool ${currentAction.tool}`,
+        error,
+      );
+      promises.push(
+        Promise.resolve({
+          tool_call_id: currentAction.toolCallId,
+          error: error.message,
+        }),
+      );
     }
   }
 

api/server/services/UserService.js

@@ -1,6 +1,6 @@
 const { ErrorTypes } = require('librechat-data-provider');
 const { encrypt, decrypt } = require('~/server/utils');
-const { updateUser, Key } = require('~/models');
+const { User, Key } = require('~/models');
 const { logger } = require('~/config');
 
 /**
@@ -16,13 +16,16 @@ const { logger } = require('~/config');
  */
 const updateUserPluginsService = async (user, pluginKey, action) => {
   try {
-    const userPlugins = user.plugins || [];
     if (action === 'install') {
-      return await updateUser(user._id, { plugins: [...userPlugins, pluginKey] });
+      return await User.updateOne(
+        { _id: user._id },
+        { $set: { plugins: [...user.plugins, pluginKey] } },
+      );
     } else if (action === 'uninstall') {
-      return await updateUser(user._id, {
-        plugins: userPlugins.filter((plugin) => plugin !== pluginKey),
-      });
+      return await User.updateOne(
+        { _id: user._id },
+        { $set: { plugins: user.plugins.filter((plugin) => plugin !== pluginKey) } },
+      );
     }
   } catch (err) {
     logger.error('[updateUserPluginsService]', err);
@@ -164,11 +167,11 @@ const checkUserKeyExpiry = (expiresAt, endpoint) => {
 };
 
 module.exports = {
+  updateUserPluginsService,
   getUserKey,
-  updateUserKey,
-  deleteUserKey,
   getUserKeyValues,
   getUserKeyExpiry,
+  updateUserKey,
+  deleteUserKey,
   checkUserKeyExpiry,
-  updateUserPluginsService,
 };

api/server/services/start/assistants.js

@@ -1,5 +1,6 @@
 const {
   Capabilities,
+  EModelEndpoint,
   assistantEndpointSchema,
   defaultAssistantsVersion,
 } = require('librechat-data-provider');
@@ -19,25 +20,16 @@ function azureAssistantsDefaults() {
 /**
  * Sets up the Assistants configuration from the config (`librechat.yaml`) file.
  * @param {TCustomConfig} config - The loaded custom configuration.
- * @param {EModelEndpoint.assistants|EModelEndpoint.azureAssistants} assistantsEndpoint - The Assistants endpoint name.
- * - The previously loaded assistants configuration from Azure OpenAI Assistants option.
  * @param {Partial<TAssistantEndpoint>} [prevConfig]
+ * - The previously loaded assistants configuration from Azure OpenAI Assistants option.
  * @returns {Partial<TAssistantEndpoint>} The Assistants endpoint configuration.
  */
-function assistantsConfigSetup(config, assistantsEndpoint, prevConfig = {}) {
-  const assistantsConfig = config.endpoints[assistantsEndpoint];
+function assistantsConfigSetup(config, prevConfig = {}) {
+  const assistantsConfig = config.endpoints[EModelEndpoint.assistants];
   const parsedConfig = assistantEndpointSchema.parse(assistantsConfig);
   if (assistantsConfig.supportedIds?.length && assistantsConfig.excludedIds?.length) {
     logger.warn(
-      `Configuration conflict: The '${assistantsEndpoint}' endpoint has both 'supportedIds' and 'excludedIds' defined. The 'excludedIds' will be ignored.`,
-    );
-  }
-  if (
-    assistantsConfig.privateAssistants &&
-    (assistantsConfig.supportedIds?.length || assistantsConfig.excludedIds?.length)
-  ) {
-    logger.warn(
-      `Configuration conflict: The '${assistantsEndpoint}' endpoint has both 'privateAssistants' and 'supportedIds' or 'excludedIds' defined. The 'supportedIds' and 'excludedIds' will be ignored.`,
+      `Both \`supportedIds\` and \`excludedIds\` are defined for the ${EModelEndpoint.assistants} endpoint; \`excludedIds\` field will be ignored.`,
     );
   }
 
@@ -49,7 +41,6 @@ function assistantsConfigSetup(config, assistantsEndpoint, prevConfig = {}) {
     supportedIds: parsedConfig.supportedIds,
     capabilities: parsedConfig.capabilities,
     excludedIds: parsedConfig.excludedIds,
-    privateAssistants: parsedConfig.privateAssistants,
     timeoutMs: parsedConfig.timeoutMs,
   };
 }

api/server/services/start/checks.js

@@ -3,7 +3,6 @@ const {
   deprecatedAzureVariables,
   conflictingAzureVariables,
 } = require('librechat-data-provider');
-const { isEnabled, checkEmailConfig } = require('~/server/utils');
 const { logger } = require('~/config');
 
 const secretDefaults = {
@@ -50,8 +49,6 @@ function checkVariables() {
       Please use the config (\`librechat.yaml\`) file for setting up OpenRouter, and use \`OPENROUTER_KEY\` or another environment variable instead.`,
     );
   }
-
-  checkPasswordReset();
 }
 
 /**
@@ -110,25 +107,4 @@ Latest version: ${Constants.CONFIG_VERSION}
   }
 }
 
-function checkPasswordReset() {
-  const emailEnabled = checkEmailConfig();
-  const passwordResetAllowed = isEnabled(process.env.ALLOW_PASSWORD_RESET);
-
-  if (!emailEnabled && passwordResetAllowed) {
-    logger.warn(
-      `❗❗❗
-
-      Password reset is enabled with \`ALLOW_PASSWORD_RESET\` but email service is not configured.
-      
-      This setup is insecure as password reset links will be issued with a recognized email.
-      
-      Please configure email service for secure password reset functionality.
-      
-      https://www.librechat.ai/docs/configuration/authentication/password_reset
-
-      ❗❗❗`,
-    );
-  }
-}
-
 module.exports = { checkVariables, checkHealth, checkConfig, checkAzureVariables };

api/server/socialLogins.js

@@ -1,15 +1,14 @@
-const Redis = require('ioredis');
-const passport = require('passport');
 const session = require('express-session');
 const RedisStore = require('connect-redis').default;
+const passport = require('passport');
 const {
-  setupOpenId,
   googleLogin,
   githubLogin,
   discordLogin,
   facebookLogin,
-} = require('~/strategies');
-const { logger } = require('~/config');
+  setupOpenId,
+} = require('../strategies');
+const client = require('../cache/redis');
 
 /**
  *
@@ -41,11 +40,6 @@ const configureSocialLogins = (app) => {
       saveUninitialized: false,
     };
     if (process.env.USE_REDIS) {
-      const client = new Redis(process.env.REDIS_URI);
-      client
-        .on('error', (err) => logger.error('ioredis error:', err))
-        .on('ready', () => logger.info('ioredis successfully initialized.'))
-        .on('reconnecting', () => logger.info('ioredis reconnecting...'));
       sessionOptions.store = new RedisStore({ client, prefix: 'librechat' });
     }
     app.use(session(sessionOptions));

api/server/utils/emails/passwordReset.handlebars

@@ -1,11 +1,9 @@
-<html
-  xmlns='http://www.w3.org/1999/xhtml'
-  xmlns:v='urn:schemas-microsoft-com:vml'
-  xmlns:o='urn:schemas-microsoft-com:office:office'
->
+<!DOCTYPE HTML
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 
-  <head>
-    <!--[if gte mso 9]>
+<head>
+	<!--[if gte mso 9]>
 <xml>
 <o:OfficeDocumentSettings>
     <o:AllowPNG />
@@ -13,184 +11,176 @@
 </o:OfficeDocumentSettings>
 </xml>
 <![endif]-->
-    <meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
-    <meta name='viewport' content='width=device-width, initial-scale=1.0' />
-    <meta name='x-apple-disable-message-reformatting' />
-    <meta name='color-scheme' content='light dark' />
-    <!--[if !mso]><!-->
-    <meta http-equiv='X-UA-Compatible' content='IE=edge' />
-    <!--<![endif]-->
-    <title></title>
-    <style type='text/css'>
-      @media (prefers-color-scheme: dark) { .darkmode { background-color: #212121 !important; }
-      .darkmode p { color: #ffffff !important; } } @media only screen and (min-width: 520px) {
-      .u-row { width: 500px !important; } .u-row .u-col { vertical-align: top; } .u-row .u-col-100 {
-      width: 500px !important; } } @media (max-width: 520px) { .u-row-container { max-width: 100%
-      !important; padding-left: 0px !important; padding-right: 0px !important; } .u-row .u-col {
-      min-width: 320px !important; max-width: 100% !important; display: block !important; } .u-row {
-      width: 100% !important; } .u-col { width: 100% !important; } .u-col>div { margin: 0 auto; } }
-      body { margin: 0; padding: 0; } table, tr, td { vertical-align: top; border-collapse:
-      collapse; } .ie-container table, .mso-container table { table-layout: fixed; } * {
-      line-height: inherit; } a[x-apple-data-detectors='true'] { color: inherit !important;
-      text-decoration: none !important; } table, td { color: #ffffff; }
-    </style>
-  </head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta name="x-apple-disable-message-reformatting">
+	<meta name="color-scheme" content="light dark">
+	<!--[if !mso]><!-->
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<!--<![endif]-->
+	<title></title>
+	<style type="text/css">
+	@media (prefers-color-scheme: dark) {
+		.darkmode {
+			background-color: #212121 !important;
+		}
+		.darkmode p {
+			color: #ffffff !important;
+		}
+	}
+	
+	@media only screen and (min-width: 520px) {
+		.u-row {
+			width: 500px !important;
+		}
+		.u-row .u-col {
+			vertical-align: top;
+		}
+		.u-row .u-col-100 {
+			width: 500px !important;
+		}
+	}
+	
+	@media (max-width: 520px) {
+		.u-row-container {
+			max-width: 100% !important;
+			padding-left: 0px !important;
+			padding-right: 0px !important;
+		}
+		.u-row .u-col {
+			min-width: 320px !important;
+			max-width: 100% !important;
+			display: block !important;
+		}
+		.u-row {
+			width: 100% !important;
+		}
+		.u-col {
+			width: 100% !important;
+		}
+		.u-col>div {
+			margin: 0 auto;
+		}
+	}
+	
+	body {
+		margin: 0;
+		padding: 0;
+	}
+	
+	table,
+	tr,
+	td {
+		vertical-align: top;
+		border-collapse: collapse;
+	}
+	
+	.ie-container table,
+	.mso-container table {
+		table-layout: fixed;
+	}
+	
+	* {
+		line-height: inherit;
+	}
+	
+	a[x-apple-data-detectors='true'] {
+		color: inherit !important;
+		text-decoration: none !important;
+	}
+	
+	table,
+	td {
+		color: #ffffff;
+	}
+	</style>
+</head>
 
-  <body
-    class='clean-body u_body'
-    style='margin: 0;padding: 0;-webkit-text-size-adjust: 100%;background-color: #212121;color: #ffffff'
-  >
-    <!--[if IE]><div class="ie-container"><![endif]-->
-    <!--[if mso]><div class="mso-container"><![endif]-->
-    <table
-      style='border-collapse: collapse;table-layout: fixed;border-spacing: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;vertical-align: top;min-width: 320px;Margin: 0 auto;background-color: #212121;width:100%'
-      cellpadding='0'
-      cellspacing='0'
-    >
-      <tbody>
-        <tr style='vertical-align: top'>
-          <td
-            style='word-break: break-word;border-collapse: collapse !important;vertical-align: top'
-          >
-            <!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center" style="background-color: #212121;"><![endif]-->
-            <div class='u-row-container' style='padding: 0px;background-color: transparent'>
-              <div
-                class='u-row'
-                style='margin: 0 auto;min-width: 320px;max-width: 500px;overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;background-color: transparent;'
-              >
-                <div
-                  style='border-collapse: collapse;display: table;width: 100%;height: 100%;background-color: transparent;'
-                >
-                  <!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table cellpadding="0" cellspacing="0" border="0" style="width:500px;"><tr style="background-color: transparent;"><![endif]-->
-                  <!--[if (mso)|(IE)]><td align="center" width="500" style="background-color: #212121;width: 500px;padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;" valign="top"><![endif]-->
-                  <div
-                    class='u-col u-col-100'
-                    style='max-width: 320px;min-width: 500px;display: table-cell;vertical-align: top;'
-                  >
-                    <div
-                      style='background-color: #212121;height: 100%;width: 100% !important;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;'
-                    >
-                      <!--[if (!mso)&(!IE)]><!-->
-                      <div
-                        style='box-sizing: border-box; height: 100%; padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;'
-                      >
-                        <!--<![endif]-->
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <div>Hi {{name}},</div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <div>
-                                    <div>Your password has been updated successfully! </div>
-                                  </div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <div>Best regards,</div>
-                                  <div>The {{appName}} Team</div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:0px 10px 10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: right; word-wrap: break-word;'
-                                >
-                                  <div>
-                                    <div><sub>©
-                                        {{year}}
-                                        {{appName}}. All rights reserved.</sub></div>
-                                  </div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <!--[if (!mso)&(!IE)]><!-->
-                      </div>
-                      <!--<![endif]-->
-                    </div>
-                  </div>
-                  <!--[if (mso)|(IE)]></td><![endif]-->
-                  <!--[if (mso)|(IE)]></tr></table></td></tr></table><![endif]-->
-                </div>
-              </div>
-            </div>
-            <!--[if (mso)|(IE)]></td></tr></table><![endif]-->
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <!--[if mso]></div><![endif]-->
-    <!--[if IE]></div><![endif]-->
-  </body>
+<body class="clean-body u_body" style="margin: 0;padding: 0;-webkit-text-size-adjust: 100%;background-color: #212121;color: #ffffff">
+	<!--[if IE]><div class="ie-container"><![endif]-->
+	<!--[if mso]><div class="mso-container"><![endif]-->
+	<table style="border-collapse: collapse;table-layout: fixed;border-spacing: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;vertical-align: top;min-width: 320px;Margin: 0 auto;background-color: #212121;width:100%" cellpadding="0" cellspacing="0">
+		<tbody>
+			<tr style="vertical-align: top">
+				<td style="word-break: break-word;border-collapse: collapse !important;vertical-align: top">
+					<!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center" style="background-color: #212121;"><![endif]-->
+					<div class="u-row-container" style="padding: 0px;background-color: transparent">
+						<div class="u-row" style="margin: 0 auto;min-width: 320px;max-width: 500px;overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;background-color: transparent;">
+							<div style="border-collapse: collapse;display: table;width: 100%;height: 100%;background-color: transparent;">
+								<!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table cellpadding="0" cellspacing="0" border="0" style="width:500px;"><tr style="background-color: transparent;"><![endif]-->
+								<!--[if (mso)|(IE)]><td align="center" width="500" style="background-color: #212121;width: 500px;padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;" valign="top"><![endif]-->
+								<div class="u-col u-col-100" style="max-width: 320px;min-width: 500px;display: table-cell;vertical-align: top;">
+									<div style="background-color: #212121;height: 100%;width: 100% !important;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;">
+										<!--[if (!mso)&(!IE)]><!-->
+										<div style="box-sizing: border-box; height: 100%; padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;">
+											<!--<![endif]-->
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<div>Hi {{name}},</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<div>
+																	<div>Your password has been updated successfully! </div>
+																</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<div>Best regards,</div>
+																<div>The {{appName}} Team</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:0px 10px 10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: right; word-wrap: break-word;">
+																<div>
+																	<div><sub>© {{year}} {{appName}}. All rights
+                                                                            reserved.</sub></div>
+																</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<!--[if (!mso)&(!IE)]><!-->
+										</div>
+										<!--<![endif]-->
+									</div>
+								</div>
+								<!--[if (mso)|(IE)]></td><![endif]-->
+								<!--[if (mso)|(IE)]></tr></table></td></tr></table><![endif]-->
+							</div>
+						</div>
+					</div>
+					<!--[if (mso)|(IE)]></td></tr></table><![endif]-->
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<!--[if mso]></div><![endif]-->
+	<!--[if IE]></div><![endif]-->
+</body>
 
 </html>

api/server/utils/emails/requestPasswordReset.handlebars

@@ -1,11 +1,9 @@
-<html
-  xmlns='http://www.w3.org/1999/xhtml'
-  xmlns:v='urn:schemas-microsoft-com:vml'
-  xmlns:o='urn:schemas-microsoft-com:office:office'
->
+<!DOCTYPE HTML
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 
-  <head>
-    <!--[if gte mso 9]>
+<head>
+	<!--[if gte mso 9]>
 <xml>
 <o:OfficeDocumentSettings>
     <o:AllowPNG />
@@ -13,272 +11,229 @@
 </o:OfficeDocumentSettings>
 </xml>
 <![endif]-->
-    <meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
-    <meta name='viewport' content='width=device-width, initial-scale=1.0' />
-    <meta name='x-apple-disable-message-reformatting' />
-    <meta name='color-scheme' content='light dark' />
-    <!--[if !mso]><!-->
-    <meta http-equiv='X-UA-Compatible' content='IE=edge' />
-    <!--<![endif]-->
-    <title></title>
-    <style type='text/css'>
-      @media (prefers-color-scheme: dark) { .darkmode { background-color: #212121 !important; }
-      .darkmode p { color: #ffffff !important; } } @media only screen and (min-width: 520px) {
-      .u-row { width: 500px !important; } .u-row .u-col { vertical-align: top; } .u-row .u-col-100 {
-      width: 500px !important; } } @media (max-width: 520px) { .u-row-container { max-width: 100%
-      !important; padding-left: 0px !important; padding-right: 0px !important; } .u-row .u-col {
-      min-width: 320px !important; max-width: 100% !important; display: block !important; } .u-row {
-      width: 100% !important; } .u-col { width: 100% !important; } .u-col>div { margin: 0 auto; } }
-      body { margin: 0; padding: 0; } table, tr, td { vertical-align: top; border-collapse:
-      collapse; } p { margin: 0; } .ie-container table, .mso-container table { table-layout: fixed;
-      } * { line-height: inherit; } a[x-apple-data-detectors='true'] { color: inherit !important;
-      text-decoration: none !important; } table, td { color: #ffffff; } #u_body a { color: #0000ee;
-      text-decoration: underline; }
-    </style>
-  </head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta name="x-apple-disable-message-reformatting">
+	<meta name="color-scheme" content="light dark">
+	<!--[if !mso]><!-->
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<!--<![endif]-->
+	<title></title>
+	<style type="text/css">
+	@media (prefers-color-scheme: dark) {
+		.darkmode {
+			background-color: #212121 !important;
+		}
+		.darkmode p {
+			color: #ffffff !important;
+		}
+	}
+	
+	@media only screen and (min-width: 520px) {
+		.u-row {
+			width: 500px !important;
+		}
+		.u-row .u-col {
+			vertical-align: top;
+		}
+		.u-row .u-col-100 {
+			width: 500px !important;
+		}
+	}
+	
+	@media (max-width: 520px) {
+		.u-row-container {
+			max-width: 100% !important;
+			padding-left: 0px !important;
+			padding-right: 0px !important;
+		}
+		.u-row .u-col {
+			min-width: 320px !important;
+			max-width: 100% !important;
+			display: block !important;
+		}
+		.u-row {
+			width: 100% !important;
+		}
+		.u-col {
+			width: 100% !important;
+		}
+		.u-col>div {
+			margin: 0 auto;
+		}
+	}
+	
+	body {
+		margin: 0;
+		padding: 0;
+	}
+	
+	table,
+	tr,
+	td {
+		vertical-align: top;
+		border-collapse: collapse;
+	}
+	
+	p {
+		margin: 0;
+	}
+	
+	.ie-container table,
+	.mso-container table {
+		table-layout: fixed;
+	}
+	
+	* {
+		line-height: inherit;
+	}
+	
+	a[x-apple-data-detectors='true'] {
+		color: inherit !important;
+		text-decoration: none !important;
+	}
+	
+	table,
+	td {
+		color: #ffffff;
+	}
+	
+	#u_body a {
+		color: #0000ee;
+		text-decoration: underline;
+	}
+	</style>
+</head>
 
-  <body
-    class='clean-body u_body'
-    style='margin: 0;padding: 0;-webkit-text-size-adjust: 100%;background-color: #212121;color: #ffffff'
-  >
-    <!--[if IE]><div class="ie-container"><![endif]-->
-    <!--[if mso]><div class="mso-container"><![endif]-->
-    <table
-      id='u_body'
-      style='border-collapse: collapse;table-layout: fixed;border-spacing: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;vertical-align: top;min-width: 320px;Margin: 0 auto;background-color: #212121;width:100%'
-      cellpadding='0'
-      cellspacing='0'
-    >
-      <tbody>
-        <tr style='vertical-align: top'>
-          <td
-            style='word-break: break-word;border-collapse: collapse !important;vertical-align: top'
-          >
-            <!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center" style="background-color: #212121;"><![endif]-->
-            <div class='u-row-container' style='padding: 0px;background-color: transparent'>
-              <div
-                class='u-row'
-                style='margin: 0 auto;min-width: 320px;max-width: 500px;overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;background-color: transparent;'
-              >
-                <div
-                  style='border-collapse: collapse;display: table;width: 100%;height: 100%;background-color: transparent;'
-                >
-                  <!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table cellpadding="0" cellspacing="0" border="0" style="width:500px;"><tr style="background-color: transparent;"><![endif]-->
-                  <!--[if (mso)|(IE)]><td align="center" width="500" style="background-color: #212121;width: 500px;padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;" valign="top"><![endif]-->
-                  <div
-                    class='u-col u-col-100'
-                    style='max-width: 320px;min-width: 500px;display: table-cell;vertical-align: top;'
-                  >
-                    <div
-                      style='background-color: #212121;height: 100%;width: 100% !important;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;'
-                    >
-                      <!--[if (!mso)&(!IE)]><!-->
-                      <div
-                        style='box-sizing: border-box; height: 100%; padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;'
-                      >
-                        <!--<![endif]-->
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <!--[if mso]><table width="100%"><tr><td><![endif]-->
-                                <h1
-                                  style='margin: 0px; line-height: 140%; text-align: left; word-wrap: break-word; font-size: 22px; font-weight: 700;'
-                                >
-                                  <div>
-                                    <div>You have requested to reset your password.
-                                    </div>
-                                  </div>
-                                </h1>
-                                <!--[if mso]></td></tr></table><![endif]-->
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <div>Hi {{name}},</div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <p style='line-height: 140%;'>Please click the button below to
-                                    reset your password.</p>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <!--[if mso]><style>.v-button {background: transparent !important;}</style><![endif]-->
-                                <div align='left'>
-                                  <!--[if mso]><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{link}}" style="height:37px; v-text-anchor:middle; width:142px;" arcsize="11%"  stroke="f" fillcolor="#10a37f"><w:anchorlock/><center style="color:#FFFFFF;"><![endif]-->
-                                  <a
-                                    href='{{link}}'
-                                    target='_blank'
-                                    class='v-button'
-                                    style='box-sizing: border-box;display: inline-block;text-decoration: none;-webkit-text-size-adjust: none;text-align: center;color: #FFFFFF; background-color: #10a37f; border-radius: 4px;-webkit-border-radius: 4px; -moz-border-radius: 4px; width:auto; max-width:100%; overflow-wrap: break-word; word-break: break-word; word-wrap:break-word; mso-border-alt: none;font-size: 14px;'
-                                  >
-                                    <span
-                                      style='display:block;padding:10px 20px;line-height:120%;'
-                                    ><span style='line-height: 16.8px;'>Reset Password</span></span>
-                                  </a>
-                                  <!--[if mso]></center></v:roundrect><![endif]-->
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <div>
-                                    <div>If you did not request a password reset, please ignore this
-                                      email.</div>
-                                  </div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <div>Best regards,</div>
-                                  <div>The {{appName}} Team</div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:0px 10px 10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: right; word-wrap: break-word;'
-                                >
-                                  <div>
-                                    <div><sub>©
-                                        {{year}}
-                                        {{appName}}. All rights reserved.</sub></div>
-                                  </div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <!--[if (!mso)&(!IE)]><!-->
-                      </div>
-                      <!--<![endif]-->
-                    </div>
-                  </div>
-                  <!--[if (mso)|(IE)]></td><![endif]-->
-                  <!--[if (mso)|(IE)]></tr></table></td></tr></table><![endif]-->
-                </div>
-              </div>
-            </div>
-            <!--[if (mso)|(IE)]></td></tr></table><![endif]-->
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <!--[if mso]></div><![endif]-->
-    <!--[if IE]></div><![endif]-->
-  </body>
+<body class="clean-body u_body" style="margin: 0;padding: 0;-webkit-text-size-adjust: 100%;background-color: #212121;color: #ffffff">
+	<!--[if IE]><div class="ie-container"><![endif]-->
+	<!--[if mso]><div class="mso-container"><![endif]-->
+	<table id="u_body" style="border-collapse: collapse;table-layout: fixed;border-spacing: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;vertical-align: top;min-width: 320px;Margin: 0 auto;background-color: #212121;width:100%" cellpadding="0" cellspacing="0">
+		<tbody>
+			<tr style="vertical-align: top">
+				<td style="word-break: break-word;border-collapse: collapse !important;vertical-align: top">
+					<!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center" style="background-color: #212121;"><![endif]-->
+					<div class="u-row-container" style="padding: 0px;background-color: transparent">
+						<div class="u-row" style="margin: 0 auto;min-width: 320px;max-width: 500px;overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;background-color: transparent;">
+							<div style="border-collapse: collapse;display: table;width: 100%;height: 100%;background-color: transparent;">
+								<!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table cellpadding="0" cellspacing="0" border="0" style="width:500px;"><tr style="background-color: transparent;"><![endif]-->
+								<!--[if (mso)|(IE)]><td align="center" width="500" style="background-color: #212121;width: 500px;padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;" valign="top"><![endif]-->
+								<div class="u-col u-col-100" style="max-width: 320px;min-width: 500px;display: table-cell;vertical-align: top;">
+									<div style="background-color: #212121;height: 100%;width: 100% !important;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;">
+										<!--[if (!mso)&(!IE)]><!-->
+										<div style="box-sizing: border-box; height: 100%; padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;">
+											<!--<![endif]-->
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<!--[if mso]><table width="100%"><tr><td><![endif]-->
+															<h1 style="margin: 0px; line-height: 140%; text-align: left; word-wrap: break-word; font-size: 22px; font-weight: 700;">
+                                                                <div>
+                                                                    <div>You have requested to reset your password.
+                                                                    </div>
+                                                                </div>
+                                                            </h1>
+															<!--[if mso]></td></tr></table><![endif]-->
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<div>Hi {{name}},</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<p style="line-height: 140%;">Please click the button below to reset your password.</p>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<!--[if mso]><style>.v-button {background: transparent !important;}</style><![endif]-->
+															<div align="left">
+																<!--[if mso]><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{link}}" style="height:37px; v-text-anchor:middle; width:142px;" arcsize="11%"  stroke="f" fillcolor="#10a37f"><w:anchorlock/><center style="color:#FFFFFF;"><![endif]-->
+																<a href="{{link}}" target="_blank" class="v-button" style="box-sizing: border-box;display: inline-block;text-decoration: none;-webkit-text-size-adjust: none;text-align: center;color: #FFFFFF; background-color: #10a37f; border-radius: 4px;-webkit-border-radius: 4px; -moz-border-radius: 4px; width:auto; max-width:100%; overflow-wrap: break-word; word-break: break-word; word-wrap:break-word; mso-border-alt: none;font-size: 14px;"> <span style="display:block;padding:10px 20px;line-height:120%;"><span
+                                                                            style="line-height: 16.8px;">Reset
+                                                                            Password</span></span>
+																</a>
+																<!--[if mso]></center></v:roundrect><![endif]-->
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<div>
+																	<div>If you did not request a password reset, please ignore this email.</div>
+																</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<div>Best regards,</div>
+																<div>The {{appName}} Team</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:0px 10px 10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: right; word-wrap: break-word;">
+																<div>
+																	<div><sub>© {{year}} {{appName}}. All rights
+                                                                            reserved.</sub></div>
+																</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<!--[if (!mso)&(!IE)]><!-->
+										</div>
+										<!--<![endif]-->
+									</div>
+								</div>
+								<!--[if (mso)|(IE)]></td><![endif]-->
+								<!--[if (mso)|(IE)]></tr></table></td></tr></table><![endif]-->
+							</div>
+						</div>
+					</div>
+					<!--[if (mso)|(IE)]></td></tr></table><![endif]-->
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<!--[if mso]></div><![endif]-->
+	<!--[if IE]></div><![endif]-->
+</body>
 
 </html>

api/server/utils/emails/verifyEmail.handlebars

@@ -1,11 +1,9 @@
-<html
-  xmlns='http://www.w3.org/1999/xhtml'
-  xmlns:v='urn:schemas-microsoft-com:vml'
-  xmlns:o='urn:schemas-microsoft-com:office:office'
->
+<!DOCTYPE HTML
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 
-  <head>
-    <!--[if gte mso 9]>
+<head>
+	<!--[if gte mso 9]>
 <xml>
 <o:OfficeDocumentSettings>
     <o:AllowPNG />
@@ -13,278 +11,229 @@
 </o:OfficeDocumentSettings>
 </xml>
 <![endif]-->
-    <meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
-    <meta name='viewport' content='width=device-width, initial-scale=1.0' />
-    <meta name='x-apple-disable-message-reformatting' />
-    <meta name='color-scheme' content='light dark' />
-    <!--[if !mso]><!-->
-    <meta http-equiv='X-UA-Compatible' content='IE=edge' />
-    <!--<![endif]-->
-    <title></title>
-    <style type='text/css'>
-      @media (prefers-color-scheme: dark) { .darkmode { background-color: #212121 !important; }
-      .darkmode p { color: #ffffff !important; } } @media only screen and (min-width: 520px) {
-      .u-row { width: 500px !important; } .u-row .u-col { vertical-align: top; } .u-row .u-col-100 {
-      width: 500px !important; } } @media (max-width: 520px) { .u-row-container { max-width: 100%
-      !important; padding-left: 0px !important; padding-right: 0px !important; } .u-row .u-col {
-      min-width: 320px !important; max-width: 100% !important; display: block !important; } .u-row {
-      width: 100% !important; } .u-col { width: 100% !important; } .u-col>div { margin: 0 auto; } }
-      body { margin: 0; padding: 0; } table, tr, td { vertical-align: top; border-collapse:
-      collapse; } .ie-container table, .mso-container table { table-layout: fixed; } * {
-      line-height: inherit; } a[x-apple-data-detectors='true'] { color: inherit !important;
-      text-decoration: none !important; } table, td { color: #ffffff; } #u_body a { color: #0000ee;
-      text-decoration: underline; }
-    </style>
-  </head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta name="x-apple-disable-message-reformatting">
+	<meta name="color-scheme" content="light dark">
+	<!--[if !mso]><!-->
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<!--<![endif]-->
+	<title></title>
+	<style type="text/css">
+	@media (prefers-color-scheme: dark) {
+		.darkmode {
+			background-color: #212121 !important;
+		}
+		.darkmode p {
+			color: #ffffff !important;
+		}
+	}
+	
+	@media only screen and (min-width: 520px) {
+		.u-row {
+			width: 500px !important;
+		}
+		.u-row .u-col {
+			vertical-align: top;
+		}
+		.u-row .u-col-100 {
+			width: 500px !important;
+		}
+	}
+	
+	@media (max-width: 520px) {
+		.u-row-container {
+			max-width: 100% !important;
+			padding-left: 0px !important;
+			padding-right: 0px !important;
+		}
+		.u-row .u-col {
+			min-width: 320px !important;
+			max-width: 100% !important;
+			display: block !important;
+		}
+		.u-row {
+			width: 100% !important;
+		}
+		.u-col {
+			width: 100% !important;
+		}
+		.u-col>div {
+			margin: 0 auto;
+		}
+	}
+	
+	body {
+		margin: 0;
+		padding: 0;
+	}
+	
+	table,
+	tr,
+	td {
+		vertical-align: top;
+		border-collapse: collapse;
+	}
+	
+	.ie-container table,
+	.mso-container table {
+		table-layout: fixed;
+	}
+	
+	* {
+		line-height: inherit;
+	}
+	
+	a[x-apple-data-detectors='true'] {
+		color: inherit !important;
+		text-decoration: none !important;
+	}
+	
+	table,
+	td {
+		color: #ffffff;
+	}
+	
+	#u_body a {
+		color: #0000ee;
+		text-decoration: underline;
+	}
+	</style>
+</head>
 
-  <body
-    class='clean-body u_body'
-    style='margin: 0;padding: 0;-webkit-text-size-adjust: 100%;background-color: #212121;color: #ffffff'
-  >
-    <!--[if IE]><div class="ie-container"><![endif]-->
-    <!--[if mso]><div class="mso-container"><![endif]-->
-    <table
-      id='u_body'
-      style='border-collapse: collapse;table-layout: fixed;border-spacing: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;vertical-align: top;min-width: 320px;Margin: 0 auto;background-color: #212121;width:100%'
-      cellpadding='0'
-      cellspacing='0'
-    >
-      <tbody>
-        <tr style='vertical-align: top'>
-          <td
-            style='word-break: break-word;border-collapse: collapse !important;vertical-align: top'
-          >
-            <!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center" style="background-color: #212121;"><![endif]-->
-            <div class='u-row-container' style='padding: 0px;background-color: transparent'>
-              <div
-                class='u-row'
-                style='margin: 0 auto;min-width: 320px;max-width: 500px;overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;background-color: transparent;'
-              >
-                <div
-                  style='border-collapse: collapse;display: table;width: 100%;height: 100%;background-color: transparent;'
-                >
-                  <!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table cellpadding="0" cellspacing="0" border="0" style="width:500px;"><tr style="background-color: transparent;"><![endif]-->
-                  <!--[if (mso)|(IE)]><td align="center" width="500" style="background-color: #212121;width: 500px;padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;" valign="top"><![endif]-->
-                  <div
-                    class='u-col u-col-100'
-                    style='max-width: 320px;min-width: 500px;display: table-cell;vertical-align: top;'
-                  >
-                    <div
-                      style='background-color: #212121;height: 100%;width: 100% !important;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;'
-                    >
-                      <!--[if (!mso)&(!IE)]><!-->
-                      <div
-                        style='box-sizing: border-box; height: 100%; padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;'
-                      >
-                        <!--<![endif]-->
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <!--[if mso]><table width="100%"><tr><td><![endif]-->
-                                <h1
-                                  style='margin: 0px; line-height: 140%; text-align: left; word-wrap: break-word; font-size: 22px; font-weight: 700;'
-                                >
-                                  <div>
-                                    <div>Welcome to {{appName}}!</div>
-                                  </div>
-                                </h1>
-                                <!--[if mso]></td></tr></table><![endif]-->
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <div>
-                                    <div>Dear {{name}},</div>
-                                  </div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <div>
-                                    <div>Thank you for registering with
-                                      {{appName}}. To complete your registration and verify your
-                                      email address, please click the button below:</div>
-                                  </div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <!--[if mso]><style>.v-button {background: transparent !important;}</style><![endif]-->
-                                <div align='left'>
-                                  <!--[if mso]><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="href=&quot;{{verificationLink}}&quot;" style="height:37px; v-text-anchor:middle; width:114px;" arcsize="11%"  stroke="f" fillcolor="#10a37f"><w:anchorlock/><center style="color:#FFFFFF;"><![endif]-->
-                                  <a
-                                    href='{{verificationLink}}'
-                                    target='_blank'
-                                    class='v-button'
-                                    style='box-sizing: border-box;display: inline-block;text-decoration: none;-webkit-text-size-adjust: none;text-align: center;color: #FFFFFF; background-color: #10a37f; border-radius: 4px;-webkit-border-radius: 4px; -moz-border-radius: 4px; width:auto; max-width:100%; overflow-wrap: break-word; word-break: break-word; word-wrap:break-word; mso-border-alt: none;font-size: 14px;'
-                                  >
-                                    <span style='display:block;padding:10px 20px;line-height:120%;'>
-                                      <div>
-                                        <div>Verify Email</div>
-                                      </div>
-                                    </span>
-                                  </a>
-                                  <!--[if mso]></center></v:roundrect><![endif]-->
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <div>
-                                    <div>If you did not create an account with
-                                      {{appName}}, please ignore this email.</div>
-                                  </div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;'
-                                >
-                                  <div>Best regards,</div>
-                                  <div>The {{appName}} Team</div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <table
-                          style='font-family:arial,helvetica,sans-serif;'
-                          role='presentation'
-                          cellpadding='0'
-                          cellspacing='0'
-                          width='100%'
-                          border='0'
-                        >
-                          <tbody>
-                            <tr>
-                              <td
-                                style='overflow-wrap:break-word;word-break:break-word;padding:0px 10px 10px;font-family:arial,helvetica,sans-serif;'
-                                align='left'
-                              >
-                                <div
-                                  style='font-size: 14px; line-height: 140%; text-align: right; word-wrap: break-word;'
-                                >
-                                  <div>
-                                    <div><sub>©
-                                        {{year}}
-                                        {{appName}}. All rights reserved.</sub></div>
-                                  </div>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                        <!--[if (!mso)&(!IE)]><!-->
-                      </div>
-                      <!--<![endif]-->
-                    </div>
-                  </div>
-                  <!--[if (mso)|(IE)]></td><![endif]-->
-                  <!--[if (mso)|(IE)]></tr></table></td></tr></table><![endif]-->
-                </div>
-              </div>
-            </div>
-            <!--[if (mso)|(IE)]></td></tr></table><![endif]-->
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <!--[if mso]></div><![endif]-->
-    <!--[if IE]></div><![endif]-->
-  </body>
+<body class="clean-body u_body" style="margin: 0;padding: 0;-webkit-text-size-adjust: 100%;background-color: #212121;color: #ffffff">
+	<!--[if IE]><div class="ie-container"><![endif]-->
+	<!--[if mso]><div class="mso-container"><![endif]-->
+	<table id="u_body" style="border-collapse: collapse;table-layout: fixed;border-spacing: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;vertical-align: top;min-width: 320px;Margin: 0 auto;background-color: #212121;width:100%" cellpadding="0" cellspacing="0">
+		<tbody>
+			<tr style="vertical-align: top">
+				<td style="word-break: break-word;border-collapse: collapse !important;vertical-align: top">
+					<!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center" style="background-color: #212121;"><![endif]-->
+					<div class="u-row-container" style="padding: 0px;background-color: transparent">
+						<div class="u-row" style="margin: 0 auto;min-width: 320px;max-width: 500px;overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;background-color: transparent;">
+							<div style="border-collapse: collapse;display: table;width: 100%;height: 100%;background-color: transparent;">
+								<!--[if (mso)|(IE)]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0px;background-color: transparent;" align="center"><table cellpadding="0" cellspacing="0" border="0" style="width:500px;"><tr style="background-color: transparent;"><![endif]-->
+								<!--[if (mso)|(IE)]><td align="center" width="500" style="background-color: #212121;width: 500px;padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;" valign="top"><![endif]-->
+								<div class="u-col u-col-100" style="max-width: 320px;min-width: 500px;display: table-cell;vertical-align: top;">
+									<div style="background-color: #212121;height: 100%;width: 100% !important;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;">
+										<!--[if (!mso)&(!IE)]><!-->
+										<div style="box-sizing: border-box; height: 100%; padding: 0px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;border-radius: 0px;-webkit-border-radius: 0px; -moz-border-radius: 0px;">
+											<!--<![endif]-->
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<!--[if mso]><table width="100%"><tr><td><![endif]-->
+															<h1 style="margin: 0px; line-height: 140%; text-align: left; word-wrap: break-word; font-size: 22px; font-weight: 700;">
+                                                                <div>
+                                                                    <div>Welcome to {{appName}}!</div>
+                                                                </div>
+                                                            </h1>
+															<!--[if mso]></td></tr></table><![endif]-->
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<div>
+																	<div>Dear {{name}},</div>
+																</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<div>
+																	<div>Thank you for registering with {{appName}}. To complete your registration and verify your email address, please click the button below:</div>
+																</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<!--[if mso]><style>.v-button {background: transparent !important;}</style><![endif]-->
+															<div align="left">
+																<!--[if mso]><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="href=&quot;{{verificationLink}}&quot;" style="height:37px; v-text-anchor:middle; width:114px;" arcsize="11%"  stroke="f" fillcolor="#10a37f"><w:anchorlock/><center style="color:#FFFFFF;"><![endif]-->
+																<a href="href=&quot;{{verificationLink}}&quot;" target="_blank" class="v-button" style="box-sizing: border-box;display: inline-block;text-decoration: none;-webkit-text-size-adjust: none;text-align: center;color: #FFFFFF; background-color: #10a37f; border-radius: 4px;-webkit-border-radius: 4px; -moz-border-radius: 4px; width:auto; max-width:100%; overflow-wrap: break-word; word-break: break-word; word-wrap:break-word; mso-border-alt: none;font-size: 14px;"> <span style="display:block;padding:10px 20px;line-height:120%;">
+                                                                        <div>
+                                                                            <div>Verify Email</div>
+                                                                        </div>
+                                                                    </span> </a>
+																<!--[if mso]></center></v:roundrect><![endif]-->
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<div>
+																	<div>If you did not create an account with {{appName}}, please ignore this email.</div>
+																</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: left; word-wrap: break-word;">
+																<div>Best regards,</div>
+																<div>The {{appName}} Team</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<table style="font-family:arial,helvetica,sans-serif;" role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
+												<tbody>
+													<tr>
+														<td style="overflow-wrap:break-word;word-break:break-word;padding:0px 10px 10px;font-family:arial,helvetica,sans-serif;" align="left">
+															<div style="font-size: 14px; line-height: 140%; text-align: right; word-wrap: break-word;">
+																<div>
+																	<div><sub>© {{year}} {{appName}}. All rights
+                                                                            reserved.</sub></div>
+																</div>
+															</div>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+											<!--[if (!mso)&(!IE)]><!-->
+										</div>
+										<!--<![endif]-->
+									</div>
+								</div>
+								<!--[if (mso)|(IE)]></td><![endif]-->
+								<!--[if (mso)|(IE)]></tr></table></td></tr></table><![endif]-->
+							</div>
+						</div>
+					</div>
+					<!--[if (mso)|(IE)]></td></tr></table><![endif]-->
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<!--[if mso]></div><![endif]-->
+	<!--[if IE]></div><![endif]-->
+</body>
 
 </html>

api/server/utils/import/__data__/librechat-export.json

@@ -19,7 +19,7 @@
     "endpoint": "openAI",
     "title": "VW Transporter 2014 Fuel Consumption. Web Search"
   },
-  "messages": [
+  "messagesTree": [
     {
       "_id": "6615516574dc2ddcdebe40b6",
       "messageId": "b123942f-ca1a-4b16-9e1f-ea4af5171168",