diff --git a/README.md b/README.md
index e5e4b2502..9fa14577f 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,8 @@
### Install
-You can install and run the server either using Node.js directly or using
-[Docker](https://www.docker.com/). This and the following sections describe the
+You can install and run the server either using Node.js directly or using
+[Docker](https://www.docker.com/). This and the following sections describe the
first approach, for the second approach see the section [use Docker](#use-docker)
Section below.
@@ -306,7 +306,7 @@ 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 [databox.me](https://databox.me).
+ identity providers, such as [solid.community](https://solid.community).
2. A server-side SSL certificate for `solid` to use (see the section below
on creating a self-signed certificate for testing).
@@ -409,6 +409,12 @@ npm run test-(acl|formats|params|patch)
Twitter/@KKjernsmo |
WebID |
+
+ Justin Bingham |
+ GitHub/justinwb |
+ Twitter/@justinwb |
+ WebID |
+
diff --git a/lib/api/authn/webid-oidc.js b/lib/api/authn/webid-oidc.js
index c3db0f085..1f53e6eeb 100644
--- a/lib/api/authn/webid-oidc.js
+++ b/lib/api/authn/webid-oidc.js
@@ -14,7 +14,7 @@ const PasswordChangeRequest = require('../../requests/password-change-request')
const {
AuthCallbackRequest,
LogoutRequest
-} = require('oidc-auth-manager').handlers
+} = require('@solid/oidc-auth-manager').handlers
/**
* Sets up OIDC authentication for the given app.
diff --git a/lib/models/authenticator.js b/lib/models/authenticator.js
index 4e43c34d2..b8774dff9 100644
--- a/lib/models/authenticator.js
+++ b/lib/models/authenticator.js
@@ -3,8 +3,8 @@
const debug = require('./../debug').authentication
const validUrl = require('valid-url')
const webid = require('webid/tls')
-const provider = require('oidc-auth-manager/src/preferred-provider')
-const { domainMatches } = require('oidc-auth-manager/src/oidc-manager')
+const provider = require('@solid/oidc-auth-manager/src/preferred-provider')
+const { domainMatches } = require('@solid/oidc-auth-manager/src/oidc-manager')
/**
* Abstract Authenticator class, representing a local login strategy.
diff --git a/lib/models/oidc-manager.js b/lib/models/oidc-manager.js
index ea5e8cf10..aa31b7281 100644
--- a/lib/models/oidc-manager.js
+++ b/lib/models/oidc-manager.js
@@ -4,7 +4,7 @@ const url = require('url')
const path = require('path')
const debug = require('../debug').authentication
-const OidcManager = require('oidc-auth-manager')
+const OidcManager = require('@solid/oidc-auth-manager')
/**
* Returns an instance of the OIDC Authentication Manager, initialized from
diff --git a/package-lock.json b/package-lock.json
index 7c5c37dd6..7693f27f0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "solid-server",
- "version": "4.1.1",
+ "version": "4.1.2-rc.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -183,9 +183,10 @@
}
}
},
- "@trust/jose": {
- "version": "github:solid/jose#728a11dc3c4294bf7960a358d0d07e30c57a8a03",
- "from": "github:solid/jose#rc-0.1.8",
+ "@solid/jose": {
+ "version": "0.1.8",
+ "resolved": "https://registry.npmjs.org/@solid/jose/-/jose-0.1.8.tgz",
+ "integrity": "sha512-JuP3z2Yuyolv7P0w7MPhjWltWbVzV0vHBFw+ZhxG2v2WOPdbGT+CvUMhCMdMG/csavceV+IpwMXMybMd8nC4sA==",
"requires": {
"@trust/json-document": "^0.1.4",
"@trust/webcrypto": "^0.9.2",
@@ -193,139 +194,124 @@
"text-encoding": "^0.6.4"
}
},
- "@trust/json-document": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/@trust/json-document/-/json-document-0.1.4.tgz",
- "integrity": "sha1-sgI7HhRbp2hb0fNux7aRKJQAc+k="
- },
- "@trust/keychain": {
- "version": "github:solid/keychain#0d0cd6ef46d945d0432a210f86aa35a90e8d3e68",
- "from": "github:solid/keychain",
+ "@solid/keychain": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/@solid/keychain/-/keychain-0.1.3.tgz",
+ "integrity": "sha512-UvwXFNJbqubu72jsJk4AjtSgEi8JmVoWy0OJSyl+IbhgQr7z2KG6tqgNX+XDnS7+1E+ghHC7N48lHOMe/TqM6Q==",
"requires": {
"@trust/webcrypto": ">=0.9.2",
"base64url": "^3.0.0"
}
},
- "@trust/keyto": {
- "version": "0.3.4",
- "resolved": "https://registry.npmjs.org/@trust/keyto/-/keyto-0.3.4.tgz",
- "integrity": "sha512-OAqKvuSEPIu2zCnIHzBthvGnV8nKmpv7cBlRMngLzJZzZI9CanyuSfnEI1xC4sH4TwqA0XJR7Mb0oX4bwymXIw==",
+ "@solid/oidc-auth-manager": {
+ "version": "0.16.3",
+ "resolved": "https://registry.npmjs.org/@solid/oidc-auth-manager/-/oidc-auth-manager-0.16.3.tgz",
+ "integrity": "sha512-7s5v7kI59WYYXArZaaHDxF+MjzioSFf9KMhW686GFJY+EqEhA89yiQByS10ZxTljdVaVHlP4T72D2p4DTPjGOw==",
"requires": {
- "asn1.js": "^4.9.1",
- "base64url": "^3.0.0",
- "elliptic": "^6.4.0"
+ "@solid/oidc-op": "^0.3.2",
+ "@solid/oidc-rs": "^0.3.2",
+ "@solid/solid-multi-rp-client": "^0.4.3",
+ "bcryptjs": "^2.4.3",
+ "fs-extra": "^6.0.1",
+ "kvplus-files": "0.0.4",
+ "li": "^1.3.0",
+ "node-fetch": "^2.1.2",
+ "rdflib": "^0.17.1",
+ "valid-url": "^1.0.9"
+ },
+ "dependencies": {
+ "fs-extra": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+ "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "jsonfile": "^4.0.0",
+ "universalify": "^0.1.0"
+ }
+ },
+ "jsonfile": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+ "requires": {
+ "graceful-fs": "^4.1.6"
+ }
+ }
}
},
- "@trust/oidc-op": {
- "version": "github:solid/oidc-op#bab702fe335d76d7b9d43d3c894b185872ba53f0",
- "from": "github:solid/oidc-op#rc-0.3.2",
- "dev": true,
+ "@solid/oidc-op": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@solid/oidc-op/-/oidc-op-0.3.2.tgz",
+ "integrity": "sha512-0XbE5evKtq/y7mSRGu/Zn6G3A6f4FBFTW8k2b1cHAucsaXOd5IP8/nmwDU06wfJ0yjliEcFxlok6hAGot8+QkA==",
"requires": {
- "@trust/jose": "github:solid/jose#728a11dc3c4294bf7960a358d0d07e30c57a8a03",
+ "@solid/jose": "0.1.8",
+ "@solid/keychain": "0.1.3",
"@trust/json-document": "^0.1.4",
- "@trust/keychain": "github:solid/keychain#0d0cd6ef46d945d0432a210f86aa35a90e8d3e68",
"@trust/webcrypto": "0.9.2",
"base64url": "^3.0.0",
"pem-jwk": "^1.5.1",
"qs": "^6.5.2",
"whatwg-url": "^6.4.1"
- },
- "dependencies": {
- "@trust/jose": {
- "version": "github:solid/jose#728a11dc3c4294bf7960a358d0d07e30c57a8a03",
- "from": "github:solid/jose#rc-0.1.8",
- "dev": true,
- "requires": {
- "@trust/json-document": "^0.1.4",
- "@trust/webcrypto": "^0.9.2",
- "base64url": "^3.0.0",
- "text-encoding": "^0.6.4"
- }
- },
- "@trust/keychain": {
- "version": "github:solid/keychain#0d0cd6ef46d945d0432a210f86aa35a90e8d3e68",
- "from": "github:solid/keychain",
- "dev": true,
- "requires": {
- "@trust/webcrypto": ">=0.9.2",
- "base64url": "^3.0.0"
- }
- }
}
},
- "@trust/oidc-rp": {
- "version": "0.4.3",
- "resolved": "https://registry.npmjs.org/@trust/oidc-rp/-/oidc-rp-0.4.3.tgz",
- "integrity": "sha512-xIpCLiIfjuVHfoZTlpmKSjBlcVCO9JxaO5oB+8dAd8uJvC0OHf0QyuTHiIO8riYbSyiqSjjBOYNMC9YIC/yAMA==",
+ "@solid/oidc-rp": {
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/@solid/oidc-rp/-/oidc-rp-0.7.1.tgz",
+ "integrity": "sha512-FEFGbaKDHyNVVW1qPfSXuT8kuZj+Y5qeKrVdR7OJCK4jd3oUTnfZBOSRlHI/HOKKOy1Wgff+0iOZzPwBmRB7pw==",
"requires": {
- "@trust/jose": "^0.1.7",
+ "@solid/jose": "0.1.8",
"@trust/json-document": "^0.1.4",
- "@trust/webcrypto": "0.4.0",
- "base64url": "^2.0.0",
- "node-fetch": "^1.7.2",
+ "@trust/webcrypto": "0.9.2",
+ "base64url": "^3.0.0",
+ "node-fetch": "^2.1.2",
+ "standard-http-error": "^2.0.1",
"text-encoding": "^0.6.4",
- "whatwg-url": "^6.1.0"
- },
- "dependencies": {
- "@trust/jose": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/@trust/jose/-/jose-0.1.7.tgz",
- "integrity": "sha512-JlWY97+Q1pU2CN08Ux5oN1/CXcvxLtQ5YkL4UhgVs4z9TR/+I4rKqhqoZQ0TDGPvCLP1QaT7F6bHbKswbDwgOQ==",
- "requires": {
- "@trust/json-document": "^0.1.4",
- "@trust/webcrypto": "^0.0.2",
- "base64url": "^2.0.0",
- "text-encoding": "^0.6.1"
- },
- "dependencies": {
- "@trust/webcrypto": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/@trust/webcrypto/-/webcrypto-0.0.2.tgz",
- "integrity": "sha1-53xpouYSudOSJRxZZscxaFN+Jmc=",
- "requires": {
- "base64url": "^2.0.0",
- "node-rsa": "^0.4.0",
- "pem-jwk": "^1.5.1",
- "text-encoding": "^0.6.1"
- }
- }
- }
- },
- "@trust/webcrypto": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/@trust/webcrypto/-/webcrypto-0.4.0.tgz",
- "integrity": "sha1-zIcSyomn5x01P877ZrJwemec9jU=",
- "requires": {
- "@trust/keyto": "^0.3.0",
- "base64url": "^2.0.0",
- "node-rsa": "^0.4.0",
- "text-encoding": "^0.6.1"
- }
- },
- "base64url": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
- "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
- },
- "node-fetch": {
- "version": "1.7.3",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
- "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
- "requires": {
- "encoding": "^0.1.11",
- "is-stream": "^1.0.1"
- }
- }
+ "whatwg-url": "^6.4.1"
}
},
- "@trust/oidc-rs": {
- "version": "github:solid/oidc-rs#66c9d12203ce9fa34c64b2194527c476fc453e5f",
- "from": "github:solid/oidc-rs#rc-0.3.2",
+ "@solid/oidc-rs": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@solid/oidc-rs/-/oidc-rs-0.3.2.tgz",
+ "integrity": "sha512-5+B/UcWRZjSgtCk+iAIyV5Kp6nbZaI+6DkZGFRrL+8mAjUSkF1/60aJwTwcZsdfQsWXBZ/JnMLaJrWCCoqRP7Q==",
"requires": {
- "@trust/jose": "github:solid/jose#728a11dc3c4294bf7960a358d0d07e30c57a8a03",
+ "@solid/jose": "0.1.8",
"node-fetch": "^2.1.2"
}
},
+ "@solid/solid-auth-oidc": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/@solid/solid-auth-oidc/-/solid-auth-oidc-0.2.2.tgz",
+ "integrity": "sha512-GKxRKa3m8BrHzcYcArci/ZVtmmNdCRtq4gZSWpaIOh3UPec9uO7mXsZClnAXZgqMD4C5w5oj9BF6PGDVdQrU6Q==",
+ "dev": true,
+ "requires": {
+ "@solid/oidc-rp": "^0.7.1"
+ }
+ },
+ "@solid/solid-multi-rp-client": {
+ "version": "0.4.3",
+ "resolved": "https://registry.npmjs.org/@solid/solid-multi-rp-client/-/solid-multi-rp-client-0.4.3.tgz",
+ "integrity": "sha512-V5vgYf5kNGYdqNG32Kz5QIYdlFggCVy9KCTmoN4uepsfiBo80Qk463c3KMwzx4PCepsbTkMsAf0cQEck1zIIJg==",
+ "requires": {
+ "@solid/oidc-rp": "0.7.1",
+ "kvplus-files": "0.0.4"
+ }
+ },
+ "@trust/json-document": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/@trust/json-document/-/json-document-0.1.4.tgz",
+ "integrity": "sha1-sgI7HhRbp2hb0fNux7aRKJQAc+k="
+ },
+ "@trust/keyto": {
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/@trust/keyto/-/keyto-0.3.4.tgz",
+ "integrity": "sha512-OAqKvuSEPIu2zCnIHzBthvGnV8nKmpv7cBlRMngLzJZzZI9CanyuSfnEI1xC4sH4TwqA0XJR7Mb0oX4bwymXIw==",
+ "requires": {
+ "asn1.js": "^4.9.1",
+ "base64url": "^3.0.0",
+ "elliptic": "^6.4.0"
+ }
+ },
"@trust/webcrypto": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/@trust/webcrypto/-/webcrypto-0.9.2.tgz",
@@ -369,9 +355,9 @@
}
},
"acorn": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
- "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.2.tgz",
+ "integrity": "sha512-cJrKCNcr2kv8dlDnbw+JPUGjHZzo4myaxOLmpOX8a+rgX94YeTcTMv/LFJUSByRpc+i4GgVnnhLxvMu/2Y+rqw=="
},
"acorn-dynamic-import": {
"version": "3.0.0",
@@ -884,24 +870,6 @@
"type-is": "~1.6.16"
}
},
- "bops": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/bops/-/bops-0.1.1.tgz",
- "integrity": "sha1-Bi4CqNqoAfoQ8uXb5nQM/4Af4X4=",
- "dev": true,
- "requires": {
- "base64-js": "0.0.2",
- "to-utf8": "0.0.1"
- },
- "dependencies": {
- "base64-js": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz",
- "integrity": "sha1-Ak8Pcq+iW3X5wO5zzU9V7Bvtl4Q=",
- "dev": true
- }
- }
- },
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1122,9 +1090,9 @@
}
},
"buffer": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz",
- "integrity": "sha512-nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+ "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
"requires": {
"base64-js": "^1.0.2",
"ieee754": "^1.1.4"
@@ -1378,24 +1346,24 @@
"integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="
},
"color-convert": {
- "version": "1.9.2",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
- "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
"dev": true,
"requires": {
- "color-name": "1.1.1"
+ "color-name": "1.1.3"
}
},
"color-name": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
- "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
"dev": true
},
"colors": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.1.tgz",
- "integrity": "sha512-jg/vxRmv430jixZrC+La5kMbUWqIg32/JsYNZb94+JEmzceYbWKTsv1OuTp+7EaqiaWRR2tPcykibwCRgclIsw=="
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.2.tgz",
+ "integrity": "sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ=="
},
"combine-source-map": {
"version": "0.8.0",
@@ -1721,12 +1689,11 @@
"dev": true
},
"define-properties": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
- "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
"requires": {
- "foreach": "^2.0.5",
- "object-keys": "^1.0.8"
+ "object-keys": "^1.0.12"
}
},
"defined": {
@@ -2660,9 +2627,9 @@
}
},
"follow-redirects": {
- "version": "1.5.5",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.5.tgz",
- "integrity": "sha512-GHjtHDlY/ehslqv0Gr5N0PUJppgg/q0rOBvX0na1s7y1A3LWxPqCYU76s3Z1bM4+UZB4QF0usaXLT5wFpof5PA==",
+ "version": "1.5.7",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.7.tgz",
+ "integrity": "sha512-NONJVIFiX7Z8k2WxfqBjtwqMifx7X42ORLFrOZ2LTKGj71G3C0kfdyTqGqr8fx5zSX6Foo/D95dgGWbPUiwnew==",
"requires": {
"debug": "^3.1.0"
},
@@ -2690,11 +2657,6 @@
"for-in": "^1.0.1"
}
},
- "foreach": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
- "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
- },
"forever-agent": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -2809,10 +2771,13 @@
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
"generate-function": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
- "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
- "dev": true
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
+ "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+ "dev": true,
+ "requires": {
+ "is-property": "^1.0.2"
+ }
},
"generate-object-property": {
"version": "1.2.0",
@@ -2907,9 +2872,9 @@
}
},
"glob": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
- "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -3246,6 +3211,12 @@
"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
"dev": true
},
+ "immediate": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+ "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+ "dev": true
+ },
"imurmurhash": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -3738,6 +3709,59 @@
"integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
"dev": true
},
+ "jszip": {
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
+ "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==",
+ "dev": true,
+ "requires": {
+ "core-js": "~2.3.0",
+ "es6-promise": "~3.0.2",
+ "lie": "~3.1.0",
+ "pako": "~1.0.2",
+ "readable-stream": "~2.0.6"
+ },
+ "dependencies": {
+ "core-js": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
+ "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU=",
+ "dev": true
+ },
+ "es6-promise": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
+ "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=",
+ "dev": true
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+ "dev": true
+ },
+ "process-nextick-args": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+ "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+ "dev": true
+ },
+ "readable-stream": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+ "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+ "dev": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~1.0.6",
+ "string_decoder": "~0.10.x",
+ "util-deprecate": "~1.0.1"
+ }
+ }
+ }
+ },
"kind-of": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -3801,6 +3825,15 @@
"resolved": "https://registry.npmjs.org/li/-/li-1.3.0.tgz",
"integrity": "sha1-IsWbyu+qmo7zWc91l4TkvxBq6hs="
},
+ "lie": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+ "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+ "dev": true,
+ "requires": {
+ "immediate": "~3.0.5"
+ }
+ },
"localstorage-memory": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/localstorage-memory/-/localstorage-memory-1.0.2.tgz",
@@ -4000,16 +4033,16 @@
"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
},
"mime-db": {
- "version": "1.35.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
- "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="
+ "version": "1.36.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
+ "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw=="
},
"mime-types": {
- "version": "2.1.19",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
- "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
+ "version": "2.1.20",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
+ "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
"requires": {
- "mime-db": "~1.35.0"
+ "mime-db": "~1.36.0"
}
},
"mimic-fn": {
@@ -4108,6 +4141,20 @@
"ms": "2.0.0"
}
},
+ "glob": {
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+ "dev": true,
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
"supports-color": {
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
@@ -5578,86 +5625,6 @@
"is-extendable": "^0.1.1"
}
},
- "oidc-auth-manager": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/oidc-auth-manager/-/oidc-auth-manager-0.16.1.tgz",
- "integrity": "sha512-Kx5M9NQqohYhic9SwpszBKbQ3RYK4REjj1ny8g2JxtyMdJvZXJtMX4dFsIsZ2kfCsL4gkQh0uUfm7haOpfAhmA==",
- "requires": {
- "@trust/oidc-op": "github:solid/oidc-op#bab702fe335d76d7b9d43d3c894b185872ba53f0",
- "@trust/oidc-rs": "github:solid/oidc-rs#66c9d12203ce9fa34c64b2194527c476fc453e5f",
- "bcryptjs": "^2.4.3",
- "fs-extra": "^6.0.1",
- "kvplus-files": "0.0.4",
- "li": "^1.3.0",
- "node-fetch": "^2.1.2",
- "rdflib": "0.16.7",
- "solid-multi-rp-client": "^0.4.1",
- "valid-url": "^1.0.9"
- },
- "dependencies": {
- "@trust/oidc-op": {
- "version": "github:solid/oidc-op#bab702fe335d76d7b9d43d3c894b185872ba53f0",
- "from": "github:solid/oidc-op#rc-0.3.2",
- "requires": {
- "@trust/jose": "github:solid/jose#728a11dc3c4294bf7960a358d0d07e30c57a8a03",
- "@trust/json-document": "^0.1.4",
- "@trust/keychain": "github:solid/keychain#0d0cd6ef46d945d0432a210f86aa35a90e8d3e68",
- "@trust/webcrypto": "0.9.2",
- "base64url": "^3.0.0",
- "pem-jwk": "^1.5.1",
- "qs": "^6.5.2",
- "whatwg-url": "^6.4.1"
- }
- },
- "async": {
- "version": "0.9.2",
- "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
- "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
- },
- "fs-extra": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
- "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
- "requires": {
- "graceful-fs": "^4.1.2",
- "jsonfile": "^4.0.0",
- "universalify": "^0.1.0"
- }
- },
- "jsonfile": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
- "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
- "requires": {
- "graceful-fs": "^4.1.6"
- }
- },
- "rdflib": {
- "version": "0.16.7",
- "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-0.16.7.tgz",
- "integrity": "sha512-YdpOGEryzANMNe6a+MTUP+TgreN+Hujcu6SRTbsQze/2RcT1I2D1PAlQ+qS7zZHasvYQU9DJ/8IdAZUfJZYdng==",
- "requires": {
- "async": "^0.9.x",
- "jsonld": "^0.4.5",
- "n3": "^0.4.1",
- "node-fetch": "^1.7.1",
- "solid-auth-client": ">=0.5.1",
- "xmldom": "^0.1.22"
- },
- "dependencies": {
- "node-fetch": {
- "version": "1.7.3",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
- "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
- "requires": {
- "encoding": "^0.1.11",
- "is-stream": "^1.0.1"
- }
- }
- }
- }
- }
- },
"oidc-op-express": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/oidc-op-express/-/oidc-op-express-0.0.3.tgz",
@@ -5690,7 +5657,7 @@
},
"onetime": {
"version": "1.1.0",
- "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
},
"opn": {
@@ -6257,15 +6224,15 @@
"integrity": "sha1-OKwyu0izydyulTTIWrSGRAi92BY="
},
"rdflib": {
- "version": "0.17.0",
- "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-0.17.0.tgz",
- "integrity": "sha512-Jw3ehBx0egWrkdIZjYJezyBb83XxzNO0whMB8/2I+aV1Blsp4zoaAPjWG2QehPi12YTwybckPtAXygpK5JlY7w==",
+ "version": "0.17.1",
+ "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-0.17.1.tgz",
+ "integrity": "sha512-onUce6sUbvk74UwZ/Dw7sr/PKU3+e2HPk2ZV6YLVUqzSlSZagDOjis6o/AVf0sIsONKmJJLVB16B1Gi8qVaEpQ==",
"requires": {
"async": "^0.9.x",
"jsonld": "^0.4.5",
"n3": "^0.4.1",
"node-fetch": "^1.7.1",
- "solid-auth-client": ">=0.5.1",
+ "solid-auth-client": "^2.2.3",
"xmldom": "^0.1.22"
},
"dependencies": {
@@ -6388,9 +6355,9 @@
"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
},
"repeat-element": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
- "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+ "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
},
"repeat-string": {
"version": "1.6.1",
@@ -6577,9 +6544,9 @@
"dev": true
},
"semver": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
- "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+ "version": "5.5.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
+ "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
"dev": true
},
"send": {
@@ -6783,9 +6750,9 @@
"dev": true
},
"snyk": {
- "version": "1.90.2",
- "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.90.2.tgz",
- "integrity": "sha512-SbV6dlDRbXx6q0I2m176NH3LER1wTibuwctcthphsywl1zjoPAdJlMmAOK3BQ61XtjV4xQmzk4OYYf6TUr9ZEw==",
+ "version": "1.94.0",
+ "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.94.0.tgz",
+ "integrity": "sha512-65dc0lnzmXc4kAwMOCPu/2I6nY0Sx0FcmO5NIzhnxvsSy6K508RMh1SQcF40V7eUFhOD3uQ/HTHTN0JW/4zYBA==",
"dev": true,
"requires": {
"abbrev": "^1.1.1",
@@ -6804,12 +6771,13 @@
"recursive-readdir": "^2.2.2",
"semver": "^5.5.0",
"snyk-config": "2.2.0",
- "snyk-docker-plugin": "1.10.3",
+ "snyk-docker-plugin": "1.10.4",
"snyk-go-plugin": "1.5.2",
"snyk-gradle-plugin": "1.3.0",
"snyk-module": "1.8.2",
"snyk-mvn-plugin": "1.2.0",
- "snyk-nuget-plugin": "1.6.4",
+ "snyk-nodejs-lockfile-parser": "1.4.1",
+ "snyk-nuget-plugin": "1.6.5",
"snyk-php-plugin": "1.5.1",
"snyk-policy": "1.12.0",
"snyk-python-plugin": "1.8.1",
@@ -6967,9 +6935,9 @@
}
},
"supports-color": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
- "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"dev": true,
"requires": {
"has-flag": "^3.0.0"
@@ -7009,15 +6977,14 @@
}
},
"snyk-docker-plugin": {
- "version": "1.10.3",
- "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.3.tgz",
- "integrity": "sha512-nIw6zS705SiQLEhBwoO2qsJ3lVN1DZ48tyMgqhlr5f5GuOrwUJ0ivUK5HQUI79xA6pF7tU18495OlbsKuEHUOw==",
+ "version": "1.10.4",
+ "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.4.tgz",
+ "integrity": "sha512-79yWMaISNbtfTY9UtTF7K24cE4k1tRsxDOZo4/a8WlyO/dmmvbdcyz3jtHiFnS8NZqOkXf7ngqae1hmcR7CdPA==",
"dev": true,
"requires": {
"debug": "^3.1.0",
"fs-extra": "^5.0.0",
- "pkginfo": "^0.4.1",
- "request": "^2.87.0",
+ "needle": "^2.0.1",
"temp-dir": "^1.0.0"
},
"dependencies": {
@@ -7110,16 +7077,45 @@
"integrity": "sha512-ieTWhn1MB88gEQ6nUtGCeUKQ6Xoxm+u+QmD9u3zfP1QS5ep9fWt3YYDUQjgUiDTJJy7QyVQdZ/fsz3RECnOA7w==",
"dev": true
},
+ "snyk-nodejs-lockfile-parser": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.4.1.tgz",
+ "integrity": "sha512-xjkf1BHk7HQlp4ABIWPtEvAOAvWhwMtJ7ElQVUvKBHPVHjMEz3mucBRfrtpuyDBJ3DaBlN8Wiw+kcEinX6f09w==",
+ "dev": true,
+ "requires": {
+ "lodash": "4.17.10",
+ "path": "0.12.7",
+ "source-map-support": "^0.5.7"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ },
+ "source-map-support": {
+ "version": "0.5.9",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
+ "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
+ "dev": true,
+ "requires": {
+ "buffer-from": "^1.0.0",
+ "source-map": "^0.6.0"
+ }
+ }
+ }
+ },
"snyk-nuget-plugin": {
- "version": "1.6.4",
- "resolved": "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.4.tgz",
- "integrity": "sha512-D7cwfPC1U/HABAs4Tc9jviajoblMggWOYvWpjf1F4InG6gTfp5lDeeonFp/Xoj6wcju/j88w2gAveWrJWXNj6w==",
+ "version": "1.6.5",
+ "resolved": "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.5.tgz",
+ "integrity": "sha512-3qIndzkxCxiaGvAwMkqChbChGdwhNePPyfi0WjhC/nJGwecqU3Fb/NeTW7lgyT+xoq/dFnzW0DgBJ4+AyNA2gA==",
"dev": true,
"requires": {
"debug": "^3.1.0",
+ "jszip": "^3.1.5",
"lodash": "^4.17.10",
- "xml2js": "^0.4.17",
- "zip": "^1.2.0"
+ "xml2js": "^0.4.17"
},
"dependencies": {
"debug": {
@@ -7330,73 +7326,17 @@
}
},
"solid-auth-client": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/solid-auth-client/-/solid-auth-client-2.1.1.tgz",
- "integrity": "sha512-F58ea/Kni0hbB8EcDk0v0HpVjHuJ6eAT8xvm5QRI9Sm+j5bEgoZJL+TNXpowKXvITcFcqOFMPWR3FeCoGeQQww==",
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/solid-auth-client/-/solid-auth-client-2.2.3.tgz",
+ "integrity": "sha512-7MbN8WcYSB9aLH+DnaMH6ivlFZFu8pDYE+wwk0jGq4TwyMxe03HsBKDkEoMRQk4W+HApIlt5r8PdHbkVCAkBKg==",
"requires": {
- "@trust/oidc-rp": "^0.4.3",
+ "@solid/oidc-rp": "^0.7.1",
"auth-header": "^0.3.1",
"commander": "^2.11.0",
"isomorphic-fetch": "^2.2.1",
"uuid": "^3.1.0"
}
},
- "solid-auth-oidc": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/solid-auth-oidc/-/solid-auth-oidc-0.2.0.tgz",
- "integrity": "sha1-lSvYt5UlYFtiqo9LEyKWMSD4Iw8=",
- "dev": true,
- "requires": {
- "@trust/oidc-rp": "^0.4.1"
- }
- },
- "solid-multi-rp-client": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/solid-multi-rp-client/-/solid-multi-rp-client-0.4.1.tgz",
- "integrity": "sha512-2Rhe7FV+yP2+gJaRCtBYURV/PLodFn2oeCkJF8I0Epa8bpJo51itoiYi1d9zRmMN2ZJRxRnlBeL8vpumooS68A==",
- "requires": {
- "@trust/oidc-rp": "github:solid/oidc-rp#626b4983b4e5243c510259b4b7a791962d26e249",
- "kvplus-files": "0.0.4"
- },
- "dependencies": {
- "@trust/jose": {
- "version": "github:solid/jose#728a11dc3c4294bf7960a358d0d07e30c57a8a03",
- "from": "github:solid/jose#728a11dc3c4294bf7960a358d0d07e30c57a8a03",
- "requires": {
- "@trust/json-document": "^0.1.4",
- "@trust/webcrypto": "^0.9.2",
- "base64url": "^3.0.0",
- "text-encoding": "^0.6.4"
- }
- },
- "@trust/oidc-rp": {
- "version": "github:solid/oidc-rp#626b4983b4e5243c510259b4b7a791962d26e249",
- "from": "github:solid/oidc-rp#rc-0.7.1",
- "requires": {
- "@trust/jose": "github:solid/jose#728a11dc3c4294bf7960a358d0d07e30c57a8a03",
- "@trust/json-document": "^0.1.4",
- "@trust/webcrypto": "0.9.2",
- "base64url": "^3.0.0",
- "node-fetch": "^2.1.2",
- "standard-http-error": "^2.0.1",
- "text-encoding": "^0.6.4",
- "whatwg-url": "^6.4.1"
- },
- "dependencies": {
- "@trust/jose": {
- "version": "github:solid/jose#728a11dc3c4294bf7960a358d0d07e30c57a8a03",
- "from": "github:solid/jose#rc-0.1.8",
- "requires": {
- "@trust/json-document": "^0.1.4",
- "@trust/webcrypto": "^0.9.2",
- "base64url": "^3.0.0",
- "text-encoding": "^0.6.4"
- }
- }
- }
- }
- }
- },
"solid-namespace": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/solid-namespace/-/solid-namespace-0.1.0.tgz",
@@ -8174,12 +8114,6 @@
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
},
- "to-utf8": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz",
- "integrity": "sha1-0Xrqcv8vujm55DYBvns/9y4ImFI=",
- "dev": true
- },
"toml": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz",
@@ -8668,15 +8602,6 @@
"dev": true
}
}
- },
- "zip": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/zip/-/zip-1.2.0.tgz",
- "integrity": "sha1-rQrUImUwm+QutW/IYZThfCTmapw=",
- "dev": true,
- "requires": {
- "bops": "~0.1.1"
- }
}
}
}
diff --git a/package.json b/package.json
index a1305cc83..8cd8f649b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "solid-server",
"description": "Solid server on top of the file-system",
- "version": "4.1.1",
+ "version": "4.1.2-rc.0",
"author": {
"name": "Tim Berners-Lee",
"email": "timbl@w3.org"
@@ -30,9 +30,10 @@
"type": "git",
"url": "https://github.com/solid/node-solid-server"
},
- "homepage": "http://github.com/solid/node-solid-server",
- "bugs": "http://github.com/solid/node-solid-server/issues",
+ "homepage": "https://github.com/solid/node-solid-server",
+ "bugs": "https://github.com/solid/node-solid-server/issues",
"dependencies": {
+ "@solid/oidc-auth-manager": "^0.16.3",
"body-parser": "^1.18.3",
"busboy": "^0.2.12",
"camelize": "^1.0.0",
@@ -59,12 +60,11 @@
"node-fetch": "^2.1.2",
"node-forge": "^0.6.38",
"nodemailer": "^3.1.4",
- "oidc-auth-manager": "^0.16.1",
"oidc-op-express": "^0.0.3",
- "rdflib": "^0.17.0",
+ "rdflib": "^0.17.1",
"recursive-readdir": "^2.1.0",
"rimraf": "^2.5.0",
- "solid-auth-client": "^2.1.1",
+ "solid-auth-client": "^2.2.3",
"solid-namespace": "^0.1.0",
"solid-permissions": "^0.6.0",
"solid-ws": "^0.2.3",
@@ -75,7 +75,8 @@
"webid": "^0.3.10"
},
"devDependencies": {
- "@trust/oidc-op": "solid/oidc-op#rc-0.3.2",
+ "@solid/oidc-op": "0.3.2",
+ "@solid/solid-auth-oidc": "^0.2.2",
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"dirty-chai": "^1.2.2",
@@ -87,7 +88,6 @@
"sinon": "^2.1.0",
"sinon-chai": "^2.8.0",
"snyk": "^1.88.2",
- "solid-auth-oidc": "^0.2.0",
"sonarjs": "^1.0.0",
"standard": "^8.6.0",
"supertest": "^3.0.0",
diff --git a/test/integration/acl-oidc-test.js b/test/integration/acl-oidc-test.js
index 14c18f962..1dff38fe6 100644
--- a/test/integration/acl-oidc-test.js
+++ b/test/integration/acl-oidc-test.js
@@ -3,7 +3,7 @@ const fs = require('fs-extra')
const request = require('request')
const path = require('path')
const { loadProvider, rm, checkDnsSettings } = require('../utils')
-const IDToken = require('@trust/oidc-op/src/IDToken')
+const IDToken = require('@solid/oidc-op/src/IDToken')
const ldnode = require('../../index')
diff --git a/test/integration/authentication-oidc-test.js b/test/integration/authentication-oidc-test.js
index 4ef120ffd..adbd24c3e 100644
--- a/test/integration/authentication-oidc-test.js
+++ b/test/integration/authentication-oidc-test.js
@@ -1,9 +1,9 @@
const Solid = require('../../index')
const path = require('path')
const fs = require('fs-extra')
-const { UserStore } = require('oidc-auth-manager')
+const { UserStore } = require('@solid/oidc-auth-manager')
const UserAccount = require('../../lib/models/user-account')
-const SolidAuthOIDC = require('solid-auth-oidc')
+const SolidAuthOIDC = require('@solid/solid-auth-oidc')
const fetch = require('node-fetch')
const localStorage = require('localstorage-memory')
diff --git a/test/utils.js b/test/utils.js
index bb2db832a..f1f79ec6b 100644
--- a/test/utils.js
+++ b/test/utils.js
@@ -2,7 +2,7 @@ var fs = require('fs')
var fsExtra = require('fs-extra')
var rimraf = require('rimraf')
var path = require('path')
-const OIDCProvider = require('@trust/oidc-op')
+const OIDCProvider = require('@solid/oidc-op')
const dns = require('dns')
const TEST_HOSTS = ['nic.localhost', 'tim.localhost', 'nicola.localhost']