Merge branch 'solid-org'

Merge to move oidc-rp to @solid npm scope
nodeSolidServer · Aug 28, 2018 · dcae9cb · dcae9cb
2 parents 87d319a + 0228a47
commit dcae9cb
Show file tree

Hide file tree

Showing 9 changed files with 1,187 additions and 1,186 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@trust/oidc-rp",
-  "version": "0.6.0",
+  "name": "@solid/oidc-rp",
+  "version": "0.7.1",
   "description": "OpenID Connect Relying Party client library",
   "main": "./lib/index.js",
   "module": "./src/index.js",
@@ -38,7 +38,7 @@
   },
   "homepage": "https://github.com/anvilresearch/oidc-rp#readme",
   "dependencies": {
-    "@trust/jose": "solid/jose#rc-0.1.8",
+    "@solid/jose": "0.1.8",
     "@trust/json-document": "^0.1.4",
     "@trust/webcrypto": "0.9.2",
     "base64url": "^3.0.0",

diff --git a/src/AuthenticationRequest.js b/src/AuthenticationRequest.js
@@ -4,7 +4,7 @@
 const assert = require('assert')
 const base64url = require('base64url')
 const crypto = require('@trust/webcrypto')
-const { JWT } = require('@trust/jose')
+const { JWT } = require('@solid/jose')
 const FormUrlEncoded = require('./FormUrlEncoded')
 const { URL } = require('whatwg-url')
 

diff --git a/src/IDToken.js b/src/IDToken.js
@@ -1,7 +1,7 @@
 /**
  * Local dependencies
  */
-const {JWT} = require('@trust/jose')
+const {JWT} = require('@solid/jose')
 const IDTokenSchema = require('./IDTokenSchema')
 
 /**

diff --git a/src/IDTokenSchema.js b/src/IDTokenSchema.js
@@ -1,7 +1,7 @@
 /**
  * Local dependencies
  */
-const {JWTSchema} = require('@trust/jose')
+const {JWTSchema} = require('@solid/jose')
 
 /**
  * IDToken Schema

diff --git a/src/PoPToken.js b/src/PoPToken.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { URL } = require('whatwg-url')
-const {JWT, JWK} = require('@trust/jose')
+const {JWT, JWK} = require('@solid/jose')
 
 const DEFAULT_MAX_AGE = 3600  // Default token expiration, in seconds
 

diff --git a/src/RelyingParty.js b/src/RelyingParty.js
@@ -6,7 +6,7 @@ const fetch = require('node-fetch')
 const { URL } = require('whatwg-url')
 const Headers = fetch.Headers ? fetch.Headers : global.Headers
 const {JSONDocument} = require('@trust/json-document')
-const {JWKSet} = require('@trust/jose')
+const {JWKSet} = require('@solid/jose')
 const AuthenticationRequest = require('./AuthenticationRequest')
 const AuthenticationResponse = require('./AuthenticationResponse')
 const RelyingPartySchema = require('./RelyingPartySchema')

diff --git a/test/AuthenticationResponseSpec.js b/test/AuthenticationResponseSpec.js
@@ -20,7 +20,7 @@ let expect = chai.expect
 /**
  * Code under test
  */
-const {JWT, JWKSet} = require('@trust/jose')
+const {JWT, JWKSet} = require('@solid/jose')
 const IDToken = require('../src/IDToken')
 const AuthenticationResponse = require('../src/AuthenticationResponse')
 const {RsaPrivateCryptoKey, RsaPublicCryptoKey} = require('./keys')

diff --git a/test/PoPTokenSpec.js b/test/PoPTokenSpec.js
@@ -21,7 +21,7 @@ let expect = chai.expect
 const PoPToken = require('../src/PoPToken')
 const Session = require('../src/Session')
 const TestKeys = require('./keys/index')
-const {JWT, JWK} = require('@trust/jose')
+const {JWT, JWK} = require('@solid/jose')
 
 const providerUri = 'https://provider.example.com'
 const resourceServerUri = 'https://rs.example.net'
@@ -77,4 +77,3 @@ describe('PoPToken', () => {
     })
   })
 })
-