From 748028f2ab2a4346d2260026911b0f55e3ab8d7c Mon Sep 17 00:00:00 2001
From: Fabien Zucchet <fabien.zucchet@student-cs.fr>
Date: Wed, 3 Mar 2021 08:35:16 +0100
Subject: [PATCH] debug
---
.../controllers/administrateur.controller.js | 7 +---
back/src/controllers/staffeurs.controller.js | 32 ++++++++++++++++---
2 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/back/src/controllers/administrateur.controller.js b/back/src/controllers/administrateur.controller.js
index 26050ab3..0ff3b6d5 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 668142d3..fc8b8cd9 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 }
--
GitLab