Store serialized client config in client store

Author: dmitrizagidulin

src/multi-rp-client.js

@@ -10,9 +10,14 @@ class MultiRpClient {
     this.debug = options.debug || console.log.bind(console)
   }
 
+  /**
+   * @method clientForIssuer
+   * @param issuerUri {string}
+   * @returns {Promise<OIDCExpressClient>}
+   */
   clientForIssuer (issuerUri) {
     let debug = this.debug
-    return this.store.get(issuerUri)
+    return this.loadClient(issuerUri)
       .then(client => {
         debug('Client fetched for issuer.')
         if (client) {
@@ -22,17 +27,35 @@ class MultiRpClient {
         // client not already in store, create and register it
         let registrationConfig = this.registrationConfigFor(issuerUri)
         return this.registerClient(registrationConfig)
-      })
-      .then(registeredClient => {
-        // Store and return the newly registered client
-        return this.store.put(registeredClient)
+          .then(registeredClient => {
+            // Store and return the newly registered client
+            return this.persistClient(registeredClient)
+          })
       })
   }
 
+  /**
+   * @method loadClient
+   * @param issuerUri {string}
+   * @returns {Promise<OIDCExpressClient>}
+   */
+  loadClient (issuerUri) {
+    return this.store.get(issuerUri)
+  }
+
   get localIssuer () {
     return this.localConfig.issuer
   }
 
+  /**
+   * @method persistClient
+   * @param expressClient {OIDCExpressClient}
+   * @return {Promise<OIDCExpressClient>}
+   */
+  persistClient (expressClient) {
+    return this.store.put(expressClient)
+  }
+
   /**
    * @method redirectUriForIssuer
    * @param issuer {string} Issuer URI

src/store.js

@@ -1,19 +1,22 @@
+const OIDCExpressClient = require('anvil-connect-express')
+
 module.exports = class OIDCClientStore {
   constructor () {
     this.clients = {}
   }
   put (expressClient) {
     return Promise.resolve()
       .then(() => {
-        this.clients[expressClient.client.issuer] = expressClient
+        this.clients[expressClient.client.issuer] = expressClient.client.serialize()
         return expressClient
       })
   }
   get (issuer) {
     return Promise.resolve()
       .then(() => {
         if (issuer in this.clients) {
-          return this.clients[issuer]
+          let clientConfig = JSON.parse(this.clients[issuer])
+          return new OIDCExpressClient(clientConfig)
         } else {
           return null
         }

test/unit/client-store-test.js

@@ -2,25 +2,22 @@
 
 const test = require('tape')
 const { ClientStore } = require('../../src/index')
-
+const OIDCExpressClient = require('anvil-connect-express')
 
 test('client store and retrieve test', t => {
-  let issuerUrl = 'https://oidc.example.com'
+  let issuer = 'https://oidc.example.com'
   let store = new ClientStore()
-  let expressClient = {
-    client: {
-      issuer: issuerUrl
-    }
-  }
+  let expressClient = new OIDCExpressClient({ issuer })
   store.put(expressClient)
     .then((storedClient) => {
       t.equal(storedClient, expressClient,
         'store.put() should return the stored client')
-      return store.get(issuerUrl)
+      return store.get(issuer)
     })
     .then(retrievedClient => {
-      t.equals(retrievedClient, expressClient,
+      t.equal(retrievedClient.client.issuer, expressClient.client.issuer,
         'Should be able to retrieve the stored client')
       t.end()
     })
+    .catch(err => { t.fail(err) })
 })

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

@@ -45,8 +45,8 @@ test('MultiRpClient.clientForIssuer() - client exists in store test', t => {
       return multiClient.clientForIssuer(issuer)
     })
     .then(retrievedClient => {
-      t.equal(retrievedClient, expressClient,
-        'If client exists in store, clientForIssuer() should retrieve it')
+      t.equal(retrievedClient.client.issuer, expressClient.client.issuer,
+        'If client config exists in store, clientForIssuer() should retrieve it')
       t.end()
     })
     .catch(err => { t.fail(err) })