Merge branch 'solid-org'

Merge to move oidc-op to @solid npm scope

Author: justinwb

package-lock.json

@@ -1,6 +1,6 @@
 {
-  "name": "@trust/oidc-op",
-  "version": "0.3.1",
+  "name": "@solid/oidc-op",
+  "version": "0.3.2",
   "description": "OpenID Connect Provider",
   "main": "src/index.js",
   "directories": {
@@ -41,9 +41,9 @@
   },
   "homepage": "https://github.com/solid/oidc-op#README",
   "dependencies": {
-    "@trust/jose": "solid/jose#rc-0.1.8",
+    "@solid/jose": "0.1.8",
+    "@solid/keychain": "0.1.3",
     "@trust/json-document": "^0.1.4",
-    "@trust/keychain": "solid/keychain",
     "@trust/webcrypto": "0.9.2",
     "base64url": "^3.0.0",
     "pem-jwk": "^1.5.1",

package.json

@@ -1,7 +1,7 @@
 /**
  * Local dependencies
  */
-const {JWT} = require('@trust/jose')
+const {JWT} = require('@solid/jose')
 const crypto = require('@trust/webcrypto')
 const AccessTokenSchema = require('./schemas/AccessTokenSchema')
 

src/AccessToken.js

@@ -3,7 +3,7 @@
  */
 const crypto = require('@trust/webcrypto')
 const base64url = require('base64url')
-const {JWT} = require('@trust/jose')
+const {JWT} = require('@solid/jose')
 const IDTokenSchema = require('./schemas/IDTokenSchema')
 
 const DEFAULT_MAX_AGE = 1209600  // Default ID token expiration, in seconds

src/IDToken.js

@@ -5,7 +5,7 @@
  */
 const url = require('url')
 const {JSONDocument} = require('@trust/json-document')
-const KeyChain = require('@trust/keychain')
+const KeyChain = require('@solid/keychain')
 const ProviderSchema = require('./schemas/ProviderSchema')
 const AuthenticationRequest = require('./handlers/AuthenticationRequest')
 const OpenIDConfigurationRequest = require('./handlers/OpenIDConfigurationRequest')

src/Provider.js

@@ -8,7 +8,7 @@ const BaseRequest = require('./BaseRequest')
 const AccessToken = require('../AccessToken')
 const AuthorizationCode = require('../AuthorizationCode')
 const IDToken = require('../IDToken')
-const { JWT, JWK, JWKSet } = require('@trust/jose')
+const { JWT, JWK, JWKSet } = require('@solid/jose')
 const { URL } = require('whatwg-url')
 
 /**
@@ -622,4 +622,3 @@ class AuthenticationRequest extends BaseRequest {
  * Export
  */
 module.exports = AuthenticationRequest
-

src/handlers/AuthenticationRequest.js

@@ -4,7 +4,7 @@
  * Dependencies
  * @ignore
  */
-const {JWT} = require('@trust/jose')
+const {JWT} = require('@solid/jose')
 const crypto = require('@trust/webcrypto')
 const url = require('url')
 const BaseRequest = require('./BaseRequest')
@@ -204,5 +204,3 @@ class DynamicRegistrationRequest extends BaseRequest {
  * Export
  */
 module.exports = DynamicRegistrationRequest
-
-

src/handlers/DynamicRegistrationRequest.js

@@ -1,7 +1,7 @@
 /**
  * Local dependencies
  */
-const {JWTSchema, JWKSchema} = require('@trust/jose')
+const {JWTSchema, JWKSchema} = require('@solid/jose')
 
 /**
  * AccessTokenSchema

src/schemas/AccessTokenSchema.js

@@ -1,7 +1,7 @@
 /**
  * Local dependencies
  */
-const {JWTSchema, JWKSchema} = require('@trust/jose')
+const {JWTSchema, JWKSchema} = require('@solid/jose')
 
 /**
  * IDToken Schema

src/schemas/IDTokenSchema.js

@@ -6,7 +6,7 @@
 const chai = require('chai')
 const fs = require('fs')
 const path = require('path')
-const { JWT } = require('@trust/jose')
+const { JWT } = require('@solid/jose')
 
 /**
  * Assertions