Display errors on the login form

Author: dmitrizagidulin

default-views/auth/login.hbs

@@ -13,6 +13,13 @@
 <div class="container">
   <form method="post" action="/login">
     <div class="form-group">
+      {{#if error}}
+        <div class="row">
+          <div class="col-md-12">
+            <p class="text-danger"><strong>{{error}}</strong></p>
+          </div>
+        </div>
+      {{/if}}
       <div class="row">
         <div class="col-md-12">
           <label for="username">Username:</label>

lib/requests/login-request.js

@@ -60,15 +60,10 @@ class LoginByPasswordRequest {
    * @return {Promise}
    */
   static handle (req, res) {
-    let request
-
-    try {
-      request = LoginByPasswordRequest.fromParams(req, res)
-    } catch (error) {
-      return Promise.reject(error)
-    }
+    const request = LoginByPasswordRequest.fromParams(req, res)
 
     return LoginByPasswordRequest.login(request)
+      .catch(request.error.bind(request))
   }
 
   /**
@@ -156,23 +151,30 @@ class LoginByPasswordRequest {
     return extracted
   }
 
+  error (error) {
+    let res = this.response
+    let params = Object.assign({}, this.authQueryParams, { error: error.message })
+    res.statusCode(error.statusCode || 400)
+    res.render('auth/login', params)
+  }
+
   /**
    * Validates the Login request (makes sure required parameters are present),
    * and throws an error if not.
    *
-   * @throws {TypeError} If missing required params
+   * @throws {Error} If missing required params
    */
   validate () {
     let error
 
     if (!this.username) {
-      error = new TypeError('Username required')
+      error = new Error('Username required')
       error.statusCode = 400
       throw error
     }
 
     if (!this.password) {
-      error = new TypeError('Password required')
+      error = new Error('Password required')
       error.statusCode = 400
       throw error
     }
@@ -182,7 +184,7 @@ class LoginByPasswordRequest {
    * Loads a user from the user store, and if one is found and the
    * password matches, returns a `UserAccount` instance for that user.
    *
-   * @throws {TypeError} If
+   * @throws {Error} If failures to load user are encountered
    *
    * @return {Promise<UserAccount>}
    */
@@ -208,7 +210,7 @@ class LoginByPasswordRequest {
       })
       .then(foundUser => {
         if (!foundUser) {
-          error = new TypeError('No user found for that username')
+          error = new Error('No user found for that username')
           error.statusCode = 400
           throw error
         }
@@ -217,7 +219,7 @@ class LoginByPasswordRequest {
       })
       .then(validUser => {
         if (!validUser) {
-          error = new TypeError('User found but no password found')
+          error = new Error('User found but no password found')
           error.statusCode = 400
           throw error
         }