fix: Auth required for ChatMessage and upsert on internal prediction

packages/server/src/controllers/internal-predictions/index.ts

@@ -3,7 +3,7 @@ import { utilBuildChatflow } from '../../utils/buildChatflow'
 import { getRunningExpressApp } from '../../utils/getRunningExpressApp'
 import { getErrorMessage } from '../../errors/utils'
 import { MODE } from '../../Interface'
-
+import chatflowsService from '../../services/chatflows'
 // Send input message and get prediction result (Internal)
 const createInternalPrediction = async (req: Request, res: Response, next: NextFunction) => {
     try {
@@ -12,6 +12,16 @@ const createInternalPrediction = async (req: Request, res: Response, next: NextF
             return
         } else {
             const apiResponse = await utilBuildChatflow(req, true)
+            const { chatId, question: prompt } = req.body
+            if (chatId) {
+                await chatflowsService.upsertChat({
+                    id: chatId,
+                    user: req.user,
+                    prompt,
+                    chatflowId: req.params.id,
+                    chatflowChatId: apiResponse.chatId
+                })
+            }
             if (apiResponse) return res.json(apiResponse)
         }
     } catch (error) {
@@ -37,6 +47,16 @@ const createAndStreamInternalPrediction = async (req: Request, res: Response, ne
         }
 
         const apiResponse = await utilBuildChatflow(req, true)
+        const { question: prompt } = req.body
+        if (chatId) {
+            await chatflowsService.upsertChat({
+                id: chatId,
+                user: req.user,
+                prompt,
+                chatflowId: req.params.id,
+                chatflowChatId: apiResponse.chatId
+            })
+        }
         sseStreamer.streamMetadataEvent(apiResponse.chatId, apiResponse)
     } catch (error) {
         if (chatId) {

packages/server/src/services/chatflows/index.ts

@@ -531,6 +531,7 @@ const upsertChat = async ({
         const chatRepository = appServer.AppDataSource.getRepository(Chat)
 
         const chatProperties = {
+            id: chatflowChatId,
             title: prompt,
             chatflowChatId,
             filters,
@@ -539,20 +540,21 @@ const upsertChat = async ({
             chatflow: { id: chatflowId }
         }
 
-        let chat: Chat
-        if (!id) {
+        let chat: Chat | undefined
+        if (chatflowChatId) {
+            const existingChat = await chatRepository.findOneBy({ chatflowChatId })
+            if (existingChat) chat = chatRepository.merge(existingChat, chatProperties)
+        }
+        if (!chat) {
             // Create new chat
             chat = chatRepository.create(chatProperties)
+        }
+        if (chat) {
+            const updatedChat = await chatRepository.save(chat)
+            return updatedChat
         } else {
-            // Update existing chat
-            const existingChat = await chatRepository.findOneBy({ id })
-            if (!existingChat) {
-                throw new InternalFlowiseError(StatusCodes.NOT_FOUND, `Chat ${id} not found`)
-            }
-            chat = chatRepository.merge(existingChat, chatProperties)
+            throw new InternalFlowiseError(StatusCodes.NOT_FOUND, `Chat ${id} not found`)
         }
-
-        return await chatRepository.save(chat)
     } catch (error) {
         throw new InternalFlowiseError(StatusCodes.INTERNAL_SERVER_ERROR, `Error: chatflowsService.upsertChat - ${getErrorMessage(error)}`)
     }

packages/ui/src/views/chatmessage/ChatMessage.jsx

@@ -859,14 +859,15 @@ export const ChatMessage = ({ open, chatflowid, isAgentCanvas, isDialog, preview
         const input = params.question
         const username = localStorage.getItem('username')
         const password = localStorage.getItem('password')
+        const token = sessionStorage.getItem('access_token')
         params.streaming = true
         await fetchEventSource(`${baseURL}/api/v1/internal-prediction/${chatflowid}`, {
             openWhenHidden: true,
             method: 'POST',
             body: JSON.stringify(params),
             headers: {
                 'Content-Type': 'application/json',
-                Authorization: username && password ? `Basic ${btoa(`${username}:${password}`)}` : undefined,
+                Authorization: token ? `Bearer ${token}` : username && password ? `Basic ${btoa(`${username}:${password}`)}` : undefined,
                 'x-request-from': 'internal'
             },
             async onopen(response) {