diff --git a/app/controllers/auth.controller.js b/app/controllers/auth.controller.js index d5a76af..24e1148 100644 --- a/app/controllers/auth.controller.js +++ b/app/controllers/auth.controller.js @@ -55,7 +55,7 @@ exports.signup = (req, res) => { return; } - res.send({ message: "l'utilisateur à été créé avec succès" }); + res.send({ message: "l'utilisateur à été créé avec succès. vous pouvez maintenant vous identifiez" }); }); }); } @@ -89,7 +89,7 @@ exports.signin = (req, res) => { }); } - var token = jwt.sign({ id: user.id }, config.secret, { + var token = jwt.sign({ id: user.id, name: user.username }, config.secret, { expiresIn: 86400 // 24 hours }); diff --git a/app/controllers/user.controller.js b/app/controllers/user.controller.js index 9fc2e39..b7a439c 100644 --- a/app/controllers/user.controller.js +++ b/app/controllers/user.controller.js @@ -3,7 +3,7 @@ exports.allAccess = (req, res) => { }; exports.userBoard = (req, res) => { - res.status(200).send({ message: "bienvenue "+req.userId }); + res.status(200).send({ message: "bienvenue "+req.userName }); console.log(req.userId); }; diff --git a/app/middlewares/authJwt.js b/app/middlewares/authJwt.js index c2a8fc8..422e297 100644 --- a/app/middlewares/authJwt.js +++ b/app/middlewares/authJwt.js @@ -16,6 +16,7 @@ verifyToken = (req, res, next) => { return res.status(401).send({ message: "non autorisé lol" }); } req.userId = decoded.id; + req.userName = decoded.name; next(); }); }; diff --git a/public/assets/js/site.js b/public/assets/js/site.js index f596ebe..3ae4535 100644 --- a/public/assets/js/site.js +++ b/public/assets/js/site.js @@ -249,13 +249,14 @@ jQuery(function($) { Cookies.remove("lastep-time"); } - // connexion shizzle + /// connexion shizzle let wrongpass; function logout(){ Cookies.remove("x-access-token"); - connOOF(); + document.getElementById("tab2bj").disabled = false; + loginTab(); } function checkLoggedin(){ @@ -280,19 +281,10 @@ jQuery(function($) { function checkLogin(value){ - function checkRegPass(s1,s2){ - if (s1==s2){ - return s1 - } - else { - return false - } - } - if (value == 'l') { let user = document.querySelector("#mainbj #user").value;; let pass = document.querySelector("#mainbj #pass").value; - body ='{"username": "'+ user +'","password": "'+ pass +'"}'; + body = JSON.stringify({"username": user, "password": pass}); var url = "/api/auth/signin"; var params = body; @@ -305,7 +297,10 @@ jQuery(function($) { console.log(data.message) document.cookie = "x-access-token="+data.accessToken; document.querySelector("#mainbj #reg_status").innerHTML = data.message - setTimeout(() => { $('[href="#ep"]').tab('show'); }, 2000); + console.log(xhr.status) + if (xhr.status == 200){ + setTimeout(() => { loginTab(); }, 2000); + } } } @@ -331,6 +326,9 @@ jQuery(function($) { const data = JSON.parse(xhr.responseText) console.log(data.message) document.querySelector("#mainbj #reg_status").innerHTML = data.message + if (xhr.status == 200){ + setTimeout(() => { loginTab(); }, 2000); + } } } else @@ -339,6 +337,51 @@ jQuery(function($) { document.querySelector("#mainbj #reg_status").innerHTML = "les mots de passes ne correspondent pas" } } + + function checkRegPass(s1,s2){ + if (s1==s2){ + return s1 + } + else { + return false + } + } + } + + function loginTab(){ + console.log("loginTab"); + tab1bj.setAttribute("aria-selected", "true"); + tab2bj.setAttribute("aria-selected", "false"); + let token = Cookies.get("x-access-token"); + checkLoggedin() + if (!token || token == "null" || token == "undefined") + { + mainbj.innerHTML = "