From b32e2102acdd6385297cd8eb44cd1eb89647ea59 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <me@raisedadead.com>
Date: Fri, 16 Dec 2016 10:35:38 +0530
Subject: [PATCH] Remove reset-password logic

---
 common/models/user.js            |  3 ++
 server/boot/user.js              | 73 +-------------------------------
 server/views/account/forgot.jade | 14 ------
 server/views/account/reset.jade  | 17 --------
 4 files changed, 4 insertions(+), 103 deletions(-)
 delete mode 100644 server/views/account/forgot.jade
 delete mode 100644 server/views/account/reset.jade

diff --git a/common/models/user.js b/common/models/user.js
index b92b766f74..3fe90c9a02 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -355,6 +355,7 @@ module.exports = function(User) {
       });
   });
 
+<<<<<<< HEAD
   User.on('resetPasswordRequest', function(info) {
     if (!isEmail(info.email)) {
       console.error(createEmailError());
@@ -398,6 +399,8 @@ module.exports = function(User) {
     });
   });
 
+=======
+>>>>>>> Remove reset-password logic
   User.beforeRemote('login', function(ctx, notUsed, next) {
     const { body } = ctx.req;
     if (body && typeof body.email === 'string') {
diff --git a/server/boot/user.js b/server/boot/user.js
index 11f1fdf671..f27762b893 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -174,10 +174,6 @@ module.exports = function(app) {
   router.get('/signup', getSignin);
   router.get('/signin', getSignin);
   router.get('/signout', signout);
-  router.get('/forgot', getForgot);
-  api.post('/forgot', postForgot);
-  router.get('/reset-password', getReset);
-  api.post('/reset-password', postReset);
   router.get('/email-signin', getEmailSignin);
   router.get('/deprecated-signin', getDepSignin);
   router.get('/update-email', getUpdateEmail);
@@ -749,74 +745,6 @@ module.exports = function(app) {
     });
   }
 
-  function getReset(req, res) {
-    if (!req.accessToken) {
-      req.flash('errors', { msg: 'access token invalid' });
-      return res.render('account/forgot');
-    }
-    return res.render('account/reset', {
-      title: 'Reset your Password',
-      accessToken: req.accessToken.id
-    });
-  }
-
-  function postReset(req, res, next) {
-    const errors = req.validationErrors();
-    const { password } = req.body;
-
-    if (errors) {
-      req.flash('errors', errors);
-      return res.redirect('back');
-    }
-
-    return User.findById(req.accessToken.userId, function(err, user) {
-      if (err) { return next(err); }
-      return user.updateAttribute('password', password, function(err) {
-        if (err) { return next(err); }
-
-        debug('password reset processed successfully');
-        req.flash('info', { msg: 'You\'ve successfully reset your password.' });
-        return res.redirect('/');
-      });
-    });
-  }
-
-  function getForgot(req, res) {
-    if (req.isAuthenticated()) {
-      return res.redirect('/');
-    }
-    return res.render('account/forgot', {
-      title: 'Forgot Password'
-    });
-  }
-
-  function postForgot(req, res) {
-    req.validate('email', 'Email format is not valid').isEmail();
-    const errors = req.validationErrors();
-    const email = req.body.email.toLowerCase();
-
-    if (errors) {
-      req.flash('errors', errors);
-      return res.redirect('/forgot');
-    }
-
-    return User.resetPassword({
-      email: email
-    }, function(err) {
-      if (err) {
-        req.flash('errors', err.message);
-        return res.redirect('/forgot');
-      }
-
-      req.flash('info', {
-        msg: 'An e-mail has been sent to ' +
-        email +
-        ' with further instructions.'
-      });
-      return res.render('account/forgot');
-    });
-  }
-
   function getReportUserProfile(req, res) {
     const username = req.params.username.toLowerCase();
     return res.render('account/report-profile', {
@@ -867,4 +795,5 @@ module.exports = function(app) {
       return res.redirect('/');
     });
   }
+
 };
diff --git a/server/views/account/forgot.jade b/server/views/account/forgot.jade
deleted file mode 100644
index 4b1e94c606..0000000000
--- a/server/views/account/forgot.jade
+++ /dev/null
@@ -1,14 +0,0 @@
-extends ../layout
-block content
-    .col-sm-6.col-sm-offset-3
-      form(method='POST', action="/forgot")
-        h2.text-center Forgot Password Reset
-        input(type='hidden', name='_csrf', value=_csrf)
-        .form-group
-          p.large-p Enter your email address. We'll send you password reset instructions.
-          input.form-control.input-lg(type='email', name='email', id='email', placeholder='Email', autofocus=true required)
-        .form-group
-          button.btn.btn-primary.btn-lg.btn-block(type='submit')
-            i.fa.fa-key
-            | Reset Password
-
diff --git a/server/views/account/reset.jade b/server/views/account/reset.jade
deleted file mode 100644
index c82eeb1cca..0000000000
--- a/server/views/account/reset.jade
+++ /dev/null
@@ -1,17 +0,0 @@
-extends ../layout
-
-block content
-  .col-sm-8.col-sm-offset-2.jumbotron
-    form(action='/reset-password?access_token=#{accessToken}', method='POST')
-      h1 Reset Password
-      input(type='hidden', name='_csrf', value=_csrf)
-      .form-group
-        label(for='password') New Password
-        input.form-control(type='password', name='password', value='', placeholder='New password', autofocus=true)
-      .form-group
-        label(for='confirm') Confirm Password
-        input.form-control(type='password', name='confirm', value='', placeholder='Confirm password')
-      .form-group
-        button.btn.btn-primary.btn-reset(type='submit')
-          i.fa.fa-keyboard-o
-          | Change Password