From f7245f32d022606fdd125cc4a1ebca0ea9e2e354 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 15 May 2014 18:01:43 +0100 Subject: [PATCH] cleaned up old password reset cruft --- .../Features/User/UserController.coffee | 34 +------------------ .../Features/User/UserPagesController.coffee | 6 ---- .../User/UserPagesControllerTests.coffee | 8 ----- 3 files changed, 1 insertion(+), 47 deletions(-) diff --git a/services/web/app/coffee/Features/User/UserController.coffee b/services/web/app/coffee/Features/User/UserController.coffee index 4181e473f9..2a465b3e7b 100644 --- a/services/web/app/coffee/Features/User/UserController.coffee +++ b/services/web/app/coffee/Features/User/UserController.coffee @@ -100,36 +100,4 @@ module.exports = res.send message: type:'error' - text:'Your old password is wrong' - - - doRequestPasswordReset : (req, res, next = (error) ->)-> - uuid = require("node-uuid") - EmailHandler = require("../Email/EmailHandler") - email = sanitize.escape(req.body.email) - email = sanitize.escape(email).trim() - email = email.toLowerCase() - logger.log email: email, "password reset requested" - User.findOne {'email':email}, (err, user)-> - if(user?) - randomPassword = uuid.v4() - AuthenticationManager.setUserPassword user._id, randomPassword, (error) -> - if err? - logger.err err:err, email:email, user_id:user._id, "problem reseting user password" - return res.send 500 - emailOpts = - newPassword: randomPassword - to: user.email - EmailHandler.sendEmail "passwordReset", emailOpts, (err)-> - if err? - logger.err err:err, emailOpts:emailOpts, "problem sending password reset email" - return res.send 500 - metrics.inc "user.password-reset" - res.send message: - text:'An email with your new password has been sent to you' - type:'success' - else - res.send message: - text:'This email address has not been registered with us' - type:'failure' - logger.info email: email, "no user found with email" \ No newline at end of file + text:'Your old password is wrong' \ No newline at end of file diff --git a/services/web/app/coffee/Features/User/UserPagesController.coffee b/services/web/app/coffee/Features/User/UserPagesController.coffee index a79bb1df06..18df005320 100644 --- a/services/web/app/coffee/Features/User/UserPagesController.coffee +++ b/services/web/app/coffee/Features/User/UserPagesController.coffee @@ -27,12 +27,6 @@ module.exports = title: 'Login', redir: req.query.redir - passwordResetPage : (req, res)-> - res.render 'user/passwordReset', - title: 'Password Reset' - - - settingsPage : (req, res)-> logger.log user: req.session.user, "loading settings page" UserLocator.findById req.session.user._id, (err, user)-> diff --git a/services/web/test/UnitTests/coffee/User/UserPagesControllerTests.coffee b/services/web/test/UnitTests/coffee/User/UserPagesControllerTests.coffee index 5a0b2789f5..a65be3e777 100644 --- a/services/web/test/UnitTests/coffee/User/UserPagesControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/User/UserPagesControllerTests.coffee @@ -90,14 +90,6 @@ describe "UserPagesController", -> done() @UserPagesController.loginPage @req, @res - describe "passwordResetPage", -> - - it "should render the login page", (done)-> - @res.render = (page)=> - page.should.equal "user/passwordReset" - done() - @UserPagesController.passwordResetPage @req, @res - describe "settingsPage", ->