@intranefr/superbackend 1.6.3 → 1.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intranefr/superbackend",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "Node.js middleware that gives your project backend superpowers",
   "main": "index.js",
   "scripts": {

package/src/middleware/auth.js

@@ -131,9 +131,37 @@ const adminSessionAuth = (req, res, next) => {
 
 // Admin authentication middleware that supports both session and basic auth
 const adminAuth = (req, res, next) => {
-  // First try session authentication
-  if (req.session && req.session.authenticated) {
-    return adminSessionAuth(req, res, next);
+  // First try session authentication (only if session exists AND is authenticated)
+  if (req.session && req.session.authenticated === true) {
+    // Verify session is still valid (check login time)
+    const loginTime = new Date(req.session.loginTime);
+    const now = new Date();
+    const sessionAge = (now - loginTime) / (1000 * 60 * 60); // hours
+    
+    // Session expires after 24 hours
+    if (sessionAge > 24) {
+      req.session.destroy((err) => {
+        if (err) console.error('Error destroying expired session:', err);
+      });
+      
+      if (req.xhr || req.headers.accept?.includes('application/json')) {
+        return res.status(401).json({ 
+          error: "Session expired", 
+          redirectTo: `${req.adminPath || '/admin'}/login` 
+        });
+      }
+      
+      return res.redirect(`${req.adminPath || '/admin'}/login?error=Session expired`);
+    }
+
+    // Attach user info to request for consistency with other auth middleware
+    req.user = {
+      authenticated: true,
+      authType: req.session.authType,
+      role: req.session.role
+    };
+    
+    return next();
   }
   
   // Fallback to basic auth for backward compatibility

package/src/middleware.js

@@ -44,6 +44,7 @@ const {
 } = require("./middleware/errorCapture");
 const rateLimiter = require("./services/rateLimiter.service");
 const pluginsService = require("./services/plugins.service");
+const telegramService = require("./services/telegram.service");
 
 let errorCaptureInitialized = false;
 
@@ -229,8 +230,6 @@ function createMiddleware(options = {}) {
       maxPoolSize: 10,
     };
 
-const telegramService = require("./services/telegram.service");
-
     // Return a promise that resolves when connection is established
     const connectionPromise = mongoose
       .connect(mongoUri, connectionOptions)
@@ -251,7 +250,19 @@ const telegramService = require("./services/telegram.service");
         // Initialize Telegram bots (check telegram config)
         const telegramEnabled = options.telegram?.enabled !== false;
         if (telegramEnabled) {
-          await telegramService.init();
+          const telegramInitializer =
+            (telegramService && typeof telegramService.initialize === "function"
+              ? telegramService.initialize.bind(telegramService)
+              : null) ||
+            (telegramService && typeof telegramService.init === "function"
+              ? telegramService.init.bind(telegramService)
+              : null);
+
+          if (telegramInitializer) {
+            await telegramInitializer();
+          } else {
+            console.warn("⚠️ Telegram service has no initialize/init method; skipping startup");
+          }
         } else {
           console.log("🔍 Telegram bots disabled - telegram.enabled:", options.telegram?.enabled);
         }
@@ -396,9 +407,21 @@ const telegramService = require("./services/telegram.service");
     // Initialize Telegram bots for existing connection (check telegram config)
     const telegramEnabled = options.telegram?.enabled !== false;
     if (telegramEnabled) {
-      telegramService.init().catch(err => {
+      const telegramInitializer =
+        (telegramService && typeof telegramService.initialize === "function"
+          ? telegramService.initialize.bind(telegramService)
+          : null) ||
+        (telegramService && typeof telegramService.init === "function"
+          ? telegramService.init.bind(telegramService)
+          : null);
+
+      if (!telegramInitializer) {
+        console.warn("⚠️ Telegram service has no initialize/init method; skipping startup (existing connection)");
+      } else {
+        telegramInitializer().catch(err => {
         console.error("Failed to initialize Telegram service (existing connection):", err);
-      });
+        });
+      }
     } else {
       console.log("🔍 Telegram bots disabled - telegram.enabled:", options.telegram?.enabled, "(existing connection)");
     }

package/src/routes/experiments.routes.js

@@ -1,13 +1,13 @@
 const express = require('express');
 const router = express.Router();
 
-const { adminSessionAuth } = require('../middleware/auth');
+const { adminAuth } = require('../middleware/auth');
 const rateLimiter = require('../services/rateLimiter.service');
 
 const controller = require('../controllers/experiments.controller');
 
 router.use(express.json({ limit: '1mb' }));
-router.use(adminSessionAuth);
+router.use(adminAuth);
 
 router.get(
   '/:code/assignment',