From ef1b411c12661d14fed7f478eb7152d732d5fbf7 Mon Sep 17 00:00:00 2001
From: quoije <mathieumoran1@gmail.com>
Date: Wed, 10 May 2023 16:53:51 -0400
Subject: [PATCH] signin/signup is now working. no checks tho

---
 app/controllers/auth.controller.js |   4 +-
 app/controllers/user.controller.js |   2 +-
 app/middlewares/authJwt.js         |   1 +
 public/assets/js/site.js           | 104 ++++++++++++++++-------------
 server.js                          |   2 -
 5 files changed, 60 insertions(+), 53 deletions(-)

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 = "<div id='logininput' class='typebox field-row-stacked' >"+
+      "<input id='user' type='text' placeholder='nom d" + "&#39;" + "utilisateur'/>"+
+      "<input id='pass' type='password' placeholder='mot de passe'/></div>"+
+      "<div id='reg_status'></div><div><button class='bjbuttons' onclick='checkLogin("+'"'+'l'+'"'+")'>se connecter</button>"+
+      "<button class='bjbuttons' onclick='logout()'>logout</button></div>" 
+    }
+    else
+    {
+      document.getElementById("tab2bj").disabled = true;
+      mainbj.innerHTML = "<div id='logininput' class='typebox field-row-stacked' >"+
+      "<div id='reg_status'>bienvenue "+ parseJwt(Cookies.get("x-access-token")).username +
+      "</div><div><button class='bjbuttons' disabled>se connecter</button>"+
+      "<button class='bjbuttons' onclick='logout()'>logout</button></div>" 
+    }
+  }
+
+  function registerTab(){
+    console.log("registerTab");
+    tab1bj.setAttribute("aria-selected", "false");
+    tab2bj.setAttribute("aria-selected", "true");
+    mainbj.innerHTML = "<div id='logininput' class='typebox field-row-stacked'>"+
+    "<input id='reg_user' type='text' placeholder='nom d" + "&#39;" + "utilisateur'/>"+
+    "<input id='reg_pass' type='password' placeholder='mot de passe'/>"+
+    "<input id='reg_conf_pass' type='password' placeholder='confirmer mot de passe'/>"+
+    "<input id='reg_email' type='text' placeholder='email'/></div><div id='reg_status'></div><div id='bjbuttons'>"+
+    "<button onclick='checkLogin("+'"'+'s'+'"'+")'>s'enregistrer</button></div>"
   }
 
   // player things
@@ -401,41 +444,6 @@ jQuery(function($) {
     return JSON.parse(jsonPayload);
 }
 
-  function loginTab(){  
-    console.log("loginTab");
-    tab1bj.setAttribute("aria-selected", "true");
-    tab2bj.setAttribute("aria-selected", "false");
-    let token = Cookies.get("x-access-token");
-    if (!token || token == "null" || token == "undefined")
-    {
-      mainbj.innerHTML = "<div id='logininput' class='typebox field-row-stacked' >"+
-      "<input id='user' type='text' placeholder='nom d" + "&#39;" + "utilisateur'/>"+
-      "<input id='pass' type='password' placeholder='mot de passe'/></div>"+
-      "<div id='reg_status'></div><div><button class='bjbuttons' onclick='checkLogin("+'"'+'l'+'"'+")'>se connecter</button>"+
-      "<button class='bjbuttons' onclick='logout()'>logout</button></div>" 
-    }
-    else
-    {
-      document.getElementById("tab2bj").remove();
-      mainbj.innerHTML = "<div id='logininput' class='typebox field-row-stacked' >"+
-      "<div id='reg_status'>bienvenue "+ parseJwt(Cookies.get("x-access-token")).id +
-      "</div><div><button class='bjbuttons' disabled>se connecter</button>"+
-      "<button class='bjbuttons' onclick='logout()'>logout</button></div>" 
-    }
-  }
-
-  function registerTab(){
-    console.log("registerTab");
-    tab1bj.setAttribute("aria-selected", "false");
-    tab2bj.setAttribute("aria-selected", "true");
-    mainbj.innerHTML = "<div id='logininput' class='typebox field-row-stacked'>"+
-    "<input id='reg_user' type='text' placeholder='nom d" + "&#39;" + "utilisateur'/>"+
-    "<input id='reg_pass' type='password' placeholder='mot de passe'/>"+
-    "<input id='reg_conf_pass' type='password' placeholder='confirmer mot de passe'/>"+
-    "<input id='reg_email' type='text' placeholder='email'/></div><div id='reg_status'></div><div id='bjbuttons'>"+
-    "<button onclick='checkLogin("+'"'+'s'+'"'+")'>s'enregistrer</button></div>"
-  }
-
   // other scripts
 
   function connOOF() {
diff --git a/server.js b/server.js
index eb44dac..b3de24c 100644
--- a/server.js
+++ b/server.js
@@ -17,8 +17,6 @@ app.use(express.json());
 // parse requests of content-type - application/x-www-form-urlencoded
 app.use(express.urlencoded({ extended: true }));
 app.use(express.static('public'));
-var cookieParser = require('cookie-parser');
-app.use(cookieParser());
 
 // simple route
 //app.get("/getd", (req, res) => {