From e5386c41ee653621c6c71b3c5bfe6ddfc6a1610b Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 12 Nov 2015 15:40:44 -0800 Subject: [PATCH] fixed password reset bug --- .../users/users.password.server.controller.js | 6 +++--- app/routes/users.server.routes.js | 4 ++-- app/views/layout.server.view.html | 2 +- public/application.js | 2 +- public/modules/core/views/home.client.view.html | 2 +- .../modules/users/config/users.client.routes.js | 8 ++++---- .../controllers/password.client.controller.js | 2 -- .../users/services/user.client.service.js | 16 ++-------------- .../views/authentication/signin.client.view.html | 4 ++-- .../views/authentication/signup.client.view.html | 4 ++-- .../reset-password-invalid.client.view.html | 2 +- 11 files changed, 19 insertions(+), 33 deletions(-) diff --git a/app/controllers/users/users.password.server.controller.js b/app/controllers/users/users.password.server.controller.js index 8b70d664..e246baed 100755 --- a/app/controllers/users/users.password.server.controller.js +++ b/app/controllers/users/users.password.server.controller.js @@ -60,7 +60,7 @@ exports.forgot = function(req, res, next) { res.render('templates/reset-password-email', { name: user.displayName, appName: config.app.title, - url: req.protocol+'://' + req.headers.host + '/#!/auth/reset/' + token + url: 'http://' + req.headers.host + '/auth/reset/' + token }, function(err, emailHTML) { done(err, emailHTML, user); }); @@ -103,10 +103,10 @@ exports.validateResetToken = function(req, res) { } }, function(err, user) { if (!user) { - return res.redirect('/#!/auth/reset/invalid'); + return res.redirect('/#!/password/reset/invalid'); } - res.redirect('/#!/auth/reset/' + req.params.token); + res.redirect('/#!/password/reset/' + req.params.token); }); }; diff --git a/app/routes/users.server.routes.js b/app/routes/users.server.routes.js index 18c77072..c459a8c5 100755 --- a/app/routes/users.server.routes.js +++ b/app/routes/users.server.routes.js @@ -21,8 +21,8 @@ module.exports = function(app) { // Setting up the users password api app.route('/users/password').post(users.requiresLogin, users.changePassword); app.route('/auth/forgot').post(users.forgot); - app.route('/auth/password/:token').get(users.validateResetToken); - app.route('/auth/password/:token').post(users.reset); + app.route('/auth/reset/:token').get(users.validateResetToken); + app.route('/auth/reset/:token').post(users.reset); // Setting up the users authentication api app.route('/auth/signup').post(users.signup); diff --git a/app/views/layout.server.view.html b/app/views/layout.server.view.html index 82c435e1..f7e49c51 100755 --- a/app/views/layout.server.view.html +++ b/app/views/layout.server.view.html @@ -61,7 +61,7 @@ -