diff --git a/back/src/controllers/administrateur.controller.js b/back/src/controllers/administrateur.controller.js index 26050ab35564fe6163d7436fdf0e81b41f6d2f39..0ff3b6d587ab1bf2eec731ade84ded82f5a2ac0f 100644 --- a/back/src/controllers/administrateur.controller.js +++ b/back/src/controllers/administrateur.controller.js @@ -183,12 +183,7 @@ async function isAdminMiddleware(req, res, next) { const admins = await simple_query(query, []); const adminsList = admins.map((item) => item.login); - console.log("admins :"); - console.log(adminsList); - console.log("login :"); - console.log(login); - console.log(adminsList.includes(login)); - if (!adminsList.includes(login)) { + if (adminsList.includes(login)) { return next(); } res.status(403); diff --git a/back/src/controllers/staffeurs.controller.js b/back/src/controllers/staffeurs.controller.js index 668142d3021e84bbe666270af8e4f021cddbddd5..fc8b8cd99b5e909213dae22024eedd2c89e6dc30 100644 --- a/back/src/controllers/staffeurs.controller.js +++ b/back/src/controllers/staffeurs.controller.js @@ -72,13 +72,37 @@ function getStaffeursLogins(req, res) { con.end(); } -function isStaffMiddleware(req, res, next) { +function simple_query(query, args) { + var connection = mysql.createConnection(dbConfig); + connection.connect(); + return new Promise((resolve, reject) => { + var sql = mysql.format(query, args); + connection.query(sql, function (error, results) { + if (error) { + console.log('SQL ERROR') + console.log(error) + reject(error) + } + else { + resolve(JSON.parse(JSON.stringify(results))) + } + }); + connection.end(); + }) +} + +async function isStaffMiddleware(req, res, next) { const login = req.session.ids.login || ''; - const staffs = getStaffLogins(); - if (staffs.includes(login)) { + var query = "SELECT login FROM Staffeurs WHERE deleted = 0;" + + const staffeurs = await simple_query(query, []); + const staffeursList = staffeurs.map((item) => item.login); + + if (staffeursList.includes(login)) { return next(); } - return res.send({ success: false }) + res.status(403); } + module.exports = { getStaffeurs, addNewStaffeur, deleteStaffeur, getStaffeursLogins, isStaffMiddleware }