Merge remote-tracking branch 'origin/feature/DIIPv4' into feature/SSISDK-58_host-nonce-endpoint

Author: sanderPostma

README.md

@@ -7,7 +7,7 @@
 
 [![CI](https://github.com/Sphereon-Opensource/OID4VC/actions/workflows/build-test-on-pr.yml/badge.svg)](https://github.com/Sphereon-Opensource/OID4VC/actions/workflows/build-test-on-pr.yml) [![codecov](https://codecov.io/gh/Sphereon-Opensource/OID4VC/branch/develop/graph/badge.svg)](https://codecov.io/gh/Sphereon-Opensource/OID4VC) [![NPM Version](https://img.shields.io/npm/v/@sphereon/oid4vci-client.svg)](https://npm.im/@sphereon/oid4vci-client)
 
-_IMPORTANT the packages are still in an early development stage, which means that breaking changes are to be expected_
+_IMPORTANT the packages are still in an early development stage, which means that breaking changes are to be expected The current branch only supports OID4VCI draft v15, for draft v13 and lower use branch archive/draft-v13-support_
 
 # Background
 

package.json

@@ -26,7 +26,7 @@
     "pnpm": ">=10"
   },
   "resolutions": {
-    "@sphereon/ssi-types": "0.34.1-feat.SSISDK.35.61",
+    "@sphereon/ssi-types": "0.34.1-feature.DIIPv4.164",
     "dcql": "1.0.1",
     "node-fetch": "2.6.12",
     "typescript": "5.8.3"

packages/callback-example/package.json

@@ -30,7 +30,7 @@
     "@sphereon/oid4vci-client": "workspace:^",
     "@sphereon/oid4vci-common": "workspace:^",
     "@sphereon/oid4vci-issuer": "workspace:^",
-    "@sphereon/ssi-types": "0.34.1-feat.SSISDK.35.61",
+    "@sphereon/ssi-types": "0.34.1-feature.DIIPv4.164",
     "jose": "^4.10.0"
   },
   "devDependencies": {

packages/client/package.json

@@ -29,7 +29,7 @@
   "dependencies": {
     "@sphereon/oid4vc-common": "workspace:^",
     "@sphereon/oid4vci-common": "workspace:^",
-    "@sphereon/ssi-types": "0.34.1-feat.SSISDK.35.61",
+    "@sphereon/ssi-types": "0.34.1-feature.DIIPv4.164",
     "cross-fetch": "^4.1.0",
     "debug": "^4.4.0"
   },

packages/common/package.json

@@ -22,7 +22,7 @@
     "test": "vitest run --config ../../vitest.config.ts --coverage"
   },
   "dependencies": {
-    "@sphereon/ssi-types": "0.34.1-feat.SSISDK.35.61",
+    "@sphereon/ssi-types": "0.34.1-feature.DIIPv4.164",
     "jwt-decode": "^4.0.0",
     "uint8arrays": "^3.1.1",
     "uuid": "^9.0.0"

packages/issuer-rest/package.json

@@ -26,7 +26,7 @@
     "@sphereon/oid4vci-common": "workspace:^",
     "@sphereon/oid4vci-issuer": "workspace:^",
     "@sphereon/ssi-express-support": "0.34.1-next.3",
-    "@sphereon/ssi-types": "0.34.1-feat.SSISDK.35.61",
+    "@sphereon/ssi-types": "0.34.1-feature.DIIPv4.164",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",

packages/issuer/package.json

@@ -24,7 +24,7 @@
     "@sphereon/oid4vc-common": "workspace:^",
     "@sphereon/oid4vci-common": "workspace:^",
     "@sphereon/ssi-express-support": "0.34.1-next.3",
-    "@sphereon/ssi-types": "0.34.1-feat.SSISDK.35.61",
+    "@sphereon/ssi-types": "0.34.1-feature.DIIPv4.164",
     "short-uuid": "^4.2.2",
     "uuid": "^9.0.0"
   },

packages/oid4vci-common/lib/types/Generic.types.ts

@@ -29,7 +29,7 @@ export interface ImageInfo {
   [key: string]: unknown
 }
 
-export type OID4VCICredentialFormat = 'jwt_vc_json' | 'jwt_vc_json-ld' | 'ldp_vc' | 'dc+sd-jwt'| 'vc+sd-jwt' | 'jwt_vc' | 'mso_mdoc' // jwt_vc & vc+sd-jwt are added for backwards compat TODO SSISDK-36
+export type OID4VCICredentialFormat = 'jwt_vc_json' | 'jwt_vc_json-ld' | 'ldp_vc' | 'dc+sd-jwt'| /*'vc+sd-jwt' |*/ 'jwt_vc' | 'mso_mdoc' // jwt_vc & vc+sd-jwt are added for backwards compat TODO SSISDK-36
 
 export const supportedOID4VCICredentialFormat: readonly (OID4VCICredentialFormat | string)[] = [
   'jwt_vc_json',

packages/oid4vci-common/package.json

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@sphereon/oid4vc-common": "workspace:^",
-    "@sphereon/ssi-types": "0.34.1-feat.SSISDK.35.61",
+    "@sphereon/ssi-types": "0.34.1-feature.DIIPv4.164",
     "cross-fetch": "^4.1.0",
     "debug": "^4.4.0",
     "jwt-decode": "^4.0.0",

packages/siop-oid4vp/README.md

@@ -323,12 +323,12 @@ const rp = RP.builder()
   .withVerifyJwtCallback(verifyJwtCallback)
   .withRevocationVerification(RevocationVerification.NEVER)
   .withClientMetadata({
-    idTokenSigningAlgValuesSupported: [SigningAlgo.EDDSA],
-    requestObjectSigningAlgValuesSupported: [SigningAlgo.EDDSA, SigningAlgo.ES256],
-    responseTypesSupported: [ResponseType.ID_TOKEN],
-    vpFormatsSupported: { jwt_vc: { alg: [SigningAlgo.EDDSA] } },
-    scopesSupported: [Scope.OPENID_DIDAUTHN, Scope.OPENID],
-    subjectTypesSupported: [SubjectType.PAIRWISE],
+    id_token_signing_alg_values_supported: [SigningAlgo.EDDSA],
+    request_object_signing_alg_values_supported: [SigningAlgo.EDDSA, SigningAlgo.ES256],
+    response_types_supported: [ResponseType.ID_TOKEN],
+    vp_formats_supported: { jwt_vc: { alg: [SigningAlgo.EDDSA] } },
+    scopes_supported: [Scope.OPENID_DIDAUTHN, Scope.OPENID],
+    subject_types_supported: [SubjectType.PAIRWISE],
     subjectSyntaxTypesSupported: ['did', 'did:ethr'],
     passBY: PassBy.VALUE,
   })
@@ -363,13 +363,13 @@ const op = OP.builder()
   .withVerifyJwtCallback(verifyJwtCallback)
   .withClientMetadata({
     authorizationEndpoint: 'www.myauthorizationendpoint.com',
-    idTokenSigningAlgValuesSupported: [SigningAlgo.EDDSA],
+    id_token_signing_alg_values_supported: [SigningAlgo.EDDSA],
     issuer: ResponseIss.SELF_ISSUED_V2,
-    requestObjectSigningAlgValuesSupported: [SigningAlgo.EDDSA, SigningAlgo.ES256],
-    responseTypesSupported: [ResponseType.ID_TOKEN],
+    request_object_signing_alg_values_supported: [SigningAlgo.EDDSA, SigningAlgo.ES256],
+    response_types_supported: [ResponseType.ID_TOKEN],
     vpFormats: { jwt_vc: { alg: [SigningAlgo.EDDSA] } },
-    scopesSupported: [Scope.OPENID_DIDAUTHN, Scope.OPENID],
-    subjectTypesSupported: [SubjectType.PAIRWISE],
+    scopes_supported: [Scope.OPENID_DIDAUTHN, Scope.OPENID],
+    subject_types_supported: [SubjectType.PAIRWISE],
     subjectSyntaxTypesSupported: ['did:ethr'],
     passBy: PassBy.VALUE,
   })
@@ -736,7 +736,7 @@ const opts: AuthorizationRequestOpts = {
     scopesSupported: [Scope.OPENID_DIDAUTHN, Scope.OPENID],
     subjectSyntaxTypesSupported: ['did:ethr:', SubjectIdentifierType.DID],
     subjectTypesSupported: [SubjectType.PAIRWISE],
-    vpFormatsSupported: {
+    vp_formats_supported: {
       ldp_vc: {
         proof_type: [IProofType.EcdsaSecp256k1Signature2019, IProofType.EcdsaSecp256k1Signature2019],
       },