Merge remote-tracking branch 'origin/develop' into fix/tx_code

# Conflicts:
#	pnpm-lock.yaml

Author: nklomp

.gitignore

@@ -11,4 +11,8 @@
 **/temp/*
 **/tmp/*
 *.tsbuildinfo
-
+*.tsimp
+*.log
+packages/siop-oid4vp/lib/schemas/validation/schemaValidation.js
+packages/siop-oid4vp/lib/generator/*
+!packages/siop-oid4vp/lib/generator/schemaGenerator.ts

.prettierignore

@@ -1,3 +1,4 @@
 **/dist
 **/coverage
 **/*/node_modules
+packages/siop-oid4vp/lib/schemas

CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.15.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.14.0...v0.15.0) (2024-07-15)
+
+### Bug Fixes
+
+- add openid federation jwtVerifier ([a5755ff](https://github.com/Sphereon-Opensource/OID4VCI/commit/a5755ffc5244f1ae72d9ad160c2271de07202ac1))
+- build ([2da9205](https://github.com/Sphereon-Opensource/OID4VCI/commit/2da92051cb6387e6c10dd0ff2767aeeddab17dd9))
+- build ([84aba5e](https://github.com/Sphereon-Opensource/OID4VCI/commit/84aba5e7cc9aca7b597f24c907dc717be45768d7))
+- remove outdated docs ([31731e7](https://github.com/Sphereon-Opensource/OID4VCI/commit/31731e7628a93a1f749600ee138d2470a5048353))
+- siop-oid4vp build order ([dacf629](https://github.com/Sphereon-Opensource/OID4VCI/commit/dacf629be63f130c0f027deea6dfdc988eaa3c1b))
+
+### Features
+
+- add siop-oid4vp package ([6bc76dd](https://github.com/Sphereon-Opensource/OID4VCI/commit/6bc76dd2e4843e0acf07fc44c4c0c247496d1973))
+- did-auth-siop-adapter ([32ec2fc](https://github.com/Sphereon-Opensource/OID4VCI/commit/32ec2fc27a22cd069dc12fe011debef7f870cf5d))
+- update pnpm-lock.yaml ([158fb23](https://github.com/Sphereon-Opensource/OID4VCI/commit/158fb23152a5f8e891cbaeb5904947bb1cacf13e))
+
+# [0.14.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.13.0...v0.14.0) (2024-07-06)
+
+### Bug Fixes
+
+- hasher dependency and token request assert vci11/13 ([81bf769](https://github.com/Sphereon-Opensource/OID4VCI/commit/81bf7692bd7721a7542c82d60fa2c01d7ce2d7b1))
+- undo tx_code changes ([7888a14](https://github.com/Sphereon-Opensource/OID4VCI/commit/7888a148a8d1c41103fde35dd065ef84c4a17c2b))
+- update tx_code check ([3b0971d](https://github.com/Sphereon-Opensource/OID4VCI/commit/3b0971db8302a977550b403e6611ec53be34f1dd))
+
+### Features
+
+- Enable tx_code support for the issuer, and properly handle both the old userPin and tx_code on the client side. fixes [#117](https://github.com/Sphereon-Opensource/OID4VCI/issues/117) ([e54071c](https://github.com/Sphereon-Opensource/OID4VCI/commit/e54071c65b00ef921acafa2c2c73707a3bc33a44))
+
 # [0.13.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.12.0...v0.13.0) (2024-07-03)
 
 ### Bug Fixes

README.md

@@ -1,7 +1,7 @@
 <h1 align="center">
   <br>
   <a href="https://www.sphereon.com"><img src="https://sphereon.com/content/themes/sphereon/assets/img/logo.svg" alt="Sphereon" width="400"></a>
-    <br>OpenID for Verifiable Credential Issuance - Client and Issuer
+    <br>OpenID for Verifiable Credentials
   <br>
 </h1>
 
@@ -11,9 +11,11 @@ _IMPORTANT the packages are still in an early development stage, which means tha
 
 # Background
 
-This is a mono-repository with a client and issuer pacakge to request and receive Verifiable Credentials using
+This is a mono-repository with a client and issuer package to request and receive Verifiable Credentials using
 the [OpenID for Verifiable Credential Issuance](https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0.html) (
-OpenID4VCI) specification for receiving Verifiable Credentials as a holder/subject.
+OpenID4VCI) specification for receiving Verifiable Credentials as a holder/subject. In addition the monorepo contains a package
+for requesting the presentation of Verifiable Credentials and Verifying these presentations [OpenID for Verifiable Presentations](https://openid.net/specs/openid-4-verifiable-presentations-1_0.html) (
+OpenID4VP)
 
 OpenID4VCI defines an API designated as Credential Endpoint that is used to issue verifiable credentials and
 corresponding OAuth 2.0 based authorization mechanisms (see [RFC6749]) that a Wallet uses to obtain authorization to
@@ -36,8 +38,11 @@ The OpenID4VCI client is typically used in wallet type of applications, where th
 The OpenID4VCI issuer is used in issuer type applications, where an organization is issuing the credential(s). More info can be found in the issuer [README](./packages/issuer/README.md). 
 Please note that the Issuer is a library. It has some examples on how to run it with REST endpoints. If you are however looking for a full solution we suggest our [SSI SDK](https://github.com/Sphereon-Opensource/ssi-sdk) or the [demo](https://github.com/Sphereon-Opensource/OID4VC-demo)
 
+## OpenID for Verifiable Presentations
 
-# Flows
+The SIOP-OpenID4VP package is used in wallet type applications and verifier type of applications. Meaning it provides both Wallet (OpenId Provider) and Verifier (Relying Party) functionality. More info can be found in the siop-oid4vp package [README](./packages/siop-oid4vp/README.md)
+
+# OpenID for VCI Flows
 
 The spec lists 2 flows:
 
@@ -53,3 +58,7 @@ authenticate first.
 The below diagram shows the steps involved in the pre-authorized code flow. Note that inner wallet functionalities (like
 saving VCs) are out of scope for this library. Also This library doesn't include any functionalities of a VC Issuer
 ![Flow diagram](https://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/Sphereon-Opensource/OID4VCI-client/develop/docs/preauthorized-code-flow.puml)
+
+# OpenID for VP Flows
+
+Visit the [README](./packages/siop-oid4vp/README.md) for more information.

jest.json

@@ -1,11 +1,6 @@
 {
   "preset": "ts-jest",
-  "moduleFileExtensions": [
-    "ts",
-    "tsx",
-    "js",
-    "jsx"
-  ],
+  "moduleFileExtensions": ["ts", "tsx", "js", "jsx"],
   "collectCoverage": true,
   "collectCoverageFrom": [
     "packages/**/src/**/*.ts",
