TheCoreDev/mia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'main'

Browse Source 
Externalisation des URL Master et Slave

See merge request france/recherche-innovation/sud-ouest/tec/mia/partenariat_cortex/ihm!5
This commit is contained in:
LE CORRE, Laurent
2023-11-23 15:33:23 +00:00
parent aab46e50cb 5275c61483
commit 29258346cd
3 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env
View File

@@ -3,3 +3,6 @@ DATABASE_HOST = db.thecoredev.fr
DATABASE_PORT = 3306
DATABASE_USER = mia
DATABASE_PASSWORD = CalomOk0t-ISvpw-
MASTER_URL = 'https://slave.thecoredev.fr'
SLAVE_URL = 'https://slave.thecoredev.fr'

3
.env.prod
View File

@@ -3,3 +3,6 @@ DATABASE_HOST = db.thecoredev.fr
DATABASE_PORT = 3306
DATABASE_USER = mia
DATABASE_PASSWORD = CalomOk0t-ISvpw-
MASTER_URL = 'https://slave.thecoredev.fr'
SLAVE_URL = 'https://slave.thecoredev.fr'

35
app.js
View File

@@ -54,9 +54,7 @@ app.get("/", (req, res) => {
app.get("/index", (req, res) => { res.render("index") });
app.get("/login", (req, res) => { res.render("login") });
app.get("/register", (req, res) => {
res.render("register", { session: req.query.s, role: req.query.r})
});
app.get("/register", (req, res) => { res.render("register", { session: req.query.s, role: req.query.r}) });
app.get("/create-session", (req, res) => { res.render("create-session") });
@@ -155,12 +153,8 @@ app.post("/auth/check-login-no-security", (req, res) => {
});
}
if (role == 'A') {
res.redirect('https://slave.thecoredev.fr');
}
else {
res.redirect('https://slave.thecoredev.fr');
}
if (role == 'A') { res.redirect(process.env.MASTER_URL); }
else { res.redirect(process.env.SLAVE_URL); }
});
}
});
@@ -201,13 +195,10 @@ app.post("/auth/check-login", (req, res) => {
}
userId = result[0].ID;
if (functions.comparePassword(password, result[0].password)) {
// Le user est connecté avec succès : on vérifie qu'il n'est pas déjà inscrit à la session et si pas le cas, on l'inscrit et on incrémente le compteur des participants
db.query('SELECT * FROM participation WHERE user = ?', [userId], async (error, result) => {
if(error) {
console.log(error)
}
bcrypt.compare(password, result[0].password)
.then(result => {
if (result) {
if (result.length == 0) {
db.query('INSERT INTO participation (user, session, role_during_session) VALUES (?,?,?)', [userId, session[0], role[0]], function (err, result) {
if (err) throw err;
@@ -219,24 +210,20 @@ app.post("/auth/check-login", (req, res) => {
console.log("1 record updated");
});
}
})
if (role == 'A') {
res.redirect('https://slave.thecoredev.fr');
}
else {
res.redirect('https://slave.thecoredev.fr');
}
if (role == 'A') { res.redirect('https://slave.thecoredev.fr'); }
else { res.redirect('https://slave.thecoredev.fr'); }
}
else {
return res.render('login', {
error: 'Mot de passe incorrect : corriger votre saisie',
"session": session,
"role": role
session: session,
role: role
})
}
})
})
})
// ******************************************* Connexion sur la session *******************************************