From 1022d9da869ea4eed6eaf83714c9898e0af58370 Mon Sep 17 00:00:00 2001 From: William Mantly Date: Wed, 28 Apr 2021 12:52:59 -0400 Subject: [PATCH 1/2] name error fixed --- nodejs/routes/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs/routes/index.js b/nodejs/routes/index.js index 3660594..410c6f1 100755 --- a/nodejs/routes/index.js +++ b/nodejs/routes/index.js @@ -36,7 +36,7 @@ router.get('/login/resetpassword/:token', async function(req, res, next){ let token = await PasswordResetToken.get(req.params.token); if(token.is_valid && 86400000+Number(token.created_on) > (new Date).getTime()){ - res.render('reset_password', {token:token}); + res.render('reset_password', {token:token, name: conf.name }); }else{ next({message: 'token not found', status: 404}); } @@ -46,10 +46,10 @@ router.get('/login/invite/:token/:mailToken', async function(req, res, next){ try{ let token = await InviteToken.get(req.params.token); - +, name: conf.name if(token.is_valid && token.mail !== '__NONE__' && token.mail_token === req.params.mailToken){ token.created_on = moment(token.created_on, 'x').fromNow(); - res.render('invite', { title: 'Express', invite: token }); + res.render('invite', { title: 'Express', invite: token, name: conf.name }); }else{ next({message: 'token not found', status: 404}); } @@ -64,7 +64,7 @@ router.get('/login/invite/:token', async function(req, res, next){ token.created_on = moment(token.created_on, 'x').fromNow(); if(token.is_valid){ - res.render('invite_email', { title: 'Express', invite: token }); + res.render('invite_email', { title: 'Express', invite: token, name: conf.name }); }else{ next({message: 'token not found', status: 404}); } From 2654c31f68a6835e06566c3f9d220f062a1c99fb Mon Sep 17 00:00:00 2001 From: William Mantly Date: Wed, 28 Apr 2021 12:55:36 -0400 Subject: [PATCH 2/2] name error fixed --- nodejs/routes/index.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nodejs/routes/index.js b/nodejs/routes/index.js index 410c6f1..8db4456 100755 --- a/nodejs/routes/index.js +++ b/nodejs/routes/index.js @@ -45,11 +45,10 @@ router.get('/login/resetpassword/:token', async function(req, res, next){ router.get('/login/invite/:token/:mailToken', async function(req, res, next){ try{ - let token = await InviteToken.get(req.params.token); -, name: conf.name + let token = await InviteToken.get(req.params.token); if(token.is_valid && token.mail !== '__NONE__' && token.mail_token === req.params.mailToken){ token.created_on = moment(token.created_on, 'x').fromNow(); - res.render('invite', { title: 'Express', invite: token, name: conf.name }); + res.render('invite', { title: 'Express', invite: token, name: conf.name }); }else{ next({message: 'token not found', status: 404}); } @@ -64,7 +63,7 @@ router.get('/login/invite/:token', async function(req, res, next){ token.created_on = moment(token.created_on, 'x').fromNow(); if(token.is_valid){ - res.render('invite_email', { title: 'Express', invite: token, name: conf.name }); + res.render('invite_email', { title: 'Express', invite: token, name: conf.name }); }else{ next({message: 'token not found', status: 404}); }