@@ -20,23 +15,19 @@
     "!**/node_modules/**",
     "!**/packages/**/index.ts"
   ],
-  "coverageReporters": [
-    "text",
-    "lcov",
-    "json"
-  ],
+  "coverageReporters": ["text", "lcov", "json"],
   "coverageDirectory": "./coverage",
   "transform": {
     "\\.jsx?$": "babel-jest",
-    "\\.tsx?$": ["ts-jest", {
-      "tsconfig": "./packages/tsconfig-base.json"
-    }
+    "\\.tsx?$": [
+      "ts-jest",
+      {
+        "tsconfig": "./packages/tsconfig-base.json"
+      }
     ]
   },
-  "testMatch": [
-    "**/__tests__/**/*.spec.*",
-    "**/tests/**/*.spec.*"
-  ],
+  "testMatch": ["**/__tests__/**/*.spec.*", "**/tests/**/*.spec.*"],
+  "modulePathIgnorePatterns": ["<rootDir>/packages/siop-oid4vp"],
   "testEnvironment": "node",
   "automock": false,
   "verbose": true

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "0.13.0",
+  "version": "0.15.0",
   "npmClient": "pnpm",
   "command": {
     "publish": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/oid4vci-workspace",
   "version": "0.11.0",
-  "description": "OpenID for Verifiable Credential Issuance workspace",
+  "description": "OpenID for Verifiable Credentials",
   "author": "Sphereon",
   "license": "Apache-2.0",
   "private": true,
@@ -12,8 +12,8 @@
     "fix:prettier": "prettier --write \"{packages,__tests__,!dist}/**/*.{ts,tsx,js,json,md,yml}\"",
     "build": "pnpm -r --stream build",
     "build:clean": "lerna clean -y && pnpm install && lerna run build:clean --concurrency 1",
-    "test:ci": "jest --config=jest.json",
-    "test": "jest --verbose --config=jest.json --coverage=true --detectOpenHandles",
+    "test:ci": "jest --config=jest.json && jest --config=packages/siop-oid4vp/jest.json",
+    "test": "jest --verbose --config=jest.json --coverage=true --detectOpenHandles && jest --verbose --config=packages/siop-oid4vp/jest.json --coverage=true --detectOpenHandles",
     "clean": "rimraf --glob **/dist **/coverage **/pnpm-lock.yaml packages/**/node_modules node_modules packages/**/tsconfig.tsbuildinfo",
     "publish:latest": "lerna publish --conventional-commits --include-merged-tags --create-release github --yes --dist-tag latest --registry https://registry.npmjs.org",
     "publish:next": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid next --pre-dist-tag next --yes --registry https://registry.npmjs.org",
@@ -49,11 +49,17 @@
     "Sphereon",
     "Verifiable Credentials",
     "OpenID",
+    "SIOP",
+    "Self Issued OpenID Provider",
+    "OPenId for Verifiable Presentations",
     "OpenID for Verifiable Credential Issuance",
     "OAuth2",
     "SSI",
     "OpenID4VCI",
+    "OpenID4VP",
     "OIDC4VCI",
-    "OID4VCI"
+    "OIDC4VP",
+    "OID4VCI",
+    "OID4VP"
   ]
 }

