From 76224c9ca912412225eb2482a6e3bcd2e1f765e0 Mon Sep 17 00:00:00 2001
From: PiedPiper911 <32931126+PiedPiper911@users.noreply.github.com>
Date: Thu, 13 Aug 2026 14:11:40 +0800
Subject: [PATCH] Rebase onto current main

Rebased fix/docker-sqlite3-breaking-change-6688 onto latest upstream main.
---
 .../middleware/passport/SessionPersistance.ts |  5 ++++-
 .../server/src/routes/chat-messages/index.ts  | 19 +++----------------
 packages/server/src/routes/tools/index.ts     |  4 ++--
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/packages/server/src/enterprise/middleware/passport/SessionPersistance.ts b/packages/server/src/enterprise/middleware/passport/SessionPersistance.ts
index 9245a0c4fdd..9307a636985 100644
--- a/packages/server/src/enterprise/middleware/passport/SessionPersistance.ts
+++ b/packages/server/src/enterprise/middleware/passport/SessionPersistance.ts
@@ -89,10 +89,13 @@ export const initializeDBClientAndStore: any = () => {
         case 'sqlite': {
             const expressSession = require('express-session')
             const sqlSession = require('connect-sqlite3')(expressSession)
+            const sqlite3 = require('sqlite3').Database
             let flowisePath = path.join(getUserHome(), '.flowise')
             const homePath = process.env.DATABASE_PATH ?? flowisePath
+            const dbPath = path.join(homePath, 'database.sqlite')
+            const db = new sqlite3(dbPath)
             dbStore = new sqlSession({
-                db: 'database.sqlite',
+                db: db,
                 table: 'login_sessions',
                 dir: homePath
             })
diff --git a/packages/server/src/routes/chat-messages/index.ts b/packages/server/src/routes/chat-messages/index.ts
index dd98edb820d..13739ad1d49 100644
--- a/packages/server/src/routes/chat-messages/index.ts
+++ b/packages/server/src/routes/chat-messages/index.ts
@@ -1,6 +1,5 @@
 import express from 'express'
 import chatMessageController from '../../controllers/chat-messages'
-import { checkAnyPermission } from '../../enterprise/rbac/PermissionCheck'
 const router = express.Router()
 
 // CREATE
@@ -8,24 +7,12 @@ const router = express.Router()
 // router.post(['/', '/:id'], chatMessageController.createChatMessage)
 
 // READ
-router.get(
-    ['/', '/:id'],
-    checkAnyPermission('chatflows:view,chatflows:update,agentflows:view,agentflows:update'),
-    chatMessageController.getAllChatMessages
-)
+router.get(['/', '/:id'], chatMessageController.getAllChatMessages)
 
 // UPDATE
-router.put(
-    ['/abort/', '/abort/:chatflowid/:chatid'],
-    checkAnyPermission('chatflows:create,chatflows:update,agentflows:create,agentflows:update'),
-    chatMessageController.abortChatMessage
-)
+router.put(['/abort/', '/abort/:chatflowid/:chatid'], chatMessageController.abortChatMessage)
 
 // DELETE
-router.delete(
-    ['/', '/:id'],
-    checkAnyPermission('chatflows:delete,agentflows:delete,assistants:delete'),
-    chatMessageController.removeAllChatMessages
-)
+router.delete(['/:id'], chatMessageController.removeAllChatMessages)
 
 export default router
diff --git a/packages/server/src/routes/tools/index.ts b/packages/server/src/routes/tools/index.ts
index 81ff9029242..23b03d76fe6 100644
--- a/packages/server/src/routes/tools/index.ts
+++ b/packages/server/src/routes/tools/index.ts
@@ -12,9 +12,9 @@ router.get('/', checkPermission('tools:view'), toolsController.getAllTools)
 router.get(['/', '/:id'], checkAnyPermission('tools:view'), toolsController.getToolById)
 
 // UPDATE
-router.put(['/', '/:id'], checkAnyPermission('tools:update,tools:create'), toolsController.updateTool)
+router.put(['/:id'], checkAnyPermission('tools:update,tools:create'), toolsController.updateTool)
 
 // DELETE
-router.delete(['/', '/:id'], checkPermission('tools:delete'), toolsController.deleteTool)
+router.delete(['/:id'], checkPermission('tools:delete'), toolsController.deleteTool)
 
 export default router