@sphereon/ssi-sdk.oid4vci-holder 0.34.1-feature.SSISDK.26.RP.58 → 0.34.1-feature.SSISDK.45.189

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.oid4vci-holder",
-  "version": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
+  "version": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -26,40 +26,41 @@
     "build": "tsup --config ../../tsup.config.ts --tsconfig ../../tsconfig.tsup.json"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.19.1-feature.SSISDK.13.32",
+    "@sphereon/did-auth-siop": "0.19.1-feature.DIIPv4.161",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/oid4vci-client": "0.19.1-feature.SSISDK.13.32",
-    "@sphereon/oid4vci-common": "0.19.1-feature.SSISDK.13.32",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.oidf-client": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
+    "@sphereon/oid4vci-client": "0.19.1-feature.DIIPv4.161",
+    "@sphereon/oid4vci-common": "0.19.1-feature.DIIPv4.161",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.oidf-client": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
     "@veramo/core": "4.2.0",
     "@veramo/data-store": "4.2.0",
     "@veramo/utils": "4.2.0",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
+    "dcql": "1.0.1",
     "i18n-js": "^3.9.2",
     "lodash.memoize": "^4.1.2",
     "uuid": "^9.0.1",
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vc-common": "0.19.1-feature.SSISDK.13.32",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
+    "@sphereon/oid4vc-common": "0.19.1-feature.DIIPv4.161",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
     "@sphereon/ssi-sdk.siopv2-oid4vp-common": "workspace:*",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",
@@ -89,5 +90,5 @@
     "OID4VCI",
     "State Machine"
   ],
-  "gitHead": "9389054b1da3dda085e28b2ec27063e20cc296c6"
+  "gitHead": "b7e0c23f77ccaa650fc21d52315e28de54f38188"
 }

package/src/agent/OID4VCIHolder.ts

