@sphereon/ssi-sdk.oid4vci-holder 0.34.1-feature.SSISDK.26.RP.58 → 0.34.1-feature.SSISDK.44.finish.dcql.310

package/dist/index.d.cts

@@ -2,20 +2,21 @@ import { AuthorizationChallengeCodeResponse, EndpointMetadataResult, CredentialO
 import { IIdentifierResolution, ManagedIdentifierMethod, ManagedIdentifierOptsOrResult, ManagedIdentifierResult } from '@sphereon/ssi-sdk-ext.identifier-resolution';
 import { IJwtService } from '@sphereon/ssi-sdk-ext.jwt-service';
 import { IIdentifier, IPluginMethodMap, IAgentContext, ICredentialVerifier, ICredentialIssuer, IDIDManager, IResolver, IKeyManager, TKeyType, VerificationPolicies, TAgent, IAgentPlugin } from '@veramo/core';
-import { OpenID4VCIClientState, OpenID4VCIClient } from '@sphereon/oid4vci-client';
 import { DynamicRegistrationClientMetadata } from '@sphereon/oid4vc-common';
+import { OpenID4VCIClientState, OpenID4VCIClientV1_0_15 } from '@sphereon/oid4vci-client';
 import { SupportedDidMethodEnum, CreateOrGetIdentifierOpts, IdentifierProviderOpts } from '@sphereon/ssi-sdk-ext.did-utils';
 import { IContactManager } from '@sphereon/ssi-sdk.contact-manager';
 import { UniqueDigitalCredential, ICredentialStore } from '@sphereon/ssi-sdk.credential-store';
-import { Party, DidAuthConfig, IIssuerLocaleBranding, IBasicIssuerLocaleBranding, IBasicCredentialLocaleBranding, Identity, DigitalCredential, IBasicCredentialClaim } from '@sphereon/ssi-sdk.data-store';
+import { ICredentialValidation, SchemaValidation } from '@sphereon/ssi-sdk.credential-validation';
+import { Party, DidAuthConfig, IIssuerLocaleBranding, IBasicIssuerLocaleBranding, IBasicCredentialLocaleBranding, Identity, DigitalCredential, IBasicCredentialClaim } from '@sphereon/ssi-sdk.data-store-types';
 import { IIssuanceBranding } from '@sphereon/ssi-sdk.issuance-branding';
 import { ImDLMdoc } from '@sphereon/ssi-sdk.mdl-mdoc';
 import { ISDJwtPlugin } from '@sphereon/ssi-sdk.sd-jwt';
-import { ICredentialValidation, SchemaValidation } from '@sphereon/ssi-sdk.credential-validation';
 import { IDidAuthSiopOpAuthenticator, CreateConfigResult } from '@sphereon/ssi-sdk.siopv2-oid4vp-op-auth';
 import { IVerifiableCredential, W3CVerifiableCredential, WrappedVerifiableCredential, WrappedVerifiablePresentation, JoseSignatureAlgorithm, JoseSignatureAlgorithmString, HasherSync, SdJwtTypeDisplayMetadata, SdJwtClaimMetadata, OriginalVerifiableCredential } from '@sphereon/ssi-types';
 import { Interpreter, State, StatesConfig, StateMachine, BaseActionObject, ServiceMap, ResolveTypegenMeta, TypegenDisabled } from 'xstate';
-import { RPRegistrationMetadataPayload, PresentationDefinitionWithLocation } from '@sphereon/did-auth-siop';
+import { RPRegistrationMetadataPayload } from '@sphereon/did-auth-siop';
+import { DcqlQuery } from 'dcql';
 import { LinkHandlerAdapter, DefaultLinkPriorities } from '@sphereon/ssi-sdk.core';
 import { IMachineStatePersistence, SerializableState } from '@sphereon/ssi-sdk.xstate-machine-persistence';
 
@@ -113,7 +114,7 @@ type SiopV2AuthorizationRequestData = {
     clientIdScheme?: string;
     clientId?: string;
     entityId?: string;
-    presentationDefinitions?: PresentationDefinitionWithLocation[];
+    dcqlQuery: DcqlQuery;
 };
 type FirstPartyMachineNavigationArgs = {
     firstPartyMachine: FirstPartyMachineInterpreter;
@@ -128,6 +129,7 @@ interface IOID4VCIHolder extends IPluginMethodMap {
     oid4vciHolderGetMachineInterpreter(args: GetMachineArgs, context: RequiredContext): Promise<OID4VCIMachine>;
     oid4vciHolderStart(args: PrepareStartArgs, context: RequiredContext): Promise<StartResult>;
     oid4vciHolderCreateCredentialsToSelectFrom(args: CreateCredentialsToSelectFromArgs, context: RequiredContext): Promise<Array<CredentialToSelectFromResult>>;
+    oid4vciHolderPrepareAuthorizationRequest(args: PrepareAuthorizationRequestArgs, context: RequiredContext): Promise<PrepareAuthorizationResult>;
     oid4vciHolderGetContact(args: GetContactArgs, context: RequiredContext): Promise<Party | undefined>;
     oid4vciHolderGetCredentials(args: GetCredentialsArgs, context: RequiredContext): Promise<Array<MappedCredentialToAccept>>;
     oid4vciHolderGetCredential(args: GetCredentialArgs, context: RequiredContext): Promise<MappedCredentialToAccept>;
@@ -176,6 +178,7 @@ type GetMachineArgs = {
     firstPartyStateNavigationListener?: FirstPartyMachineStateNavigationListener;
 };
 type PrepareStartArgs = Pick<OID4VCIMachineContext, 'requestData' | 'authorizationRequestOpts' | 'didMethodPreferences' | 'issuanceOpt' | 'accessTokenOpts'>;
+type PrepareAuthorizationRequestArgs = Pick<OID4VCIMachineContext, 'openID4VCIClientState' | 'contact'>;
 type CreateCredentialsToSelectFromArgs = Pick<OID4VCIMachineContext, 'credentialsSupported' | 'credentialBranding' | 'selectedCredentials' | 'locale' | 'openID4VCIClientState'>;
 type GetContactArgs = Pick<OID4VCIMachineContext, 'serverMetadata'>;
 type GetCredentialsArgs = Pick<OID4VCIMachineContext, 'verificationCode' | 'openID4VCIClientState' | 'selectedCredentials' | 'didMethodPreferences' | 'issuanceOpt' | 'accessTokenOpts'>;
@@ -265,6 +268,7 @@ declare enum OID4VCIMachineStates {
     selectCredentials = "selectCredentials",
     transitionFromSelectingCredentials = "transitionFromSelectingCredentials",
     verifyPin = "verifyPin",
+    prepareAuthorizationRequest = "prepareAuthorizationRequest",
     initiateAuthorizationRequest = "initiateAuthorizationRequest",
     waitForAuthorizationResponse = "waitForAuthorizationResponse",
     getCredentials = "getCredentials",
@@ -372,6 +376,7 @@ declare enum OID4VCIMachineServices {
     getFederationTrust = "getFederationTrust",
     addContactIdentity = "addContactIdentity",
     createCredentialsToSelectFrom = "createCredentialsToSelectFrom",
+    prepareAuthorizationRequest = "prepareAuthorizationRequest",
     getIssuerBranding = "getIssuerBranding",
     storeIssuerBranding = "storeIssuerBranding",
     getCredentials = "getCredentials",
@@ -447,12 +452,14 @@ type OID4VCIMachine = {
     interpreter: OID4VCIMachineInterpreter;
 };
 type StartResult = {
-    authorizationCodeURL?: string;
     credentialBranding?: Record<string, Array<IBasicCredentialLocaleBranding>>;
     credentialsSupported: Record<string, CredentialConfigurationSupported>;
     serverMetadata: EndpointMetadataResult;
     oid4vciClientState: OpenID4VCIClientState;
 };
+type PrepareAuthorizationResult = {
+    authorizationCodeURL?: string;
+};
 type SelectAppLocaleBrandingArgs = {
     locale?: string;
     localeBranding?: Array<IBasicCredentialLocaleBranding | IBasicIssuerLocaleBranding>;
@@ -486,7 +493,7 @@ type CredentialToAccept = {
     credentialResponse: CredentialResponseV1_0_15 | CredentialResponse;
 };
 type GetCredentialConfigsSupportedArgs = {
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     vcFormatPreferences: Array<string>;
     format?: Array<string>;
     types?: Array<Array<string>>;
@@ -497,7 +504,7 @@ type GetCredentialConfigsSupportedArgs = {
  * It can potentially return multiple results mainly because of different formats.
  */
 type GetCredentialConfigsSupportedBySingleTypeOrIdArgs = {
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     vcFormatPreferences: Array<string>;
     format?: string[];
     types?: string[];
@@ -526,7 +533,7 @@ type GetDefaultIssuanceOptsArgs = {
     context: RequiredContext;
 };
 type DefaultIssuanceOpts = {
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
 };
 type GetIdentifierArgs = {
     issuanceOpt: IssuanceOpts;
@@ -556,7 +563,7 @@ type CreateIdentifierCreateOpts = {
     options?: IdentifierProviderOpts;
 };
 type GetIssuanceOptsArgs = {
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     credentialsSupported: Record<string, CredentialConfigurationSupported>;
     serverMetadata: EndpointMetadataResult;
     context: RequiredContext;
@@ -567,19 +574,19 @@ type GetIssuanceOptsArgs = {
 };
 type GetIssuanceDidMethodArgs = {
     credentialSupported: CredentialConfigurationSupported;
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     didMethodPreferences: Array<SupportedDidMethodEnum>;
 };
 type GetIssuanceCryptoSuiteArgs = {
     credentialSupported: CredentialConfigurationSupported;
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     jwtCryptographicSuitePreferences: Array<JoseSignatureAlgorithm | JoseSignatureAlgorithmString>;
     jsonldCryptographicSuitePreferences: Array<string>;
 };
 type GetCredentialArgs = {
     pin?: string;
     issuanceOpt: IssuanceOpts;
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     accessTokenOpts?: AccessTokenOpts;
 };
 type AccessTokenOpts = {
@@ -698,6 +705,7 @@ declare class OID4VCIHolder implements IAgentPlugin {
      * @private
      */
     private oid4vciHolderStart;
+    private oid4vciHolderPrepareAuthorizationRequest;
     private oid4vciHolderCreateCredentialsToSelectFrom;
     private oid4vciHolderGetContact;
     private oid4vciHolderGetCredentials;
@@ -734,6 +742,7 @@ declare const getCredentialConfigsBasedOnFormatPref: (args: GetPreferredCredenti
 declare const selectCredentialLocaleBranding: (args: SelectAppLocaleBrandingArgs) => Promise<IBasicCredentialLocaleBranding | IBasicIssuerLocaleBranding | undefined>;
 declare const verifyCredentialToAccept: (args: VerifyCredentialToAcceptArgs) => Promise<VerificationResult>;
 declare const mapCredentialToAccept: (args: MapCredentialToAcceptArgs) => Promise<MappedCredentialToAccept>;
+declare const extractCredentialFromResponse: (credentialResponse: CredentialResponse) => OriginalVerifiableCredential;
 declare const getIdentifierOpts: (args: GetIdentifierArgs) => Promise<ManagedIdentifierResult>;
 declare const getCredentialConfigsSupportedMerged: (args: GetCredentialConfigsSupportedArgs) => Promise<Record<string, CredentialConfigurationSupported>>;
 declare const getCredentialConfigsSupported: (args: GetCredentialConfigsSupportedArgs) => Promise<Array<Record<string, CredentialConfigurationSupported>>>;
@@ -784,4 +793,4 @@ declare class OID4VCIHolderLinkHandler extends LinkHandlerAdapter {
     }): Promise<void>;
 }
 
-export { type AccessTokenOpts, type AddContactIdentityArgs, type AssertValidCredentialsArgs, type Attribute, type AuthorizationResponseEvent, type ContactAliasEvent, type ContactConsentEvent, type CreateConfigArgs, type CreateContactEvent, type CreateCredentialsToSelectFromArgs, type CreateFirstPartyMachineOpts, type CreateIdentifierArgs, type CreateIdentifierCreateOpts, type CreateIdentifierOpts, type CreateOID4VCIMachineOpts, type CredentialToAccept, type CredentialToSelectFromResult, type CredentialVerificationError, type DeclineEvent, type DefaultIssuanceOpts, type DidAgents, type DynamicRegistrationClientMetadataDisplay, type ErrorDetails, type FirstPartyDeclineEvent, type FirstPartyMachineContext, type FirstPartyMachineEventTypes, FirstPartyMachineEvents, type FirstPartyMachineInterpreter, type FirstPartyMachineNavigationArgs, type FirstPartyMachineServiceDefinitions, FirstPartyMachineServices, type FirstPartyMachineState, type FirstPartyMachineStateNavigationListener, FirstPartyMachineStateTypes, type FirstPartyMachineStates, type FirstPartyMachineStatesConfig, type FirstPartyNextEvent, type FirstPartyPreviousEvent, type FirstPartySelectCredentialsEvent, type FirstPartyStateMachine, type GetAuthenticationKeyArgs, type GetBasicIssuerLocaleBrandingArgs, type GetContactArgs, type GetCredentialArgs, type GetCredentialBrandingArgs, type GetCredentialConfigsSupportedArgs, type GetCredentialConfigsSupportedBySingleTypeOrIdArgs, type GetCredentialsArgs, type GetDefaultIssuanceOptsArgs, type GetFederationTrustArgs, type GetIdentifierArgs, type GetIssuanceCryptoSuiteArgs, type GetIssuanceDidMethodArgs, type GetIssuanceOptsArgs, type GetIssuerBrandingArgs, type GetIssuerMetadataArgs, type GetMachineArgs, type GetOrCreatePrimaryIdentifierArgs, type GetPreferredCredentialFormatsArgs, type GetSiopRequestArgs, type IOID4VCIHolder, IdentifierAliasEnum, type InstanceFirstPartyMachineOpts, type InvokeAuthorizationRequestEvent, type IssuanceOpts, type IssuerLocaleBrandingFromArgs, type IssuerType, type MapCredentialToAcceptArgs, type MappedCredentialToAccept, type NextEvent, OID4VCICallbackStateListener, type OID4VCIContext, OID4VCIHolder, OID4VCIHolderEvent, OID4VCIHolderLinkHandler, type OID4VCIHolderOptions, type OID4VCIMachine, OID4VCIMachineAddContactStates, type OID4VCIMachineContext, type OID4VCIMachineEventTypes, OID4VCIMachineEvents, OID4VCIMachineGuards, type OID4VCIMachineInstanceOpts, type OID4VCIMachineInterpreter, type OID4VCIMachineNavigationArgs, type OID4VCIMachineServiceDefinitions, OID4VCIMachineServices, type OID4VCIMachineState, type OID4VCIMachineStateNavigationListener, OID4VCIMachineStates, OID4VCIMachineVerifyPinStates, type OID4VCIProviderProps, type OID4VCIStateMachine, type Oid4vciCombineDisplayLocalesFromArgs, type Oid4vciCredentialDisplayLocalesFromArgs, type Oid4vciCredentialLocaleBrandingFromArgs, type Oid4vciGetCredentialBrandingFromArgs, type Oid4vciIssuerCredentialSubjectLocalesFromArgs, type OnContactIdentityCreatedArgs, type OnCredentialStoredArgs, type OnIdentifierCreatedArgs, type PrepareStartArgs, type PreviousEvent, type RequestData, RequestType, type RequiredContext, type SdJwtCombineDisplayLocalesFromArgs, type SdJwtCredentialClaimLocalesFromArgs, type SdJwtCredentialDisplayLocalesFromArgs, type SdJwtCredentialLocaleBrandingFromArgs, type SdJwtGetCredentialBrandingFromArgs, type SelectAppLocaleBrandingArgs, type SelectCredentialsEvent, type SendAuthorizationChallengeRequestArgs, type SendAuthorizationResponseArgs, type SendNotificationArgs, type SetAuthorizationCodeURLEvent, type SiopV2AuthorizationRequestData, type StartFirstPartApplicationMachine, type StartResult, type StoreCredentialBrandingArgs, type StoreCredentialsArgs, type StoreIssuerBrandingArgs, SupportedLanguage, type VerificationCodeEvent, type VerificationResult, type VerificationSubResult, type VerifyCredentialArgs, type VerifyCredentialToAcceptArgs, type VerifyEBSICredentialIssuerArgs, type VerifyEBSICredentialIssuerResult, type VerifyMdocArgs, type VerifySDJWTCredentialArgs, createConfig, getBasicIssuerLocaleBranding, getCredentialBranding, getCredentialConfigsBasedOnFormatPref, getCredentialConfigsSupported, getCredentialConfigsSupportedBySingleTypeOrId, getCredentialConfigsSupportedMerged, getIdentifierOpts, getIssuanceCryptoSuite, getIssuanceMethod, getIssuanceOpts, getSiopRequest, issuerLocaleBrandingFrom, mapCredentialToAccept, oid4vciCombineDisplayLocalesFrom, oid4vciCredentialDisplayLocalesFrom, oid4vciCredentialLocaleBrandingFrom, oid4vciGetCredentialBrandingFrom, oid4vciHolderContextMethods, oid4vciIssuerCredentialSubjectLocalesFrom, sdJwtCombineDisplayLocalesFrom, sdJwtCredentialClaimLocalesFrom, sdJwtCredentialDisplayLocalesFrom, sdJwtCredentialLocaleBrandingFrom, sdJwtGetCredentialBrandingFrom, selectCredentialLocaleBranding, sendAuthorizationChallengeRequest, sendAuthorizationResponse, signCallback, startFirstPartApplicationMachine, verifyCredentialToAccept };
+export { type AccessTokenOpts, type AddContactIdentityArgs, type AssertValidCredentialsArgs, type Attribute, type AuthorizationResponseEvent, type ContactAliasEvent, type ContactConsentEvent, type CreateConfigArgs, type CreateContactEvent, type CreateCredentialsToSelectFromArgs, type CreateFirstPartyMachineOpts, type CreateIdentifierArgs, type CreateIdentifierCreateOpts, type CreateIdentifierOpts, type CreateOID4VCIMachineOpts, type CredentialToAccept, type CredentialToSelectFromResult, type CredentialVerificationError, type DeclineEvent, type DefaultIssuanceOpts, type DidAgents, type DynamicRegistrationClientMetadataDisplay, type ErrorDetails, type FirstPartyDeclineEvent, type FirstPartyMachineContext, type FirstPartyMachineEventTypes, FirstPartyMachineEvents, type FirstPartyMachineInterpreter, type FirstPartyMachineNavigationArgs, type FirstPartyMachineServiceDefinitions, FirstPartyMachineServices, type FirstPartyMachineState, type FirstPartyMachineStateNavigationListener, FirstPartyMachineStateTypes, type FirstPartyMachineStates, type FirstPartyMachineStatesConfig, type FirstPartyNextEvent, type FirstPartyPreviousEvent, type FirstPartySelectCredentialsEvent, type FirstPartyStateMachine, type GetAuthenticationKeyArgs, type GetBasicIssuerLocaleBrandingArgs, type GetContactArgs, type GetCredentialArgs, type GetCredentialBrandingArgs, type GetCredentialConfigsSupportedArgs, type GetCredentialConfigsSupportedBySingleTypeOrIdArgs, type GetCredentialsArgs, type GetDefaultIssuanceOptsArgs, type GetFederationTrustArgs, type GetIdentifierArgs, type GetIssuanceCryptoSuiteArgs, type GetIssuanceDidMethodArgs, type GetIssuanceOptsArgs, type GetIssuerBrandingArgs, type GetIssuerMetadataArgs, type GetMachineArgs, type GetOrCreatePrimaryIdentifierArgs, type GetPreferredCredentialFormatsArgs, type GetSiopRequestArgs, type IOID4VCIHolder, IdentifierAliasEnum, type InstanceFirstPartyMachineOpts, type InvokeAuthorizationRequestEvent, type IssuanceOpts, type IssuerLocaleBrandingFromArgs, type IssuerType, type MapCredentialToAcceptArgs, type MappedCredentialToAccept, type NextEvent, OID4VCICallbackStateListener, type OID4VCIContext, OID4VCIHolder, OID4VCIHolderEvent, OID4VCIHolderLinkHandler, type OID4VCIHolderOptions, type OID4VCIMachine, OID4VCIMachineAddContactStates, type OID4VCIMachineContext, type OID4VCIMachineEventTypes, OID4VCIMachineEvents, OID4VCIMachineGuards, type OID4VCIMachineInstanceOpts, type OID4VCIMachineInterpreter, type OID4VCIMachineNavigationArgs, type OID4VCIMachineServiceDefinitions, OID4VCIMachineServices, type OID4VCIMachineState, type OID4VCIMachineStateNavigationListener, OID4VCIMachineStates, OID4VCIMachineVerifyPinStates, type OID4VCIProviderProps, type OID4VCIStateMachine, type Oid4vciCombineDisplayLocalesFromArgs, type Oid4vciCredentialDisplayLocalesFromArgs, type Oid4vciCredentialLocaleBrandingFromArgs, type Oid4vciGetCredentialBrandingFromArgs, type Oid4vciIssuerCredentialSubjectLocalesFromArgs, type OnContactIdentityCreatedArgs, type OnCredentialStoredArgs, type OnIdentifierCreatedArgs, type PrepareAuthorizationRequestArgs, type PrepareAuthorizationResult, type PrepareStartArgs, type PreviousEvent, type RequestData, RequestType, type RequiredContext, type SdJwtCombineDisplayLocalesFromArgs, type SdJwtCredentialClaimLocalesFromArgs, type SdJwtCredentialDisplayLocalesFromArgs, type SdJwtCredentialLocaleBrandingFromArgs, type SdJwtGetCredentialBrandingFromArgs, type SelectAppLocaleBrandingArgs, type SelectCredentialsEvent, type SendAuthorizationChallengeRequestArgs, type SendAuthorizationResponseArgs, type SendNotificationArgs, type SetAuthorizationCodeURLEvent, type SiopV2AuthorizationRequestData, type StartFirstPartApplicationMachine, type StartResult, type StoreCredentialBrandingArgs, type StoreCredentialsArgs, type StoreIssuerBrandingArgs, SupportedLanguage, type VerificationCodeEvent, type VerificationResult, type VerificationSubResult, type VerifyCredentialArgs, type VerifyCredentialToAcceptArgs, type VerifyEBSICredentialIssuerArgs, type VerifyEBSICredentialIssuerResult, type VerifyMdocArgs, type VerifySDJWTCredentialArgs, createConfig, extractCredentialFromResponse, getBasicIssuerLocaleBranding, getCredentialBranding, getCredentialConfigsBasedOnFormatPref, getCredentialConfigsSupported, getCredentialConfigsSupportedBySingleTypeOrId, getCredentialConfigsSupportedMerged, getIdentifierOpts, getIssuanceCryptoSuite, getIssuanceMethod, getIssuanceOpts, getSiopRequest, issuerLocaleBrandingFrom, mapCredentialToAccept, oid4vciCombineDisplayLocalesFrom, oid4vciCredentialDisplayLocalesFrom, oid4vciCredentialLocaleBrandingFrom, oid4vciGetCredentialBrandingFrom, oid4vciHolderContextMethods, oid4vciIssuerCredentialSubjectLocalesFrom, sdJwtCombineDisplayLocalesFrom, sdJwtCredentialClaimLocalesFrom, sdJwtCredentialDisplayLocalesFrom, sdJwtCredentialLocaleBrandingFrom, sdJwtGetCredentialBrandingFrom, selectCredentialLocaleBranding, sendAuthorizationChallengeRequest, sendAuthorizationResponse, signCallback, startFirstPartApplicationMachine, verifyCredentialToAccept };

package/dist/index.d.ts

@@ -2,20 +2,21 @@ import { AuthorizationChallengeCodeResponse, EndpointMetadataResult, CredentialO
 import { IIdentifierResolution, ManagedIdentifierMethod, ManagedIdentifierOptsOrResult, ManagedIdentifierResult } from '@sphereon/ssi-sdk-ext.identifier-resolution';
 import { IJwtService } from '@sphereon/ssi-sdk-ext.jwt-service';
 import { IIdentifier, IPluginMethodMap, IAgentContext, ICredentialVerifier, ICredentialIssuer, IDIDManager, IResolver, IKeyManager, TKeyType, VerificationPolicies, TAgent, IAgentPlugin } from '@veramo/core';
-import { OpenID4VCIClientState, OpenID4VCIClient } from '@sphereon/oid4vci-client';
 import { DynamicRegistrationClientMetadata } from '@sphereon/oid4vc-common';
+import { OpenID4VCIClientState, OpenID4VCIClientV1_0_15 } from '@sphereon/oid4vci-client';
 import { SupportedDidMethodEnum, CreateOrGetIdentifierOpts, IdentifierProviderOpts } from '@sphereon/ssi-sdk-ext.did-utils';
 import { IContactManager } from '@sphereon/ssi-sdk.contact-manager';
 import { UniqueDigitalCredential, ICredentialStore } from '@sphereon/ssi-sdk.credential-store';
-import { Party, DidAuthConfig, IIssuerLocaleBranding, IBasicIssuerLocaleBranding, IBasicCredentialLocaleBranding, Identity, DigitalCredential, IBasicCredentialClaim } from '@sphereon/ssi-sdk.data-store';
+import { ICredentialValidation, SchemaValidation } from '@sphereon/ssi-sdk.credential-validation';
+import { Party, DidAuthConfig, IIssuerLocaleBranding, IBasicIssuerLocaleBranding, IBasicCredentialLocaleBranding, Identity, DigitalCredential, IBasicCredentialClaim } from '@sphereon/ssi-sdk.data-store-types';
 import { IIssuanceBranding } from '@sphereon/ssi-sdk.issuance-branding';
 import { ImDLMdoc } from '@sphereon/ssi-sdk.mdl-mdoc';
 import { ISDJwtPlugin } from '@sphereon/ssi-sdk.sd-jwt';
-import { ICredentialValidation, SchemaValidation } from '@sphereon/ssi-sdk.credential-validation';
 import { IDidAuthSiopOpAuthenticator, CreateConfigResult } from '@sphereon/ssi-sdk.siopv2-oid4vp-op-auth';
 import { IVerifiableCredential, W3CVerifiableCredential, WrappedVerifiableCredential, WrappedVerifiablePresentation, JoseSignatureAlgorithm, JoseSignatureAlgorithmString, HasherSync, SdJwtTypeDisplayMetadata, SdJwtClaimMetadata, OriginalVerifiableCredential } from '@sphereon/ssi-types';
 import { Interpreter, State, StatesConfig, StateMachine, BaseActionObject, ServiceMap, ResolveTypegenMeta, TypegenDisabled } from 'xstate';
-import { RPRegistrationMetadataPayload, PresentationDefinitionWithLocation } from '@sphereon/did-auth-siop';
+import { RPRegistrationMetadataPayload } from '@sphereon/did-auth-siop';
+import { DcqlQuery } from 'dcql';
 import { LinkHandlerAdapter, DefaultLinkPriorities } from '@sphereon/ssi-sdk.core';
 import { IMachineStatePersistence, SerializableState } from '@sphereon/ssi-sdk.xstate-machine-persistence';
 
@@ -113,7 +114,7 @@ type SiopV2AuthorizationRequestData = {
     clientIdScheme?: string;
     clientId?: string;
     entityId?: string;
-    presentationDefinitions?: PresentationDefinitionWithLocation[];
+    dcqlQuery: DcqlQuery;
 };
 type FirstPartyMachineNavigationArgs = {
     firstPartyMachine: FirstPartyMachineInterpreter;
@@ -128,6 +129,7 @@ interface IOID4VCIHolder extends IPluginMethodMap {
     oid4vciHolderGetMachineInterpreter(args: GetMachineArgs, context: RequiredContext): Promise<OID4VCIMachine>;
     oid4vciHolderStart(args: PrepareStartArgs, context: RequiredContext): Promise<StartResult>;
     oid4vciHolderCreateCredentialsToSelectFrom(args: CreateCredentialsToSelectFromArgs, context: RequiredContext): Promise<Array<CredentialToSelectFromResult>>;
+    oid4vciHolderPrepareAuthorizationRequest(args: PrepareAuthorizationRequestArgs, context: RequiredContext): Promise<PrepareAuthorizationResult>;
     oid4vciHolderGetContact(args: GetContactArgs, context: RequiredContext): Promise<Party | undefined>;
     oid4vciHolderGetCredentials(args: GetCredentialsArgs, context: RequiredContext): Promise<Array<MappedCredentialToAccept>>;
     oid4vciHolderGetCredential(args: GetCredentialArgs, context: RequiredContext): Promise<MappedCredentialToAccept>;
@@ -176,6 +178,7 @@ type GetMachineArgs = {
     firstPartyStateNavigationListener?: FirstPartyMachineStateNavigationListener;
 };
 type PrepareStartArgs = Pick<OID4VCIMachineContext, 'requestData' | 'authorizationRequestOpts' | 'didMethodPreferences' | 'issuanceOpt' | 'accessTokenOpts'>;
+type PrepareAuthorizationRequestArgs = Pick<OID4VCIMachineContext, 'openID4VCIClientState' | 'contact'>;
 type CreateCredentialsToSelectFromArgs = Pick<OID4VCIMachineContext, 'credentialsSupported' | 'credentialBranding' | 'selectedCredentials' | 'locale' | 'openID4VCIClientState'>;
 type GetContactArgs = Pick<OID4VCIMachineContext, 'serverMetadata'>;
 type GetCredentialsArgs = Pick<OID4VCIMachineContext, 'verificationCode' | 'openID4VCIClientState' | 'selectedCredentials' | 'didMethodPreferences' | 'issuanceOpt' | 'accessTokenOpts'>;
@@ -265,6 +268,7 @@ declare enum OID4VCIMachineStates {
     selectCredentials = "selectCredentials",
     transitionFromSelectingCredentials = "transitionFromSelectingCredentials",
     verifyPin = "verifyPin",
+    prepareAuthorizationRequest = "prepareAuthorizationRequest",
     initiateAuthorizationRequest = "initiateAuthorizationRequest",
     waitForAuthorizationResponse = "waitForAuthorizationResponse",
     getCredentials = "getCredentials",
@@ -372,6 +376,7 @@ declare enum OID4VCIMachineServices {
     getFederationTrust = "getFederationTrust",
     addContactIdentity = "addContactIdentity",
     createCredentialsToSelectFrom = "createCredentialsToSelectFrom",
+    prepareAuthorizationRequest = "prepareAuthorizationRequest",
     getIssuerBranding = "getIssuerBranding",
     storeIssuerBranding = "storeIssuerBranding",
     getCredentials = "getCredentials",
@@ -447,12 +452,14 @@ type OID4VCIMachine = {
     interpreter: OID4VCIMachineInterpreter;
 };
 type StartResult = {
-    authorizationCodeURL?: string;
     credentialBranding?: Record<string, Array<IBasicCredentialLocaleBranding>>;
     credentialsSupported: Record<string, CredentialConfigurationSupported>;
     serverMetadata: EndpointMetadataResult;
     oid4vciClientState: OpenID4VCIClientState;
 };
+type PrepareAuthorizationResult = {
+    authorizationCodeURL?: string;
+};
 type SelectAppLocaleBrandingArgs = {
     locale?: string;
     localeBranding?: Array<IBasicCredentialLocaleBranding | IBasicIssuerLocaleBranding>;
@@ -486,7 +493,7 @@ type CredentialToAccept = {
     credentialResponse: CredentialResponseV1_0_15 | CredentialResponse;
 };
 type GetCredentialConfigsSupportedArgs = {
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     vcFormatPreferences: Array<string>;
     format?: Array<string>;
     types?: Array<Array<string>>;
@@ -497,7 +504,7 @@ type GetCredentialConfigsSupportedArgs = {
  * It can potentially return multiple results mainly because of different formats.
  */
 type GetCredentialConfigsSupportedBySingleTypeOrIdArgs = {
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     vcFormatPreferences: Array<string>;
     format?: string[];
     types?: string[];
@@ -526,7 +533,7 @@ type GetDefaultIssuanceOptsArgs = {
     context: RequiredContext;
 };
 type DefaultIssuanceOpts = {
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
 };
 type GetIdentifierArgs = {
     issuanceOpt: IssuanceOpts;
@@ -556,7 +563,7 @@ type CreateIdentifierCreateOpts = {
     options?: IdentifierProviderOpts;
 };
 type GetIssuanceOptsArgs = {
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     credentialsSupported: Record<string, CredentialConfigurationSupported>;
     serverMetadata: EndpointMetadataResult;
     context: RequiredContext;
@@ -567,19 +574,19 @@ type GetIssuanceOptsArgs = {
 };
 type GetIssuanceDidMethodArgs = {
     credentialSupported: CredentialConfigurationSupported;
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     didMethodPreferences: Array<SupportedDidMethodEnum>;
 };
 type GetIssuanceCryptoSuiteArgs = {
     credentialSupported: CredentialConfigurationSupported;
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     jwtCryptographicSuitePreferences: Array<JoseSignatureAlgorithm | JoseSignatureAlgorithmString>;
     jsonldCryptographicSuitePreferences: Array<string>;
 };
 type GetCredentialArgs = {
     pin?: string;
     issuanceOpt: IssuanceOpts;
-    client: OpenID4VCIClient;
+    client: OpenID4VCIClientV1_0_15;
     accessTokenOpts?: AccessTokenOpts;
 };
 type AccessTokenOpts = {
@@ -698,6 +705,7 @@ declare class OID4VCIHolder implements IAgentPlugin {
      * @private
      */
     private oid4vciHolderStart;
+    private oid4vciHolderPrepareAuthorizationRequest;
     private oid4vciHolderCreateCredentialsToSelectFrom;
     private oid4vciHolderGetContact;
     private oid4vciHolderGetCredentials;
@@ -734,6 +742,7 @@ declare const getCredentialConfigsBasedOnFormatPref: (args: GetPreferredCredenti
 declare const selectCredentialLocaleBranding: (args: SelectAppLocaleBrandingArgs) => Promise<IBasicCredentialLocaleBranding | IBasicIssuerLocaleBranding | undefined>;
 declare const verifyCredentialToAccept: (args: VerifyCredentialToAcceptArgs) => Promise<VerificationResult>;
 declare const mapCredentialToAccept: (args: MapCredentialToAcceptArgs) => Promise<MappedCredentialToAccept>;
+declare const extractCredentialFromResponse: (credentialResponse: CredentialResponse) => OriginalVerifiableCredential;
 declare const getIdentifierOpts: (args: GetIdentifierArgs) => Promise<ManagedIdentifierResult>;
 declare const getCredentialConfigsSupportedMerged: (args: GetCredentialConfigsSupportedArgs) => Promise<Record<string, CredentialConfigurationSupported>>;
 declare const getCredentialConfigsSupported: (args: GetCredentialConfigsSupportedArgs) => Promise<Array<Record<string, CredentialConfigurationSupported>>>;
@@ -784,4 +793,4 @@ declare class OID4VCIHolderLinkHandler extends LinkHandlerAdapter {
     }): Promise<void>;
 }
 
-export { type AccessTokenOpts, type AddContactIdentityArgs, type AssertValidCredentialsArgs, type Attribute, type AuthorizationResponseEvent, type ContactAliasEvent, type ContactConsentEvent, type CreateConfigArgs, type CreateContactEvent, type CreateCredentialsToSelectFromArgs, type CreateFirstPartyMachineOpts, type CreateIdentifierArgs, type CreateIdentifierCreateOpts, type CreateIdentifierOpts, type CreateOID4VCIMachineOpts, type CredentialToAccept, type CredentialToSelectFromResult, type CredentialVerificationError, type DeclineEvent, type DefaultIssuanceOpts, type DidAgents, type DynamicRegistrationClientMetadataDisplay, type ErrorDetails, type FirstPartyDeclineEvent, type FirstPartyMachineContext, type FirstPartyMachineEventTypes, FirstPartyMachineEvents, type FirstPartyMachineInterpreter, type FirstPartyMachineNavigationArgs, type FirstPartyMachineServiceDefinitions, FirstPartyMachineServices, type FirstPartyMachineState, type FirstPartyMachineStateNavigationListener, FirstPartyMachineStateTypes, type FirstPartyMachineStates, type FirstPartyMachineStatesConfig, type FirstPartyNextEvent, type FirstPartyPreviousEvent, type FirstPartySelectCredentialsEvent, type FirstPartyStateMachine, type GetAuthenticationKeyArgs, type GetBasicIssuerLocaleBrandingArgs, type GetContactArgs, type GetCredentialArgs, type GetCredentialBrandingArgs, type GetCredentialConfigsSupportedArgs, type GetCredentialConfigsSupportedBySingleTypeOrIdArgs, type GetCredentialsArgs, type GetDefaultIssuanceOptsArgs, type GetFederationTrustArgs, type GetIdentifierArgs, type GetIssuanceCryptoSuiteArgs, type GetIssuanceDidMethodArgs, type GetIssuanceOptsArgs, type GetIssuerBrandingArgs, type GetIssuerMetadataArgs, type GetMachineArgs, type GetOrCreatePrimaryIdentifierArgs, type GetPreferredCredentialFormatsArgs, type GetSiopRequestArgs, type IOID4VCIHolder, IdentifierAliasEnum, type InstanceFirstPartyMachineOpts, type InvokeAuthorizationRequestEvent, type IssuanceOpts, type IssuerLocaleBrandingFromArgs, type IssuerType, type MapCredentialToAcceptArgs, type MappedCredentialToAccept, type NextEvent, OID4VCICallbackStateListener, type OID4VCIContext, OID4VCIHolder, OID4VCIHolderEvent, OID4VCIHolderLinkHandler, type OID4VCIHolderOptions, type OID4VCIMachine, OID4VCIMachineAddContactStates, type OID4VCIMachineContext, type OID4VCIMachineEventTypes, OID4VCIMachineEvents, OID4VCIMachineGuards, type OID4VCIMachineInstanceOpts, type OID4VCIMachineInterpreter, type OID4VCIMachineNavigationArgs, type OID4VCIMachineServiceDefinitions, OID4VCIMachineServices, type OID4VCIMachineState, type OID4VCIMachineStateNavigationListener, OID4VCIMachineStates, OID4VCIMachineVerifyPinStates, type OID4VCIProviderProps, type OID4VCIStateMachine, type Oid4vciCombineDisplayLocalesFromArgs, type Oid4vciCredentialDisplayLocalesFromArgs, type Oid4vciCredentialLocaleBrandingFromArgs, type Oid4vciGetCredentialBrandingFromArgs, type Oid4vciIssuerCredentialSubjectLocalesFromArgs, type OnContactIdentityCreatedArgs, type OnCredentialStoredArgs, type OnIdentifierCreatedArgs, type PrepareStartArgs, type PreviousEvent, type RequestData, RequestType, type RequiredContext, type SdJwtCombineDisplayLocalesFromArgs, type SdJwtCredentialClaimLocalesFromArgs, type SdJwtCredentialDisplayLocalesFromArgs, type SdJwtCredentialLocaleBrandingFromArgs, type SdJwtGetCredentialBrandingFromArgs, type SelectAppLocaleBrandingArgs, type SelectCredentialsEvent, type SendAuthorizationChallengeRequestArgs, type SendAuthorizationResponseArgs, type SendNotificationArgs, type SetAuthorizationCodeURLEvent, type SiopV2AuthorizationRequestData, type StartFirstPartApplicationMachine, type StartResult, type StoreCredentialBrandingArgs, type StoreCredentialsArgs, type StoreIssuerBrandingArgs, SupportedLanguage, type VerificationCodeEvent, type VerificationResult, type VerificationSubResult, type VerifyCredentialArgs, type VerifyCredentialToAcceptArgs, type VerifyEBSICredentialIssuerArgs, type VerifyEBSICredentialIssuerResult, type VerifyMdocArgs, type VerifySDJWTCredentialArgs, createConfig, getBasicIssuerLocaleBranding, getCredentialBranding, getCredentialConfigsBasedOnFormatPref, getCredentialConfigsSupported, getCredentialConfigsSupportedBySingleTypeOrId, getCredentialConfigsSupportedMerged, getIdentifierOpts, getIssuanceCryptoSuite, getIssuanceMethod, getIssuanceOpts, getSiopRequest, issuerLocaleBrandingFrom, mapCredentialToAccept, oid4vciCombineDisplayLocalesFrom, oid4vciCredentialDisplayLocalesFrom, oid4vciCredentialLocaleBrandingFrom, oid4vciGetCredentialBrandingFrom, oid4vciHolderContextMethods, oid4vciIssuerCredentialSubjectLocalesFrom, sdJwtCombineDisplayLocalesFrom, sdJwtCredentialClaimLocalesFrom, sdJwtCredentialDisplayLocalesFrom, sdJwtCredentialLocaleBrandingFrom, sdJwtGetCredentialBrandingFrom, selectCredentialLocaleBranding, sendAuthorizationChallengeRequest, sendAuthorizationResponse, signCallback, startFirstPartApplicationMachine, verifyCredentialToAccept };
+export { type AccessTokenOpts, type AddContactIdentityArgs, type AssertValidCredentialsArgs, type Attribute, type AuthorizationResponseEvent, type ContactAliasEvent, type ContactConsentEvent, type CreateConfigArgs, type CreateContactEvent, type CreateCredentialsToSelectFromArgs, type CreateFirstPartyMachineOpts, type CreateIdentifierArgs, type CreateIdentifierCreateOpts, type CreateIdentifierOpts, type CreateOID4VCIMachineOpts, type CredentialToAccept, type CredentialToSelectFromResult, type CredentialVerificationError, type DeclineEvent, type DefaultIssuanceOpts, type DidAgents, type DynamicRegistrationClientMetadataDisplay, type ErrorDetails, type FirstPartyDeclineEvent, type FirstPartyMachineContext, type FirstPartyMachineEventTypes, FirstPartyMachineEvents, type FirstPartyMachineInterpreter, type FirstPartyMachineNavigationArgs, type FirstPartyMachineServiceDefinitions, FirstPartyMachineServices, type FirstPartyMachineState, type FirstPartyMachineStateNavigationListener, FirstPartyMachineStateTypes, type FirstPartyMachineStates, type FirstPartyMachineStatesConfig, type FirstPartyNextEvent, type FirstPartyPreviousEvent, type FirstPartySelectCredentialsEvent, type FirstPartyStateMachine, type GetAuthenticationKeyArgs, type GetBasicIssuerLocaleBrandingArgs, type GetContactArgs, type GetCredentialArgs, type GetCredentialBrandingArgs, type GetCredentialConfigsSupportedArgs, type GetCredentialConfigsSupportedBySingleTypeOrIdArgs, type GetCredentialsArgs, type GetDefaultIssuanceOptsArgs, type GetFederationTrustArgs, type GetIdentifierArgs, type GetIssuanceCryptoSuiteArgs, type GetIssuanceDidMethodArgs, type GetIssuanceOptsArgs, type GetIssuerBrandingArgs, type GetIssuerMetadataArgs, type GetMachineArgs, type GetOrCreatePrimaryIdentifierArgs, type GetPreferredCredentialFormatsArgs, type GetSiopRequestArgs, type IOID4VCIHolder, IdentifierAliasEnum, type InstanceFirstPartyMachineOpts, type InvokeAuthorizationRequestEvent, type IssuanceOpts, type IssuerLocaleBrandingFromArgs, type IssuerType, type MapCredentialToAcceptArgs, type MappedCredentialToAccept, type NextEvent, OID4VCICallbackStateListener, type OID4VCIContext, OID4VCIHolder, OID4VCIHolderEvent, OID4VCIHolderLinkHandler, type OID4VCIHolderOptions, type OID4VCIMachine, OID4VCIMachineAddContactStates, type OID4VCIMachineContext, type OID4VCIMachineEventTypes, OID4VCIMachineEvents, OID4VCIMachineGuards, type OID4VCIMachineInstanceOpts, type OID4VCIMachineInterpreter, type OID4VCIMachineNavigationArgs, type OID4VCIMachineServiceDefinitions, OID4VCIMachineServices, type OID4VCIMachineState, type OID4VCIMachineStateNavigationListener, OID4VCIMachineStates, OID4VCIMachineVerifyPinStates, type OID4VCIProviderProps, type OID4VCIStateMachine, type Oid4vciCombineDisplayLocalesFromArgs, type Oid4vciCredentialDisplayLocalesFromArgs, type Oid4vciCredentialLocaleBrandingFromArgs, type Oid4vciGetCredentialBrandingFromArgs, type Oid4vciIssuerCredentialSubjectLocalesFromArgs, type OnContactIdentityCreatedArgs, type OnCredentialStoredArgs, type OnIdentifierCreatedArgs, type PrepareAuthorizationRequestArgs, type PrepareAuthorizationResult, type PrepareStartArgs, type PreviousEvent, type RequestData, RequestType, type RequiredContext, type SdJwtCombineDisplayLocalesFromArgs, type SdJwtCredentialClaimLocalesFromArgs, type SdJwtCredentialDisplayLocalesFromArgs, type SdJwtCredentialLocaleBrandingFromArgs, type SdJwtGetCredentialBrandingFromArgs, type SelectAppLocaleBrandingArgs, type SelectCredentialsEvent, type SendAuthorizationChallengeRequestArgs, type SendAuthorizationResponseArgs, type SendNotificationArgs, type SetAuthorizationCodeURLEvent, type SiopV2AuthorizationRequestData, type StartFirstPartApplicationMachine, type StartResult, type StoreCredentialBrandingArgs, type StoreCredentialsArgs, type StoreIssuerBrandingArgs, SupportedLanguage, type VerificationCodeEvent, type VerificationResult, type VerificationSubResult, type VerifyCredentialArgs, type VerifyCredentialToAcceptArgs, type VerifyEBSICredentialIssuerArgs, type VerifyEBSICredentialIssuerResult, type VerifyMdocArgs, type VerifySDJWTCredentialArgs, createConfig, extractCredentialFromResponse, getBasicIssuerLocaleBranding, getCredentialBranding, getCredentialConfigsBasedOnFormatPref, getCredentialConfigsSupported, getCredentialConfigsSupportedBySingleTypeOrId, getCredentialConfigsSupportedMerged, getIdentifierOpts, getIssuanceCryptoSuite, getIssuanceMethod, getIssuanceOpts, getSiopRequest, issuerLocaleBrandingFrom, mapCredentialToAccept, oid4vciCombineDisplayLocalesFrom, oid4vciCredentialDisplayLocalesFrom, oid4vciCredentialLocaleBrandingFrom, oid4vciGetCredentialBrandingFrom, oid4vciHolderContextMethods, oid4vciIssuerCredentialSubjectLocalesFrom, sdJwtCombineDisplayLocalesFrom, sdJwtCredentialClaimLocalesFrom, sdJwtCredentialDisplayLocalesFrom, sdJwtCredentialLocaleBrandingFrom, sdJwtGetCredentialBrandingFrom, selectCredentialLocaleBranding, sendAuthorizationChallengeRequest, sendAuthorizationResponse, signCallback, startFirstPartApplicationMachine, verifyCredentialToAccept };