mbkauthe 4.7.1 → 4.8.0

package/lib/routes/dbLogs.js

@@ -1,11 +1,14 @@
 import express from "express";
 import { renderError } from "#response.js";
 import { dblogin } from "#pool.js";
+import { getQueryCount, getQueryLog, resetQueryCount, resetQueryLog } from "../utils/dbQueryLogger.js";
 import { mbkautheVar } from "#config.js";
 import rateLimit from 'express-rate-limit';
 
 const router = express.Router();
 
+const isDbLogsEnabled = () => process.env.env === "dev" && process.env.dbLogs === "true";
+
 // Rate limiter for info/test routes
 const LogLimit = rateLimit({
   windowMs: 1 * 60 * 1000,
@@ -23,33 +26,68 @@ const LogLimit = rateLimit({
 // DB stats API (JSON)
 router.get(["/db.json"], LogLimit, async (req, res) => {
   try {
-    const queryCount = typeof dblogin.getQueryCount === 'function' ? dblogin.getQueryCount() : null;
+    const isDev = isDbLogsEnabled();
     const queryLimit = Number(req.query.limit) || 50;
-    const queryLog = typeof dblogin.getQueryLog === 'function' ? dblogin.getQueryLog({ limit: queryLimit }) : [];
-    const resetRequested = req.query.reset === '1';
 
-    if (resetRequested) {
-      if (typeof dblogin.resetQueryCount === 'function') dblogin.resetQueryCount();
-      if (typeof dblogin.resetQueryLog === 'function') dblogin.resetQueryLog();
+    if (!isDev) {
+      return res.status(403).json({
+        success: false,
+        message: "DB logs are disabled.",
+        isDev,
+        queryCount: 0,
+        queryLimit,
+        queryLog: []
+      });
     }
 
-    return res.json({ queryCount, queryLimit, queryLog, resetDone: resetRequested });
+    const queryCount = typeof getQueryCount === 'function' ? getQueryCount() : (typeof dblogin.getQueryCount === 'function' ? dblogin.getQueryCount() : 0);
+    const queryLog = typeof getQueryLog === 'function' ? getQueryLog({ limit: queryLimit }) : (typeof dblogin.getQueryLog === 'function' ? dblogin.getQueryLog({ limit: queryLimit }) : []);
+
+    return res.json({ queryCount, queryLimit, queryLog, isDev });
   } catch (err) {
     console.error('[mbkauthe] /db.json route error:', err);
     return res.status(500).json({ success: false, message: 'Could not fetch DB stats.' });
   }
 });
 
+// Dedicated reset API for DB logs and counters
+router.post(["/db/reset"], LogLimit, async (req, res) => {
+  try {
+    const isDev = isDbLogsEnabled();
+    if (!isDev) {
+      return res.status(403).json({
+        success: false,
+        message: "DB logs are disabled.",
+        isDev
+      });
+    }
+
+    if (typeof resetQueryCount === 'function') resetQueryCount();
+    else if (typeof dblogin.resetQueryCount === 'function') dblogin.resetQueryCount();
+
+    if (typeof resetQueryLog === 'function') resetQueryLog();
+    else if (typeof dblogin.resetQueryLog === 'function') dblogin.resetQueryLog();
+
+    return res.json({ success: true, message: 'Query log and count have been reset.' });
+  } catch (err) {
+    console.error('[mbkauthe] /db/reset route error:', err);
+    return res.status(500).json({ success: false, message: 'Could not reset DB stats.' });
+  }
+});
+
 // DB stats page (HTML)
 router.get(["/db"], LogLimit, async (req, res) => {
   try {
+    const isDev = isDbLogsEnabled();
     const queryLimit = Number(req.query.limit) || 50;
     const resetDone = req.query.resetDone === '1';
     return res.render('pages/dbLogs.handlebars', {
       layout: false,
       appName: mbkautheVar.APP_NAME,
       queryLimit,
-      resetDone
+      resetDone,
+      isDev,
+      disabledMessage: isDev ? null : 'DB logs are disabled.'
     });
   } catch (err) {
     console.error('[mbkauthe] /db route error:', err);

package/lib/routes/misc.js

@@ -6,7 +6,7 @@ import { renderError, renderPage } from "#response.js";
 import { authenticate, validateSession, validateSessionAndRole } from "../middleware/auth.js";
 import { ErrorCodes, ErrorMessages, createErrorResponse } from "../utils/errors.js";
 import { dblogin } from "#pool.js";
-import { clearSessionCookies, decryptSessionId } from "#cookies.js";
+import { clearSessionCookies, decryptSessionId, cachedCookieOptions } from "#cookies.js";
 import { fileURLToPath } from "url";
 import path from "path";
 import fs from "fs";
@@ -91,8 +91,12 @@ router.get('/user/profilepic', async (req, res) => {
     }
 
     const username = req.session.user.username;
-    const cacheKey = `profilepic_${username}`;
-    let imageUrl = req.session[cacheKey];
+    let imageUrl = null;
+    const cookieUser = req.cookies?.profileImageUser;
+    const cookieImageUrl = req.cookies?.profileImageUrl;
+    if (cookieUser === username && typeof cookieImageUrl === 'string' && cookieImageUrl.length > 0) {
+      imageUrl = cookieImageUrl;
+    }
 
     // If not in cache, fetch from DB
     if (!imageUrl) {
@@ -107,7 +111,8 @@ router.get('/user/profilepic', async (req, res) => {
       } else {
         imageUrl = 'default';
       }
-      req.session[cacheKey] = imageUrl;
+      res.cookie('profileImageUrl', imageUrl, { ...cachedCookieOptions, httpOnly: false });
+      res.cookie('profileImageUser', username, { ...cachedCookieOptions, httpOnly: false });
     }
 
     // Generate ETag based on username and image URL
@@ -137,7 +142,8 @@ router.get('/user/profilepic', async (req, res) => {
 
       if (!imageResponse.ok) {
         console.warn(`[mbkauthe] Failed to fetch profile pic from ${imageUrl}, status: ${imageResponse.status}`);
-        req.session[cacheKey] = 'default';
+        res.cookie('profileImageUrl', 'default', { ...cachedCookieOptions, httpOnly: false });
+        res.cookie('profileImageUser', username, { ...cachedCookieOptions, httpOnly: false });
         return serveDefaultIcon();
       }
 
@@ -147,7 +153,8 @@ router.get('/user/profilepic', async (req, res) => {
       imageResponse.body.pipe(res);
     } catch (fetchErr) {
       console.error('[mbkauthe] Error fetching external profile picture:', fetchErr);
-      req.session[cacheKey] = 'default';
+      res.cookie('profileImageUrl', 'default', { ...cachedCookieOptions, httpOnly: false });
+      res.cookie('profileImageUser', username, { ...cachedCookieOptions, httpOnly: false });
       return serveDefaultIcon();
     }
 
@@ -503,8 +510,7 @@ router.get(["/info", "/i"], LoginLimit, async (req, res) => {
   }
 
   try {
-    res.render("pages/info_mbkauthe.handlebars", {
-      layout: false,
+    renderPage(req, res, "pages/info_mbkauthe.handlebars", false, {
       mbkautheVar: safe_mbkautheVar,
       CurrentVersion: packageJson.version,
       APP_VERSION: appVersion,