V1.0.0.beta-15 Update

Note: We appreciate your feedback and bug reports to continue improving our platform. Thank you for your continued support!

Middlewares/authMiddleware.js

@@ -1,34 +1,48 @@
-const fs = require('fs');
+const fs = require('fs').promises;
 const path = require('path');
 const { logger, logRequestInfo, ErrorLogger, authLogger } = require('../config/logs');
-const debug = require('debug')('app:authMiddleware');
 
 const authMiddleware = async (req, res, next) => {
-  if (req.isAuthenticated() || (req.session && req.session.user && req.session.user.name)) {
-    const data = await fs.promises.readFile(path.join(__dirname, '../data', 'user.json'), 'utf8');
-    const users = JSON.parse(data);
-    const user = users.find(user => user.name === (req.session.user && req.session.user.name));
 
+    try {
+        if (req.isAuthenticated()) {
 
-    if (!user) {
-      authLogger.info('User is not authenticated and user name is not set');
-      return res.redirect('/auth/login');
+            const data = await fs.readFile(path.join(__dirname, '../data', 'user.json'), 'utf8');
+            const users = JSON.parse(data);
+
+            const sessionUser = req.user;
+            
+
+            if (!sessionUser) {
+                authLogger.info('Session user is undefined');
+                return res.redirect('/auth/login');
+            }
+
+            if (!sessionUser.id && !sessionUser.name) {
+                authLogger.info('Session user lacks both id and name');
+                return res.redirect('/auth/login');
+            }
+
+            const user = users.find(user => user.id === sessionUser.id || user.name === sessionUser.name);
+
+            if (!user) {
+                authLogger.info('User not found in user.json');
+                return res.redirect('/auth/login');
+            }
+
+            req.session.user = user; 
+            res.locals.user = user;
+            req.userData = user;
+
+            return next();
+        } else {
+            authLogger.info(`Authentication failed for IP: ${req.ip}, User Agent: ${req.headers['user-agent']}. Redirecting to login.`);
+            res.redirect('/auth/login');
+        }
+    } catch (error) {
+        authLogger.error('Error in authentication middleware:', error);
+        return next(error);
     }
-
-    if (!req.session.user) {
-      authLogger.info('User connection attempt in progress, verification in progress...');
-      authLogger.info(`Login successfully completed, logged in user is: id=${user.id}, name=${user.name}, role=${user.role}, IP: ${req.ip}, User Agent: ${req.headers['user-agent']}`);
-    }
-
-    res.locals.user = user;
-    req.session.user = user;
-    req.userData = user;
-    return next();
-  } else {
-    authLogger.info(`Authentication failed for IP: ${req.ip}, User Agent: ${req.headers['user-agent']}. Redirecting to login.`);
-    debug('User is not authenticated, redirecting to login...');
-    res.redirect('/auth/login');
-  }
 };
 
-module.exports = authMiddleware;
+module.exports = authMiddleware;