Update error flash message, redirect to /forgot if no reset token is found or if it has expired

controllers/reset.js

@@ -1,22 +1,16 @@
-'use strict';
-
-/**
- * Module Dependencies
- */
-
 var bcrypt = require('bcrypt-nodejs');
-var mongoose      = require('mongoose');
-var nodemailer    = require("nodemailer");
+var nodemailer = require('nodemailer');
 var User = require('../models/User');
-var secrets       = require('../config/secrets');
 
 /**
- * GET /reset/:id/:token
- * Reset your password page
+ * GET /reset/:token
+ * Reset Password page.
  */
 
 exports.getReset = function(req, res) {
-  if (req.user) return res.redirect('/');  //user already logged in!
+  if (req.isAuthenticated()) {
+    return res.redirect('/');
+  }
 
   var conditions = {
     _id: req.params.id,
@@ -32,10 +26,8 @@ exports.getReset = function(req, res) {
       });
     }
     if (!user) {
-      req.flash('errors', { msg: 'Your reset request is invalid.  It may have expired.' });
-      return res.render('account/reset', {
-        validToken: false
-      });
+      req.flash('errors', { msg: 'Password reset token is invalid or has expired.' });
+      return res.redirect('/forgot');
     }
     // Validate the token
     bcrypt.compare(req.params.token, user.resetPasswordToken, function(err, isValid) {