Merge branch 'support-new-oidc-rp-interface'

Updating to support new oidc-rp interface

Author: justinwb

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@solid/solid-auth-oidc",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "engines": {
     "node": ">= 6.0"
   },

package.json

@@ -406,13 +406,13 @@ class ClientAuthOIDC {
   initUserFromResponse (client) {
     return client.validateResponse(this.currentLocation(), this.store)
       .then(response => {
-        this.idToken = response.idToken
-        this.accessToken = response.accessToken
+        this.idToken = response.authorization.id_token
+        this.accessToken = response.authorization.access_token
         this.session = response
 
         this.clearAuthResponseFromUrl()
 
-        return this.extractAndValidateWebId(response.decoded)
+        return this.extractAndValidateWebId(response.idClaims.sub)
       })
       .catch(error => {
         this.clearAuthResponseFromUrl()
@@ -433,7 +433,7 @@ class ClientAuthOIDC {
    * @return {string}
    */
   extractAndValidateWebId (idToken) {
-    let webId = idToken.payload.sub
+    let webId = idToken
     this.webId = webId
     return webId
   }

src/index.js

@@ -318,12 +318,12 @@ describe('SolidAuthOIDC', () => {
     it('should validate the auth response', () => {
       let aliceWebId = 'https://alice.example.com/'
       let authResponse = {
-        params: {
+        authorization: {
           id_token: 'sample.id.token',
           access_token: 'sample.access.token'
         },
-        decoded: {
-          payload: { sub: aliceWebId }
+        idClaims: {
+          sub: aliceWebId
         }
       }
       let validateResponseStub = sinon.stub().resolves(authResponse)