Update dependencies (#1454)

* Update dependencies

* npm install

* npx npm-check-updates -u && npm install

* standard --fix

* globals in auth-buttons.js

* Suppress some lint warnings

* disable some more lint rules

* disable some more lint rules

* npm run standard passing

* adapt to new sinon api

* Fix http-proxy-middleware api change

* downgrade bootstrap to get fonts back

* all bar one integration test passing again

* investigating cors-proxy-test

* adapt to nock

* bootstrap@3.4.1

* 3 JSON-LD related tests failing in mashlib-dev now

* remove rp client key

* remove rp client key for bob

* remove more client keys from test resources

* client keys generated by npm test

* use mashlib/dist/databrowser.html

* npm install

* update published packages

* solid-auth-cli is now a peerDependency of rdflib :/

* npm install --save-dev  @solid/solid-auth-oidc@0.4.0

* update

* solid-auth-cli is being moved from dependencies to devDependencies

* npm install --save-dev @solid/solid-auth-oidc@0.3.0

Author: michielbdejong

.travis.yml

@@ -1,7 +1,6 @@
 sudo: false
 language: node_js
 node_js:
-  - "8"
   - "10"
   - "lts/*"
   - "node"

README.md

@@ -133,7 +133,6 @@ also add to `config.json`
 ```
 
 ### Upgrading from version <5.3
-Make sure you're running Node version 10 or later.
 Please take into account the [v5.3 upgrade notes](https://github.com/solid/node-solid-server/blob/master/CHANGELOG.md#530-upgrade-notes).
 
 ### Upgrading from version <5.0

bin/lib/cli-utils.js

@@ -32,7 +32,7 @@ function loadConfig (program, options) {
     ...options,
     version: program.version()
   }
-  let configFile = argv['configFile'] || './config.json'
+  const configFile = argv.configFile || './config.json'
 
   try {
     const file = fs.readFileSync(configFile)
@@ -42,7 +42,7 @@ function loadConfig (program, options) {
     argv = { ...config, ...argv }
   } catch (err) {
     // If config file was specified, but it doesn't exist, stop with error message
-    if (typeof argv['configFile'] !== 'undefined') {
+    if (typeof argv.configFile !== 'undefined') {
       if (!fs.existsSync(configFile)) {
         console.log(red(bold('ERR')), 'Config file ' + configFile + ' doesn\'t exist.')
         process.exit(1)

bin/lib/cli.js

@@ -37,4 +37,3 @@ function getVersion () {
     return version
   }
 }
-

bin/lib/migrateLegacyResources.js

@@ -20,7 +20,7 @@ module.exports = function (program) {
     .action(async (opts) => {
       const verbose = opts.verbose
       const suffix = opts.suffix || '$.ttl'
-      let paths = opts.path ? [ opts.path ] : [ 'data', 'config/templates' ]
+      let paths = opts.path ? [opts.path] : ['data', 'config/templates']
       paths = paths.map(path => path.startsWith(Path.sep) ? path : Path.join(process.cwd(), path))
       try {
         for (const path of paths) {

bin/lib/options.js

@@ -312,8 +312,8 @@ module.exports = [
       if (!value.match(/^[0-9]+(,[0-9]+)*$/)) {
         return 'direct-port(s) must be a comma-separated list of integers.'
       }
-      let list = value.split(/,/).map(v => parseInt(v))
-      let bad = list.find(v => { return v < 1 || v > 65535 })
+      const list = value.split(/,/).map(v => parseInt(v))
+      const bad = list.find(v => { return v < 1 || v > 65535 })
       if (bad.length) {
         return 'redirect-http-from port(s) ' + bad + ' out of range'
       }

bin/lib/start.js

@@ -44,18 +44,18 @@ module.exports = function (program, server) {
 function bin (argv, server) {
   if (!argv.email) {
     argv.email = {
-      host: argv['emailHost'],
-      port: argv['emailPort'],
+      host: argv.emailHost,
+      port: argv.emailPort,
       secure: true,
       auth: {
-        user: argv['emailAuthUser'],
-        pass: argv['emailAuthPass']
+        user: argv.emailAuthUser,
+        pass: argv.emailAuthPass
       }
     }
-    delete argv['emailHost']
-    delete argv['emailPort']
-    delete argv['emailAuthUser']
-    delete argv['emailAuthPass']
+    delete argv.emailHost
+    delete argv.emailPort
+    delete argv.emailAuthUser
+    delete argv.emailAuthPass
   }
 
   if (!argv.tokenTypesSupported) {

common/js/auth-buttons.js

@@ -1,3 +1,4 @@
+/* global location, alert, solid */
 /* Provide functionality for authentication buttons */
 
 (({ auth }) => {
@@ -41,7 +42,7 @@
     const session = await auth.popupLogin()
     if (session) {
       // Make authenticated request to the server to establish a session cookie
-      const {status} = await auth.fetch(location, { method: 'HEAD' })
+      const { status } = await auth.fetch(location, { method: 'HEAD' })
       if (status === 401) {
         alert(`Invalid login.\n\nDid you set ${session.idp} as your OIDC provider in your profile ${session.webId}?`)
         await auth.logout()

common/js/solid.js

@@ -267,8 +267,8 @@
 
     // Add the errors in the stack to the DOM
     this.errors.map((error) => {
-      let text = document.createTextNode(error)
-      let paragraph = document.createElement('p')
+      const text = document.createTextNode(error)
+      const paragraph = document.createElement('p')
       paragraph.appendChild(text)
       this.passwordHelpText.appendChild(paragraph)
     })
@@ -419,29 +419,29 @@
    * @returns {string[]}
    */
   PasswordValidator.prototype.tokenize = function () {
-    let tokenArray = []
-    for (let i in arguments) {
+    const tokenArray = []
+    for (const i in arguments) {
       tokenArray.push(arguments[i])
     }
     return tokenArray.join(' ').split(' ')
   }
 
   PasswordValidator.prototype.sha1 = function (str) {
-    let buffer = new TextEncoder('utf-8').encode(str)
+    const buffer = new TextEncoder('utf-8').encode(str)
 
     return crypto.subtle.digest('SHA-1', buffer).then((hash) => {
       return this.hex(hash)
     })
   }
 
   PasswordValidator.prototype.hex = function (buffer) {
-    let hexCodes = []
-    let view = new DataView(buffer)
+    const hexCodes = []
+    const view = new DataView(buffer)
     for (let i = 0; i < view.byteLength; i += 4) {
-      let value = view.getUint32(i)
-      let stringValue = value.toString(16)
+      const value = view.getUint32(i)
+      const stringValue = value.toString(16)
       const padding = '00000000'
-      let paddedValue = (padding + stringValue).slice(-padding.length)
+      const paddedValue = (padding + stringValue).slice(-padding.length)
       hexCodes.push(paddedValue)
     }
     return hexCodes.join('')

config/defaults.js

@@ -1,19 +1,19 @@
 'use strict'
 
 module.exports = {
-  'auth': 'oidc',
-  'localAuth': {
-    'tls': true,
-    'password': true
+  auth: 'oidc',
+  localAuth: {
+    tls: true,
+    password: true
   },
-  'configPath': './config',
-  'dbPath': './.db',
-  'port': 8443,
-  'serverUri': 'https://localhost:8443',
-  'webid': true,
-  'strictOrigin': true,
-  'trustedOrigins': [],
-  'dataBrowserPath': 'default'
+  configPath: './config',
+  dbPath: './.db',
+  port: 8443,
+  serverUri: 'https://localhost:8443',
+  webid: true,
+  strictOrigin: true,
+  trustedOrigins: [],
+  dataBrowserPath: 'default'
 
   // For use in Enterprises to configure a HTTP proxy for all outbound HTTP requests from the SOLID server (we use
   // https://www.npmjs.com/package/global-tunnel-ng).