solid-server 5.6.24 → 5.7.2

package/.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [12.x, 14.x, 16.x]
         os: [ubuntu-latest]
 
     steps:

package/.nvmrc

@@ -1 +1 @@
-13.14.0
+16.14.0

package/README.md

@@ -28,12 +28,15 @@ You can install and run the server either using Node.js directly or using
 first approach, for the second approach see the section [use Docker](#use-docker)
 Section below.
 
+**Note**: If using Git for Windows, it is helpful to use the -verbose flag to see the progress of the install.
+
 To install, first install [Node](https://nodejs.org/en/) and then run the following
 
 ```bash
 $ npm install -g solid-server
 ```
 
+
 ### Run a single-user server (beginner)
 
 The easiest way to setup `solid-server` is by running the wizard. This will create a `config.json` in your current folder
@@ -368,7 +371,8 @@ In order to really get a feel for the Solid platform, and to test out `solid`,
 you will need the following:
 
 1. A WebID profile and browser certificate from one of the Solid-compliant
-    identity providers, such as [solidcommunity.net](https://solidcommunity.net).
+    identity providers, such as [solidcommunity.net](bourgeoa
+    community.net).
 
 2. A server-side SSL certificate for `solid` to use (see the section below
     on creating a self-signed certificate for testing).
@@ -450,7 +454,7 @@ You can receive or provide help too:
 - [NSS Gitter channel](https://gitter.im/solid/node-solid-server) for specific (installation) advice about this code base
 - [Create a new issue](https://github.com/solid/node-solid-server/issues/new) to report bugs
 - [Fix an issue](https://github.com/solid/node-solid-server/issues)
-- Reach out to Jackson at jacksonm@inrupt.com to become more involved in maintaining Node Solid Server
+- Reach out to @bourgeoa at alain.bourgeois10@gmail.com to become more involved in maintaining Node Solid Server
 
 Have a look at [CONTRIBUTING.md](https://github.com/solid/node-solid-server/blob/master/CONTRIBUTING.md).
 

package/bin/config.json

@@ -0,0 +1,18 @@
+{
+  "root": "/Users/imyshor/Projects/solid/solidos/workspaces/node-solid-server/bin/data",
+  "port": "8443",
+  "serverUri": "https://localhost:8443",
+  "webid": false,
+  "mount": "/",
+  "configPath": "./config",
+  "configFile": "./config.json",
+  "dbPath": "./.db",
+  "sslKey": "../",
+  "sslCert": "../",
+  "multiuser": false,
+  "server": {
+    "name": "localhost",
+    "description": "",
+    "logo": ""
+  }
+}

package/common/js/index-buttons.js

@@ -4,13 +4,16 @@ function register() {
     alert(2); window.location.href = "/register"; 
 }
 document.addEventListener('DOMContentLoaded', async function() {
-    if (!UI.authn.currentUser()) await UI.authn.checkUser();
-    let user = UI.authn.currentUser();
+    const authn = UI.authn
+    const authSession = UI.authn.authSession
+
+    if (!authn.currentUser()) await authn.checkUser();
+    let user = authn.currentUser();
 
     // IF LOGGED IN: SET SolidServerRootRedirectLink. LOGOUT
     if( user ) {
         window.localStorage.setItem(keyname, user.uri);
-        await UI.authn.authSession.logout();
+        await authSession.logout();
     }
     else {
         let webId = window.localStorage.getItem(keyname);
@@ -31,7 +34,7 @@ document.addEventListener('DOMContentLoaded', async function() {
         let span = document.createElement("span")
         span.innerHTML = html
         loginArea.appendChild(span);
-        loginArea.appendChild(UI.authn.loginStatusBox(document, null, {}))
+        loginArea.appendChild(UI.login.loginStatusBox(document, null, {}))
         const logInButton = loginArea.querySelectorAll('input')[1];
         logInButton.value = "Log in to see your WebID";
         const signUpButton = loginArea.querySelectorAll('input')[2];

package/default-templates/new-account/profile/card$.ttl

@@ -17,6 +17,7 @@
 
     solid:account </> ;  # link to the account uri
     pim:storage </> ;    # root storage
+    solid:oidcIssuer <{{idp}}> ; # identity provider
 
     ldp:inbox </inbox/> ;
 

package/lib/ldp.js

@@ -286,6 +286,7 @@ class LDP {
     }
 
     // Directory created, now write the file
+    if (container) return
     return withLock(path, () => new Promise((resolve, reject) => {
       // HACK: the middleware in webid-oidc.js uses body-parser, thus ending the stream of data
       // for JSON bodies. So, the stream needs to be reset

package/lib/models/account-manager.js

@@ -334,9 +334,9 @@ class AccountManager {
       name: userData.name,
       externalWebId: userData.externalWebId,
       localAccountId: userData.localAccountId,
-      webId: userData.webid || userData.webId || userData.externalWebId
+      webId: userData.webid || userData.webId || userData.externalWebId,
+      idp: this.host.serverUri
     }
-
     if (userConfig.username) {
       userConfig.username = userConfig.username.toLowerCase()
     }
@@ -360,6 +360,9 @@ class AccountManager {
     } else { // no username - derive it from web id
       if (userConfig.externalWebId) {
         userConfig.username = userConfig.externalWebId
+
+        // TODO find oidcIssuer from externalWebId
+        // removed from idp https://github.com/solid/node-solid-server/pull/1566
       } else {
         userConfig.username = this.usernameFromWebId(userConfig.webId)
       }

package/lib/models/account-template.js

@@ -75,7 +75,8 @@ class AccountTemplate {
     const substitutions = {
       name: userAccount.displayName,
       webId: userAccount.webId,
-      email: userAccount.email
+      email: userAccount.email,
+      idp: userAccount.idp
     }
 
     return substitutions

package/lib/models/user-account.js

@@ -24,6 +24,7 @@ class UserAccount {
     this.email = options.email
     this.externalWebId = options.externalWebId
     this.localAccountId = options.localAccountId
+    this.idp = options.idp
   }
 
   /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-server",
   "description": "Solid server on top of the file-system",
-  "version": "5.6.24",
+  "version": "5.7.2",
   "author": {
     "name": "Tim Berners-Lee",
     "email": "timbl@w3.org"
@@ -61,44 +61,44 @@
   "dependencies": {
     "@fastify/busboy": "^1.0.0",
     "@solid/acl-check": "^0.4.5",
-    "@solid/oidc-auth-manager": "^0.24.1",
-    "@solid/oidc-op": "0.11.5",
-    "async-lock": "^1.3.0",
-    "body-parser": "^1.19.1",
+    "@solid/oidc-auth-manager": "^0.24.2",
+    "@solid/oidc-op": "^0.11.6",
+    "async-lock": "^1.3.1",
+    "body-parser": "^1.20.0",
     "bootstrap": "^3.4.1",
-    "cached-path-relative": "^1.0.2",
+    "cached-path-relative": "^1.1.0",
     "camelize": "^1.0.0",
     "cheerio": "^1.0.0-rc.10",
     "colorette": "^2.0.16",
     "commander": "^8.3.0",
     "cors": "^2.8.5",
-    "debug": "^4.3.3",
-    "express": "^4.17.2",
+    "debug": "^4.3.4",
+    "express": "^4.17.3",
     "express-handlebars": "^5.3.4",
     "express-session": "^1.17.2",
     "extend": "^3.0.2",
     "from2": "^2.3.0",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.0.1",
     "get-folder-size": "^2.0.1",
     "glob": "^7.2.0",
     "global-tunnel-ng": "^2.7.1",
     "handlebars": "^4.7.7",
-    "http-proxy-middleware": "^2.0.1",
-    "inquirer": "^8.2.0",
+    "http-proxy-middleware": "^2.0.4",
+    "inquirer": "^8.2.2",
     "into-stream": "^6.0.0",
     "ip-range-check": "0.2.0",
     "is-ip": "^3.1.0",
     "li": "^1.3.0",
-    "mashlib": "^1.7.21",
-    "mime-types": "^2.1.34",
-    "negotiator": "^0.6.2",
+    "mashlib": "^1.8.2",
+    "mime-types": "^2.1.35",
+    "negotiator": "^0.6.3",
     "node-fetch": "^2.6.7",
-    "node-forge": "^1.2.1",
+    "node-forge": "^1.3.1",
     "node-mailer": "^0.1.1",
-    "nodemailer": "^6.7.2",
+    "nodemailer": "^6.7.3",
     "oidc-op-express": "^0.0.3",
     "owasp-password-strength-test": "^1.3.0",
-    "rdflib": "^2.2.17",
+    "rdflib": "^2.2.19",
     "recursive-readdir": "^2.2.2",
     "request": "^2.88.2",
     "rimraf": "^3.0.2",
@@ -108,7 +108,7 @@
     "text-encoder-lite": "^2.0.0",
     "the-big-username-blacklist": "^1.5.2",
     "ulid": "^2.3.0",
-    "urijs": "^1.19.7",
+    "urijs": "^1.19.11",
     "uuid": "^8.3.2",
     "valid-url": "^1.0.9",
     "validator": "^13.7.0",
@@ -116,23 +116,23 @@
   },
   "devDependencies": {
     "@solid/solid-auth-oidc": "^0.3.0",
-    "chai": "4.3.4",
+    "chai": "^4.3.6",
     "chai-as-promised": "7.1.1",
     "cross-env": "7.0.3",
     "dirty-chai": "2.0.1",
     "eslint": "^7.32.0",
     "localstorage-memory": "1.0.3",
-    "mocha": "9.1.3",
-    "nock": "^13.2.1",
+    "mocha": "^9.2.2",
+    "nock": "^13.2.4",
     "node-mocks-http": "1.11.0",
     "nyc": "15.1.0",
     "pre-commit": "1.2.2",
     "randombytes": "2.1.0",
     "sinon": "12.0.1",
     "sinon-chai": "3.7.0",
-    "snyk": "^1.809.0",
+    "snyk": "^1.906.0",
     "standard": "16.0.4",
-    "supertest": "6.1.6",
+    "supertest": "^6.2.2",
     "turtle-validator": "1.1.1",
     "whatwg-url": "11.0.0"
   },