solid-server 5.6.24 → 5.7.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

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/create-app.js

@@ -32,7 +32,7 @@ const corsSettings = cors({
   methods: [
     'OPTIONS', 'HEAD', 'GET', 'PATCH', 'POST', 'PUT', 'DELETE'
   ],
-  exposedHeaders: 'Authorization, User, Location, Link, Vary, Last-Modified, ETag, Accept-Patch, Accept-Post, Updates-Via, Allow, WAC-Allow, Content-Length, WWW-Authenticate, MS-Author-Via, X-Powered-By',
+  exposedHeaders: 'Authorization, User, Location, Link, Vary, Last-Modified, ETag, Accept-Patch, Accept-Post, Updates-Via, Allow, WAC-Allow, Content-Length, WWW-Authenticate, X-Powered-By',
   credentials: true,
   maxAge: 1728000,
   origin: true,

package/lib/handlers/cors-proxy.js

@@ -13,7 +13,7 @@ const validUrl = require('valid-url')
 
 const CORS_SETTINGS = {
   methods: 'GET',
-  exposedHeaders: 'Authorization, User, Location, Link, Vary, Last-Modified, Content-Length, Content-Location, MS-Author-Via, X-Powered-By',
+  exposedHeaders: 'Authorization, User, Location, Link, Vary, Last-Modified, Content-Length, Content-Location, X-Powered-By',
   maxAge: 1728000,
   origin: true
 }

package/lib/handlers/get.js

@@ -27,8 +27,6 @@ async function handler (req, res, next) {
   const requestedType = negotiator.mediaType()
   const possibleRDFType = negotiator.mediaType(RDFs)
 
-  res.header('MS-Author-Via', 'SPARQL')
-
   // Set live updates
   if (ldp.live) {
     res.header('Updates-Via', ldp.resourceMapper.resolveUrl(req.hostname).replace(/^http/, 'ws'))

package/lib/handlers/patch.js

@@ -23,7 +23,6 @@ const DEFAULT_FOR_NEW_CONTENT_TYPE = 'text/turtle'
 // Handles a PATCH request
 async function patchHandler (req, res, next) {
   debug(`PATCH -- ${req.originalUrl}`)
-  res.header('MS-Author-Via', 'SPARQL')
   try {
     // Obtain details of the target resource
     const ldp = req.app.locals.ldp

package/lib/handlers/put.js

@@ -8,7 +8,6 @@ const { stringToStream } = require('../utils')
 
 async function handler (req, res, next) {
   debug(req.originalUrl)
-  res.header('MS-Author-Via', 'SPARQL')
 
   const contentType = req.get('content-type')
   if (isAuxiliary(req)) {

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.0",
   "author": {
     "name": "Tim Berners-Lee",
     "email": "timbl@w3.org"
@@ -61,8 +61,8 @@
   "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",
+    "@solid/oidc-auth-manager": "^0.24.2",
+    "@solid/oidc-op": "^0.11.6",
     "async-lock": "^1.3.0",
     "body-parser": "^1.19.1",
     "bootstrap": "^3.4.1",
@@ -89,7 +89,7 @@
     "ip-range-check": "0.2.0",
     "is-ip": "^3.1.0",
     "li": "^1.3.0",
-    "mashlib": "^1.7.21",
+    "mashlib": "^1.8.0",
     "mime-types": "^2.1.34",
     "negotiator": "^0.6.2",
     "node-fetch": "^2.6.7",
@@ -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.10",
     "uuid": "^8.3.2",
     "valid-url": "^1.0.9",
     "validator": "^13.7.0",