From 1c282d151751241c86a0c707ac6744b390e1ebe1 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Wed, 17 Jul 2024 10:27:07 -0400
Subject: [PATCH] =?UTF-8?q?=20=F0=9F=9B=A3=EF=B8=8F=20fix:=20Add=20validat?=
 =?UTF-8?q?ion=20middleware=20to=20message=20route=20definitions=20(#3365)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/server/routes/messages.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/server/routes/messages.js b/api/server/routes/messages.js
index f647540acd..f06a19b483 100644
--- a/api/server/routes/messages.js
+++ b/api/server/routes/messages.js
@@ -5,15 +5,15 @@ const { requireJwtAuth, validateMessageReq } = require('~/server/middleware');
 const { countTokens } = require('~/server/utils');
 
 router.use(requireJwtAuth);
-router.use(validateMessageReq);
 
-router.get('/:conversationId', async (req, res) => {
+/* Note: It's necessary to add `validateMessageReq` within route definition for correct params */
+router.get('/:conversationId', validateMessageReq, async (req, res) => {
   const { conversationId } = req.params;
   res.status(200).send(await getMessages({ conversationId }, '-_id -__v -user'));
 });
 
 // CREATE
-router.post('/:conversationId', async (req, res) => {
+router.post('/:conversationId', validateMessageReq, async (req, res) => {
   const message = req.body;
   const savedMessage = await saveMessage(req, { ...message, user: req.user.id });
   await saveConvo(req.user.id, savedMessage);
@@ -21,13 +21,13 @@ router.post('/:conversationId', async (req, res) => {
 });
 
 // READ
-router.get('/:conversationId/:messageId', async (req, res) => {
+router.get('/:conversationId/:messageId', validateMessageReq, async (req, res) => {
   const { conversationId, messageId } = req.params;
   res.status(200).send(await getMessages({ conversationId, messageId }, '-_id -__v -user'));
 });
 
 // UPDATE
-router.put('/:conversationId/:messageId', async (req, res) => {
+router.put('/:conversationId/:messageId', validateMessageReq, async (req, res) => {
   const { messageId, model } = req.params;
   const { text } = req.body;
   const tokenCount = await countTokens(text, model);
@@ -36,7 +36,7 @@ router.put('/:conversationId/:messageId', async (req, res) => {
 });
 
 // DELETE
-router.delete('/:conversationId/:messageId', async (req, res) => {
+router.delete('/:conversationId/:messageId', validateMessageReq, async (req, res) => {
   const { messageId } = req.params;
   await deleteMessages({ messageId });
   res.status(204).send();