Merge branch 'master' into oidc-dev

Author: dmitrizagidulin

lib/api/accounts/user-accounts.js

@@ -3,6 +3,7 @@
 const express = require('express')
 const bodyParser = require('body-parser').urlencoded({ extended: false })
 const debug = require('../../debug').accounts
+const path = require('path')
 
 const CreateAccountRequest = require('../../requests/create-account-request')
 const AddCertificateRequest = require('../../requests/add-cert-request')

package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-server",
   "description": "Solid server on top of the file-system",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "author": {
     "name": "Tim Berners-Lee",
     "email": "timbl@w3.org"

static/signup.html.acl

@@ -0,0 +1,14 @@
+# ACL resource for the static resources
+
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+# Public-readable
+<#public>
+    a acl:Authorization;
+
+    acl:agentClass foaf:Agent;  # everyone
+
+    acl:accessTo <./signup.html>;
+
+    acl:mode acl:Read.

test/integration/account-creation-oidc.js

@@ -9,6 +9,7 @@ const fs = require('fs-extra')
 
 describe('AccountManager (OIDC account creation tests)', function () {
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
+  this.timeout(10000)
 
   var serverUri = 'https://localhost:3457'
   var host = 'localhost:3457'
@@ -200,3 +201,51 @@ describe('AccountManager (OIDC account creation tests)', function () {
     })
   })
 })
+
+describe('Single User signup page', () => {
+  const serverUri = 'https://localhost:7457'
+  const port = 7457
+  var ldpHttpsServer
+  const rootDir = path.join(__dirname, '/resources/accounts/single-user/')
+  const ldp = ldnode.createServer({
+    port,
+    root: rootDir,
+    sslKey: path.join(__dirname, '/keys/key.pem'),
+    sslCert: path.join(__dirname, '/keys/cert.pem'),
+    webid: true,
+    idp: false,
+    strictOrigin: true
+  })
+  const server = supertest(serverUri)
+
+  before(function (done) {
+    ldpHttpsServer = ldp.listen(port, done)
+  })
+
+  after(function () {
+    if (ldpHttpsServer) ldpHttpsServer.close()
+    fs.removeSync(path.join(rootDir))
+  })
+
+  it('should return a 401 unauthorized without accept text/html', done => {
+    server.get('/')
+      .set('accept', 'text/plain')
+      .expect(401)
+      .end(done)
+  })
+
+  it('should redirect to signup with accept text/html', done => {
+    server.get('/')
+      .set('accept', 'text/html')
+      .expect(302)
+      .expect('location', '/signup.html')
+      .end(done)
+  })
+
+  it('it should serve the signup page', done => {
+    server.get('/signup.html')
+      .expect(200)
+      .expect(/<title>Admin Signup<\/title>/)
+      .end(done)
+  })
+})