Correction des derniers bugs

This commit is contained in:
2023-11-15 14:56:17 +01:00
parent fcfd5639ef
commit 3ea896bdc1

30
app.js
View File

@@ -63,7 +63,18 @@ app.get("/register", (req, res) => {
app.post("/auth/register", (req, res) => { app.post("/auth/register", (req, res) => {
const { gender, name, firstname, nickname, title, email, password, password_confirm, session, role } = req.body const { gender, name, firstname, nickname, title, email, password, password_confirm, session, role } = req.body
db.query('SELECT email FROM user WHERE email = ? OR nickname = ?', [email, nickname], async (error, result) => { let requete = '';
if (nickname != '') {
requete = "SELECT * FROM user WHERE UPPER(nickname) = '?'".replace("?", nickname.toUpperCase());
}
if (email != '') {
requete = "SELECT * FROM user WHERE UPPER(email) = '?'".replace("?", email.toUpperCase());
}
if (requete.length > 0) {
let topic, sessionDate;
db.query(requete, async (error, result) => {
if(error){ if(error){
console.log(error) console.log(error)
} }
@@ -79,15 +90,26 @@ app.post("/auth/register", (req, res) => {
}) })
} }
db.query('SELECT topic, DATE_FORMAT(scheduled_on, "%d/%m/%Y %H:%i") as "date" FROM session WHERE id = ?', [session], (err, result) => {
if(error){
console.log(error)
}
if( result.length > 0 ) {
topic = result[0].topic;
sessionDate = result[0].date;
}
})
let hashedPassword = await bcrypt.hash(password, 8); let hashedPassword = await bcrypt.hash(password, 8);
db.query('INSERT INTO user SET?', {gender : (gender != undefined ? gender : ""), firstname: firstname, name: name, title: title, email: email, nickname : nickname, password: hashedPassword}, (err, result) => { db.query('INSERT INTO user SET?', {gender : (gender != undefined ? gender : ""), firstname: firstname, name: name, title: title, email: email, nickname : nickname, password: hashedPassword}, (err, result) => {
if(error) { if(error) {
console.log(error) console.log(error)
} else { } else {
return res.render('login', { session: session, role: role, email: email, nickname: nickname }) return res.render('login', { session: session, role: role, email: email, nickname: nickname, topic: topic, session_date: sessionDate })
} }
}) })
}) })
}
}) })
// ******************************************* Connexion sur le compte utilisateur ******************************************* // ******************************************* Connexion sur le compte utilisateur *******************************************
@@ -139,10 +161,10 @@ app.post("/auth/check-login", (req, res) => {
}) })
if (role == 'A') { if (role == 'A') {
res.redirect('https://mia.thecoredev.fr'); res.redirect('https://slave.thecoredev.fr');
} }
else { else {
res.redirect('https://mia.thecoredev.fr'); res.redirect('https://slave.thecoredev.fr');
} }
} }
else { else {