@sphereon/ssi-sdk.oid4vci-holder 0.34.1-next.91 → 0.36.1-feat.SSISDK.83.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.oid4vci-holder",
-  "version": "0.34.1-next.91+3c949810",
+  "version": "0.36.1-feat.SSISDK.83.3+08adc8a3",
   "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.SSISDK.45.90",
+    "@sphereon/did-auth-siop": "0.20.0",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/oid4vci-client": "0.19.1-feature.SSISDK.45.90",
-    "@sphereon/oid4vci-common": "0.19.1-feature.SSISDK.45.90",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.contact-manager": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.core": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.credential-store": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.oidf-client": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-types": "0.34.1-next.91+3c949810",
+    "@sphereon/oid4vci-client": "0.20.0",
+    "@sphereon/oid4vci-common": "0.20.0",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.contact-manager": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.core": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.credential-store": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.credential-validation": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.data-store-types": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.issuance-branding": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.mdl-mdoc": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.oidf-client": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.sd-jwt": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.36.1-feat.SSISDK.83.3+08adc8a3",
+    "@sphereon/ssi-types": "0.36.1-feat.SSISDK.83.3+08adc8a3",
     "@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.SSISDK.45.90",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-next.91+3c949810",
+    "@sphereon/oid4vc-common": "0.20.0",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.36.1-feat.SSISDK.83.3+08adc8a3",
     "@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": "3c9498100ca07dfc2ba7979e7347fb9b19c47d18"
+  "gitHead": "08adc8a36bd361bbae337829b04343fd37de5803"
 }

package/src/agent/OID4VCIHolder.ts

