dev branch

.nvmrc

@@ -0,0 +1 @@
+v8.16.0

common/js/auth-buttons.js

@@ -30,7 +30,9 @@
         await auth.logout()
       }
       // Now that we have a cookie, reload to display the authenticated page
-      location.reload()
+      const webId = new URL(session.webId)
+      const podUrl = `${webId.protocol}//${webId.host}`
+      location.href = podUrl
     }
   }
 
@@ -43,7 +45,6 @@
   // Redirect to the registration page
   function register () {
     const registration = new URL('/register', location)
-    registration.searchParams.set('returnToUrl', location)
     location.href = registration
   }
 })(solid)

default-views/account/register-form.hbs

@@ -2,13 +2,13 @@
   <div class="col-md-6">
     <div class="panel panel-default">
       <div class="panel-body">
-        <form method="post" action="/api/accounts/new">
+        <form method="post" action="/api/accounts/new" id="RegisterForm">
           {{> shared/error}}
 
           <div class="form-group">
             <label class="control-label" for="username">Username*</label>
             <input type="text" class="form-control" name="username" id="username" placeholder="alice"
-                   required/>
+                   required value="{{username}}"/>
 
 	    {{#if multiuser}}
 	    <p>Your username should be a lower-case word with only
@@ -54,28 +54,35 @@
 
           <div class="form-group">
             <label class="control-label" for="name">Name*</label>
-            <input type="text" class="form-control" name="name" id="name" required/>
+            <input type="text" class="form-control" name="name" id="name" required value="{{name}}"/>
           </div>
 
           <div class="form-group">
             <label class="control-label" for="email">Email*</label>
-            <input type="email" class="form-control" name="email" id="email"/>
+            <input type="email" class="form-control" name="email" id="email" value="{{email}}"/>
             <span class="help-block">Your email will only be used for account recovery</span>
           </div>
 
-          <div class="form-group">
+          <div class="checkbox">
+            <label>
+              <input type="checkbox" name="connectExternalWebId" value="true" id="ConnectExternalWebId" {{#if connectExternalWebId}}checked{{/if}}/>
+              Connect to External WebID (<strong>Advanced feature</strong>)
+            </label>
+          </div>
+
+          <div class="form-group hidden" id="ExternalWebId">
             <label class="control-label" for="externalWebId">External WebID:</label>
-            <input type="text" class="form-control" name="externalWebId" id="externalWebId"/>
+            <input type="text" class="form-control" name="externalWebId" id="externalWebId" value="{{externalWebId}}"/>
             <span class="help-block">
-                We will generate a Web ID when you register, but if you already have a Web ID hosted elsewhere that you'd prefer to use to log in, enter it here
+              By connecting this account with an existing webId, you can use that webId to authenticate with the new account.
             </span>
           </div>
 
           {{#if enforceToc}}
             {{#if tocUri}}
               <div class="checkbox">
                 <label>
-                  <input type="checkbox" name="acceptToc" value="true">
+                  <input type="checkbox" name="acceptToc" value="true" {{#if acceptToc}}checked{{/if}}>
                   I agree to the <a href="{{tocUri}}" target="_blank">Terms &amp; Conditions</a> of this service
                 </label>
               </div>
@@ -114,10 +121,27 @@
 <script>
   var username = document.getElementById('username');
   username.onkeyup = function() {
-  var list = document.getElementsByClassName('editable-username');
-  for (let item of list) {
-    item.innerHTML = username.value.toLowerCase()
+    var list = document.getElementsByClassName('editable-username');
+      for (let item of list) {
+      item.innerHTML = username.value.toLowerCase()
+    }
   }
-}
+
+  window.addEventListener('DOMContentLoaded', function () {
+    var connect = document.getElementById('ConnectExternalWebId')
+    var container = document.getElementById('ExternalWebId')
+    container.classList.toggle('hidden', !connect.checked)
+    connect.addEventListener('change', function () {
+      container.classList.toggle('hidden', !connect.checked)
+    })
+
+    var form = document.getElementById('RegisterForm')
+    var externalWebIdField = document.getElementById('externalWebId')
+    form.addEventListener('submit', function () {
+      if (!connect.checked) {
+        externalWebIdField.value = ''
+      }
+    })
+  })
 </script>
 

lib/create-app.js

@@ -67,9 +67,7 @@ function createApp (argv = {}) {
 
   // Serve the public 'common' directory (for shared CSS files, etc)
   app.use('/common', express.static(path.join(__dirname, '../common')))
-  routeResolvedFile(app, '/common/js/', 'mashlib/dist/mashlib.js')
-  routeResolvedFile(app, '/common/js/', 'mashlib/dist/mashlib.min.js')
-  routeResolvedFile(app, '/common/js/', 'mashlib/dist/mashlib.min.js.map')
+  app.use('/', express.static(path.join(__dirname, '../node_modules/mashlib/dist'), { index: false }))
   routeResolvedFile(app, '/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js')
   routeResolvedFile(app, '/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js.map')
   app.use('/.well-known', express.static(path.join(__dirname, '../common/well-known')))

lib/handlers/get.js

@@ -89,7 +89,7 @@ async function handler (req, res, next) {
 
     if (useDataBrowser) {
       res.set('Content-Type', 'text/html')
-      const defaultDataBrowser = _path.join(__dirname, '../../static/databrowser.html')
+      const defaultDataBrowser = _path.join(__dirname, '../../node_modules/mashlib/dist/index.html')
       const dataBrowserPath = ldp.dataBrowserPath === 'default' ? defaultDataBrowser : ldp.dataBrowserPath
       debug('   sending data browser file: ' + dataBrowserPath)
       res.sendFile(dataBrowserPath)

lib/models/user-account.js

@@ -76,6 +76,17 @@ class UserAccount {
     return parsed.protocol + '//' + parsed.host
   }
 
+  /**
+   * Returns the Uri to the account's Pod
+   *
+   * @return {string}
+   */
+  get podUri () {
+    const webIdUrl = url.parse(this.webId)
+    const podUrl = `${webIdUrl.protocol}//${webIdUrl.host}`
+    return url.format(podUrl)
+  }
+
   /**
    * Returns the URI of the WebID Profile for this account.
    * Usage:

lib/requests/auth-request.js

@@ -150,10 +150,10 @@ class AuthRequest {
    *
    * @param error {Error}
    */
-  error (error) {
+  error (error, body) {
     error.statusCode = error.statusCode || 400
 
-    this.renderForm(error)
+    this.renderForm(error, body)
   }
 
   /**

lib/requests/create-account-request.js

@@ -91,7 +91,7 @@ class CreateAccountRequest extends AuthRequest {
       request.validate()
       await request.createAccount()
     } catch (error) {
-      request.error(error)
+      request.error(error, req.body)
     }
   }
 
@@ -106,7 +106,7 @@ class CreateAccountRequest extends AuthRequest {
   /**
    * Renders the Register form
    */
-  renderForm (error) {
+  renderForm (error, data = {}) {
     let authMethod = this.accountManager.authMethod
 
     let params = Object.assign({}, this.authQueryParams, {
@@ -116,7 +116,13 @@ class CreateAccountRequest extends AuthRequest {
       registerDisabled: authMethod === 'tls',
       returnToUrl: this.returnToUrl,
       tocUri: this.tocUri,
-      disablePasswordChecks: this.disablePasswordChecks
+      disablePasswordChecks: this.disablePasswordChecks,
+      username: data.username,
+      name: data.name,
+      email: data.email,
+      externalWebId: data.externalWebId,
+      acceptToc: data.acceptToc,
+      connectExternalWebId: data.connectExternalWebId
     })
 
     if (error) {
@@ -309,8 +315,15 @@ class CreateOidcAccountRequest extends CreateAccountRequest {
       })
   }
 
+  /**
+   * Generate the response for the account creation
+   *
+   * @param userAccount {UserAccount}
+   *
+   * @return {UserAccount}
+   */
   sendResponse (userAccount) {
-    let redirectUrl = this.returnToUrl || this.loginUrl()
+    let redirectUrl = this.returnToUrl || userAccount.podUri
     this.response.redirect(redirectUrl)
 
     return userAccount