Update dependencies (#51)

* Update dependencies

* npm install --save-dev standard@latest

* npm install --save-dev [email protected]

* npm install --save-dev [email protected]

* npm update mkdirp --depth 6

* rm -ff node_modules/ ; rm package-lock.json ; npm install

* Node 8.10 on Travis

* Update all outdated dependencies

* standard --fix

* mocha.opts is deprecated

* npm install @solid/oidc-rp@latest @solid/solid-multi-rp-client@latest @solid/oidc-op@latest ; rm -rf node_modules ; rm package-lock.json ; npm install ; git add package-lock.json

* Require Node 12

Author: michielbdejong

.travis.yml

@@ -1,8 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - "8.0"
-  - "10.0"	
+  - "12.0"
   - "node"
 cache:
   directories:

package-lock.json

@@ -6,7 +6,7 @@
   "scripts": {
     "standard": "standard",
     "test": "npm run standard && npm run mocha",
-    "mocha": "nyc mocha",
+    "mocha": "nyc mocha --exit --recursive --timeout 20000",
     "preversion": "npm test",
     "postversion": "git push --follow-tags"
   },
@@ -38,30 +38,31 @@
   },
   "homepage": "https://github.com/solid/oidc-auth-manager",
   "dependencies": {
-    "@solid/oidc-op": "^0.7.0",
+    "@solid/oidc-op": "^0.8.0",
+    "@solid/oidc-rp": "^0.11.0",
     "@solid/oidc-rs": "^0.5.0",
-    "@solid/solid-multi-rp-client": "^0.4.3",
-    "ajv": "^5.5.2",
+    "@solid/solid-multi-rp-client": "^0.5.0",
+    "ajv": "^6.12.3",
     "bcryptjs": "^2.4.3",
-    "fs-extra": "^6.0.1",
+    "fs-extra": "^9.0.1",
     "kvplus-files": "0.0.4",
     "li": "^1.3.0",
-    "node-fetch": "^2.1.2",
-    "rdflib": "^0.17.1",
+    "node-fetch": "^2.6.0",
+    "rdflib": "^1.2.3",
     "valid-url": "^1.0.9"
   },
   "devDependencies": {
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "dirty-chai": "^2.0.1",
-    "mocha": "^5.2.0",
-    "nock": "^9.4.1",
-    "node-mocks-http": "^1.7.0",
-    "nyc": "^11.7.0",
-    "sinon": "^5.1.0",
-    "sinon-chai": "^3.1.0",
-    "standard": "^11.0.1",
-    "whatwg-url": "^6.4.1"
+    "mocha": "^8.0.1",
+    "nock": "^13.0.2",
+    "node-mocks-http": "^1.8.1",
+    "nyc": "^15.1.0",
+    "sinon": "^9.0.2",
+    "sinon-chai": "^3.5.0",
+    "standard": "^14.3.4",
+    "whatwg-url": "^8.1.0"
   },
   "nyc": {
     "reporter": [

package.json

@@ -50,15 +50,15 @@ class AuthCallbackRequest {
   static fromParams (req, res) {
     let oidcManager, serverUri
     if (req.app && req.app.locals) {
-      let locals = req.app.locals
+      const locals = req.app.locals
       oidcManager = locals.oidc
       serverUri = locals.host.serverUri
     }
 
-    let requestUri = AuthCallbackRequest.fullUriFor(req)
-    let issuer = AuthCallbackRequest.extractIssuer(req)
+    const requestUri = AuthCallbackRequest.fullUriFor(req)
+    const issuer = AuthCallbackRequest.extractIssuer(req)
 
-    let options = {
+    const options = {
       issuer,
       requestUri,
       oidcManager,
@@ -68,7 +68,7 @@ class AuthCallbackRequest {
       session: req.session
     }
 
-    let request = new AuthCallbackRequest(options)
+    const request = new AuthCallbackRequest(options)
 
     return request
   }
@@ -98,14 +98,14 @@ class AuthCallbackRequest {
 
   validate () {
     if (!this.issuer) {
-      let error = new Error('Issuer id is missing from request params')
+      const error = new Error('Issuer id is missing from request params')
       error.statusCode = 400
       throw error
     }
   }
 
   loadClient () {
-    let rpClientStore = this.oidcManager.clients
+    const rpClientStore = this.oidcManager.clients
 
     return rpClientStore.clientForIssuer(this.issuer)
   }
@@ -125,7 +125,7 @@ class AuthCallbackRequest {
         authorization: rpSession.authorization
       }
     } catch (err) {
-      let error = new Error('Could not verify Web ID from token claims')
+      const error = new Error('Could not verify Web ID from token claims')
       error.statusCode = 401
       error.cause = err
       error.info = { credentials: this.session.credentials }

src/handlers/auth-callback-request.js

@@ -1,4 +1,5 @@
 'use strict'
+/* eslint-disable node/no-deprecated-api */
 
 const AuthResponseSent = require('../errors/auth-response-sent')
 const url = require('url')
@@ -17,12 +18,12 @@ class LoginConsentRequest {
    * @return {Promise<OPAuthenticationRequest>}
    */
   static handle (opAuthRequest, skipConsent = false) {
-    let notLoggedIn = !opAuthRequest.subject
+    const notLoggedIn = !opAuthRequest.subject
     if (notLoggedIn) {
       return Promise.resolve(opAuthRequest) // pass through
     }
 
-    let consentRequest = LoginConsentRequest.from(opAuthRequest)
+    const consentRequest = LoginConsentRequest.from(opAuthRequest)
 
     if (skipConsent) {
       consentRequest.markConsentSuccess(opAuthRequest)
@@ -38,9 +39,9 @@ class LoginConsentRequest {
    * @return {LoginConsentRequest}
    */
   static from (opAuthRequest) {
-    let params = LoginConsentRequest.extractParams(opAuthRequest)
+    const params = LoginConsentRequest.extractParams(opAuthRequest)
 
-    let options = {
+    const options = {
       opAuthRequest,
       params,
       response: opAuthRequest.res
@@ -50,10 +51,10 @@ class LoginConsentRequest {
   }
 
   static extractParams (opAuthRequest) {
-    let req = opAuthRequest.req
-    let query = req.query || {}
-    let body = req.body || {}
-    let params = query['client_id'] ? query : body
+    const req = opAuthRequest.req
+    const query = req.query || {}
+    const body = req.body || {}
+    const params = query.client_id ? query : body
     return params
   }
 
@@ -63,7 +64,7 @@ class LoginConsentRequest {
    * @return {Promise<OPAuthenticationRequest>}
    */
   static obtainConsent (consentRequest) {
-    let { opAuthRequest, clientId } = consentRequest
+    const { opAuthRequest, clientId } = consentRequest
 
     const parsedAppOrigin = url.parse(consentRequest.opAuthRequest.params.redirect_uri)
     const appOrigin = `${parsedAppOrigin.protocol}//${parsedAppOrigin.host}`
@@ -98,7 +99,7 @@ class LoginConsentRequest {
    * @return {string}
    */
   get clientId () {
-    return this.params['client_id']
+    return this.params.client_id
   }
 
   isLocalRpClient (appOrigin) {
@@ -124,7 +125,7 @@ class LoginConsentRequest {
   }
 
   redirectToConsent (authRequest) {
-    let { opAuthRequest } = this
+    const { opAuthRequest } = this
     let consentUrl = url.parse('/sharing')
     consentUrl.query = opAuthRequest.req.query
 

src/handlers/login-consent-request.js

@@ -19,14 +19,14 @@ class LogoutRequest {
   static handle (req, res) {
     return Promise.resolve()
       .then(() => {
-        let request = LogoutRequest.fromParams(req, res)
+        const request = LogoutRequest.fromParams(req, res)
 
         return LogoutRequest.logout(request)
       })
   }
 
   static fromParams (req, res) {
-    let options = {
+    const options = {
       request: req,
       response: res,
       returnToUrl: LogoutRequest.parseReturnUrl(req)
@@ -36,7 +36,7 @@ class LogoutRequest {
   }
 
   static parseReturnUrl (req) {
-    let query = req.query || {}
+    const query = req.query || {}
     return query.post_logout_redirect_uri ? query.post_logout_redirect_uri : query.returnToUrl
   }
 
@@ -46,7 +46,7 @@ class LogoutRequest {
   }
 
   clearUserSession () {
-    let session = this.request.session
+    const session = this.request.session
 
     session.accessToken = ''
     session.refreshToken = ''

src/handlers/logout-request.js

@@ -31,19 +31,19 @@ class SelectProviderRequest {
    */
   validate () {
     if (!this.webId) {
-      let error = new Error('No webid is given for Provider Discovery')
+      const error = new Error('No webid is given for Provider Discovery')
       error.statusCode = 400
       throw error
     }
 
     if (!validUrl.isUri(this.webId)) {
-      let error = new Error('Invalid webid given for Provider Discovery')
+      const error = new Error('Invalid webid given for Provider Discovery')
       error.statusCode = 400
       throw error
     }
 
     if (!this.oidcManager) {
-      let error = new Error('OIDC multi-rp client not initialized')
+      const error = new Error('OIDC multi-rp client not initialized')
       error.statusCode = 500
       throw error
     }
@@ -67,12 +67,12 @@ class SelectProviderRequest {
 
     let oidcManager, serverUri
     if (req.app && req.app.locals) {
-      let locals = req.app.locals
+      const locals = req.app.locals
       oidcManager = locals.oidc
       serverUri = locals.host.serverUri
     }
 
-    let options = {
+    const options = {
       webId,
       oidcManager,
       serverUri,
@@ -81,7 +81,7 @@ class SelectProviderRequest {
       session: req.session
     }
 
-    let request = new SelectProviderRequest(options)
+    const request = new SelectProviderRequest(options)
 
     return request
   }
@@ -198,21 +198,21 @@ class SelectProviderRequest {
    * @return {Promise<string>}
    */
   authUrlFor (providerUri) {
-    let multiRpClient = this.oidcManager.clients
+    const multiRpClient = this.oidcManager.clients
 
     return multiRpClient.authUrlForIssuer(providerUri, this.session)
   }
 
   error (error) {
-    let res = this.response
+    const res = this.response
 
     res.status(error.statusCode || 400)
 
     res.render('auth/select-provider', { error: error.message })
   }
 
   renderView () {
-    let res = this.response
+    const res = this.response
 
     res.render('auth/select-provider', { serverUri: this.serverUri })
   }

src/handlers/select-provider-request.js

@@ -1,4 +1,5 @@
 'use strict'
+/* eslint-disable node/no-deprecated-api */
 
 const url = require('url')
 
@@ -24,9 +25,9 @@ const AuthResponseSent = require('./errors/auth-response-sent')
  * @return {AuthenticationRequest}
  */
 function authenticate (authRequest) {
-  let debug = authRequest.host.debug || console.log.bind(console)
+  const debug = authRequest.host.debug || console.log.bind(console)
 
-  let webId = authenticatedUser(authRequest)
+  const webId = authenticatedUser(authRequest)
 
   if (webId) {
     debug('User is already authenticated as', webId)
@@ -82,8 +83,8 @@ function initSubjectClaim (authRequest, webId) {
 }
 
 function obtainConsent (authRequest) {
-  let debug = authRequest.host.debug || console.error.bind(console)
-  let skipConsent = false
+  const debug = authRequest.host.debug || console.error.bind(console)
+  const skipConsent = false
 
   return LoginConsentRequest.handle(authRequest, skipConsent)
     .catch(error => {
@@ -95,7 +96,7 @@ function obtainConsent (authRequest) {
 }
 
 function logout (logoutRequest) {
-  let debug = console.error.bind(console)
+  const debug = console.error.bind(console)
 
   return LogoutRequest.handle(logoutRequest.req, logoutRequest.res)
     .then(() => logoutRequest)