X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Froutes%2Fusers.js;h=129cda23b492a99d47d6ade4cd7f962ad285e149;hp=1d553dba74ecba1e247f273c88b0821fc5dda68a;hb=dac395887d96e2d642b209c6db6aaacc3ffacb34;hpb=5fde3a01497262862afc4cb4c9457d4e0ad69a4a diff --git a/server/routes/users.js b/server/routes/users.js index 1d553dba..129cda23 100644 --- a/server/routes/users.js +++ b/server/routes/users.js @@ -18,7 +18,7 @@ router.get("/whoami", access.ajax, (req,res) => { }); }; const anonymous = {name:"", email:"", id:0, notify:false}; - if (!req.cookies.token) + if (!req.cookies.token) return callback(anonymous); UserModel.getOne("sessionToken", req.cookies.token, function(err, user) { if (!!err || !user) @@ -41,101 +41,101 @@ router.get("/users", access.ajax, (req,res) => { // 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 + "!\\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 => { - res.json(err || {}); - }); - }); + // 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 + "!\\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 => { + res.json(err || {}); + }); + }); } 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); - }); + 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); - }); - }); + 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); + }); + }); }); router.get('/authenticate', access.unlogged, access.ajax, (req,res) => { UserModel.getOne("loginToken", req.query.token, (err,user) => { - access.checkRequest(res, err, user, "Invalid token", () => { + 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 + 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({ + 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()} : {}); - }); + 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({}); + res.clearCookie("token"); + res.json({}); }); module.exports = router;