Fixes on login/logout + challenges sending

[vchess.git] / server / utils / access.js

diff --git a/server/utils/access.js b/server/utils/access.js
index 20f3f79..2e2fa92 100644 (file)
--- a/server/utils/access.js
+++ b/server/utils/access.js
@@ -6,7 +6,7 @@ module.exports =
        logged: function(req, res, next) {
                const callback = () => {
                        if (!loggedIn)
-                               return res.redirect("/");
+                               return res.json({errmsg: "Not logged in"});
                        next();
                };
                let loggedIn = undefined;
@@ -28,8 +28,6 @@ module.exports =
                                {
                                        // Token in cookies presumably wrong: erase it
                                        res.clearCookie("token");
-                                       res.clearCookie("id");
-                                       res.clearCookie("name");
                                        loggedIn = false;
                                }
                                callback();
@@ -42,13 +40,13 @@ module.exports =
                // Just a quick heuristic, which should be enough
                const loggedIn = !!req.cookies.token;
                if (loggedIn)
-                       return res.redirect("/");
+                       return res.json({errmsg: "Already logged in"});
                next();
        },
 
        // Prevent direct access to AJAX results
        ajax: function(req, res, next) {
-               if (!req.xhr)
+    if (!req.xhr)
                        return res.json({errmsg: "Unauthorized access"});
                next();
        },