Refactor to use the new oidc-rp lib

Author: dmitrizagidulin

package.json

@@ -38,9 +38,10 @@
   },
   "homepage": "https://github.com/solid/solid-multi-rp-client",
   "dependencies": {
-    "anvil-connect-express": "^0.3.2"
+    "oidc-rp": "0.0.0"
   },
   "devDependencies": {
+    "sinon": "^1.17.6",
     "standard": "^5.4.1",
     "tape": "^4.6.2"
   },

src/multi-rp-client.js

@@ -1,6 +1,6 @@
 'use strict'
 const ClientStore = require('./store')
-const OIDCExpressClient = require('anvil-connect-express')
+const OIDCRelyingParty = require('oidc-rp')
 const DEFAULT_MAX_AGE = 86400
 
 class MultiRpClient {
@@ -14,19 +14,19 @@ class MultiRpClient {
    * Returns the authorization (signin) URL for a given OIDC client (which
    * is tied to / registered with a specific OIDC Provider).
    * @method authUrl
-   * @param expressClient {OIDCExpressClient}
+   * @param client {RelyingParty}
    * @param workflow {string} OIDC workflow type, one of 'code' or 'implicit'.
    * @return {string} Absolute URL for an OIDC auth call (to start either
    *   the Authorization Code workflow, or the Implicit workflow).
    */
-  authUrl (expressClient, workflow = 'code') {
+  authUrl (client, workflow = 'code') {
     let debug = this.debug
     let authParams = {
       endpoint: 'signin',
       response_mode: 'query',
       // response_mode: 'form_post',
-      client_id: expressClient.client.client_id,
-      redirect_uri: expressClient.client.redirect_uri,
+      client_id: client.client_id,
+      redirect_uri: client.redirect_uri,
       // state: '...',  // not doing state for the moment
       scope: 'openid profile'  // not doing 'openid profile' for the moment
     }
@@ -37,7 +37,7 @@ class MultiRpClient {
       authParams.nonce = '123'  // TODO: Implement proper nonce generation
     }
 
-    var signinUrl = expressClient.client.authorizationUri(authParams)
+    var signinUrl = client.authorizationUri(authParams)
     debug('Signin url: ' + signinUrl)
     return signinUrl
   }
@@ -115,20 +115,8 @@ class MultiRpClient {
 
   registerClient (config) {
     let debug = this.debug
-    let oidcExpress = new OIDCExpressClient(config)
-    debug('Running client.initProvider()...')
-    return oidcExpress.client.initProvider()
-      .then(() => {
-        debug('Client discovered, JWKs retrieved')
-        if (!oidcExpress.client.client_id) {
-          // Register if you haven't already.
-          debug('Registering client')
-          return oidcExpress.client.register(config)
-        } else {
-          // Already registered.
-          return oidcExpress
-        }
-      })
+    debug('new OIDCRelyingParty.register()', config)
+    return OIDCRelyingParty.register(config.issuer, config, {})
   }
 
   /**

src/store.js

@@ -1,22 +1,26 @@
-const OIDCExpressClient = require('anvil-connect-express')
+const OIDCRelyingParty = require('oidc-rp')
 
 module.exports = class OIDCClientStore {
   constructor () {
     this.clients = {}
   }
-  put (expressClient) {
+  put (client) {
+    if (!client) {
+      return Promise.reject(new Error('Cannot store null client'))
+    }
     return Promise.resolve()
       .then(() => {
-        this.clients[expressClient.client.issuer] = expressClient.client.serialize()
-        return expressClient
+        let issuer = client.provider.url
+        this.clients[issuer] = client.serialize()
+        return client
       })
   }
   get (issuer) {
     return Promise.resolve()
       .then(() => {
         if (issuer in this.clients) {
           let clientConfig = JSON.parse(this.clients[issuer])
-          return new OIDCExpressClient(clientConfig)
+          return OIDCRelyingParty.from(clientConfig)
         } else {
           return null
         }

test/unit/client-store-test.js

@@ -1,23 +1,21 @@
 'use strict'
 
 const test = require('tape')
-const { ClientStore } = require('../../src/index')
-const OIDCExpressClient = require('anvil-connect-express')
+const ClientStore = require('../../src/store')
+const OIDCRelyingParty = require('oidc-rp')
 
-test('client store and retrieve test', t => {
+test('client store test', t => {
   let issuer = 'https://oidc.example.com'
   let store = new ClientStore()
-  let expressClient = new OIDCExpressClient({ issuer })
-  store.put(expressClient)
+  let client = new OIDCRelyingParty({ provider: { url: issuer }})
+  return store.put(client)
     .then((storedClient) => {
-      t.equal(storedClient, expressClient,
+      t.equal(storedClient, client,
         'store.put() should return the stored client')
-      return store.get(issuer)
-    })
-    .then(retrievedClient => {
-      t.equal(retrievedClient.client.issuer, expressClient.client.issuer,
-        'Should be able to retrieve the stored client')
       t.end()
     })
-    .catch(err => { t.fail(err) })
+    .catch(err => {
+      console.log(err)
+      t.fail(err)
+    })
 })

test/unit/multi-rp-client-test.js

@@ -1,8 +1,9 @@
 'use strict'
 
 const test = require('tape')
-const OIDCExpressClient = require('anvil-connect-express')
+const OIDCRelyingParty = require('oidc-rp')
 const { ClientStore, MultiRpClient } = require('../../src/index')
+const sinon = require('sinon')
 
 test('MultiRpClient constructor test', t => {
   let store = new ClientStore()
@@ -37,19 +38,27 @@ test('MultiRpClient.registrationConfigFor() test', t => {
 test('MultiRpClient.clientForIssuer() - client exists in store test', t => {
   let issuer = 'https://oidc.example.com'
   let store = new ClientStore()
-  let expressClient = new OIDCExpressClient({ issuer })
+  let getStub = sinon.stub(store, 'get', (issuer) => {
+    return Promise.resolve(new OIDCRelyingParty({ provider: { url: issuer }}))
+  })
+  let client = new OIDCRelyingParty({ provider: { url: issuer }})
   let multiClient
-  store.put(expressClient)
+  store.put(client)
     .then(() => {
       multiClient = new MultiRpClient({ store })
       return multiClient.clientForIssuer(issuer)
     })
     .then(retrievedClient => {
-      t.equal(retrievedClient.client.issuer, expressClient.client.issuer,
+      t.equal(retrievedClient.issuer, client.issuer,
         'If client config exists in store, clientForIssuer() should retrieve it')
+      t.ok(getStub.calledWith(issuer))
+      getStub.restore()
       t.end()
     })
-    .catch(err => { t.fail(err) })
+    .catch(err => {
+      console.log(err)
+      t.fail(err)
+    })
 })
 
 test('MultiRpClient.redirectUriForIssuer() test', t => {