Skip to content

Commit

Permalink
Merge branch 'solid-org'
Browse files Browse the repository at this point in the history
Merge to move oidc-op to @solid npm scope
  • Loading branch information
justinwb committed Aug 28, 2018
2 parents 103b2d7 + 9d6a4b7 commit b4dc21b
Show file tree
Hide file tree
Showing 15 changed files with 826 additions and 824 deletions.
1,606 changes: 805 additions & 801 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/AccessToken.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion src/IDToken.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Provider.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
3 changes: 1 addition & 2 deletions src/handlers/AuthenticationRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')

/**
Expand Down Expand Up @@ -622,4 +622,3 @@ class AuthenticationRequest extends BaseRequest {
* Export
*/
module.exports = AuthenticationRequest

4 changes: 1 addition & 3 deletions src/handlers/DynamicRegistrationRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -204,5 +204,3 @@ class DynamicRegistrationRequest extends BaseRequest {
* Export
*/
module.exports = DynamicRegistrationRequest


2 changes: 1 addition & 1 deletion src/schemas/AccessTokenSchema.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Local dependencies
*/
const {JWTSchema, JWKSchema} = require('@trust/jose')
const {JWTSchema, JWKSchema} = require('@solid/jose')

/**
* AccessTokenSchema
Expand Down
2 changes: 1 addition & 1 deletion src/schemas/IDTokenSchema.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Local dependencies
*/
const {JWTSchema, JWKSchema} = require('@trust/jose')
const {JWTSchema, JWKSchema} = require('@solid/jose')

/**
* IDToken Schema
Expand Down
2 changes: 1 addition & 1 deletion test/AccessTokenSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/IDTokenSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -31,7 +31,7 @@ describe('IDToken', () => {
var provider

before(function () {
this.timeout(5000)
this.timeout(25000)

let configPath = path.join(__dirname, 'config', 'provider.json')

Expand Down
5 changes: 3 additions & 2 deletions test/ProviderSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const TokenRequest = require(path.join(cwd, 'src', 'handlers', 'TokenRequest'))
const UserInfoRequest = require(path.join(cwd, 'src', 'handlers', 'UserInfoRequest'))
const RPInitiatedLogoutRequest = require(path.join(cwd, 'src', 'handlers', 'RPInitiatedLogoutRequest'))
const {JSONSchema} = require('@trust/json-document')
const KeyChain = require('@trust/keychain')
const KeyChain = require('@solid/keychain')

/**
* Tests
Expand Down Expand Up @@ -329,7 +329,8 @@ describe('OpenID Connect Provider', () => {
provider = new Provider({ issuer: 'https://example.com' })
})

it('should return a new keychain', () => {
it('should return a new keychain', function() {
this.timeout(25000);
return provider.generateKeyChain()
.then(keys => {
expect(keys).to.be.an.instanceof(KeyChain)
Expand Down
4 changes: 2 additions & 2 deletions test/handlers/AuthenticationRequestSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const chai = require('chai')
const sinon = require('sinon')
const HttpMocks = require('node-mocks-http')
const MemoryStore = require(path.join(cwd, 'test', 'backends', 'MemoryStore'))
const { JWT } = require('@trust/jose')
const { JWT } = require('@solid/jose')

/**
* Assertions
Expand Down Expand Up @@ -45,7 +45,7 @@ describe('AuthenticationRequest', () => {
let provider, params, req, res, request

before(function () {
this.timeout(5000)
this.timeout(25000)

let configPath = path.join(__dirname, '..', 'config', 'provider.json')

Expand Down
2 changes: 1 addition & 1 deletion test/handlers/DynamicRegistrationRequestSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('DynamicRegistrationRequest', () => {
let request

before(function () {
this.timeout(5000)
this.timeout(25000)

let configPath = path.join(__dirname, '..', 'config', 'provider.json')

Expand Down
2 changes: 1 addition & 1 deletion test/handlers/JWKSetRequestSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('JWKSetRequest', () => {
let req, res, provider

before(function () {
this.timeout(5000)
this.timeout(25000)

req = HttpMocks.createRequest()
res = HttpMocks.createResponse()
Expand Down

0 comments on commit b4dc21b

Please sign in to comment.