X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Futils%2Faccess.js;fp=server%2Futils%2Faccess.js;h=049e9eb6fc7392110e83a472cb4ab0f2ae0fa82b;hb=866842c3c310524c034922870234120ed2a16cbf;hp=d51c4b77c6b673780810ee7d71448c342871ff9e;hpb=8477e53d8e78606e4c4e4bf91c77b1011aab583c;p=vchess.git

diff --git a/server/utils/access.js b/server/utils/access.js
index d51c4b77..049e9eb6 100644
--- a/server/utils/access.js
+++ b/server/utils/access.js
@@ -6,8 +6,8 @@ module.exports =
   logged: function(req, res, next) {
     const callback = () => {
       if (!loggedIn)
-        return res.json({errmsg: "Not logged in"});
-      next();
+        res.json({errmsg: "Not logged in"});
+      else next();
     };
     let loggedIn = undefined;
     if (!req.cookies.token)
@@ -40,27 +40,27 @@ module.exports =
     // Just a quick heuristic, which should be enough
     const loggedIn = !!req.cookies.token;
     if (loggedIn)
-      return res.json({errmsg: "Already logged in"});
-    next();
+      res.json({errmsg: "Already logged in"});
+    else next();
   },
 
   // Prevent direct access to AJAX results
   ajax: function(req, res, next) {
     if (!req.xhr)
-      return res.json({errmsg: "Unauthorized access"});
-    next();
+      res.json({errmsg: "Unauthorized access"});
+    else next();
   },
 
   // Check for errors before callback (continue page loading). TODO: better name.
   checkRequest: function(res, err, out, msg, cb) {
-    if (!!err)
-      return res.json({errmsg: err.errmsg || err.toString()});
-    if (!out
+    if (err)
+      res.json({errmsg: err.errmsg || err.toString()});
+    else if (!out
       || (Array.isArray(out) && out.length == 0)
       || (typeof out === "object" && Object.keys(out).length == 0))
     {
-      return res.json({errmsg: msg});
+      res.json({errmsg: msg});
     }
-    cb();
+    else cb();
   },
 }