Merge branch 'master' into release/v5.0.0

Author: kjetilk

default-templates/new-account/index.html

@@ -42,6 +42,10 @@ <h1>Data</h1>
         <span class="lead">Public Folder</span>
         <span class="badge">public</span>
       </a>
+      <a href="/private/" target="_blank" class="list-group-item">
+        <span class="lead">Private Folder</span>
+        <span class="badge">private</span>
+      </a>
     </div>
   </section>
 

default-templates/new-account/private/.acl

@@ -0,0 +1,10 @@
+# ACL resource for the private folder
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+
+# The owner has all permissions
+<#owner>
+    a acl:Authorization;
+    acl:agent <{{webId}}>;
+    acl:accessTo <./>;
+    acl:defaultForNew <./>;
+    acl:mode acl:Read, acl:Write, acl:Control.

default-views/account/register-form.hbs

@@ -75,7 +75,7 @@
             {{#if tocUri}}
               <div class="checkbox">
                 <label>
-                  <input type="checkbox" name="acceptToc">
+                  <input type="checkbox" name="acceptToc" value="true">
                   I agree to the <a href="{{tocUri}}" target="_blank">Terms &amp; Conditions</a> of this service
                 </label>
               </div>

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-server",
   "description": "Solid server on top of the file-system",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "author": {
     "name": "Tim Berners-Lee",
     "email": "[email protected]"
@@ -42,6 +42,7 @@
     "body-parser": "^1.18.3",
     "bootstrap": "^3.3.7",
     "busboy": "^0.2.12",
+    "cached-path-relative": "^1.0.2",
     "camelize": "^1.0.0",
     "colorette": "^1.0.5",
     "commander": "^2.9.0",

package.json

@@ -114,7 +114,7 @@ describe('AccountManager (OIDC account creation tests)', function () {
     it('should not create WebID if T&C is not accepted', (done) => {
       let subdomain = supertest('https://nicola.' + host)
       subdomain.post('/api/accounts/new')
-        .send('username=nicola&password=12345&acceptToc=false')
+        .send('username=nicola&password=12345&acceptToc=')
         .expect(400, done)
     })