IGNITE-843 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fc5b6ac0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fc5b6ac0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fc5b6ac0 Branch: refs/heads/ignite-843-rc3 Commit: fc5b6ac02d548fe71aac937bde4a91ee22ce30eb Parents: 7ca1712 Author: Andrey <[email protected]> Authored: Tue Feb 9 09:47:04 2016 +0700 Committer: Andrey <[email protected]> Committed: Tue Feb 9 09:47:04 2016 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/serve/config/default.json | 2 +- modules/control-center-web/src/main/js/serve/routes/public.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fc5b6ac0/modules/control-center-web/src/main/js/serve/config/default.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/serve/config/default.json b/modules/control-center-web/src/main/js/serve/config/default.json index 574d42a..3dcc5ca 100644 --- a/modules/control-center-web/src/main/js/serve/config/default.json +++ b/modules/control-center-web/src/main/js/serve/config/default.json @@ -19,7 +19,7 @@ }, "smtp": { "service": "", - "username": "", + "username": "Apache Ignite Web Console", "email": "", "password": "" } http://git-wip-us.apache.org/repos/asf/ignite/blob/fc5b6ac0/modules/control-center-web/src/main/js/serve/routes/public.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/serve/routes/public.js b/modules/control-center-web/src/main/js/serve/routes/public.js index 1aa9bc0..5d53639 100644 --- a/modules/control-center-web/src/main/js/serve/routes/public.js +++ b/modules/control-center-web/src/main/js/serve/routes/public.js @@ -138,15 +138,15 @@ module.exports.factory = function (express, passport, nodemailer, settings, mong if (!user) return res.status(401).send('No account with that email address exists!'); - if (err) // TODO IGNITE-843 Send email to admin + if (err) return res.status(401).send('Failed to reset password!'); user.resetPasswordToken = token; user.save(function (err) { - if (err) // TODO IGNITE-843 Send email to admin + if (err) return res.status(401).send('Failed to reset password!'); var mailer = nodemailer.createTransport(transporter); @@ -160,7 +160,7 @@ module.exports.factory = function (express, passport, nodemailer, settings, mong 'http://' + req.headers.host + '/password/reset?token=' + token + '\n\n' + 'If you did not request this, please ignore this email and your password will remain unchanged.\n\n' + '--------------\n' + - 'Apache Ignite Web Console\n' + settings.smtp.username + '\n' }; mailer.sendMail(mailOptions, function (err) {
