X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Froutes%2Fusers.js;h=f9f1d86f6c7b3d4743047498d0213b5f65da8cb1;hp=0302b1c05c96f1a8def94851748445eaeed20d0a;hb=866842c3c310524c034922870234120ed2a16cbf;hpb=8477e53d8e78606e4c4e4bf91c77b1011aab583c

diff --git a/server/routes/users.js b/server/routes/users.js
index 0302b1c0..f9f1d86f 100644
--- a/server/routes/users.js
+++ b/server/routes/users.js
@@ -1,5 +1,3 @@
-// AJAX methods to get, create, update or delete a user
-
 let router = require("express").Router();
 const UserModel = require('../models/User');
 const sendEmail = require('../utils/mailer');
@@ -7,10 +5,33 @@ const genToken = require("../utils/tokenGenerator");
 const access = require("../utils/access");
 const params = require("../config/parameters");
 
+router.post('/register', access.unlogged, access.ajax, (req,res) => {
+  const name = req.body.name;
+  const email = req.body.email;
+  const notify = !!req.body.notify;
+  if (UserModel.checkNameEmail({name: name, email: email}))
+  {
+    UserModel.create(name, email, notify, (err,ret) => {
+      if (err)
+        res.json({errmsg: "User creation failed. Try again"});
+      else
+      {
+        const user = {
+          id: ret.uid,
+          name: name,
+          email: email,
+        };
+        setAndSendLoginToken("Welcome to " + params.siteURL, user, res);
+        res.json({});
+      }
+    });
+  }
+});
+
 // NOTE: this method is safe because the sessionToken must be guessed
 router.get("/whoami", access.ajax, (req,res) => {
   const callback = (user) => {
-    return res.json({
+    res.json({
       name: user.name,
       email: user.email,
       id: user.id,
@@ -19,80 +40,72 @@ router.get("/whoami", access.ajax, (req,res) => {
   };
   const anonymous = {name:"", email:"", id:0, notify:false};
   if (!req.cookies.token)
-    return callback(anonymous);
-  if (!req.cookies.token.match(/^[a-z0-9]+$/))
-    return res.json({errmsg: "Bad token"});
-  UserModel.getOne("sessionToken", req.cookies.token, function(err, user) {
-    if (!!err || !user)
-      callback(anonymous);
-    else
-      callback(user);
-  });
+    callback(anonymous);
+  else if (req.cookies.token.match(/^[a-z0-9]+$/))
+  {
+    UserModel.getOne("sessionToken", req.cookies.token, (err, user) => {
+      callback(user || anonymous);
+    });
+  }
 });
 
 // NOTE: this method is safe because only IDs and names are returned
 router.get("/users", access.ajax, (req,res) => {
   const ids = req.query["ids"];
-  if (!!ids && !ids.match(/^([0-9]+,?)+$/)) //NOTE: slightly too permissive
-    return res.json({errmsg: "Bad IDs array"});
-  UserModel.getByIds(ids, (err,users) => {
-    if (!!err)
-      return res.json({errmsg: err.toString()});
-    return res.json({users:users});
-  });
+  if (ids.match(/^([0-9]+,?)+$/)) //NOTE: slightly too permissive
+  {
+    UserModel.getByIds(ids, (err,users) => {
+      res.json({users:users});
+    });
+  }
+});
+
+router.put('/update', access.logged, access.ajax, (req,res) => {
+  const name = req.body.name;
+  const email = req.body.email;
+  if (UserModel.checkNameEmail({name: name, email: email}));
+  {
+    const user = {
+      id: req.userId,
+      name: name,
+      email: email,
+      notify: !!req.body.notify,
+    };
+    UserModel.updateSettings(user);
+    res.json({});
+  }
 });
 
+// Authentication-related methods:
+
 // to: object user (to who we send an email)
 function setAndSendLoginToken(subject, to, res)
 {
   // Set login token and send welcome(back) email with auth link
   const token = genToken(params.token.length);
-  UserModel.setLoginToken(token, to.id, err => {
-    if (!!err)
-      return res.json({errmsg: err.toString()});
-    const body =
-      "Hello " + to.name + "!" + `
+  UserModel.setLoginToken(token, to.id);
+  const body =
+    "Hello " + to.name + "!" + `
 ` +
-      "Access your account here: " +
-      params.siteURL + "/#/authenticate/" + token + `
+    "Access your account here: " +
+    params.siteURL + "/#/authenticate/" + token + `
 ` +
-      "Token will expire in " + params.token.expire/(1000*60) + " minutes."
-    sendEmail(params.mail.noreply, to.email, subject, body, err => {
-      res.json(err || {});
-    });
-  });
+    "Token will expire in " + params.token.expire/(1000*60) + " minutes."
+  sendEmail(params.mail.noreply, to.email, subject, body);
 }
 
-router.post('/register', access.unlogged, access.ajax, (req,res) => {
-  const name = req.body.name;
-  const email = req.body.email;
-  const notify = !!req.body.notify;
-  const error = UserModel.checkNameEmail({name: name, email: email});
-  if (!!error)
-    return res.json({errmsg: error});
-  UserModel.create(name, email, notify, (err,uid) => {
-    if (!!err)
-      return res.json({errmsg: err.toString()});
-    const user = {
-      id: uid["rowid"],
-      name: name,
-      email: email,
-    };
-    setAndSendLoginToken("Welcome to " + params.siteURL, user, res);
-  });
-});
-
 router.get('/sendtoken', access.unlogged, access.ajax, (req,res) => {
   const nameOrEmail = decodeURIComponent(req.query.nameOrEmail);
   const type = (nameOrEmail.indexOf('@') >= 0 ? "email" : "name");
-  const error = UserModel.checkNameEmail({[type]: nameOrEmail});
-  if (!!error)
-    return res.json({errmsg: error});
-  UserModel.getOne(type, nameOrEmail, (err,user) => {
-    access.checkRequest(res, err, user, "Unknown user", () => {
-      setAndSendLoginToken("Token for " + params.siteURL, user, res);
+  if (UserModel.checkNameEmail({[type]: nameOrEmail}))
+  {
+    UserModel.getOne(type, nameOrEmail, (err,user) => {
+      access.checkRequest(res, err, user, "Unknown user", () => {
+        setAndSendLoginToken("Token for " + params.siteURL, user, res);
+        res.json({});
+      });
     });
-  });
+  }
 });
 
 router.get('/authenticate', access.unlogged, access.ajax, (req,res) => {
@@ -102,45 +115,28 @@ router.get('/authenticate', access.unlogged, access.ajax, (req,res) => {
     access.checkRequest(res, err, user, "Invalid token", () => {
       // 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
-      UserModel.trySetSessionToken(user.id, (err,token) => {
-        if (!!err)
-          return res.json({errmsg: err.toString()});
-        // Set cookie
-        res.cookie("token", token, {
-          httpOnly: true,
-          secure: !!params.siteURL.match(/^https/),
-          maxAge: params.cookieExpire,
-        });
-        res.json({
-          id: user.id,
-          name: user.name,
-          email: user.email,
-          notify: user.notify,
+        res.json({errmsg: "Token expired"});
+      else
+      {
+        // Generate session token (if not exists) + destroy login token
+        UserModel.trySetSessionToken(user.id, (token) => {
+          res.cookie("token", token, {
+            httpOnly: true,
+            secure: !!params.siteURL.match(/^https/),
+            maxAge: params.cookieExpire,
+          });
+          res.json({
+            id: user.id,
+            name: user.name,
+            email: user.email,
+            notify: user.notify,
+          });
         });
-      });
+      }
     });
   });
 });
 
-router.put('/update', access.logged, access.ajax, (req,res) => {
-  const name = req.body.name;
-  const email = req.body.email;
-  const error = UserModel.checkNameEmail({name: name, email: email});
-  if (!!error)
-    return res.json({errmsg: error});
-  const user = {
-    id: req.userId,
-    name: name,
-    email: email,
-    notify: !!req.body.notify,
-  };
-  UserModel.updateSettings(user, err => {
-    res.json(err ? {errmsg: err.toString()} : {});
-  });
-});
-
 router.get('/logout', access.logged, access.ajax, (req,res) => {
   res.clearCookie("token");
   res.json({});