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

Correction des derniers bugs

Browse Source
This commit is contained in:
TheCoreDev
2023-11-15 14:56:17 +01:00
parent fcfd5639ef
commit 3ea896bdc1
1 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app.js
View File

@@ -63,31 +63,53 @@ 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(error){ if (nickname != '') {
console.log(error) requete = "SELECT * FROM user WHERE UPPER(nickname) = '?'".replace("?", nickname.toUpperCase());
} }
if( result.length > 0 ) { if (email != '') {
return res.render('register', { requete = "SELECT * FROM user WHERE UPPER(email) = '?'".replace("?", email.toUpperCase());
error: 'Adresse email ou pseudo déjà utilisé : modifiez votre saisie ou bien cliquez sur le lien ci-dessus pour vous connecter', }
session: session, role: role
})
} else if(password !== password_confirm) {
return res.render('register', {
error: 'Vos mots de passe ne correspondent pas',
session: session, role: role
})
}
let hashedPassword = await bcrypt.hash(password, 8); if (requete.length > 0) {
db.query('INSERT INTO user SET?', {gender : (gender != undefined ? gender : ""), firstname: firstname, name: name, title: title, email: email, nickname : nickname, password: hashedPassword}, (err, result) => { let topic, sessionDate;
if(error) {
db.query(requete, async (error, result) => {
if(error){
console.log(error) console.log(error)
} else {
return res.render('login', { session: session, role: role, email: email, nickname: nickname })
} }
if( result.length > 0 ) {
return res.render('register', {
error: 'Adresse email ou pseudo déjà utilisé : modifiez votre saisie ou bien cliquez sur le lien ci-dessus pour vous connecter',
session: session, role: role
})
} else if(password !== password_confirm) {
return res.render('register', {
error: 'Vos mots de passe ne correspondent pas',
session: session, role: role
})
}
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);
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) {
console.log(error)
} else {
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 {