Add support for external WebIDs registering with username & password

Author: dmitrizagidulin

default-templates/new-account/index.html

@@ -14,10 +14,10 @@ <h3>Solid User Profile</h3>
   <div class="row">
     <div class="col-md-12">
       <p style="margin-top: 3em; margin-bottom: 3em;">
-        Welcome to your Solid user profile.
+        Welcome.
       </p>
       <p>
-        Your Web ID is:<br />
+        Web ID:<br />
 
         <code>{{webId}}</code>
       </p>

default-templates/new-account/profile/card

@@ -6,10 +6,10 @@
 
 <>
     a foaf:PersonalProfileDocument ;
-    foaf:maker <#me> ;
-    foaf:primaryTopic <#me> .
+    foaf:maker <{{webId}}> ;
+    foaf:primaryTopic <{{webId}}> .
 
-<#me>
+<{{webId}}>
     a foaf:Person ;
     a schema:Person ;
 
@@ -18,6 +18,7 @@
     solid:account </> ;  # link to the account uri
     pim:storage </> ;    # root storage
 
+    solid:inbox </inbox/> ;
     ldp:inbox </inbox/> ;
 
     pim:preferencesFile </settings/prefs.ttl> ;  # private settings/preferences

default-views/account/register-form.hbs

@@ -8,28 +8,42 @@
       </div>
     {{/if}}
     <div class="row">
-      <div class="col-md-12">
+      <div class="col-md-6">
         <label for="username">Username:</label>
         <input type="text" class="form-control" name="username" id="username" placeholder="alice" />
       </div>
+      <div class="col-md-6">&nbsp;</div>
     </div>
     <div class="row">
-      <div class="col-md-12">
+      <div class="col-md-6">
         <label for="password">Password:</label>
         <input type="password" class="form-control" name="password" id="password" />
       </div>
+      <div class="col-md-6">&nbsp;</div>
     </div>
     <div class="row">
-      <div class="col-md-12">
+      <div class="col-md-6">
         <label for="name">Name:</label>
-        <input type="name" class="form-control" name="name" id="name" />
+        <input type="text" class="form-control" name="name" id="name" />
       </div>
+      <div class="col-md-6">&nbsp;</div>
     </div>
     <div class="row">
-      <div class="col-md-12">
+      <div class="col-md-6">
         <label for="email">Email:</label>
+        <p>Your email will only used for account recovery</p>
         <input type="email" class="form-control" name="email" id="email" />
       </div>
+      <div class="col-md-6">&nbsp;</div>
+    </div>
+    <div class="row">
+      <div class="col-md-6">
+        <label for="externalWebId">(Optional) External WebID:</label>
+        <p>We will generate a Web ID when you register, but if you
+        already have a Web ID hosted elsewhere, enter it here</p>
+        <input type="text" class="form-control" name="externalWebId" id="externalWebId" />
+      </div>
+      <div class="col-md-6">&nbsp;</div>
     </div>
     <input type="hidden" name="returnToUrl" value="{{returnToUrl}}" />
   </div>

lib/handlers/error-pages.js

@@ -15,7 +15,7 @@ const SELECT_PROVIDER_AUTH_METHODS = ['oidc']
  * @param next {Function}
  */
 function handler (err, req, res, next) {
-  debug('Error page because of ' + err)
+  debug('Error page because of:', err)
 
   let locals = req.app.locals
   let authMethod = locals.authMethod

lib/models/account-manager.js

@@ -346,16 +346,32 @@ class AccountManager {
       email: userData.email,
       name: userData.name,
       externalWebId: userData.externalWebId,
-      webId: userData.webid || userData.webId ||
-        this.accountWebIdFor(userData.username)
+      localAccountId: userData.localAccountId,
+      webId: userData.webid || userData.webId || userData.externalWebId
     }
 
-    if (!userConfig.username) {
-      if (!userConfig.webId) {
+    try {
+      userConfig.webId = userConfig.webId || this.accountWebIdFor(userConfig.username)
+    } catch (err) {
+      if (err.message === 'Cannot construct uri for blank account name') {
         throw new Error('Username or web id is required')
+      } else {
+        throw err
       }
+    }
 
-      userConfig.username = this.usernameFromWebId(userConfig.webId)
+    if (userConfig.username) {
+      if (userConfig.externalWebId && !userConfig.localAccountId) {
+        // External Web ID exists, derive the local account id from username
+        userConfig.localAccountId = this.accountWebIdFor(userConfig.username)
+          .split('//')[1]  // drop the https://
+      }
+    } else {  // no username - derive it from web id
+      if (userConfig.externalWebId) {
+        userConfig.username = userConfig.externalWebId
+      } else {
+        userConfig.username = this.usernameFromWebId(userConfig.webId)
+      }
     }
 
     return UserAccount.from(userConfig)

lib/models/user-account.js

@@ -13,12 +13,16 @@ class UserAccount {
    * @param [options.webId] {string}
    * @param [options.name] {string}
    * @param [options.email] {string}
+   * @param [options.externalWebId] {string}
+   * @param [options.localAccountId] {string}
    */
   constructor (options = {}) {
     this.username = options.username
     this.webId = options.webId
     this.name = options.name
     this.email = options.email
+    this.externalWebId = options.externalWebId
+    this.localAccountId = options.localAccountId
   }
 
   /**