@@ -4,13 +4,14 @@ import {
   AuthorizationRequestOpts,
   AuthorizationServerClientOpts,
   AuthorizationServerOpts,
+  CredentialConfigurationSupported,
   CredentialConfigurationSupportedJwtVcJsonLdAndLdpVcV1_0_15,
   CredentialDefinitionJwtVcJsonLdAndLdpVcV1_0_15,
   CredentialOfferRequestWithBaseUrl,
   DefaultURISchemes,
   EndpointMetadataResult,
   getTypesFromAuthorizationDetails,
-  getTypesFromCredentialOffer,
+  getTypesFromCredentialSupported,
   getTypesFromObject,
   Jwt,
   NotificationRequest,
@@ -35,7 +36,6 @@ import {
   ConnectionType,
   CorrelationIdentifierType,
   CredentialCorrelationType,
-  CredentialRole,
   ensureRawDocument,
   FindPartyArgs,
   IBasicCredentialLocaleBranding,
@@ -55,10 +55,10 @@ import {
   JoseSignatureAlgorithmString,
   JwtDecodedVerifiableCredential,
   Loggers,
-  OriginalVerifiableCredential,
   parseDid,
   SdJwtDecodedVerifiableCredentialPayload,
   WrappedW3CVerifiableCredential,
+  CredentialRole,
 } from '@sphereon/ssi-types'
 import {
   CredentialPayload,
@@ -75,6 +75,7 @@ import { decodeJWT } from 'did-jwt'
 import { v4 as uuidv4 } from 'uuid'
 import { OID4VCIMachine } from '../machines/oid4vciMachine'
 import {
+  extractCredentialFromResponse,
   getBasicIssuerLocaleBranding,
   getCredentialBranding,
   getCredentialConfigsSupportedMerged,
@@ -229,7 +230,7 @@ export class OID4VCIHolder implements IAgentPlugin {
     oid4vciHolderStoreIssuerBranding: this.oid4vciHolderStoreIssuerBranding.bind(this),
   }
 
-  private readonly vcFormatPreferences: Array<string> = ['dc+sd-jwt', 'vc+sd-jwt', 'mso_mdoc', 'jwt_vc_json', 'jwt_vc', 'ldp_vc']
+  private readonly vcFormatPreferences: Array<string> = ['dc+sd-jwt', 'vc+sd-jwt', 'mso_mdoc', 'jwt_vc_json', 'jwt_vc', 'ldp_vc'] // TODO see SSISDK-52 concerning vc+sd-jwt
   private readonly jsonldCryptographicSuitePreferences: Array<string> = [
     'Ed25519Signature2018',
     'EcdsaSecp256k1Signature2019',
@@ -443,7 +444,13 @@ export class OID4VCIHolder implements IAgentPlugin {
     }
 
     if (offer) {
-      types = getTypesFromCredentialOffer(offer.original_credential_offer)
+      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 {
       types = asArray(authorizationRequestOpts.authorizationDetails)
         .map((authReqOpts) => getTypesFromAuthorizationDetails(authReqOpts) ?? [])
@@ -939,21 +946,8 @@ export class OID4VCIHolder implements IAgentPlugin {
           ? 'credential_accepted_holder_signed'
           : 'credential_deleted_holder_signed'
         logger.log(`Subject issuance/signing will be used, with event`, event)
-        const credentialResponse = mappedCredentialToAccept.credentialToAccept.credentialResponse
-        let issuerVC
-        if ('credential' in credentialResponse) {
-          issuerVC = credentialResponse.credential as OriginalVerifiableCredential
-        } else if (
-          'credentials' in credentialResponse &&
-          credentialResponse.credentials &&
-          Array.isArray(credentialResponse.credentials) &&
-          credentialResponse.credentials.length > 0
-        ) {
-          issuerVC = credentialResponse.credentials[0].credential as OriginalVerifiableCredential // FIXME SSISDK-13 (no multi-credential support yet)
-        }
-        if (!issuerVC) {
-          return Promise.reject(Error('No credential found in credential response'))
-        }
+
+        const issuerVC = extractCredentialFromResponse(mappedCredentialToAccept.credentialToAccept.credentialResponse)
         const wrappedIssuerVC = CredentialMapper.toWrappedVerifiableCredential(issuerVC, { hasher: this.hasher ?? defaultHasher })
         console.log(`Wrapped VC: ${wrappedIssuerVC.type}, ${wrappedIssuerVC.format}`)
         // We will use the subject of the VCI Issuer (the holder, as the issuer of the new credential, so the below is not a mistake!)

package/src/services/OID4VCIHolderService.ts

@@ -1,16 +1,15 @@
 import { LOG } from '@sphereon/oid4vci-client'
 import {
+  AuthorizationChallengeCodeResponse,
   CredentialConfigurationSupported,
-  CredentialSupportedSdJwtVc,
   CredentialConfigurationSupportedSdJwtVcV1_0_15,
-  CredentialOfferFormatV1_0_11,
   CredentialResponse,
+  CredentialResponseV1_0_15,
+  CredentialSupportedSdJwtVc,
   getSupportedCredentials,
   getTypesFromCredentialSupported,
   getTypesFromObject,
   MetadataDisplay,
-  OpenId4VCIVersion,
-  AuthorizationChallengeCodeResponse,
 } from '@sphereon/oid4vci-common'
 import { KeyUse } from '@sphereon/ssi-sdk-ext.did-resolver-jwk'
 import { getOrCreatePrimaryIdentifier, SupportedDidMethodEnum } from '@sphereon/ssi-sdk-ext.did-utils'
@@ -23,6 +22,7 @@ import {
   managedIdentifierToJwk,
 } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 import { keyTypeFromCryptographicSuite } from '@sphereon/ssi-sdk-ext.key-utils'
+import { defaultHasher } from '@sphereon/ssi-sdk.core'
 import { IBasicCredentialLocaleBranding, IBasicIssuerLocaleBranding } from '@sphereon/ssi-sdk.data-store'
 import {
   CredentialMapper,
@@ -40,8 +40,12 @@ import {
 } from '@sphereon/ssi-types'
 import { asArray } from '@veramo/utils'
 import { translate } from '../localization/Localization'
+import { FirstPartyMachine } from '../machines/firstPartyMachine'
+import { issuerLocaleBrandingFrom, oid4vciGetCredentialBrandingFrom, sdJwtGetCredentialBrandingFrom } from '../mappers/OIDC4VCIBrandingMapper'
+import { FirstPartyMachineState, FirstPartyMachineStateTypes } from '../types/FirstPartyMachine'
 import {
   DidAgents,
+  GetBasicIssuerLocaleBrandingArgs,
   GetCredentialBrandingArgs,
   GetCredentialConfigsSupportedArgs,
   GetCredentialConfigsSupportedBySingleTypeOrIdArgs,
@@ -49,22 +53,17 @@ import {
   GetIssuanceCryptoSuiteArgs,
   GetIssuanceDidMethodArgs,
   GetIssuanceOptsArgs,
-  GetBasicIssuerLocaleBrandingArgs,
   GetPreferredCredentialFormatsArgs,
   IssuanceOpts,
   MapCredentialToAcceptArgs,
   MappedCredentialToAccept,
   OID4VCIHolderEvent,
+  RequiredContext,
   SelectAppLocaleBrandingArgs,
+  StartFirstPartApplicationMachine,
   VerificationResult,
   VerifyCredentialToAcceptArgs,
-  StartFirstPartApplicationMachine,
-  RequiredContext,
 } from '../types/IOID4VCIHolder'
-import { oid4vciGetCredentialBrandingFrom, sdJwtGetCredentialBrandingFrom, issuerLocaleBrandingFrom } from '../mappers/OIDC4VCIBrandingMapper'
-import { FirstPartyMachine } from '../machines/firstPartyMachine'
-import { FirstPartyMachineState, FirstPartyMachineStateTypes } from '../types/FirstPartyMachine'
-import { defaultHasher } from '@sphereon/ssi-sdk.core'
 
 export const getCredentialBranding = async (args: GetCredentialBrandingArgs): Promise<Record<string, Array<IBasicCredentialLocaleBranding>>> => {
   const { credentialsSupported, context } = args
@@ -153,21 +152,7 @@ export const selectCredentialLocaleBranding = async (
 export const verifyCredentialToAccept = async (args: VerifyCredentialToAcceptArgs): Promise<VerificationResult> => {
   const { mappedCredential, hasher, onVerifyEBSICredentialIssuer, schemaValidation, context } = args
 
-  const credentialResponse = mappedCredential.credentialToAccept.credentialResponse
-  let credential
-  if ('credential' in credentialResponse) {
-    credential = credentialResponse.credential as OriginalVerifiableCredential
-  } else if (
-    'credentials' in credentialResponse &&
-    credentialResponse.credentials &&
-    Array.isArray(credentialResponse.credentials) &&
-    credentialResponse.credentials.length > 0
-  ) {
-    credential = credentialResponse.credentials[0].credential as OriginalVerifiableCredential // FIXME SSISDK-13 (no multi-credential support yet)
-  }
-  if (!credential) {
-    return Promise.reject(Error('No credential found in credential response'))
-  }
+  const credential = extractCredentialFromResponse(mappedCredential.credentialToAccept.credentialResponse)
 
   const wrappedVC = CredentialMapper.toWrappedVerifiableCredential(credential, { hasher: hasher ?? defaultHasher })
   if (
@@ -216,21 +201,7 @@ export const verifyCredentialToAccept = async (args: VerifyCredentialToAcceptArg
 export const mapCredentialToAccept = async (args: MapCredentialToAcceptArgs): Promise<MappedCredentialToAccept> => {
   const { credentialToAccept, hasher } = args
 
-  const credentialResponse: CredentialResponse = credentialToAccept.credentialResponse
-  let verifiableCredential: W3CVerifiableCredential | undefined
-  if ('credential' in credentialResponse) {
-    verifiableCredential = credentialResponse.credential
-  } else if (
-    'credentials' in credentialResponse &&
-    credentialResponse.credentials &&
-    Array.isArray(credentialResponse.credentials) &&
-    credentialResponse.credentials.length > 0
-  ) {
-    verifiableCredential = credentialResponse.credentials[0].credential // FIXME SSISDK-13 (no multi-credential support yet)
-  }
-  if (!verifiableCredential) {
-    return Promise.reject(Error('No credential found in credential response'))
-  }
+  const verifiableCredential = extractCredentialFromResponse(credentialToAccept.credentialResponse) as W3CVerifiableCredential
 
   const wrappedVerifiableCredential: WrappedVerifiableCredential = CredentialMapper.toWrappedVerifiableCredential(
     verifiableCredential as OriginalVerifiableCredential,
@@ -261,6 +232,7 @@ export const mapCredentialToAccept = async (args: MapCredentialToAcceptArgs): Pr
         ? uniformVerifiableCredential.decodedPayload.iss
         : uniformVerifiableCredential.issuer.id
 
+  const credentialResponse = credentialToAccept.credentialResponse as CredentialResponseV1_0_15
   return {
     correlationId,
     credentialToAccept,
@@ -271,6 +243,27 @@ export const mapCredentialToAccept = async (args: MapCredentialToAcceptArgs): Pr
   }
 }
 
+export const extractCredentialFromResponse = (credentialResponse: CredentialResponse): OriginalVerifiableCredential => {
+  let credential: OriginalVerifiableCredential | undefined
+
+  if ('credential' in credentialResponse) {
+    credential = credentialResponse.credential as OriginalVerifiableCredential
+  } else if (
+    'credentials' in credentialResponse &&
+    credentialResponse.credentials &&
+    Array.isArray(credentialResponse.credentials) &&
+    credentialResponse.credentials.length > 0
+  ) {
+    credential = credentialResponse.credentials[0].credential as OriginalVerifiableCredential // FIXME SSISDK-13 (no multi-credential support yet)
+  }
+
+  if (!credential) {
+    throw new Error('No credential found in credential response')
+  }
+
+  return credential
+}
+
 export const getIdentifierOpts = async (args: GetIdentifierArgs): Promise<ManagedIdentifierResult> => {
   const { issuanceOpt, context } = args
   const { identifier: identifierArg } = issuanceOpt
@@ -391,7 +384,10 @@ export const getCredentialConfigsSupportedBySingleTypeOrId = async (
   }
 
   if (configurationId) {
-    const allSupported = client.getCredentialsSupported(false)
+    if (!format) {
+      return Promise.reject(Error('format parameter missing from input'))
+    }
+    const allSupported = client.getCredentialsSupported(format)
     return Object.fromEntries(
       Object.entries(allSupported).filter(
         ([id, supported]) => id === configurationId || supported.id === configurationId || createIdFromTypes(supported) === configurationId,
@@ -399,29 +395,15 @@ export const getCredentialConfigsSupportedBySingleTypeOrId = async (
     )
   }
 
-  if (!types && !client.credentialOffer) {
-    return Promise.reject(Error('openID4VCIClient has no credentialOffer and no types where provided'))
-    /*} else if (!format && !client.credentialOffer) {
-    return Promise.reject(Error('openID4VCIClient has no credentialOffer and no formats where provided'))*/
+  if (!client.credentialOffer) {
+    return Promise.reject(Error('openID4VCIClient has no credentialOffer'))
   }
-  // We should always have a credential offer at this point given the above
-  if (!Array.isArray(format) && client.credentialOffer) {
-    if (
-      client.version() > OpenId4VCIVersion.VER_1_0_09 &&
-      typeof client.credentialOffer.credential_offer === 'object' &&
-      'credentials' in client.credentialOffer.credential_offer
-    ) {
-      format = client.credentialOffer.credential_offer.credentials
-        .filter((cred: CredentialOfferFormatV1_0_11 | string) => typeof cred !== 'string')
-        .map((cred: CredentialOfferFormatV1_0_11 | string) => (cred as CredentialOfferFormatV1_0_11).format)
-      if (format?.length === 0) {
-        format = undefined // Otherwise we would match nothing
-      }
-    }
+  if (!types) {
+    return Promise.reject(Error('openID4VCIClient has no types'))
   }
 
   const offerSupported = getSupportedCredentials({
-    types: types ? [types] : client.getCredentialOfferTypes(),
+    types: [types],
     format,
     version: client.version(),
     issuerMetadata: client.endpointMetadata.credentialIssuerMetadata,
@@ -601,7 +583,7 @@ export const getIssuanceCryptoSuite = async (opts: GetIssuanceCryptoSuiteArgs):
     case 'jwt':
     case 'jwt_vc_json':
     case 'jwt_vc':
-    case 'vc+sd-jwt':
+    //case 'vc+sd-jwt': // TODO see SSISDK-52 concerning vc+sd-jwt
     case 'dc+sd-jwt':
     case 'mso_mdoc': {
       const supportedPreferences: Array<JoseSignatureAlgorithm | JoseSignatureAlgorithmString> = jwtCryptographicSuitePreferences.filter(

package/src/types/FirstPartyMachine.ts

@@ -1,10 +1,11 @@
-import { BaseActionObject, Interpreter, ResolveTypegenMeta, ServiceMap, State, StateMachine, StatesConfig, TypegenDisabled } from 'xstate'
+import { RPRegistrationMetadataPayload } from '@sphereon/did-auth-siop'
 import { OpenID4VCIClientState } from '@sphereon/oid4vci-client'
-import { DidAuthConfig, Party } from '@sphereon/ssi-sdk.data-store'
-import { PresentationDefinitionWithLocation, RPRegistrationMetadataPayload } from '@sphereon/did-auth-siop'
-import { UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
 import { AuthorizationChallengeCodeResponse } from '@sphereon/oid4vci-common'
+import { UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
+import { DidAuthConfig, Party } from '@sphereon/ssi-sdk.data-store'
 import { IIdentifier } from '@veramo/core'
+import { DcqlQuery } from 'dcql'
+import { BaseActionObject, Interpreter, ResolveTypegenMeta, ServiceMap, State, StateMachine, StatesConfig, TypegenDisabled } from 'xstate'
 import { ErrorDetails, RequiredContext } from './IOID4VCIHolder'
 
 export enum FirstPartyMachineStateTypes {
@@ -149,7 +150,7 @@ export type SiopV2AuthorizationRequestData = {
   clientIdScheme?: string
   clientId?: string
   entityId?: string
-  presentationDefinitions?: PresentationDefinitionWithLocation[]
+  dcqlQuery: DcqlQuery
 }
 
 export type FirstPartyMachineNavigationArgs = {