Sfoglia il codice sorgente

Log user in automatically when they click "log in" and are already in session.
Bug fix: when logging out, session was set to null. Should be set to undefined.

Lee Morgan 5 anni fa
parent
commit
a8f2fafee4
3 ha cambiato i file con 4 aggiunte e 2 eliminazioni
  1. 1 1
      controllers/otherData.js
  2. 2 1
      controllers/renderer.js
  3. 1 0
      middleware.js

+ 1 - 1
controllers/otherData.js

@@ -41,7 +41,7 @@ module.exports = {
     Redirects to /
     */
     logout: function(req, res){
-        req.session.user = null;
+        req.session.user = undefined;
 
         return res.redirect("/");
     }

+ 2 - 1
controllers/renderer.js

@@ -14,7 +14,8 @@ module.exports = {
     },
 
     //GET: Renders the login page
-    loginPage: function(req, res){  
+    loginPage: function(req, res){
+        if(req.session.user !== undefined) return res.redirect("/dashboard");
         return res.render("otherPages/login", {banner: res.locals.banner});
     },
 

+ 1 - 0
middleware.js

@@ -29,6 +29,7 @@ module.exports = {
             })
             .catch((err)=>{
                 if(err === "no merchant"){
+                    req.session.user = undefined;
                     req.session.error = "PLEASE LOG IN";
                     return res.redirect("/login");
                 }