Merge pull request #10 from solid/bump-rp-dep

Update oidc-rp dep to 0.4.1

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - ">=7.0"
+  - ">=6.0"
 
 cache:
   directories:

package.json

@@ -2,7 +2,7 @@
   "name": "solid-auth-oidc",
   "version": "0.1.3",
   "engines": {
-    "node": ">= 7.0"
+    "node": ">= 6.0"
   },
   "description": "Authentication library for Solid client based on OAuth2/OpenID Connect",
   "main": "./lib/index.js",
@@ -56,7 +56,7 @@
   },
   "homepage": "https://github.com/solid/solid-auth-oidc",
   "dependencies": {
-    "oidc-rp": "git://github.com/anvilresearch/oidc-rp.git#rc-005"
+    "@trust/oidc-rp": "^0.4.1"
   },
   "devDependencies": {
     "babel-cli": "^6.24.1",
@@ -72,7 +72,8 @@
     "sinon": "^2.1.0",
     "sinon-chai": "^2.9.0",
     "standard": "^10.0.2",
-    "webpack": "^2.5.1"
+    "webpack": "^2.5.1",
+    "whatwg-url": "^6.1.0"
   },
   "standard": {
     "globals": [

src/index.js

@@ -25,7 +25,8 @@
  https://github.com/solid/solid
  */
 'use strict'
-const RelyingParty = require('oidc-rp')
+const RelyingParty = require('@trust/oidc-rp')
+const PoPToken = require('@trust/oidc-rp/lib/PoPToken')
 const providerSelectPopupSource = require('./provider-select-popup')
 
 // URI parameter types
@@ -388,6 +389,10 @@ class ClientAuthOIDC {
     return this.sendAuthRequest(client)
   }
 
+  issuePoPTokenFor (uri, session) {
+    return PoPToken.issueFor(uri, session)
+  }
+
   /**
    * Validates the auth response in the current uri, initializes the current
    * user's ID Token and Access token, and returns the user's WebID
@@ -401,8 +406,9 @@ class ClientAuthOIDC {
   initUserFromResponse (client) {
     return client.validateResponse(this.currentLocation(), this.store)
       .then(response => {
-        this.idToken = response.params.id_token
-        this.accessToken = response.params.access_token
+        this.idToken = response.idToken
+        this.accessToken = response.accessToken
+        this.session = response
 
         this.clearAuthResponseFromUrl()
 

test/auth.test.js

@@ -1,7 +1,7 @@
 'use strict'
 
-global.URL = require('url').URL
-global.URLSearchParams = require('url').URLSearchParams
+global.URL = require('whatwg-url').URL
+global.URLSearchParams = require('whatwg-url').URLSearchParams
 
 const localStorage = require('localstorage-memory')
 
@@ -17,6 +17,7 @@ chai.should()
 const expect = chai.expect
 
 const SolidAuthOIDC = require('../src/index')
+const PoPToken = require('@trust/oidc-rp/lib/PoPToken')
 
 describe('SolidAuthOIDC', () => {
   var auth
@@ -494,4 +495,25 @@ describe('SolidAuthOIDC', () => {
       expect(url).to.equal('https://example.com/')
     })
   })
+
+  describe('issuePoPTokenFor()', () => {
+    before(() => {
+      sinon.stub(PoPToken, 'issueFor').resolves()
+    })
+
+    after(() => {
+      PoPToken.issueFor.restore()
+    })
+
+    it('should invoke PoPToken.issueFor', () => {
+      let auth = new SolidAuthOIDC()
+      let uri = 'https://rs.com'
+      let session = {}
+
+      return auth.issuePoPTokenFor(uri, session)
+        .then(() => {
+          expect(PoPToken.issueFor).to.have.been.calledWith(uri, session)
+        })
+    })
+  })
 })

webpack.config.js

@@ -15,6 +15,7 @@ module.exports = {
       {
         test: /\.js$/,
         loader: 'babel-loader',
+        exclude: /(node_modules)/,
         query: {
           presets: ['es2015']
         }
@@ -25,7 +26,7 @@ module.exports = {
     'node-fetch': 'fetch',
     'text-encoding': 'TextEncoder',
     'urlutils': 'URL',
-    'webcrypto': 'crypto'
+    '@trust/webcrypto': 'crypto'
   },
   devtool: 'source-map'
 }