@solid/oidc-auth-manager 0.24.3 → 0.24.5-de716c04

package/package.json

@@ -1,15 +1,17 @@
 {
   "name": "@solid/oidc-auth-manager",
-  "version": "0.24.3",
+  "version": "0.24.5-de716c04",
   "description": "An OpenID Connect (OIDC) authentication manager (OP, RP and RS) for decentralized peer-to-peer authentication",
   "main": "./src/index.js",
   "scripts": {
     "build": "echo nothing to build",
     "standard": "standard",
+    "standard-fix": "standard --fix",
     "test": "npm run standard && npm run mocha",
     "mocha": "nyc mocha --exit --recursive --timeout 20000",
     "preversion": "npm test",
-    "postversion": "git push --follow-tags"
+    "postversion": "git push --follow-tags",
+    "ignore:prepublishOnly": "npm test"
   },
   "engines": {
     "node": ">=8.10"
@@ -39,33 +41,33 @@
   },
   "homepage": "https://github.com/solid/oidc-auth-manager",
   "dependencies": {
-    "@solid/oidc-op": "^0.11.6",
-    "@solid/oidc-rp": "^0.11.7",
-    "@solid/oidc-rs": "^0.5.6",
-    "@solid/solid-multi-rp-client": "^0.6.4",
-    "ajv": "^7.2.4",
-    "bcryptjs": "^2.4.3",
-    "fs-extra": "^9.1.0",
+    "@solid/oidc-op": "^0.12.0",
+    "@solid/oidc-rp": "^0.12.0",
+    "@solid/oidc-rs": "^0.7.0",
+    "@solid/solid-multi-rp-client": "0.7.0",
+    "ajv": "^8.17.1",
+    "bcryptjs": "^3.0.3",
+    "fs-extra": "^11.3.3",
     "kvplus-files": "0.0.4",
     "li": "^1.3.0",
-    "node-fetch": "^2.6.7",
-    "rdflib": "^2.2.20",
+    "node-fetch": "^2.7.0",
+    "rdflib": "^2.3.2",
     "valid-url": "^1.0.9"
   },
   "devDependencies": {
-    "chai": "^4.3.6",
-    "chai-as-promised": "^7.1.1",
+    "chai": "^4.5.0",
+    "chai-as-promised": "^7.1.2",
     "dirty-chai": "^2.0.1",
-    "mocha": "^8.4.0",
-    "nock": "^13.2.9",
-    "node-mocks-http": "^1.11.0",
-    "nyc": "^15.1.0",
+    "mocha": "^11.7.5",
+    "nock": "^14.0.10",
+    "node-mocks-http": "^1.17.2",
+    "nyc": "^17.1.0",
     "sinon": "^9.2.4",
     "sinon-chai": "^3.7.0",
     "solid-auth-cli": "^1.0.15",
     "solid-auth-client": "^2.5.6",
-    "standard": "^16.0.4",
-    "whatwg-url": "^8.7.0"
+    "standard": "^17.1.2",
+    "whatwg-url": "^15.1.0"
   },
   "nyc": {
     "reporter": [

package/src/handlers/login-consent-request.js

@@ -1,8 +1,6 @@
 'use strict'
-/* eslint-disable node/no-deprecated-api */
 
 const AuthResponseSent = require('../errors/auth-response-sent')
-const url = require('url')
 
 class LoginConsentRequest {
   constructor (options) {
@@ -66,8 +64,8 @@ class LoginConsentRequest {
   static obtainConsent (consentRequest) {
     const { opAuthRequest, clientId } = consentRequest
 
-    const parsedAppOrigin = url.parse(consentRequest.opAuthRequest.params.redirect_uri)
-    const appOrigin = `${parsedAppOrigin.protocol}//${parsedAppOrigin.host}`
+    const parsedAppOrigin = new URL(consentRequest.opAuthRequest.params.redirect_uri)
+    const appOrigin = parsedAppOrigin.origin
 
     // Consent for the local RP client (the home pod) is implied
     if (consentRequest.isLocalRpClient(appOrigin)) {
@@ -126,10 +124,10 @@ class LoginConsentRequest {
 
   redirectToConsent (authRequest) {
     const { opAuthRequest } = this
-    let consentUrl = url.parse('/sharing')
-    consentUrl.query = opAuthRequest.req.query
-
-    consentUrl = url.format(consentUrl)
+    console.log('Redirecting user to /sharing')
+    console.log(opAuthRequest.host)
+    const queryString = new URLSearchParams(opAuthRequest.req.query).toString()
+    const consentUrl = `/sharing${queryString ? '?' + queryString : ''}`
     opAuthRequest.subject = null
 
     opAuthRequest.res.redirect(consentUrl)

package/src/host-api.js

@@ -1,7 +1,4 @@
 'use strict'
-/* eslint-disable node/no-deprecated-api */
-
-const url = require('url')
 
 const LogoutRequest = require('./handlers/logout-request')
 const LoginConsentRequest = require('./handlers/login-consent-request')
@@ -44,10 +41,11 @@ function authenticate (authRequest) {
 }
 
 function redirectToLogin (authRequest) {
-  let loginUrl = url.parse('/login')
-  loginUrl.query = authRequest.req.query
+  console.log('Redirecting user to /login')
+  console.log(authRequest.host)
 
-  loginUrl = url.format(loginUrl)
+  const queryString = new URLSearchParams(authRequest.req.query).toString()
+  const loginUrl = `/login${queryString ? '?' + queryString : ''}`
   authRequest.subject = null
 
   authRequest.res.redirect(loginUrl)

package/src/user-store.js

@@ -204,7 +204,7 @@ class UserStore {
 
   deleteUser (user) {
     const userKey = UserStore.normalizeIdKey(user.id)
-    var deletedEmail
+    let deletedEmail
     if (user.email) {
       const emailKey = UserStore.normalizeEmailKey(user.email)
       deletedEmail = this.backend.del('users-by-email', emailKey)

package/test/unit/user-store-test.js

@@ -194,7 +194,7 @@ describe('UserStore', () => {
 
     it('should look up user record by normalized email', () => {
       const email = 'alice@example.com'
-      const user = { id: 'abc', email: email }
+      const user = { id: 'abc', email }
 
       store.backend.get = sinon.stub().resolves(user)
 
@@ -242,7 +242,7 @@ describe('UserStore', () => {
 
       store.backend.del = sinon.stub()
 
-      return store.deleteUser({ id: userId, email: email })
+      return store.deleteUser({ id: userId, email })
         .then(() => {
           expect(store.backend.del).to.have.been.calledWith('users', UserStore.normalizeIdKey(userId))
           expect(store.backend.del).to.have.been.calledWith('users-by-email', UserStore.normalizeEmailKey(email))

package/.travis.yml

@@ -1,8 +0,0 @@
-sudo: false
-language: node_js
-node_js:
-  - "12.0"
-  - "node"
-cache:
-  directories:
-    - node_modules