packages/callback-example/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.15.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.14.0...v0.15.0) (2024-07-15)
+
+**Note:** Version bump only for package @sphereon/oid4vci-callback-example
+
+# [0.14.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.13.0...v0.14.0) (2024-07-06)
+
+### Features
+
+- Enable tx_code support for the issuer, and properly handle both the old userPin and tx_code on the client side. fixes [#117](https://github.com/Sphereon-Opensource/OID4VCI/issues/117) ([e54071c](https://github.com/Sphereon-Opensource/OID4VCI/commit/e54071c65b00ef921acafa2c2c73707a3bc33a44))
+
 # [0.13.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.12.0...v0.13.0) (2024-07-03)
 
 ### Bug Fixes

packages/callback-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/oid4vci-callback-example",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "OpenID 4 Verifiable Credential Issuance issuer callback example",
   "source": "lib/index.ts",
   "main": "dist/index.js",

packages/client/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.15.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.14.0...v0.15.0) (2024-07-15)
+
+### Features
+
+- did-auth-siop-adapter ([32ec2fc](https://github.com/Sphereon-Opensource/OID4VCI/commit/32ec2fc27a22cd069dc12fe011debef7f870cf5d))
+
+# [0.14.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.13.0...v0.14.0) (2024-07-06)
+
+### Features
+
+- Enable tx_code support for the issuer, and properly handle both the old userPin and tx_code on the client side. fixes [#117](https://github.com/Sphereon-Opensource/OID4VCI/issues/117) ([e54071c](https://github.com/Sphereon-Opensource/OID4VCI/commit/e54071c65b00ef921acafa2c2c73707a3bc33a44))
+
 # [0.13.0](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.12.0...v0.13.0) (2024-07-03)
 
 ### Bug Fixes