Update user data handling in UserIDMiddlewareAD.js and refactor getUserData function
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
2024-04-17 17:00:04 +02:00
parent 7a02f2682c
commit 06b1936840
9 changed files with 163 additions and 118 deletions

View File

@@ -15,7 +15,6 @@ async function getUserData() {
async function checkUserExistsAD(req, res, next) {
let userData = await getUserData();
console.log('User data:', userData);
if (Array.isArray(req.user)) {
req.user = req.user.find(u => u._json && u._json.sAMAccountName);

View File

@@ -4,19 +4,14 @@ const { logger, logRequestInfo, ErrorLogger, authLogger } = require('../config/l
const debug = require('debug')('app:authMiddleware');
const authMiddleware = async (req, res, next) => {
debug('Checking if user is authenticated...');
if (req.isAuthenticated() || (req.session && req.session.user && req.session.user.name)) {
debug('User is authenticated, reading user data...');
const data = await fs.promises.readFile(path.join(__dirname, '../data', 'user.json'), 'utf8');
const users = JSON.parse(data);
debug('User data:', users);
const user = users.find(user => user.name === (req.session.user && req.session.user.name));
debug('User name from session:', req.session.user && req.session.user.name);
if (!user) {
authLogger.info('User is not authenticated and user name is not set');
debug('User not found in user data, redirecting to login...');
return res.redirect('/auth/login');
}
@@ -25,11 +20,9 @@ const authMiddleware = async (req, res, next) => {
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']}`);
}
debug('Setting user data in session and locals...');
res.locals.user = user;
req.session.user = user;
req.userData = user;
debug('User data set, calling next middleware...');
return next();
} else {
authLogger.info(`Authentication failed for IP: ${req.ip}, User Agent: ${req.headers['user-agent']}. Redirecting to login.`);