From 6b555dfb10fbf0b171f0b9735e0fa95e59e603f5 Mon Sep 17 00:00:00 2001 From: Sphereon Date: Thu, 28 Sep 2023 15:58:40 +0000 Subject: [PATCH 1/6] chore(release): v0.7.1 --- CHANGELOG.md | 16 ++++++++++++++++ lerna.json | 2 +- packages/callback-example/CHANGELOG.md | 11 +++++++++++ packages/callback-example/package.json | 2 +- packages/client/CHANGELOG.md | 14 ++++++++++++++ packages/client/package.json | 6 +++--- packages/common/CHANGELOG.md | 14 ++++++++++++++ packages/common/package.json | 2 +- packages/issuer-rest/CHANGELOG.md | 11 +++++++++++ packages/issuer-rest/package.json | 2 +- packages/issuer/CHANGELOG.md | 12 ++++++++++++ packages/issuer/package.json | 2 +- 12 files changed, 86 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f8763c1..d12f682d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) + + +### Bug Fixes + +* Better match credential offer types and formats onto issuer metadata ([4044c21](https://github.com/Sphereon-Opensource/OID4VCI/commit/4044c2175b4cbee16f44c8bb5499bba249ca4993)) +* clearinterval ([214e3c6](https://github.com/Sphereon-Opensource/OID4VCI/commit/214e3c6d7ced9b27c50186db8ed876330230a6a5)) +* Fix credential offer matching against metadata ([3c23bab](https://github.com/Sphereon-Opensource/OID4VCI/commit/3c23bab83569e04a4b5846fed83ce00d68e8ddce)) +* Fix credential offer matching against metadata ([b79027f](https://github.com/Sphereon-Opensource/OID4VCI/commit/b79027fe601ecccb1373ba399419e14f5ec2d7ff)) +* relax auth_endpoint handling. Doesn't have to be available when doing pre-auth flow. Client handles errors anyway in case of auth/par flow ([ce39958](https://github.com/Sphereon-Opensource/OID4VCI/commit/ce39958f21f82243f26111fd14bd2443517eef9c)) +* relax auth_endpoint handling. Doesn't have to be available when doing pre-auth flow. Client handles errors anyway in case of auth/par flow ([cb5f9c1](https://github.com/Sphereon-Opensource/OID4VCI/commit/cb5f9c1c12285508c6d403814d032e8883a59e7d)) + + + + + # [0.7.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.6.0...v0.7.0) (2023-08-19) diff --git a/lerna.json b/lerna.json index 03e15a17..ed88f58a 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.7.0", + "version": "0.7.1", "npmClient": "pnpm", "command": { "publish": { diff --git a/packages/callback-example/CHANGELOG.md b/packages/callback-example/CHANGELOG.md index c65fb009..abcd8bf0 100644 --- a/packages/callback-example/CHANGELOG.md +++ b/packages/callback-example/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) + + +### Bug Fixes + +* Better match credential offer types and formats onto issuer metadata ([4044c21](https://github.com/Sphereon-Opensource/OID4VCI/commit/4044c2175b4cbee16f44c8bb5499bba249ca4993)) + + + + + # [0.7.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.6.0...v0.7.0) (2023-08-19) ### Features diff --git a/packages/callback-example/package.json b/packages/callback-example/package.json index 95e4f822..ca115b21 100644 --- a/packages/callback-example/package.json +++ b/packages/callback-example/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-callback-example", - "version": "0.7.0", + "version": "0.7.1", "description": "OpenID 4 Verifiable Credential Issuance issuer callback example", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index 4a1628ff..45bc7cd0 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) + + +### Bug Fixes + +* Better match credential offer types and formats onto issuer metadata ([4044c21](https://github.com/Sphereon-Opensource/OID4VCI/commit/4044c2175b4cbee16f44c8bb5499bba249ca4993)) +* clearinterval ([214e3c6](https://github.com/Sphereon-Opensource/OID4VCI/commit/214e3c6d7ced9b27c50186db8ed876330230a6a5)) +* relax auth_endpoint handling. Doesn't have to be available when doing pre-auth flow. Client handles errors anyway in case of auth/par flow ([ce39958](https://github.com/Sphereon-Opensource/OID4VCI/commit/ce39958f21f82243f26111fd14bd2443517eef9c)) +* relax auth_endpoint handling. Doesn't have to be available when doing pre-auth flow. Client handles errors anyway in case of auth/par flow ([cb5f9c1](https://github.com/Sphereon-Opensource/OID4VCI/commit/cb5f9c1c12285508c6d403814d032e8883a59e7d)) + + + + + # [0.7.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.6.0...v0.7.0) (2023-08-19) ### Bug Fixes diff --git a/packages/client/package.json b/packages/client/package.json index 226a0b58..900aa00d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-client", - "version": "0.7.0", + "version": "0.7.1", "description": "OpenID for Verifiable Credential Issuance (OpenID4VCI) client", "source": "lib/index.ts", "main": "dist/index.js", @@ -21,7 +21,6 @@ "debug": "^4.3.4" }, "devDependencies": { - "uint8arrays": "3.1.1", "@types/jest": "^29.5.3", "@types/node": "^18.17.4", "@typescript-eslint/eslint-plugin": "^5.62.0", @@ -40,7 +39,8 @@ "open-cli": "^7.2.0", "ts-jest": "^29.1.1", "ts-node": "^10.9.1", - "typescript": "4.9.5" + "typescript": "4.9.5", + "uint8arrays": "3.1.1" }, "engines": { "node": ">=16" diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md index 1a83f8b9..ac925c00 100644 --- a/packages/common/CHANGELOG.md +++ b/packages/common/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) + + +### Bug Fixes + +* Better match credential offer types and formats onto issuer metadata ([4044c21](https://github.com/Sphereon-Opensource/OID4VCI/commit/4044c2175b4cbee16f44c8bb5499bba249ca4993)) +* Fix credential offer matching against metadata ([3c23bab](https://github.com/Sphereon-Opensource/OID4VCI/commit/3c23bab83569e04a4b5846fed83ce00d68e8ddce)) +* Fix credential offer matching against metadata ([b79027f](https://github.com/Sphereon-Opensource/OID4VCI/commit/b79027fe601ecccb1373ba399419e14f5ec2d7ff)) +* relax auth_endpoint handling. Doesn't have to be available when doing pre-auth flow. Client handles errors anyway in case of auth/par flow ([cb5f9c1](https://github.com/Sphereon-Opensource/OID4VCI/commit/cb5f9c1c12285508c6d403814d032e8883a59e7d)) + + + + + # [0.7.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.6.0...v0.7.0) (2023-08-19) ### Bug Fixes diff --git a/packages/common/package.json b/packages/common/package.json index 0fe158e6..eb91bfe1 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-common", - "version": "0.7.0", + "version": "0.7.1", "description": "OpenID 4 Verifiable Credential Issuance Common Types", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/issuer-rest/CHANGELOG.md b/packages/issuer-rest/CHANGELOG.md index 5c503e66..4994469f 100644 --- a/packages/issuer-rest/CHANGELOG.md +++ b/packages/issuer-rest/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) + + +### Bug Fixes + +* Better match credential offer types and formats onto issuer metadata ([4044c21](https://github.com/Sphereon-Opensource/OID4VCI/commit/4044c2175b4cbee16f44c8bb5499bba249ca4993)) + + + + + # [0.7.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.6.0...v0.7.0) (2023-08-19) ### Bug Fixes diff --git a/packages/issuer-rest/package.json b/packages/issuer-rest/package.json index a9aea51d..62d8665c 100644 --- a/packages/issuer-rest/package.json +++ b/packages/issuer-rest/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-issuer-server", - "version": "0.7.0", + "version": "0.7.1", "description": "OpenID 4 Verifiable Credential Issuance Server", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/issuer/CHANGELOG.md b/packages/issuer/CHANGELOG.md index 0d3fad98..c438faa2 100644 --- a/packages/issuer/CHANGELOG.md +++ b/packages/issuer/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) + + +### Bug Fixes + +* Better match credential offer types and formats onto issuer metadata ([4044c21](https://github.com/Sphereon-Opensource/OID4VCI/commit/4044c2175b4cbee16f44c8bb5499bba249ca4993)) +* clearinterval ([214e3c6](https://github.com/Sphereon-Opensource/OID4VCI/commit/214e3c6d7ced9b27c50186db8ed876330230a6a5)) + + + + + # [0.7.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.6.0...v0.7.0) (2023-08-19) ### Features diff --git a/packages/issuer/package.json b/packages/issuer/package.json index 1115143a..a4a80633 100644 --- a/packages/issuer/package.json +++ b/packages/issuer/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-issuer", - "version": "0.7.0", + "version": "0.7.1", "description": "OpenID 4 Verifiable Credential Issuance issuer REST endpoints", "source": "lib/index.ts", "main": "dist/index.js", From 592ec4b837898eb3022d19479d79b6065e7a0d9e Mon Sep 17 00:00:00 2001 From: Niels Klomp Date: Fri, 29 Sep 2023 00:30:27 +0200 Subject: [PATCH 2/6] fix: id lookup against server metadata not working --- packages/client/lib/OpenID4VCIClient.ts | 8 ++++++-- .../common/lib/functions/IssuerMetadataUtils.ts | 15 +++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/client/lib/OpenID4VCIClient.ts b/packages/client/lib/OpenID4VCIClient.ts index 83dc0681..592d2dfd 100644 --- a/packages/client/lib/OpenID4VCIClient.ts +++ b/packages/client/lib/OpenID4VCIClient.ts @@ -365,6 +365,10 @@ export class OpenID4VCIClient { return response.successBody; } + // FIXME: We really should convert 0 ? formats : ['jwt_vc_json', 'jwt_vc_json-ld', 'ldp_vc']; const credentialSupportedOverlap: CredentialSupported[] = []; - if (opts?.types && typeof opts?.types === 'string') { + if ((opts?.types && typeof opts?.types === 'string') || opts?.types?.length === 1) { + const types = Array.isArray(opts.types) ? opts.types[0] : opts.types; const supported = credentialsSupported.filter( - (sup) => sup.id === opts.types || (initiationTypes && arrayEqualsIgnoreOrder(sup.types, initiationTypes)), + (sup) => sup.id === types || (initiationTypes && arrayEqualsIgnoreOrder(sup.types, initiationTypes)), ); if (supported) { credentialSupportedOverlap.push(...supported); } - } /*else if (initiationTypes && Array.isArray(initiationTypes) && initiationTypes.length === 1) { + } - const supported = credentialsSupported.filter( - (sup) => sup.id === initiationTypes![0] || (arrayEqualsIgnoreOrder(sup.types, initiationTypes!) && sup.types.includes(initiationTypes![0])), - ); - if (supported) { - credentialSupportedOverlap.push(...supported); - } - }*/ else { + if (credentialSupportedOverlap.length === 0) { // Make sure we include Verifiable Credential both on the offer side as well as in the metadata side, to ensure consistency of the issuer does not. if (initiationTypes && !initiationTypes.includes('VerifiableCredential')) { initiationTypes.push('VerifiableCredential'); From a219ea88197ebe5db4c747250c8cbcfb42dac289 Mon Sep 17 00:00:00 2001 From: Sphereon Date: Thu, 28 Sep 2023 22:55:42 +0000 Subject: [PATCH 3/6] chore(release): v0.7.2 --- CHANGELOG.md | 11 +++++++++++ lerna.json | 2 +- packages/callback-example/CHANGELOG.md | 8 ++++++++ packages/callback-example/package.json | 2 +- packages/client/CHANGELOG.md | 11 +++++++++++ packages/client/package.json | 2 +- packages/common/CHANGELOG.md | 11 +++++++++++ packages/common/package.json | 2 +- packages/issuer-rest/CHANGELOG.md | 8 ++++++++ packages/issuer-rest/package.json | 2 +- packages/issuer/CHANGELOG.md | 8 ++++++++ packages/issuer/package.json | 2 +- 12 files changed, 63 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d12f682d..11ae5f2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) + + +### Bug Fixes + +* id lookup against server metadata not working ([592ec4b](https://github.com/Sphereon-Opensource/OID4VCI/commit/592ec4b837898eb3022d19479d79b6065e7a0d9e)) + + + + + ## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) diff --git a/lerna.json b/lerna.json index ed88f58a..fdadf94f 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.7.1", + "version": "0.7.2", "npmClient": "pnpm", "command": { "publish": { diff --git a/packages/callback-example/CHANGELOG.md b/packages/callback-example/CHANGELOG.md index abcd8bf0..b1dc7ce5 100644 --- a/packages/callback-example/CHANGELOG.md +++ b/packages/callback-example/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) + +**Note:** Version bump only for package @sphereon/oid4vci-callback-example + + + + + ## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) diff --git a/packages/callback-example/package.json b/packages/callback-example/package.json index ca115b21..f3fa0feb 100644 --- a/packages/callback-example/package.json +++ b/packages/callback-example/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-callback-example", - "version": "0.7.1", + "version": "0.7.2", "description": "OpenID 4 Verifiable Credential Issuance issuer callback example", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index 45bc7cd0..1da084b7 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) + + +### Bug Fixes + +* id lookup against server metadata not working ([592ec4b](https://github.com/Sphereon-Opensource/OID4VCI/commit/592ec4b837898eb3022d19479d79b6065e7a0d9e)) + + + + + ## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) diff --git a/packages/client/package.json b/packages/client/package.json index 900aa00d..ceb5bca5 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-client", - "version": "0.7.1", + "version": "0.7.2", "description": "OpenID for Verifiable Credential Issuance (OpenID4VCI) client", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md index ac925c00..a62956a6 100644 --- a/packages/common/CHANGELOG.md +++ b/packages/common/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) + + +### Bug Fixes + +* id lookup against server metadata not working ([592ec4b](https://github.com/Sphereon-Opensource/OID4VCI/commit/592ec4b837898eb3022d19479d79b6065e7a0d9e)) + + + + + ## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) diff --git a/packages/common/package.json b/packages/common/package.json index eb91bfe1..42159d41 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-common", - "version": "0.7.1", + "version": "0.7.2", "description": "OpenID 4 Verifiable Credential Issuance Common Types", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/issuer-rest/CHANGELOG.md b/packages/issuer-rest/CHANGELOG.md index 4994469f..34aa2e04 100644 --- a/packages/issuer-rest/CHANGELOG.md +++ b/packages/issuer-rest/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) + +**Note:** Version bump only for package @sphereon/oid4vci-issuer-server + + + + + ## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) diff --git a/packages/issuer-rest/package.json b/packages/issuer-rest/package.json index 62d8665c..3d10adff 100644 --- a/packages/issuer-rest/package.json +++ b/packages/issuer-rest/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-issuer-server", - "version": "0.7.1", + "version": "0.7.2", "description": "OpenID 4 Verifiable Credential Issuance Server", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/issuer/CHANGELOG.md b/packages/issuer/CHANGELOG.md index c438faa2..dac8b93c 100644 --- a/packages/issuer/CHANGELOG.md +++ b/packages/issuer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) + +**Note:** Version bump only for package @sphereon/oid4vci-issuer + + + + + ## [0.7.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.0...v0.7.1) (2023-09-28) diff --git a/packages/issuer/package.json b/packages/issuer/package.json index a4a80633..8a6096ca 100644 --- a/packages/issuer/package.json +++ b/packages/issuer/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-issuer", - "version": "0.7.1", + "version": "0.7.2", "description": "OpenID 4 Verifiable Credential Issuance issuer REST endpoints", "source": "lib/index.ts", "main": "dist/index.js", From d99304cd02b92974785f516e8bd82900cc3e0925 Mon Sep 17 00:00:00 2001 From: Niels Klomp Date: Sat, 30 Sep 2023 00:23:14 +0200 Subject: [PATCH 4/6] fix: allow token endpoint to be defined in metadata without triggering logic for external AS --- packages/issuer-rest/lib/oid4vci-api-functions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/issuer-rest/lib/oid4vci-api-functions.ts b/packages/issuer-rest/lib/oid4vci-api-functions.ts index 73b04872..e01fddb7 100644 --- a/packages/issuer-rest/lib/oid4vci-api-functions.ts +++ b/packages/issuer-rest/lib/oid4vci-api-functions.ts @@ -71,7 +71,7 @@ export function accessTokenEndpoint( opts: ITokenEndpointOpts & ISingleEndpointOpts & { baseUrl: string | URL }, ) { const tokenEndpoint = issuer.issuerMetadata.token_endpoint - const externalAS = !!tokenEndpoint + const externalAS = issuer.issuerMetadata.authorization_server if (externalAS) { console.log(`[OID4VCI] External Authorization Server ${tokenEndpoint} is being used. Not enabling issuer token endpoint`) return From b4b99b0517c9cf82fad33c8bb8d1ded3f0c2da89 Mon Sep 17 00:00:00 2001 From: Niels Klomp Date: Sat, 30 Sep 2023 23:13:49 +0200 Subject: [PATCH 5/6] chore: update deps --- packages/callback-example/package.json | 2 +- packages/client/package.json | 2 +- packages/common/package.json | 2 +- packages/issuer-rest/package.json | 4 +- packages/issuer/package.json | 2 +- pnpm-lock.yaml | 87 +++++++++++++++++++++----- 6 files changed, 76 insertions(+), 23 deletions(-) diff --git a/packages/callback-example/package.json b/packages/callback-example/package.json index f3fa0feb..817365d0 100644 --- a/packages/callback-example/package.json +++ b/packages/callback-example/package.json @@ -17,7 +17,7 @@ "@sphereon/oid4vci-client": "workspace:*", "@sphereon/oid4vci-common": "workspace:*", "@sphereon/oid4vci-issuer": "workspace:*", - "@sphereon/ssi-types": "^0.15.1", + "@sphereon/ssi-types": "0.17.2", "jose": "^4.10.0" }, "devDependencies": { diff --git a/packages/client/package.json b/packages/client/package.json index ceb5bca5..1458c798 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "@sphereon/oid4vci-common": "workspace:*", - "@sphereon/ssi-types": "^0.15.1", + "@sphereon/ssi-types": "0.17.2", "cross-fetch": "^3.1.8", "debug": "^4.3.4" }, diff --git a/packages/common/package.json b/packages/common/package.json index 42159d41..142c0a62 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -9,7 +9,7 @@ "build": "tsc" }, "dependencies": { - "@sphereon/ssi-types": "^0.15.1", + "@sphereon/ssi-types": "0.17.2", "cross-fetch": "^3.1.8", "jwt-decode": "^3.1.2" }, diff --git a/packages/issuer-rest/package.json b/packages/issuer-rest/package.json index 3d10adff..4ccada6f 100644 --- a/packages/issuer-rest/package.json +++ b/packages/issuer-rest/package.json @@ -12,8 +12,8 @@ "dependencies": { "@sphereon/oid4vci-common": "workspace:*", "@sphereon/oid4vci-issuer": "workspace:*", - "@sphereon/ssi-express-support": "^0.15.1", - "@sphereon/ssi-types": "^0.15.1", + "@sphereon/ssi-express-support": "0.17.2", + "@sphereon/ssi-types": "0.17.2", "body-parser": "^1.20.2", "cookie-parser": "^1.4.6", "cors": "^2.8.5", diff --git a/packages/issuer/package.json b/packages/issuer/package.json index 8a6096ca..71ce5c48 100644 --- a/packages/issuer/package.json +++ b/packages/issuer/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@sphereon/oid4vci-common": "workspace:*", - "@sphereon/ssi-types": "^0.15.1", + "@sphereon/ssi-types": "0.17.2", "uuid": "^9.0.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9a79996c..6209a136 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -75,8 +75,8 @@ importers: specifier: workspace:* version: link:../issuer '@sphereon/ssi-types': - specifier: ^0.15.1 - version: 0.15.1 + specifier: 0.17.2 + version: 0.17.2 jose: specifier: ^4.10.0 version: 4.14.6 @@ -118,8 +118,8 @@ importers: specifier: workspace:* version: link:../common '@sphereon/ssi-types': - specifier: ^0.15.1 - version: 0.15.1 + specifier: 0.17.2 + version: 0.17.2 cross-fetch: specifier: ^3.1.8 version: 3.1.8 @@ -191,8 +191,8 @@ importers: packages/common: dependencies: '@sphereon/ssi-types': - specifier: ^0.15.1 - version: 0.15.1 + specifier: 0.17.2 + version: 0.17.2 cross-fetch: specifier: ^3.1.8 version: 3.1.8 @@ -213,8 +213,8 @@ importers: specifier: workspace:* version: link:../common '@sphereon/ssi-types': - specifier: ^0.15.1 - version: 0.15.1 + specifier: 0.17.2 + version: 0.17.2 uuid: specifier: ^9.0.0 version: 9.0.1 @@ -244,11 +244,11 @@ importers: specifier: workspace:* version: link:../issuer '@sphereon/ssi-express-support': - specifier: ^0.15.1 - version: 0.15.1 + specifier: 0.17.2 + version: 0.17.2 '@sphereon/ssi-types': - specifier: ^0.15.1 - version: 0.15.1 + specifier: 0.17.2 + version: 0.17.2 body-parser: specifier: ^1.20.2 version: 1.20.2 @@ -3313,10 +3313,10 @@ packages: dependencies: '@sinonjs/commons': 3.0.0 - /@sphereon/ssi-express-support@0.15.1: - resolution: {integrity: sha512-jmPnucQO4je5o7b57RTL30alryckKjwYKkGEvN/J26nTd467/M5nZWv1rf7eo1O7LdCdnRT7ihR9bg5vkP3UOw==} + /@sphereon/ssi-express-support@0.17.2: + resolution: {integrity: sha512-OrLC7YAelpUmCIzPRgHM97HBNFqDoSdJNNssstS6Ho0ZXswq4fsPDm+h49+//ogp1ERbuOl9Ywqhp+3DdLZCPA==} peerDependencies: - '@noble/hashes': ^1.3.1 + '@noble/hashes': 1.2.0 passport-azure-ad: ^4.3.5 passport-http-bearer: ^1.0.1 peerDependenciesMeta: @@ -3329,12 +3329,14 @@ packages: dependencies: body-parser: 1.20.2 casbin: 5.27.1 + cookie-session: 2.0.0 cors: 2.8.5 dotenv-flow: 3.3.0 express: 4.18.2 express-session: 1.17.3 http-terminator: 3.2.0 morgan: 1.10.0 + openid-client: 5.5.0 passport: 0.6.0 qs: 6.11.2 uint8arrays: 3.1.1 @@ -3342,8 +3344,8 @@ packages: - supports-color dev: false - /@sphereon/ssi-types@0.15.1: - resolution: {integrity: sha512-NFpgcVHIU8YQ2OkCHpw9YVa5bIDBcfSbp0kvwC0iZa0du1tr3148fV2Xm4ilcLeRNvUKL5BbDEdHl1WuQkmoyw==} + /@sphereon/ssi-types@0.17.2: + resolution: {integrity: sha512-Qo1dkISavtPIe1WKZXZGyHvquoUvdUlDI0GLzb21clKFPuxbawXdlxpCqOh6NCNRfX7ohEeCUQdEA1PNBlnKYA==} dependencies: jwt-decode: 3.1.2 dev: false @@ -5093,6 +5095,18 @@ packages: cookie-signature: 1.0.6 dev: false + /cookie-session@2.0.0: + resolution: {integrity: sha512-hKvgoThbw00zQOleSlUr2qpvuNweoqBtxrmx0UFosx6AGi9lYtLoA+RbsvknrEX8Pr6MDbdWAb2j6SnMn+lPsg==} + engines: {node: '>= 0.10'} + dependencies: + cookies: 0.8.0 + debug: 3.2.7 + on-headers: 1.0.2 + safe-buffer: 5.2.1 + transitivePeerDependencies: + - supports-color + dev: false + /cookie-signature@1.0.6: resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} dev: false @@ -5116,6 +5130,14 @@ packages: resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==} dev: true + /cookies@0.8.0: + resolution: {integrity: sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==} + engines: {node: '>= 0.8'} + dependencies: + depd: 2.0.0 + keygrip: 1.1.0 + dev: false + /core-js-compat@3.32.2: resolution: {integrity: sha512-+GjlguTDINOijtVRUxrQOv3kfu9rl+qPNdX2LTbJ/ZyVTuxK+ksVSAGX1nHstu4hrv1En/uPTtWgq2gI5wt4AQ==} dependencies: @@ -8272,6 +8294,13 @@ packages: resolution: {integrity: sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==} dev: false + /keygrip@1.1.0: + resolution: {integrity: sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==} + engines: {node: '>= 0.6'} + dependencies: + tsscmp: 1.0.6 + dev: false + /keyv@4.5.3: resolution: {integrity: sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==} dependencies: @@ -9723,6 +9752,11 @@ packages: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} + /object-hash@2.2.0: + resolution: {integrity: sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==} + engines: {node: '>= 6'} + dev: false + /object-inspect@1.12.3: resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==} @@ -9767,6 +9801,11 @@ packages: es-abstract: 1.22.2 dev: true + /oidc-token-hash@5.0.3: + resolution: {integrity: sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==} + engines: {node: ^10.13.0 || >=12.0.0} + dev: false + /on-finished@2.3.0: resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==} engines: {node: '>= 0.8'} @@ -9843,6 +9882,15 @@ packages: is-wsl: 2.2.0 dev: true + /openid-client@5.5.0: + resolution: {integrity: sha512-Y7Xl8BgsrkzWLHkVDYuroM67hi96xITyEDSkmWaGUiNX6CkcXC3XyQGdv5aWZ6dukVKBFVQCADi9gCavOmU14w==} + dependencies: + jose: 4.14.6 + lru-cache: 6.0.0 + object-hash: 2.2.0 + oidc-token-hash: 5.0.3 + dev: false + /optionator@0.9.3: resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} engines: {node: '>= 0.8.0'} @@ -11936,6 +11984,11 @@ packages: /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} + /tsscmp@1.0.6: + resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==} + engines: {node: '>=0.6.x'} + dev: false + /tsutils@3.21.0(typescript@4.9.5): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} From c4120939ca8501aae9bb9ad6c5f49e772f9380be Mon Sep 17 00:00:00 2001 From: Sphereon Date: Sat, 30 Sep 2023 21:19:58 +0000 Subject: [PATCH 6/6] chore(release): v0.7.3 --- CHANGELOG.md | 11 +++++++++++ lerna.json | 2 +- packages/callback-example/CHANGELOG.md | 8 ++++++++ packages/callback-example/package.json | 2 +- packages/client/CHANGELOG.md | 8 ++++++++ packages/client/package.json | 2 +- packages/common/CHANGELOG.md | 8 ++++++++ packages/common/package.json | 2 +- packages/issuer-rest/CHANGELOG.md | 11 +++++++++++ packages/issuer-rest/package.json | 2 +- packages/issuer/CHANGELOG.md | 8 ++++++++ packages/issuer/package.json | 2 +- 12 files changed, 60 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11ae5f2a..645ecfb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.3](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.2...v0.7.3) (2023-09-30) + + +### Bug Fixes + +* allow token endpoint to be defined in metadata without triggering logic for external AS ([d99304c](https://github.com/Sphereon-Opensource/OID4VCI/commit/d99304cd02b92974785f516e8bd82900cc3e0925)) + + + + + ## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) diff --git a/lerna.json b/lerna.json index fdadf94f..f907ac54 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.7.2", + "version": "0.7.3", "npmClient": "pnpm", "command": { "publish": { diff --git a/packages/callback-example/CHANGELOG.md b/packages/callback-example/CHANGELOG.md index b1dc7ce5..560d36af 100644 --- a/packages/callback-example/CHANGELOG.md +++ b/packages/callback-example/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.3](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.2...v0.7.3) (2023-09-30) + +**Note:** Version bump only for package @sphereon/oid4vci-callback-example + + + + + ## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) **Note:** Version bump only for package @sphereon/oid4vci-callback-example diff --git a/packages/callback-example/package.json b/packages/callback-example/package.json index 817365d0..44054592 100644 --- a/packages/callback-example/package.json +++ b/packages/callback-example/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-callback-example", - "version": "0.7.2", + "version": "0.7.3", "description": "OpenID 4 Verifiable Credential Issuance issuer callback example", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index 1da084b7..a8623855 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.3](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.2...v0.7.3) (2023-09-30) + +**Note:** Version bump only for package @sphereon/oid4vci-client + + + + + ## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) diff --git a/packages/client/package.json b/packages/client/package.json index 1458c798..4b1246d6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-client", - "version": "0.7.2", + "version": "0.7.3", "description": "OpenID for Verifiable Credential Issuance (OpenID4VCI) client", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md index a62956a6..e5f23567 100644 --- a/packages/common/CHANGELOG.md +++ b/packages/common/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.3](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.2...v0.7.3) (2023-09-30) + +**Note:** Version bump only for package @sphereon/oid4vci-common + + + + + ## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) diff --git a/packages/common/package.json b/packages/common/package.json index 142c0a62..386b7bb5 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-common", - "version": "0.7.2", + "version": "0.7.3", "description": "OpenID 4 Verifiable Credential Issuance Common Types", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/issuer-rest/CHANGELOG.md b/packages/issuer-rest/CHANGELOG.md index 34aa2e04..21d8261e 100644 --- a/packages/issuer-rest/CHANGELOG.md +++ b/packages/issuer-rest/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.3](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.2...v0.7.3) (2023-09-30) + + +### Bug Fixes + +* allow token endpoint to be defined in metadata without triggering logic for external AS ([d99304c](https://github.com/Sphereon-Opensource/OID4VCI/commit/d99304cd02b92974785f516e8bd82900cc3e0925)) + + + + + ## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) **Note:** Version bump only for package @sphereon/oid4vci-issuer-server diff --git a/packages/issuer-rest/package.json b/packages/issuer-rest/package.json index 4ccada6f..ac2a4ad3 100644 --- a/packages/issuer-rest/package.json +++ b/packages/issuer-rest/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-issuer-server", - "version": "0.7.2", + "version": "0.7.3", "description": "OpenID 4 Verifiable Credential Issuance Server", "source": "lib/index.ts", "main": "dist/index.js", diff --git a/packages/issuer/CHANGELOG.md b/packages/issuer/CHANGELOG.md index dac8b93c..685d8f03 100644 --- a/packages/issuer/CHANGELOG.md +++ b/packages/issuer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.7.3](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.2...v0.7.3) (2023-09-30) + +**Note:** Version bump only for package @sphereon/oid4vci-issuer + + + + + ## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28) **Note:** Version bump only for package @sphereon/oid4vci-issuer diff --git a/packages/issuer/package.json b/packages/issuer/package.json index 71ce5c48..d19c2ab0 100644 --- a/packages/issuer/package.json +++ b/packages/issuer/package.json @@ -1,6 +1,6 @@ { "name": "@sphereon/oid4vci-issuer", - "version": "0.7.2", + "version": "0.7.3", "description": "OpenID 4 Verifiable Credential Issuance issuer REST endpoints", "source": "lib/index.ts", "main": "dist/index.js",