Add more error logging, bump oidc-rp dep to rc-002

Author: dmitrizagidulin

package.json

@@ -39,7 +39,7 @@
   "homepage": "https://github.com/solid/solid-multi-rp-client",
   "dependencies": {
     "kvplus-files": "0.0.4",
-    "oidc-rp": "git://github.com/anvilresearch/oidc-rp.git#rc-001"
+    "oidc-rp": "git://github.com/anvilresearch/oidc-rp.git#rc-002"
   },
   "devDependencies": {
     "sinon": "^1.17.7",

src/client-store.js

@@ -23,7 +23,16 @@ module.exports = class OIDCClientStore {
       })
 
     this.backend.serialize = (client) => { return client.serialize() }
-    this.backend.deserialize = (data) => { return JSON.parse(data) }
+    this.backend.deserialize = (data) => {
+      let result
+      try {
+        result = JSON.parse(data)
+      } catch (error) {
+        console.log(`Error parsing JSON at '${this.backend.path}', ` +
+          `collection '${this.collectionName}': `, error)
+      }
+      return result
+    }
   }
 
   del (client) {
@@ -64,5 +73,9 @@ module.exports = class OIDCClientStore {
         }
         return result
       })
+      .catch(error => {
+        console.error('Error in clientStore.get() while loading a RelyingParty:',
+          error)
+      })
   }
 }

src/multi-rp-client.js

@@ -72,10 +72,15 @@ class MultiRpClient {
    * @returns {Promise<string>}
    */
   authUrlForIssuer (issuer, session, workflow = 'code') {
+    let debug = this.debug
+
     return this.clientForIssuer(issuer)
       .then((client) => {
         return this.authUrl(client, session, workflow)
       })
+      .catch(error => {
+        debug('Error in authUrlForIssuer(): ', error)
+      })
   }
 
   /**
@@ -87,18 +92,24 @@ class MultiRpClient {
     let debug = this.debug
     return this.loadClient(issuerUri)
       .then(client => {
-        debug('Client fetched for issuer.')
         if (client) {
+          debug(`Client fetched for issuer ${issuerUri}`)
           return client
         }
-        debug('Client not present, initializing new client.')
+        debug(`Client not present for issuer ${issuerUri}, initializing new client`)
         // client not already in store, create and register it
         let registrationConfig = this.registrationConfigFor(issuerUri)
         return this.registerClient(registrationConfig)
+          .catch(error => {
+            debug('Error registering a new client: ', error)
+          })
           .then(registeredClient => {
             // Store and return the newly registered client
             return this.persistClient(registeredClient)
           })
+          .catch(error => {
+            debug('Error persisting registered client: ', error)
+          })
       })
   }
 
@@ -128,7 +139,10 @@ class MultiRpClient {
    * @method redirectUriForIssuer
    * @param issuer {string} Issuer URI
    * @param baseUri {string}
-   * @returns {string}
+   *
+   * @throws {Error} If baseUri is missing.
+   *
+   * @return {string}
    */
   redirectUriForIssuer (issuerUri, baseUri = this.localConfig.redirect_uri) {
     if (!baseUri) {
@@ -141,6 +155,8 @@ class MultiRpClient {
   registerClient (config) {
     // let debug = this.debug
     // debug('new OIDCRelyingParty.register()', config)
+    this.debug('Registering new client for issuer ', config.issuer)
+
     return OIDCRelyingParty.register(config.issuer, config, {})
   }
 
@@ -150,6 +166,7 @@ class MultiRpClient {
    */
   registrationConfigFor (issuer, config = {}) {
     let redirectUri = config.redirect_uri || this.redirectUriForIssuer(issuer)
+
     let defaultClientName = `Solid OIDC RP for ${issuer}`
 
     config.client_name = config.client_name || defaultClientName