From e73910b8a057be47d024e143622c28fbc65dc609 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Tue, 16 Nov 2021 12:51:52 +0700 Subject: [PATCH] Fixed Login error in RegisterLogin.js --- routes/registerlogin.js | 63 +++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/routes/registerlogin.js b/routes/registerlogin.js index c9956ca..d997cea 100644 --- a/routes/registerlogin.js +++ b/routes/registerlogin.js @@ -126,45 +126,52 @@ exports.register = async function (req, res) { }; exports.login = async function (req, res) { - if ( - !req.body.email || - !req.body.password - ) { - // Empty Fields + if (!req.body.email || !req.body.password) { + // Empty fields res.render("pages/login-error"); } else { - db_connect.query( - "SELECT * FROM users WHERE email = ?", - [email], - async function (error, response, fields) { - const passCheck = await bcrypt.compare(password, response[0].password); - if (error) { - // Error - res.render("pages/login-error"); - } else { - if (response.length > 0) { - if (passCheck) { - if (response[0].verify == 0) { - res.render("pages/login-error"); + var email = req.body.email; + var password = req.body.password; + db_connect.query( + "SELECT * FROM users WHERE email = ?", + [email], + async function (error, response, fields) { + const passCheck = await bcrypt.compare(password, response[0].password); + if (error) { + res.send({ + code: 400, + failed: "An error has occured...", + }); + } else { + if (response.length > 0) { + if (passCheck) { + if (response[0].verify == 0) { + res.send({ + code: 204, + success: "Sorry You havent verified your email", + }); + } else { + res.send({ + code: 200, + success: "Login Successful!!", + }); + } } else { - res.render("pages/index"); + res.send({ + code: 204, + success: "Sorry Email and password does not match", + }); } } else { res.send({ code: 204, - success: "Sorry Email and password does not match", + success: "Sorry Email does not exits", }); } - } else { - res.send({ - code: 204, - success: "Sorry Email does not exits", - }); } } - } - ); -}; + ); + } }; /* verification email link */