MoveList working. TODO: Chat

[vchess.git] / server / routes / users.js

diff --git a/server/routes/users.js b/server/routes/users.js
index 4b142d7..163dc30 100644 (file)
--- a/server/routes/users.js
+++ b/server/routes/users.js
@@ -17,17 +17,25 @@ router.get("/whoami", access.ajax, (req,res) => {
     });
   };
   const anonymous = {name:"", email:"", id:0, notify:false};
-  console.log(req.cookies); //TODO: cookie not found after authenticate ?
        if (!req.cookies.token)
     return callback(anonymous);
   UserModel.getOne("sessionToken", req.cookies.token, function(err, user) {
     if (!!err || !user)
       callback(anonymous);
-    else (!!user)
+    else
       callback(user);
   });
 });
 
+router.get("/users", access.ajax, (req,res) => {
+  const ids = req.query["ids"];
+  UserModel.getByIds(ids, (err,users) => {
+    if (!!err)
+      return res.json({errmsg: err.toString()});
+    return res.json({users:users});
+  });
+});
+
 // to: object user (to who we send an email)
 function setAndSendLoginToken(subject, to, res)
 {
@@ -37,14 +45,12 @@ function setAndSendLoginToken(subject, to, res)
                if (!!err)
                        return res.json({errmsg: err.toString()});
                const body =
-                       "Hello " + to.name + "!\n" +
+                       "Hello " + to.name + "!\\n" +
                        "Access your account here: " +
                        params.siteURL + "/#/authenticate/" + token + "\\n" +
                        "Token will expire in " + params.token.expire/(1000*60) + " minutes."
                sendEmail(params.mail.noreply, to.email, subject, body, err => {
-      // "id" is generally the only info missing on client side,
-                       // but the name is also unknown if log-in with the email.
-                       res.json(err || {id: to.id, name: to.name});
+                       res.json(err || {});
                });
        });
 }
@@ -84,7 +90,7 @@ router.get('/sendtoken', access.unlogged, access.ajax, (req,res) => {
 router.get('/authenticate', access.unlogged, access.ajax, (req,res) => {
   UserModel.getOne("loginToken", req.query.token, (err,user) => {
                access.checkRequest(res, err, user, "Invalid token", () => {
-                       // If token older than params.tokenExpire, do nothing
+      // If token older than params.tokenExpire, do nothing
                        if (Date.now() > user.loginTime + params.token.expire)
                                return res.json({errmsg: "Token expired"});
                        // Generate session token (if not exists) + destroy login token