mbkauthe 4.7.2 → 4.8.1

package/lib/middleware/auth.js

@@ -6,6 +6,44 @@ import { ErrorCodes, createErrorResponse } from "../utils/errors.js";
 import { hashApiToken } from "#config.js";
 import { canAccessMethod } from "#config.js";
 
+const IS_DEV = process.env.env === 'dev' || process.env.test === 'dev' || process.env.NODE_ENV === 'development';
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const isUuid = (val) => typeof val === 'string' && UUID_RE.test(val);
+
+const SQL_VALIDATE_APP_SESSION = `
+  SELECT s.expires_at, u."Active", u."Role"
+  FROM "Sessions" s
+  JOIN "Users" u ON s."UserName" = u."UserName"
+  WHERE s.id = $1
+  LIMIT 1
+`;
+
+/**
+ * Decide if the incoming request should return JSON errors instead of HTML.
+ * Non-browser clients (API calls / AJAX) should get JSON.
+ */
+function isJsonRequest(req) {
+  if (!req || !req.headers) return false;
+  const accept = (req.headers.accept || "").toLowerCase();
+  const xRequestedWith = (req.headers["x-requested-with"] || "").toLowerCase();
+  const userAgent = (req.headers["user-agent"] || "").toLowerCase();
+  const url = (req.originalUrl || req.url || "").toLowerCase();
+  const path = (req.path || "").toLowerCase();
+
+  const isApiPath = url.startsWith("/mbkauthe/api/") || url.startsWith("/api/") || path.startsWith("/mbkauthe/api/") || path.startsWith("/api/");
+  const isAcceptJson = accept.includes("application/json") || accept.includes("json") || accept.includes("*/*");
+
+  const nonBrowserAgent = /curl|wget|httpie|python-requests|python|go-http-client|java\/|php|node-fetch|axios|postman|insomnia|okhttp/;
+  const browserAgent = /mozilla|applewebkit|chrome|safari|firefox|edg|msie|trident|opera/;
+
+  if (isApiPath || xRequestedWith === "xmlhttprequest") return true;
+  if (isAcceptJson && !accept.includes("text/html")) return true;
+
+  if (nonBrowserAgent.test(userAgent) && !browserAgent.test(userAgent)) return true;
+
+  return false;
+}
+
 /**
  * Validates a Bearer token (API Token or Session UUID)
  * Returns a user object if valid, or null/error object
@@ -158,8 +196,13 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
 
   // --- Fallback to Cookie Session ---
   if (!req.session.user) {
-    console.log("[mbkauthe] User not authenticated");
-    console.log("[mbkauthe]: ", req.session.user);
+    if (IS_DEV) {
+      console.log("[mbkauthe] User not authenticated");
+      console.log("[mbkauthe]: ", req.session.user);
+    }
+    if (isJsonRequest(req)) {
+      return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_NOT_FOUND));
+    }
     return renderError(res, req, {
       code: 401,
       error: "Not Logged In",
@@ -170,13 +213,16 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
   }
 
   try {
-    const { id, sessionId, role, allowedApps } = req.session.user;
+    const { sessionId, role, allowedApps } = req.session.user;
 
     // Defensive checks for sessionId and allowedApps
-    if (!sessionId) {
+    if (!sessionId || !isUuid(sessionId)) {
       console.warn(`[mbkauthe] Missing sessionId for user "${req.session.user.username}"`);
       req.session.destroy();
       clearSessionCookies(res);
+      if (isJsonRequest(req)) {
+        return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_EXPIRED));
+      }
       return renderError(res, req, {
         code: 401,
         error: "Session Expired",
@@ -186,20 +232,16 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
       });
     }
 
-    // Normalize sessionId (DB id) for consistent comparison
-    const normalizedSessionId = sessionId;
-
     // Validate session by DB primary key id and join to user
-    const query = `SELECT s.id as sid, s.expires_at, u."Active", u."Role"
-                   FROM "Sessions" s
-                   JOIN "Users" u ON s."UserName" = u."UserName"
-                   WHERE s.id = $1 LIMIT 1`;
-    const result = await dblogin.query({ name: 'validate-app-session', text: query, values: [normalizedSessionId] });
+    const result = await dblogin.query({ name: 'validate-app-session', text: SQL_VALIDATE_APP_SESSION, values: [sessionId] });
 
     if (result.rows.length === 0) {
       console.log(`[mbkauthe] Session not found for user "${req.session.user.username}"`);
       req.session.destroy();
       clearSessionCookies(res);
+      if (isJsonRequest(req)) {
+        return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_EXPIRED));
+      }
       return renderError(res, req, {
         code: 401,
         error: "Session Expired",
@@ -212,11 +254,18 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
     const sessionRow = result.rows[0];
 
     // Check expired
-    if (sessionRow.expires_at && new Date(sessionRow.expires_at) <= new Date()) {
+    if (sessionRow.expires_at) {
+      const expiresMs = sessionRow.expires_at instanceof Date
+        ? sessionRow.expires_at.getTime()
+        : Date.parse(sessionRow.expires_at);
+      if (!Number.isNaN(expiresMs) && expiresMs <= Date.now()) {
       console.log(`[mbkauthe] Session invalidated (expired) for user "${req.session.user.username}"`);
       // destroy and clear cookies
       req.session.destroy();
       clearSessionCookies(res);
+      if (isJsonRequest(req)) {
+        return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_EXPIRED));
+      }
       return renderError(res, req, {
         code: 401,
         error: "Session Expired",
@@ -225,12 +274,16 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
         page: `/mbkauthe/login?redirect=${encodeURIComponent(req.originalUrl)}`,
       });
     }
+    }
 
 
     if (!sessionRow.Active) {
       console.log(`[mbkauthe] Account is inactive for user "${req.session.user.username}"`);
       req.session.destroy();
       clearSessionCookies(res);
+      if (isJsonRequest(req)) {
+        return res.status(401).json(createErrorResponse(401, ErrorCodes.ACCOUNT_INACTIVE));
+      }
       return renderError(res, req, {
         code: 401,
         error: "Account Inactive",
@@ -247,6 +300,9 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
         console.warn(`[mbkauthe] User \"${req.session.user.username}\" is not authorized to use the application \"${mbkautheVar.APP_NAME}\"`);
         req.session.destroy();
         clearSessionCookies(res);
+        if (isJsonRequest(req)) {
+          return res.status(401).json(createErrorResponse(401, ErrorCodes.APP_NOT_AUTHORIZED));
+        }
         return renderError(res, req, {
           code: 401,
           error: "Unauthorized",
@@ -258,7 +314,7 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
     }
 
     // Store user role in request for checkRolePermission to use
-    req.userRole = result.rows[0].Role;
+    req.userRole = sessionRow.Role;
 
     next();
   } catch (err) {
@@ -277,25 +333,18 @@ async function validateApiSession(req, res, next) {
   }
 
   try {
-    const { id, sessionId, role, allowedApps } = req.session.user;
+    const { sessionId, role, allowedApps } = req.session.user;
 
     // Defensive checks for sessionId and allowedApps
-    if (!sessionId) {
+    if (!sessionId || !isUuid(sessionId)) {
       console.warn(`[mbkauthe] Missing sessionId for user "${req.session.user.username}"`);
       req.session.destroy();
       clearSessionCookies(res);
       return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_EXPIRED));
     }
 
-    // Normalize sessionId (DB id) for consistent comparison
-    const normalizedSessionId = sessionId;
-
     // Validate session by DB primary key id and join to user
-    const query = `SELECT s.id as sid, s.expires_at, u."Active", u."Role"
-                   FROM "Sessions" s
-                   JOIN "Users" u ON s."UserName" = u."UserName"
-                   WHERE s.id = $1 LIMIT 1`;
-    const result = await dblogin.query({ name: 'validate-app-session-for-api', text: query, values: [normalizedSessionId] });
+    const result = await dblogin.query({ name: 'validate-app-session-for-api', text: SQL_VALIDATE_APP_SESSION, values: [sessionId] });
 
     if (result.rows.length === 0) {
       req.session.destroy();
@@ -306,11 +355,16 @@ async function validateApiSession(req, res, next) {
     const sessionRow = result.rows[0];
 
     // Check expired
-    if (sessionRow.expires_at && new Date(sessionRow.expires_at) <= new Date()) {
+    if (sessionRow.expires_at) {
+      const expiresMs = sessionRow.expires_at instanceof Date
+        ? sessionRow.expires_at.getTime()
+        : Date.parse(sessionRow.expires_at);
+      if (!Number.isNaN(expiresMs) && expiresMs <= Date.now()) {
       req.session.destroy();
       clearSessionCookies(res);
       return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_EXPIRED));
     }
+    }
 
 
     if (!result.rows[0].Active) {
@@ -332,7 +386,7 @@ async function validateApiSession(req, res, next) {
     }
 
     // Store user role in request for checkRolePermission to use
-    req.userRole = result.rows[0].Role;
+    req.userRole = sessionRow.Role;
 
     next();
   } catch (err) {
@@ -444,6 +498,9 @@ const checkRolePermission = (requiredRoles, notAllowed) => {
     try {
       if (!req.session || !req.session.user || !req.session.user.id) {
         console.log("[mbkauthe] User not authenticated");
+        if (isJsonRequest(req)) {
+          return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_NOT_FOUND));
+        }
         return renderError(res, req, {
           code: 401,
           error: "Not Logged In",
@@ -453,11 +510,19 @@ const checkRolePermission = (requiredRoles, notAllowed) => {
         });
       }
 
+      // SuperAdmin bypasses all role checks
+      if(req.session.role === "SuperAdmin") {
+        return next();
+      }
+
       // Use role from validateSession to avoid additional DB query
       const userRole = req.userRole;
 
       // Check notAllowed role
       if (notAllowed && userRole === notAllowed) {
+        if (isJsonRequest(req)) {
+          return res.status(403).json(createErrorResponse(403, ErrorCodes.ROLE_NOT_ALLOWED));
+        }
         return renderError(res, req, {
           code: 403,
           error: "Access Denied",
@@ -471,12 +536,15 @@ const checkRolePermission = (requiredRoles, notAllowed) => {
       const rolesArray = Array.isArray(requiredRoles) ? requiredRoles : [requiredRoles];
 
       // Check for "Any" or "any" role
-      if (rolesArray.includes("Any") || rolesArray.includes("any")) {
+      if (rolesArray.includes("Any") || rolesArray.includes("any") || rolesArray.includes("*")) {
         return next();
       }
 
       // Check if user role is in allowed roles
       if (!rolesArray.includes(userRole)) {
+        if (isJsonRequest(req)) {
+          return res.status(403).json(createErrorResponse(403, ErrorCodes.INSUFFICIENT_PERMISSIONS));
+        }
         return renderError(res, req, {
           code: 403,
           error: "Access Denied",
@@ -502,7 +570,6 @@ const validateSessionAndRole = (requiredRole, notAllowed, strictTokenValidation
   };
 };
 
-
 const authenticate = (authentication) => {
   return (req, res, next) => {
     const token = req.headers["authorization"];
@@ -520,8 +587,13 @@ const authenticate = (authentication) => {
 const strictValidateSession = (req, res, next) => validateSession(req, res, next, true);
 const strictValidateSessionAndRole = (requiredRole, notAllowed) => validateSessionAndRole(requiredRole, notAllowed, true);
 
+// Short aliases for convenience
+const sessVal = validateSession;
+const sessRole = validateSessionAndRole;
+
 export {
   validateSession, validateApiSession, checkRolePermission,
   validateSessionAndRole, authenticate, reloadSessionUser,
-  strictValidateSession, strictValidateSessionAndRole
+  strictValidateSession, strictValidateSessionAndRole,
+  sessVal, sessRole
 }

package/lib/pool.js

@@ -12,14 +12,9 @@ const poolConfig = {
   ssl: {
     rejectUnauthorized: true,
   },
-
-  // Connection pool tuning for serverless/ephemeral environments (Vercel)
-  // - keep max small to avoid exhausting DB connections
-  // - reduce idle time so connections are returned sooner
-  // - set a short connection timeout to fail fast
-  max: 10,
+  max: 3,
   idleTimeoutMillis: 10000,
-  connectionTimeoutMillis: 25000,
+  connectionTimeoutMillis: 10000,
 };
 
 export const dblogin = new Pool(poolConfig);
@@ -27,11 +22,21 @@ export const dblogin = new Pool(poolConfig);
 // Keep pool.js focused on pool setup; attach dev-only query logger from dedicated module.
 attachDevQueryLogger(dblogin);
 
+/*
+ attachDevQueryLogger([
+  { pool: dblogin, name: "loginDB" },
+  { pool: dblogin1, name: "loginDB1" },
+]);
+*/
+
+/*
 (async () => {
   try {
     const client = await dblogin.connect();
     client.release();
+    console.log("[mbkauthe] Database connection pool established successfully.");
   } catch (err) {
     console.error("[mbkauthe] Database connection error (pool):", err);
   }
-})();
+})();
+*/

