From f141c0bebd2b8bb8aec146b3764cabf926642bad Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 2 Oct 2025 19:28:10 +1300 Subject: [PATCH] Move dbCheck to only API calls that touch the database --- server/app.js | 2 -- server/homebrew.api.js | 13 +++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/server/app.js b/server/app.js index 162b34df3..afba0997b 100644 --- a/server/app.js +++ b/server/app.js @@ -32,7 +32,6 @@ import { splitTextStyleAndMetadata } from '../shared/helpers.js'; //==== Middleware Imports ====// import contentNegotiation from './middleware/content-negotiation.js'; -import dbCheck from './middleware/dbCheck.js'; import bodyParser from 'body-parser'; import cookieParser from 'cookie-parser'; import forceSSL from './forcessl.mw.js'; @@ -50,7 +49,6 @@ const sanitizeBrew = (brew, accessType)=>{ app.set('trust proxy', 1 /* number of proxies between user and server */); app.use('/', serveCompressedStaticAssets(`build`)); -app.use(dbCheck); app.use(contentNegotiation); app.use(bodyParser.json({ limit: '25mb' })); app.use(cookieParser()); diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 3221638ab..5a3008cc9 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -13,6 +13,7 @@ import { md5 } from 'hash-wasm'; import { splitTextStyleAndMetadata, brewSnippetsToJSON, debugTextMismatch } from '../shared/helpers.js'; import checkClientVersion from './middleware/check-client-version.js'; +import dbCheck from './middleware/dbCheck.js'; const router = express.Router(); @@ -530,11 +531,11 @@ const api = { } }; -router.post('/api', checkClientVersion, asyncHandler(api.newBrew)); -router.put('/api/:id', checkClientVersion, asyncHandler(api.getBrew('edit', false)), asyncHandler(api.updateBrew)); -router.put('/api/update/:id', checkClientVersion, asyncHandler(api.getBrew('edit', false)), asyncHandler(api.updateBrew)); -router.delete('/api/:id', checkClientVersion, asyncHandler(api.deleteBrew)); -router.get('/api/remove/:id', checkClientVersion, asyncHandler(api.deleteBrew)); -router.get('/api/theme/:renderer/:id', asyncHandler(api.getThemeBundle)); +router.post('/api', checkClientVersion, dbCheck, asyncHandler(api.newBrew)); +router.put('/api/:id', checkClientVersion, dbCheck, asyncHandler(api.getBrew('edit', false)), asyncHandler(api.updateBrew)); +router.put('/api/update/:id', checkClientVersion, dbCheck, asyncHandler(api.getBrew('edit', false)), asyncHandler(api.updateBrew)); +router.delete('/api/:id', checkClientVersion, dbCheck, asyncHandler(api.deleteBrew)); +router.get('/api/remove/:id', checkClientVersion, dbCheck, asyncHandler(api.deleteBrew)); +router.get('/api/theme/:renderer/:id', dbCheck, asyncHandler(api.getThemeBundle)); export default api;