@@ -1,6 +1,6 @@
-import { CredentialOfferClient, MetadataClient, OpenID4VCIClient } from '@sphereon/oid4vci-client'
+import { CredentialOfferClient, MetadataClient, OpenID4VCIClient, OpenID4VCIClientV1_0_15 } from '@sphereon/oid4vci-client'
 import {
-  AuthorizationDetails,
+  AuthorizationDetailsV1_0_15,
   AuthorizationRequestOpts,
   AuthorizationServerClientOpts,
   AuthorizationServerOpts,
@@ -9,8 +9,6 @@ import {
   CredentialOfferRequestWithBaseUrl,
   DefaultURISchemes,
   EndpointMetadataResult,
-  getTypesFromAuthorizationDetails,
-  getTypesFromCredentialOffer,
   getTypesFromObject,
   Jwt,
   NotificationRequest,
@@ -35,7 +33,6 @@ import {
   ConnectionType,
   CorrelationIdentifierType,
   CredentialCorrelationType,
-  CredentialRole,
   ensureRawDocument,
   FindPartyArgs,
   IBasicCredentialLocaleBranding,
@@ -45,10 +42,11 @@ import {
   IIssuerLocaleBranding,
   NonPersistedIdentity,
   Party,
-} from '@sphereon/ssi-sdk.data-store'
+} from '@sphereon/ssi-sdk.data-store-types'
 import {
   CredentialMapper,
   type CredentialProofFormat,
+  CredentialRole,
   HasherSync,
   IVerifiableCredential,
   JoseSignatureAlgorithm,
@@ -70,6 +68,7 @@ import {
   W3CVerifiableCredential,
 } from '@veramo/core'
 import { asArray, computeEntryHash } from '@veramo/utils'
+import fetch from 'cross-fetch'
 import { decodeJWT } from 'did-jwt'
 import { v4 as uuidv4 } from 'uuid'
 import { OID4VCIMachine } from '../machines/oid4vciMachine'
@@ -85,7 +84,6 @@ import {
   startFirstPartApplicationMachine,
   verifyCredentialToAccept,
 } from '../services/OID4VCIHolderService'
-import 'cross-fetch/polyfill'
 import {
   AddContactIdentityArgs,
   AssertValidCredentialsArgs,
@@ -111,6 +109,8 @@ import {
   OnContactIdentityCreatedArgs,
   OnCredentialStoredArgs,
   OnIdentifierCreatedArgs,
+  PrepareAuthorizationRequestArgs,
+  PrepareAuthorizationResult,
   PrepareStartArgs,
   RequestType,
   RequiredContext,
@@ -216,6 +216,7 @@ export class OID4VCIHolder implements IAgentPlugin {
     oid4vciHolderStart: this.oid4vciHolderStart.bind(this),
     oid4vciHolderGetIssuerMetadata: this.oid4vciHolderGetIssuerMetadata.bind(this),
     oid4vciHolderGetMachineInterpreter: this.oid4vciHolderGetMachineInterpreter.bind(this),
+    oid4vciHolderPrepareAuthorizationRequest: this.oid4vciHolderPrepareAuthorizationRequest.bind(this),
     oid4vciHolderCreateCredentialsToSelectFrom: this.oid4vciHolderCreateCredentialsToSelectFrom.bind(this),
     oid4vciHolderGetContact: this.oid4vciHolderGetContact.bind(this),
     oid4vciHolderGetCredentials: this.oid4vciHolderGetCredentials.bind(this),
@@ -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',
@@ -326,6 +327,8 @@ export class OID4VCIHolder implements IAgentPlugin {
         startFirstPartApplicationMachine({ ...args, stateNavigationListener: opts.firstPartyStateNavigationListener }, context),
       [OID4VCIMachineServices.createCredentialsToSelectFrom]: (args: CreateCredentialsToSelectFromArgs) =>
         this.oid4vciHolderCreateCredentialsToSelectFrom(args, context),
+      [OID4VCIMachineServices.prepareAuthorizationRequest]: (args: PrepareAuthorizationRequestArgs) =>
+        this.oid4vciHolderPrepareAuthorizationRequest(args, context),
       [OID4VCIMachineServices.getContact]: (args: GetContactArgs) => this.oid4vciHolderGetContact(args, context),
       [OID4VCIMachineServices.getCredentials]: (args: GetCredentialsArgs) =>
         this.oid4vciHolderGetCredentials({ accessTokenOpts: args.accessTokenOpts ?? opts.accessTokenOpts, ...args }, context),
@@ -375,11 +378,9 @@ export class OID4VCIHolder implements IAgentPlugin {
     }
 
     const authorizationRequestOpts = { ...this.defaultAuthorizationRequestOpts, ...args.authorizationRequestOpts } satisfies AuthorizationRequestOpts
-    // We filter the details first against our vcformat prefs
+    // TODO: Previously we filtered the details first against our vcformat prefs. However auth details does not have the notion of formats anymore
     authorizationRequestOpts.authorizationDetails = authorizationRequestOpts?.authorizationDetails
-      ? asArray(authorizationRequestOpts.authorizationDetails).filter(
-          (detail) => typeof detail === 'string' || this.vcFormatPreferences.includes(detail.format),
-        )
+      ? asArray(authorizationRequestOpts.authorizationDetails)
       : undefined
 
     if (!authorizationRequestOpts.redirectUri) {
@@ -391,19 +392,19 @@ export class OID4VCIHolder implements IAgentPlugin {
       authorizationRequestOpts.clientId = authorizationRequestOpts.redirectUri
     }
 
+    // TODO: This entire filter and formats population should not work anymore, as the auth details no longer have the format property.
     let formats: string[] = this.vcFormatPreferences
     const authFormats = authorizationRequestOpts?.authorizationDetails
-      ?.map((detail: AuthorizationDetails) => (typeof detail === 'object' && 'format' in detail && detail.format ? detail.format : undefined))
+      ?.map((detail: AuthorizationDetailsV1_0_15) => (typeof detail === 'object' && 'format' in detail && detail.format ? detail.format : undefined))
       .filter((format) => !!format)
       .map((format) => format as string)
     if (authFormats && authFormats.length > 0) {
       formats = Array.from(new Set(authFormats))
     }
-    let oid4vciClient: OpenID4VCIClient
-    let types: string[][] | undefined = undefined
+    let oid4vciClient: OpenID4VCIClientV1_0_15
     let offer: CredentialOfferRequestWithBaseUrl | undefined
     if (requestData.existingClientState) {
-      oid4vciClient = await OpenID4VCIClient.fromState({ state: requestData.existingClientState })
+      oid4vciClient = await OpenID4VCIClientV1_0_15.fromState({ state: requestData.existingClientState })
       offer = oid4vciClient.credentialOffer
     } else {
       offer = requestData.credentialOffer
@@ -425,46 +426,44 @@ export class OID4VCIHolder implements IAgentPlugin {
       if (!offer) {
         // else no offer, meaning we have an issuer URL
         logger.log(`Issuer url received (no credential offer): ${uri}`)
-        oid4vciClient = await OpenID4VCIClient.fromCredentialIssuer({
+        oid4vciClient = await OpenID4VCIClientV1_0_15.fromCredentialIssuer({
           credentialIssuer: uri,
           authorizationRequest: authorizationRequestOpts,
           clientId: authorizationRequestOpts.clientId,
-          createAuthorizationRequestURL: requestData.createAuthorizationRequestURL ?? true,
+          createAuthorizationRequestURL: false, // requestData.createAuthorizationRequestURL ?? true,
         })
       } else {
         logger.log(`Credential offer received: ${uri}`)
-        oid4vciClient = await OpenID4VCIClient.fromURI({
+        oid4vciClient = await OpenID4VCIClientV1_0_15.fromURI({
           uri,
           authorizationRequest: authorizationRequestOpts,
           clientId: authorizationRequestOpts.clientId,
-          createAuthorizationRequestURL: requestData.createAuthorizationRequestURL ?? true,
+          createAuthorizationRequestURL: false, // requestData.createAuthorizationRequestURL ?? true,
         })
       }
     }
 
+    let configurationIds: Array<string> = []
     if (offer) {
-      types = getTypesFromCredentialOffer(offer.original_credential_offer)
+      configurationIds = offer.original_credential_offer.credential_configuration_ids
     } else {
-      types = asArray(authorizationRequestOpts.authorizationDetails)
-        .map((authReqOpts) => getTypesFromAuthorizationDetails(authReqOpts) ?? [])
-        .filter((inner) => inner.length > 0)
+      configurationIds = asArray(authorizationRequestOpts.authorizationDetails)
+        // .filter((authDetails): authDetails is Exclude<AuthorizationDetailsV1_0_15, string> => typeof authDetails !== 'string')
+        .map((authReqOpts) => authReqOpts.credential_configuration_id)
+        .filter((id): id is string => !!id)
     }
 
-    const serverMetadata = await oid4vciClient.retrieveServerMetadata()
     const credentialsSupported = await getCredentialConfigsSupportedMerged({
       client: oid4vciClient,
       vcFormatPreferences: formats,
-      types,
+      configurationIds,
     })
+
+    const serverMetadata = await oid4vciClient.retrieveServerMetadata()
     const credentialBranding = await getCredentialBranding({ credentialsSupported, context })
-    const authorizationCodeURL = oid4vciClient.authorizationURL
-    if (authorizationCodeURL) {
-      logger.log(`authorization code URL ${authorizationCodeURL}`)
-    }
     const oid4vciClientState = JSON.parse(await oid4vciClient.exportState())
 
     return {
-      authorizationCodeURL,
       credentialBranding,
       credentialsSupported,
       serverMetadata,
@@ -472,6 +471,44 @@ export class OID4VCIHolder implements IAgentPlugin {
     }
   }
 
+  private async oid4vciHolderPrepareAuthorizationRequest(
+    args: PrepareAuthorizationRequestArgs,
+    context: RequiredContext,
+  ): Promise<PrepareAuthorizationResult> {
+    const { openID4VCIClientState, contact } = args
+    if (!openID4VCIClientState) {
+      return Promise.reject(Error('Missing openID4VCI client state in context'))
+    }
+
+    const clientId = contact?.identities
+      .map((identity) => {
+        const connectionConfig = identity.connection?.config
+        if (connectionConfig && 'clientId' in connectionConfig) {
+          return connectionConfig.clientId
+        }
+        return undefined
+      })
+      .find((clientId) => clientId)
+
+    if (!clientId) {
+      return Promise.reject(Error(`Missing client id in contact's connectionConfig`))
+    }
+    const client = await OpenID4VCIClient.fromState({ state: openID4VCIClientState })
+    const authorizationCodeURL = await client.createAuthorizationRequestUrl({
+      authorizationRequest: {
+        clientId: clientId,
+      } satisfies AuthorizationRequestOpts,
+    })
+    if (authorizationCodeURL) {
+      logger.log(`authorization code URL ${authorizationCodeURL}`)
+    }
+    return {
+      authorizationCodeURL,
+      // Needed, because the above createAuthorizationRequestUrl manipulates the state, adding pkce opts to the state
+      oid4vciClientState: JSON.parse(await client.exportState())
+    }
+  }
+
   private async oid4vciHolderCreateCredentialsToSelectFrom(
     args: CreateCredentialsToSelectFromArgs,
     context: RequiredContext,
@@ -587,7 +624,7 @@ export class OID4VCIHolder implements IAgentPlugin {
       return Promise.reject(Error('Missing openID4VCI client state in context'))
     }
 
-    const client = await OpenID4VCIClient.fromState({ state: openID4VCIClientState })
+    const client = await OpenID4VCIClientV1_0_15.fromState({ state: openID4VCIClientState })
     const credentialsSupported = await getCredentialConfigsSupportedMerged({
       client,
       vcFormatPreferences: this.vcFormatPreferences,

package/src/machines/firstPartyMachine.ts

@@ -1,6 +1,6 @@
 import { assign, createMachine, DoneInvokeEvent, interpret } from 'xstate'
 import { AuthorizationChallengeCodeResponse, AuthorizationChallengeError, AuthorizationChallengeErrorResponse } from '@sphereon/oid4vci-common'
-import { DidAuthConfig } from '@sphereon/ssi-sdk.data-store'
+import { DidAuthConfig } from '@sphereon/ssi-sdk.data-store-types'
 import { CreateConfigResult } from '@sphereon/ssi-sdk.siopv2-oid4vp-op-auth'
 import { createConfig, getSiopRequest, sendAuthorizationChallengeRequest, sendAuthorizationResponse } from '../services/FirstPartyMachineServices'
 import { translate } from '../localization/Localization'

package/src/machines/oid4vciMachine.ts

@@ -1,5 +1,5 @@
 import { AuthorizationChallengeCodeResponse, AuthzFlowType, toAuthorizationResponsePayload } from '@sphereon/oid4vci-common'
-import { IBasicIssuerLocaleBranding, Identity, IIssuerLocaleBranding, Party } from '@sphereon/ssi-sdk.data-store'
+import { IBasicIssuerLocaleBranding, Identity, IIssuerLocaleBranding, Party } from '@sphereon/ssi-sdk.data-store-types'
 import { assign, createMachine, DoneInvokeEvent, interpret } from 'xstate'
 import { translate } from '../localization/Localization'
 import {
@@ -28,6 +28,7 @@ import {
   SelectCredentialsEvent,
   SetAuthorizationCodeURLEvent,
   VerificationCodeEvent,
+  PrepareAuthorizationResult,
 } from '../types/IOID4VCIHolder'
 import { FirstPartyMachineStateTypes } from '../types/FirstPartyMachine'
 
@@ -98,9 +99,7 @@ const oid4vciRequireAuthorizationGuard = (ctx: OID4VCIMachineContext, _event: OI
     throw Error('Missing openID4VCI client state in context')
   }
 
-  if (!openID4VCIClientState.authorizationURL) {
-    return false
-  } else if (openID4VCIClientState.authorizationRequestOpts) {
+  if (openID4VCIClientState.authorizationURL && openID4VCIClientState.authorizationRequestOpts) {
     // We have authz options or there is not credential offer to begin with.
     // We require authz as long as we do not have the authz code response
     return !ctx.openID4VCIClientState?.authorizationCodeResponse
@@ -164,6 +163,9 @@ const createOID4VCIMachine = (opts?: CreateOID4VCIMachineOpts): OID4VCIStateMach
         [OID4VCIMachineServices.start]: {
           data: StartResult
         }
+        [OID4VCIMachineServices.prepareAuthorizationRequest]: {
+          data: PrepareAuthorizationResult
+        }
         [OID4VCIMachineServices.createCredentialsToSelectFrom]: {
           data: Array<CredentialToSelectFromResult>
         }
@@ -208,7 +210,6 @@ const createOID4VCIMachine = (opts?: CreateOID4VCIMachineOpts): OID4VCIStateMach
           onDone: {
             target: OID4VCIMachineStates.createCredentialsToSelectFrom,
             actions: assign({
-              authorizationCodeURL: (_ctx: OID4VCIMachineContext, _event: DoneInvokeEvent<StartResult>) => _event.data.authorizationCodeURL,
               credentialBranding: (_ctx: OID4VCIMachineContext, _event: DoneInvokeEvent<StartResult>) => _event.data.credentialBranding ?? {},
               credentialsSupported: (_ctx: OID4VCIMachineContext, _event: DoneInvokeEvent<StartResult>) => _event.data.credentialsSupported,
               serverMetadata: (_ctx: OID4VCIMachineContext, _event: DoneInvokeEvent<StartResult>) => _event.data.serverMetadata,
@@ -439,6 +440,10 @@ const createOID4VCIMachine = (opts?: CreateOID4VCIMachineOpts): OID4VCIStateMach
             target: OID4VCIMachineStates.startFirstPartApplicationFlow,
             cond: OID4VCIMachineGuards.isFirstPartyApplication,
           },
+          {
+            target: OID4VCIMachineStates.prepareAuthorizationRequest,
+            cond: OID4VCIMachineGuards.requireAuthorizationGuard,
+          },
           {
             target: OID4VCIMachineStates.initiateAuthorizationRequest,
             cond: OID4VCIMachineGuards.requireAuthorizationGuard,
@@ -511,12 +516,16 @@ const createOID4VCIMachine = (opts?: CreateOID4VCIMachineOpts): OID4VCIStateMach
             target: OID4VCIMachineStates.startFirstPartApplicationFlow,
             cond: OID4VCIMachineGuards.isFirstPartyApplication,
           },
+          {
+            target: OID4VCIMachineStates.prepareAuthorizationRequest,
+            cond: OID4VCIMachineGuards.requireAuthorizationGuard,
+          },
           {
             target: OID4VCIMachineStates.verifyPin,
             cond: OID4VCIMachineGuards.requirePinGuard,
           },
           {
-            target: OID4VCIMachineStates.initiateAuthorizationRequest,
+            target: OID4VCIMachineStates.prepareAuthorizationRequest,
             cond: OID4VCIMachineGuards.requireAuthorizationGuard,
           },
           {
@@ -524,6 +533,30 @@ const createOID4VCIMachine = (opts?: CreateOID4VCIMachineOpts): OID4VCIStateMach
           },
         ],
       },
+      [OID4VCIMachineStates.prepareAuthorizationRequest]: {
+        id: OID4VCIMachineStates.prepareAuthorizationRequest,
+        invoke: {
+          src: OID4VCIMachineServices.prepareAuthorizationRequest,
+          onDone: {
+            target: OID4VCIMachineStates.initiateAuthorizationRequest,
+            actions: assign({
+              authorizationCodeURL: (_ctx: OID4VCIMachineContext, _event: DoneInvokeEvent<PrepareAuthorizationResult>) =>
+                _event.data.authorizationCodeURL,
+              openID4VCIClientState: (_ctx: OID4VCIMachineContext, _event: DoneInvokeEvent<PrepareAuthorizationResult>) => _event.data.oid4vciClientState,
+            }),
+          },
+          onError: {
+            target: OID4VCIMachineStates.handleError,
+            actions: assign({
+              error: (_ctx: OID4VCIMachineContext, _event: DoneInvokeEvent<Error>): ErrorDetails => ({
+                title: translate('oid4vci_machine_prepare_authorization_error_title'),
+                message: _event.data.message,
+                stack: _event.data.stack,
+              }),
+            }),
+          },
+        },
+      },
       [OID4VCIMachineStates.initiateAuthorizationRequest]: {
         id: OID4VCIMachineStates.initiateAuthorizationRequest,
         on: {

package/src/mappers/OIDC4VCIBrandingMapper.ts

@@ -1,5 +1,5 @@
 import { CredentialsSupportedDisplay, NameAndLocale } from '@sphereon/oid4vci-common'
-import { IBasicCredentialClaim, IBasicCredentialLocaleBranding, IBasicIssuerLocaleBranding } from '@sphereon/ssi-sdk.data-store'
+import { IBasicCredentialClaim, IBasicCredentialLocaleBranding, IBasicIssuerLocaleBranding } from '@sphereon/ssi-sdk.data-store-types'
 import { SdJwtClaimDisplayMetadata, SdJwtClaimMetadata, SdJwtClaimPath, SdJwtTypeDisplayMetadata } from '@sphereon/ssi-types'
 import {
   IssuerLocaleBrandingFromArgs,

package/src/services/OID4VCIHolderService.ts

@@ -3,7 +3,6 @@ import {
   AuthorizationChallengeCodeResponse,
   CredentialConfigurationSupported,
   CredentialConfigurationSupportedSdJwtVcV1_0_15,
-  CredentialOfferFormatV1_0_11,
   CredentialResponse,
   CredentialResponseV1_0_15,
   CredentialSupportedSdJwtVc,
@@ -11,7 +10,6 @@ import {
   getTypesFromCredentialSupported,
   getTypesFromObject,
   MetadataDisplay,
-  OpenId4VCIVersion,
 } from '@sphereon/oid4vci-common'
 import { KeyUse } from '@sphereon/ssi-sdk-ext.did-resolver-jwk'
 import { getOrCreatePrimaryIdentifier, SupportedDidMethodEnum } from '@sphereon/ssi-sdk-ext.did-utils'
@@ -25,7 +23,7 @@ import {
 } 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 { IBasicCredentialLocaleBranding, IBasicIssuerLocaleBranding } from '@sphereon/ssi-sdk.data-store-types'
 import {
   CredentialMapper,
   Hasher,
@@ -211,9 +209,7 @@ export const mapCredentialToAccept = async (args: MapCredentialToAcceptArgs): Pr
   )
   let uniformVerifiableCredential: IVerifiableCredential
   if (CredentialMapper.isSdJwtDecodedCredential(wrappedVerifiableCredential.credential)) {
-    uniformVerifiableCredential = await sdJwtDecodedCredentialToUniformCredential(
-      <SdJwtDecodedVerifiableCredential>wrappedVerifiableCredential.credential,
-    )
+    uniformVerifiableCredential = sdJwtDecodedCredentialToUniformCredential(<SdJwtDecodedVerifiableCredential>wrappedVerifiableCredential.credential)
   } else if (CredentialMapper.isSdJwtEncoded(wrappedVerifiableCredential.credential)) {
     if (!hasher) {
       return Promise.reject('a hasher is required for encoded SD-JWT credentials')
@@ -386,7 +382,7 @@ export const getCredentialConfigsSupportedBySingleTypeOrId = async (
   }
 
   if (configurationId) {
-    const allSupported = client.getCredentialsSupported(false)
+    const allSupported = client.getCredentialsSupported(undefined, format)
     return Object.fromEntries(
       Object.entries(allSupported).filter(
         ([id, supported]) => id === configurationId || supported.id === configurationId || createIdFromTypes(supported) === configurationId,
@@ -394,29 +390,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,

package/src/types/FirstPartyMachine.ts

@@ -1,12 +1,12 @@
-import { BaseActionObject, Interpreter, ResolveTypegenMeta, ServiceMap, State, StateMachine, StatesConfig, TypegenDisabled } from 'xstate'
-import { OpenID4VCIClientState } from '@sphereon/oid4vci-client'
-import { DidAuthConfig, Party } from '@sphereon/ssi-sdk.data-store'
 import { RPRegistrationMetadataPayload } from '@sphereon/did-auth-siop'
-import { UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
+import { OpenID4VCIClientState } from '@sphereon/oid4vci-client'
 import { AuthorizationChallengeCodeResponse } from '@sphereon/oid4vci-common'
+import { UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
+import { DidAuthConfig, Party } from '@sphereon/ssi-sdk.data-store-types'
 import { IIdentifier } from '@veramo/core'
-import { ErrorDetails, RequiredContext } from './IOID4VCIHolder'
 import { DcqlQuery } from 'dcql'
+import { BaseActionObject, Interpreter, ResolveTypegenMeta, ServiceMap, State, StateMachine, StatesConfig, TypegenDisabled } from 'xstate'
+import { ErrorDetails, RequiredContext } from './IOID4VCIHolder'
 
 export enum FirstPartyMachineStateTypes {
   sendAuthorizationChallengeRequest = 'sendAuthorizationChallengeRequest',