Improves some error responses for forgot API

Author: dmlenton

routes/api/account.js

@@ -81,18 +81,18 @@ module.exports = function (app) {
     const account = new User(appId);
     account.loadByRef(ref, (err, json) => {
       if (err) {
-        return next(new JsonError('This reset key is not valid'));
+        return next(new JsonError('This reset key is not valid', 400));
       }
       if (json.reset_key !== req.params.key)
-        return next(new JsonError('This reset key is not valid'));
+        return next(new JsonError('This reset key is not valid', 400));
       if (json.reset_date) {
         if (new Date() - new Date(json.reset_date) > ONE_DAY) {
-          return next(new JsonError('This reset key is out of date'));
+          return next(new JsonError('This reset key is out of date', 400));
         }
       }
-      if (password.length === 0) return next(new JsonError('Password is missing'));
-      if (passwordConfirm.length === 0) return next(new JsonError('Password confirmation is missing'));
-      if (password !== passwordConfirm) return next(new JsonError('Your passwords do not match'));
+      if (password.length === 0) return next(new JsonError('Password is missing', 400));
+      if (passwordConfirm.length === 0) return next(new JsonError('Password confirmation is missing', 400));
+      if (password !== passwordConfirm) return next(new JsonError('Your passwords do not match', 400));
       account.setPassword(password, (err) => {
         if (err) return next(new JsonError('There was a problem setting your password'));
       });
@@ -104,9 +104,11 @@ module.exports = function (app) {
   router.post('/forgot', cors(), (req, res, next) => {
     if (!req.body || !req.body.username)
       throw new JsonError('You must specify an email address', 400);
+    if (!isEmail(req.body.username))
+      throw new JsonError('You must specify a valid email address', 400);
     let account = new User(req.site.server.client_id);
     account.loadByUsername(req.body.username, (err, user) => {
-      if (err) return next(new JsonError('Unable to find the specified email address'));
+      if (err || !user) return next(new JsonError('Unable to find the specified email address', 400));
       account = Object.assign(account, user);
       const appId = req.site.server.client_id;
       const options = {