@sphereon/ssi-sdk.oid4vci-holder 0.34.1-fix.182 → 0.34.1-fix.223

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.oid4vci-holder",
-  "version": "0.34.1-fix.182+7d393013",
+  "version": "0.34.1-fix.223+9c86d039",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -26,27 +26,27 @@
     "build": "tsup --config ../../tsup.config.ts --tsconfig ../../tsconfig.tsup.json"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.19.1-feature.DIIPv4.126",
+    "@sphereon/did-auth-siop": "0.19.1-feature.DIIPv4.170",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/oid4vci-client": "0.19.1-feature.DIIPv4.126",
-    "@sphereon/oid4vci-common": "0.19.1-feature.DIIPv4.126",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.contact-manager": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.core": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.credential-store": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.oidf-client": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-fix.182+7d393013",
-    "@sphereon/ssi-types": "0.34.1-fix.182+7d393013",
+    "@sphereon/oid4vci-client": "0.19.1-feature.DIIPv4.170",
+    "@sphereon/oid4vci-common": "0.19.1-feature.DIIPv4.170",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.contact-manager": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.core": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.credential-store": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.credential-validation": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.data-store": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.oidf-client": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-types": "0.34.1-fix.223+9c86d039",
     "@veramo/core": "4.2.0",
     "@veramo/data-store": "4.2.0",
     "@veramo/utils": "4.2.0",
@@ -59,8 +59,8 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vc-common": "0.19.1-feature.DIIPv4.126",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-fix.182+7d393013",
+    "@sphereon/oid4vc-common": "0.19.1-feature.DIIPv4.170",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-fix.223+9c86d039",
     "@sphereon/ssi-sdk.siopv2-oid4vp-common": "workspace:*",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",
@@ -90,5 +90,5 @@
     "OID4VCI",
     "State Machine"
   ],
-  "gitHead": "7d393013f6a3e887f41600f6683179c647aa19b9"
+  "gitHead": "9c86d03951f1267495e456d1fbfd9eb380f27e78"
 }

package/src/agent/OID4VCIHolder.ts

@@ -4,11 +4,14 @@ import {
   AuthorizationRequestOpts,
   AuthorizationServerClientOpts,
   AuthorizationServerOpts,
+  CredentialConfigurationSupported,
   CredentialConfigurationSupportedJwtVcJsonLdAndLdpVcV1_0_15,
   CredentialDefinitionJwtVcJsonLdAndLdpVcV1_0_15,
   CredentialOfferRequestWithBaseUrl,
   DefaultURISchemes,
   EndpointMetadataResult,
+  getTypesFromAuthorizationDetails,
+  getTypesFromCredentialSupported,
   getTypesFromObject,
   Jwt,
   NotificationRequest,
@@ -46,7 +49,6 @@ import {
 import {
   CredentialMapper,
   type CredentialProofFormat,
-  CredentialRole,
   HasherSync,
   IVerifiableCredential,
   JoseSignatureAlgorithm,
@@ -56,6 +58,7 @@ import {
   parseDid,
   SdJwtDecodedVerifiableCredentialPayload,
   WrappedW3CVerifiableCredential,
+  CredentialRole,
 } from '@sphereon/ssi-types'
 import {
   CredentialPayload,
@@ -398,6 +401,7 @@ export class OID4VCIHolder implements IAgentPlugin {
       formats = Array.from(new Set(authFormats))
     }
     let oid4vciClient: OpenID4VCIClient
+    let types: string[][] | undefined = undefined
     let offer: CredentialOfferRequestWithBaseUrl | undefined
     if (requestData.existingClientState) {
       oid4vciClient = await OpenID4VCIClient.fromState({ state: requestData.existingClientState })
@@ -439,23 +443,26 @@ export class OID4VCIHolder implements IAgentPlugin {
       }
     }
 
-    let configurationIds: Array<string> = []
     if (offer) {
-      configurationIds = offer.original_credential_offer.credential_configuration_ids
+      const credentialsSupported: CredentialConfigurationSupported[] = offer.original_credential_offer.credential_configuration_ids.flatMap(
+        (configId) => {
+          const config = oid4vciClient.endpointMetadata.credentialIssuerMetadata?.credential_configurations_supported[configId]
+          return config ? [config as CredentialConfigurationSupported] : []
+        },
+      )
+      types = credentialsSupported.map((credentialSupported) => getTypesFromCredentialSupported(credentialSupported))
     } else {
-      configurationIds = asArray(authorizationRequestOpts.authorizationDetails)
-        .filter((authDetails): authDetails is Exclude<AuthorizationDetails, string> => typeof authDetails !== 'string')
-        .map((authReqOpts) => authReqOpts.credential_configuration_id)
-        .filter((id): id is string => !!id)
+      types = asArray(authorizationRequestOpts.authorizationDetails)
+        .map((authReqOpts) => getTypesFromAuthorizationDetails(authReqOpts) ?? [])
+        .filter((inner) => inner.length > 0)
     }
 
+    const serverMetadata = await oid4vciClient.retrieveServerMetadata()
     const credentialsSupported = await getCredentialConfigsSupportedMerged({
       client: oid4vciClient,
       vcFormatPreferences: formats,
-      configurationIds,
+      types,
     })
-
-    const serverMetadata = await oid4vciClient.retrieveServerMetadata()
     const credentialBranding = await getCredentialBranding({ credentialsSupported, context })
     const authorizationCodeURL = oid4vciClient.authorizationURL
     if (authorizationCodeURL) {

package/src/services/OID4VCIHolderService.ts

@@ -384,6 +384,9 @@ export const getCredentialConfigsSupportedBySingleTypeOrId = async (
   }
 
   if (configurationId) {
+    if (!format) {
+      return Promise.reject(Error('format parameter missing from input'))
+    }
     const allSupported = client.getCredentialsSupported(format)
     return Object.fromEntries(
       Object.entries(allSupported).filter(