X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Froutes%2Fusers.js;h=5b04ddd191c21b1604c9edca0dd72da4e044011f;hb=ed9c9c3741ec8b03cf899eae529216a2520bba0d;hp=ebbfa1e6228910d406416b6767fc271cfd62598b;hpb=1aeed627be63a298d3a093797c3728e3de30b464;p=vchess.git

diff --git a/server/routes/users.js b/server/routes/users.js
index ebbfa1e6..5b04ddd1 100644
--- a/server/routes/users.js
+++ b/server/routes/users.js
@@ -7,6 +7,35 @@ var genToken = require("../utils/tokenGenerator");
 var access = require("../utils/access");
 var params = require("../config/parameters");
 
+router.get("/whoami", access.ajax, (req,res) => {
+  const callback = (user) => {
+    return res.json({
+      name: user.name,
+      email: user.email,
+      id: user.id,
+      notify: user.notify,
+    });
+  };
+  const anonymous = {name:"", email:"", id:0, notify:false};
+	if (!req.cookies.token)
+    return callback(anonymous);
+  UserModel.getOne("sessionToken", req.cookies.token, function(err, user) {
+    if (!!err || !user)
+      callback(anonymous);
+    else (!!user)
+      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)
 {
@@ -21,9 +50,7 @@ function setAndSendLoginToken(subject, to, res)
 			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 || {});
 		});
 	});
 }
@@ -63,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
@@ -71,12 +98,17 @@ router.get('/authenticate', access.unlogged, access.ajax, (req,res) => {
 				if (!!err)
 					return res.json({errmsg: err.toString()});
 				// Set cookie
-				res.cookie("token", token, {
+        res.cookie("token", token, {
 					httpOnly: true,
 					secure: !!params.siteURL.match(/^https/),
 					maxAge: params.cookieExpire,
 				});
-				res.json({name:user.name, id:user.id});
+				res.json({
+          id: user.id,
+          name: user.name,
+          email: user.email,
+          notify: user.notify,
+        });
 			});
 		});
 	});