Fix Koopa chess + select only required fields in userMode.getOne()

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

diff --git a/server/utils/access.js b/server/utils/access.js
index 732353f..bf6430c 100644 (file)
--- a/server/utils/access.js
+++ b/server/utils/access.js
@@ -1,12 +1,11 @@
 var UserModel = require("../models/User");
 
-module.exports =
-{
+module.exports = {
   // Prevent access to "users pages"
   logged: function(req, res, next) {
     const callback = () => {
       if (!loggedIn)
-        res.json({errmsg: "Error: try to delete cookies"});
+        res.json({ errmsg: "Error: try to delete cookies" });
       else next();
     };
     let loggedIn = undefined;
@@ -14,18 +13,20 @@ module.exports =
       loggedIn = false;
       callback();
     } else {
-      UserModel.getOne("sessionToken", req.cookies.token, function(err, user) {
-        if (!!user) {
-          req.userId = user.id;
-          req.userName = user.name;
-          loggedIn = true;
-        } else {
-          // Token in cookies presumably wrong: erase it
-          res.clearCookie("token");
-          loggedIn = false;
+      UserModel.getOne(
+        "sessionToken", req.cookies.token, "id",
+        (err, user) => {
+          if (!!user) {
+            req.userId = user.id;
+            loggedIn = true;
+          } else {
+            // Token in cookies presumably wrong: erase it
+            res.clearCookie("token");
+            loggedIn = false;
+          }
+          callback();
         }
-        callback();
-      });
+      );
     }
   },
 
@@ -33,25 +34,25 @@ module.exports =
   unlogged: function(req, res, next) {
     // Just a quick heuristic, which should be enough
     const loggedIn = !!req.cookies.token;
-    if (loggedIn) res.json({errmsg: "Error: try to delete cookies"});
+    if (loggedIn) res.json({ errmsg: "Error: try to delete cookies" });
     else next();
   },
 
   // Prevent direct access to AJAX results
   ajax: function(req, res, next) {
-    if (!req.xhr) res.json({errmsg: "Unauthorized access"});
+    if (!req.xhr) res.json({ errmsg: "Unauthorized access" });
     else next();
   },
 
-  // Check for errors before callback (continue page loading). TODO: better name.
+  // Check for errors before callback (continue page loading). (TODO: name?)
   checkRequest: function(res, err, out, msg, cb) {
-    if (!!err) res.json({errmsg: err.errmsg || err.toString()});
+    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)
     ) {
-      res.json({errmsg: msg});
+      res.json({ errmsg: msg });
     } else cb();
   }
-}
+};