package/lib/routes/auth.js

@@ -110,11 +110,17 @@ export async function checkTrustedDevice(req, username) {
   try {
     // Hash the provided device token before querying DB (we store token hashes in DB)
     const deviceTokenHash = hashDeviceToken(deviceToken);
+    // Single round-trip: validate trusted device AND refresh LastUsed.
     const deviceQuery = `
-      SELECT td."UserName", td."LastUsed", td."ExpiresAt", u."id", u."Active", u."Role", u."AllowedApps"
-      FROM "TrustedDevices" td
-      JOIN "Users" u ON td."UserName" = u."UserName"
-      WHERE td."DeviceToken" = $1 AND td."UserName" = $2 AND td."ExpiresAt" > NOW()
+      UPDATE "TrustedDevices" td
+      SET "LastUsed" = NOW()
+      FROM "Users" u
+      WHERE td."DeviceToken" = $1
+        AND td."UserName" = $2
+        AND td."ExpiresAt" > NOW()
+        AND u."UserName" = td."UserName"
+        AND u."Active" = TRUE
+      RETURNING td."UserName", td."ExpiresAt", u."id" as id, u."Active", u."Role", u."AllowedApps"
     `;
     const deviceResult = await dblogin.query({
       name: 'check-trusted-device',
@@ -138,13 +144,6 @@ export async function checkTrustedDevice(req, username) {
         }
       }
 
-      // Update last used timestamp
-      await dblogin.query({
-        name: 'update-device-last-used',
-        text: 'UPDATE "TrustedDevices" SET "LastUsed" = NOW() WHERE "DeviceToken" = $1',
-        values: [deviceTokenHash]
-      });
-
       console.log(`[mbkauthe] Trusted device validated for user: ${username}`);
       return {
         id: deviceUser.id,
@@ -193,21 +192,24 @@ export async function completeLoginProcess(req, res, user, redirectUrl = null, t
     const configuredMax = parseInt(mbkautheVar.MAX_SESSIONS_PER_USER, 10);
     const MAX_SESSIONS = Number.isInteger(configuredMax) && configuredMax > 0 ? configuredMax : 5;
 
-    // Clean up expired sessions first to prevent accumulation
-    await dblogin.query({
-      name: 'cleanup-expired-sessions',
-      text: `DELETE FROM "Sessions" WHERE "UserName" = $1 AND expires_at IS NOT NULL AND expires_at <= NOW()`,
-      values: [username]
-    });
-
-    // Count active sessions for this user (by username)
+    // Clean up expired sessions + count active sessions in a single round-trip.
     const countRes = await dblogin.query({
-      name: 'count-user-sessions',
-      text: `SELECT id FROM "Sessions" WHERE "UserName" = $1 AND (expires_at IS NULL OR expires_at > NOW()) ORDER BY created_at ASC`,
+      name: 'cleanup-and-count-user-sessions',
+      text: `
+        WITH deleted AS (
+          DELETE FROM "Sessions"
+          WHERE "UserName" = $1
+            AND expires_at IS NOT NULL
+            AND expires_at <= NOW()
+        )
+        SELECT COUNT(*)::int AS count
+        FROM "Sessions"
+        WHERE "UserName" = $1
+      `,
       values: [username]
     });
 
-    const currentSessions = countRes.rows.length;
+    const currentSessions = Number(countRes.rows?.[0]?.count ?? 0);
     // If we have MAX_SESSIONS or more, delete oldest to make room for exactly 1 new session
     if (currentSessions >= MAX_SESSIONS) {
       const sessionsToDelete = currentSessions - MAX_SESSIONS + 1; // +1 to make room for new session
@@ -215,15 +217,15 @@ export async function completeLoginProcess(req, res, user, redirectUrl = null, t
 
       await dblogin.query({
         name: 'prune-oldest-user-session',
-        text: `DELETE FROM "Sessions" WHERE id IN (SELECT id FROM "Sessions" WHERE "UserName" = $1 AND (expires_at IS NULL OR expires_at > NOW()) ORDER BY created_at ASC LIMIT $2)`,
+        // Expired sessions were already removed above; remaining rows are active.
+        text: `DELETE FROM "Sessions" WHERE id IN (SELECT id FROM "Sessions" WHERE "UserName" = $1 ORDER BY created_at ASC LIMIT $2)`,
         values: [username, sessionsToDelete]
       });
     }
 
     const expiresAt = new Date(Date.now() + (cachedCookieOptions.maxAge || 0));
 
-    // Insert new session record for the user (generate id explicitly to avoid relying on DB default)
-    const newSessionId = crypto.randomUUID();
+    // Insert new session record for the user.
     let dbSessionId;
     try {
       const insertRes = await dblogin.query({
@@ -237,12 +239,18 @@ export async function completeLoginProcess(req, res, user, redirectUrl = null, t
       throw insertErr;
     }
 
-    // Update last_login timestamp for the user
-    await dblogin.query({
-      name: 'login-update-last-login',
-      text: `UPDATE "Users" SET "last_login" = NOW() WHERE "id" = $1`,
-      values: [user.id]
-    });
+    // Update last_login and fetch FullName/Image in a single query.
+    let profileRow = null;
+    try {
+      const profUpdateRes = await dblogin.query({
+        name: 'login-update-last-login-return-profile',
+        text: `UPDATE "Users" SET "last_login" = NOW() WHERE "id" = $1 RETURNING "FullName", "Image"`,
+        values: [user.id]
+      });
+      profileRow = profUpdateRes.rows?.[0] || null;
+    } catch (profileUpdateErr) {
+      console.error('[mbkauthe] Error updating last_login/returning profile:', profileUpdateErr);
+    }
 
     req.session.user = {
       id: user.id,
@@ -255,20 +263,26 @@ export async function completeLoginProcess(req, res, user, redirectUrl = null, t
     // Clear profile picture cache to fetch fresh data
     clearProfilePicCache(req, username);
 
-    // Attempt to fetch FullName and Image from Users and store it in session for display purposes
+    // Store FullName/Image in session and cache cookie values.
     let loginProfileImage = null;
-    try {
-      const profileResult = await dblogin.query({
-        name: 'login-get-fullname-and-image',
-        text: 'SELECT "FullName", "Image" FROM "Users" WHERE "UserName" = $1 LIMIT 1',
-        values: [username]
-      });
-      if (profileResult.rows.length > 0) {
-        if (profileResult.rows[0].FullName) req.session.user.fullname = profileResult.rows[0].FullName;
-        if (profileResult.rows[0].Image && profileResult.rows[0].Image.trim() !== '') loginProfileImage = profileResult.rows[0].Image;
+    if (profileRow) {
+      if (profileRow.FullName) req.session.user.fullname = profileRow.FullName;
+      if (typeof profileRow.Image === 'string' && profileRow.Image.trim() !== '') loginProfileImage = profileRow.Image;
+    } else {
+      // Fallback: try a read query if UPDATE...RETURNING failed unexpectedly.
+      try {
+        const profileResult = await dblogin.query({
+          name: 'login-get-fullname-and-image',
+          text: 'SELECT "FullName", "Image" FROM "Users" WHERE "UserName" = $1 LIMIT 1',
+          values: [username]
+        });
+        if (profileResult.rows.length > 0) {
+          if (profileResult.rows[0].FullName) req.session.user.fullname = profileResult.rows[0].FullName;
+          if (profileResult.rows[0].Image && profileResult.rows[0].Image.trim() !== '') loginProfileImage = profileResult.rows[0].Image;
+        }
+      } catch (profileErr) {
+        console.error("[mbkauthe] Error fetching FullName/Image for user:", profileErr);
       }
-    } catch (profileErr) {
-      console.error("[mbkauthe] Error fetching FullName/Image for user:", profileErr);
     }
 
     if (req.session.preAuthUser) {

package/lib/routes/dbLogs.js

@@ -1,6 +1,7 @@
 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';
 
@@ -39,8 +40,8 @@ router.get(["/db.json"], LogLimit, async (req, res) => {
       });
     }
 
-    const queryCount = typeof dblogin.getQueryCount === 'function' ? dblogin.getQueryCount() : null;
-    const queryLog = typeof dblogin.getQueryLog === 'function' ? dblogin.getQueryLog({ limit: queryLimit }) : [];
+    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) {
@@ -61,8 +62,11 @@ router.post(["/db/reset"], LogLimit, async (req, res) => {
       });
     }
 
-    if (typeof dblogin.resetQueryCount === 'function') dblogin.resetQueryCount();
-    if (typeof dblogin.resetQueryLog === 'function') dblogin.resetQueryLog();
+    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) {

package/lib/routes/misc.js

@@ -228,7 +228,24 @@ router.get('/api/checkSession', LoginLimit, async (req, res) => {
       return res.status(200).json({ sessionValid: false, expiry: null });
     }
 
-    const result = await dblogin.query({ name: 'check-session-validity', text: `SELECT s.expires_at, u."Active" FROM "Sessions" s JOIN "Users" u ON s."UserName" = u."UserName" WHERE s.id = $1 LIMIT 1`, values: [sessionId] });
+    // Single round-trip: fetch app-session expiry and (if needed) connect-pg-simple expiry.
+    const result = await dblogin.query({
+      name: 'check-session-validity',
+      text: `
+        SELECT
+          s.expires_at,
+          u."Active",
+          CASE
+            WHEN s.expires_at IS NULL THEN (SELECT expire FROM "session" WHERE sid = $2)
+            ELSE NULL
+          END AS connect_expire
+        FROM "Sessions" s
+        JOIN "Users" u ON s."UserName" = u."UserName"
+        WHERE s.id = $1
+        LIMIT 1
+      `,
+      values: [sessionId, req.sessionID]
+    });
 
     if (result.rows.length === 0) {
       req.session.destroy(() => { });
@@ -243,12 +260,9 @@ router.get('/api/checkSession', LoginLimit, async (req, res) => {
       return res.status(200).json({ sessionValid: false, expiry: null });
     }
 
-    // Determine expiry: prefer application session expiry if present else fallback to connect-pg-simple expire
-    let expiry = row.expires_at ? new Date(row.expires_at).toISOString() : null;
-    if (!expiry) {
-      const sessResult = await dblogin.query({ name: 'get-session-expiry', text: 'SELECT expire FROM "session" WHERE sid = $1', values: [req.sessionID] });
-      expiry = sessResult.rows.length > 0 && sessResult.rows[0].expire ? new Date(sessResult.rows[0].expire).toISOString() : null;
-    }
+    // Determine expiry: prefer application session expiry if present else fallback to connect-pg-simple expiry.
+    const expirySource = row.expires_at || row.connect_expire || null;
+    const expiry = expirySource ? new Date(expirySource).toISOString() : null;
 
     return res.status(200).json({ sessionValid: true, expiry });
   } catch (err) {