Add /register view

dmitrizagidulin · dmitrizagidulin · commit fa206474da8a · 2017-06-30T15:54:10.000-04:00
diff --git a/default-views/account/register.hbs b/default-views/account/register.hbs
@@ -0,0 +1,58 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Register</title>
+  <link rel="stylesheet" href="/common/css/bootstrap.min.css">
+</head>
+<body>
+<div class="container">
+  <h4>Register</h4>
+</div>
+<div class="container">
+  <form method="post" action="/api/accounts/new">
+    <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>
+          <input type="text" class="form-control" name="username" id="username" placeholder="alice" />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-12">
+          <label for="password">Password:</label>
+          <input type="password" class="form-control" name="password" id="password" />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-12">
+          <label for="name">Name:</label>
+          <input type="name" class="form-control" name="name" id="name" />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-12">
+          <label for="email">Email:</label>
+          <input type="email" class="form-control" name="email" id="email" />
+        </div>
+      </div>
+      <input type="hidden" name="returnToUrl" value="{{returnToUrl}}" />
+
+    </div>
+    <button type="submit" class="btn btn-primary" id="register">Register</button>
+
+    <div>Already have an account?
+      <a href="/login?returnToUrl={{{returnToUrl}}}">Log In</a>
+    </div>
+  </form>
+</div>
+</body>
+</html>
diff --git a/lib/api/authn/webid-oidc.js b/lib/api/authn/webid-oidc.js
@@ -46,7 +46,7 @@ function middleware (oidc) {
 
   router.get('/register', (req, res) => {
     let params = Object.assign({}, req.query, { authParams: url.parse(req.url).query })
-    res.render('auth/register', params)
+    res.render('account/register', params)
   })
 
   router.get('/goodbye', (req, res) => {
diff --git a/lib/requests/create-account-request.js b/lib/requests/create-account-request.js
@@ -39,15 +39,15 @@ class CreateAccountRequest {
    * @param res
    * @param accountManager {AccountManager}
    *
-   * @throws {TypeError} If required parameters are missing (via
+   * @throws {Error} If required parameters are missing (via
    *   `userAccountFrom()`), or it encounters an unsupported authentication
    *   scheme.
    *
    * @return {CreateAccountRequest|CreateTlsAccountRequest}
    */
   static fromParams (req, res, accountManager) {
     if (!req.app || !req.app.locals) {
-      throw new TypeError('Missing req.app.local params')
+      throw new Error('Missing req.app.local params')
     }
 
     let authMethod = req.app.locals.authMethod
@@ -150,6 +150,11 @@ class CreateAccountRequest {
       })
   }
 
+  error (error) {
+    // Default error handler, to be overriden in subclasses
+    throw error
+  }
+
   /**
    * Initializes the session with the newly created user's credentials
    *
@@ -185,7 +190,7 @@ class CreateOidcAccountRequest extends CreateAccountRequest {
    */
   constructor (options = {}) {
     if (!options.password) {
-      let error = new TypeError('Password required to create an account')
+      let error = new Error('Password required to create an account')
       error.status = 400
       throw error
     }
@@ -195,6 +200,13 @@ class CreateOidcAccountRequest extends CreateAccountRequest {
     this.userStore = options.userStore
   }
 
+  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)
+  }
+
   /**
    * Generate salted password hash, etc.
    *
