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

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-types'
 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 = {

package/src/types/IOID4VCIHolder.ts

@@ -1,4 +1,5 @@
-import { OpenID4VCIClient, OpenID4VCIClientState } from '@sphereon/oid4vci-client'
+import { DynamicRegistrationClientMetadata } from '@sphereon/oid4vc-common'
+import { OpenID4VCIClientState, OpenID4VCIClientV1_0_15 } from '@sphereon/oid4vci-client'
 import {
   AuthorizationRequestOpts,
   AuthorizationResponse,
@@ -15,7 +16,6 @@ import {
   MetadataDisplay,
   NotificationRequest,
 } from '@sphereon/oid4vci-common'
-import { DynamicRegistrationClientMetadata } from '@sphereon/oid4vc-common'
 import { CreateOrGetIdentifierOpts, IdentifierProviderOpts, SupportedDidMethodEnum } from '@sphereon/ssi-sdk-ext.did-utils'
 import {
   IIdentifierResolution,
@@ -26,6 +26,7 @@ import {
 import { IJwtService } from '@sphereon/ssi-sdk-ext.jwt-service'
 import { IContactManager } from '@sphereon/ssi-sdk.contact-manager'
 import { ICredentialStore } from '@sphereon/ssi-sdk.credential-store'
+import { ICredentialValidation, SchemaValidation } from '@sphereon/ssi-sdk.credential-validation'
 import {
   DigitalCredential,
   IBasicCredentialClaim,
@@ -34,11 +35,10 @@ import {
   Identity,
   IIssuerLocaleBranding,
   Party,
-} from '@sphereon/ssi-sdk.data-store'
+} 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 } from '@sphereon/ssi-sdk.siopv2-oid4vp-op-auth'
 import {
   HasherSync,
@@ -79,6 +79,7 @@ export interface IOID4VCIHolder extends IPluginMethodMap {
     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>>
@@ -148,6 +149,7 @@ export type PrepareStartArgs = Pick<
   OID4VCIMachineContext,
   'requestData' | 'authorizationRequestOpts' | 'didMethodPreferences' | 'issuanceOpt' | 'accessTokenOpts'
 >
+export type PrepareAuthorizationRequestArgs = Pick<OID4VCIMachineContext, 'openID4VCIClientState' | 'contact'>
 export type CreateCredentialsToSelectFromArgs = Pick<
   OID4VCIMachineContext,
   'credentialsSupported' | 'credentialBranding' | 'selectedCredentials' | 'locale' | 'openID4VCIClientState'
@@ -256,6 +258,7 @@ export enum OID4VCIMachineStates {
   selectCredentials = 'selectCredentials',
   transitionFromSelectingCredentials = 'transitionFromSelectingCredentials',
   verifyPin = 'verifyPin',
+  prepareAuthorizationRequest = 'prepareAuthorizationRequest',
   initiateAuthorizationRequest = 'initiateAuthorizationRequest',
   waitForAuthorizationResponse = 'waitForAuthorizationResponse',
   getCredentials = 'getCredentials',
@@ -395,6 +398,7 @@ export enum OID4VCIMachineServices {
   getFederationTrust = 'getFederationTrust',
   addContactIdentity = 'addContactIdentity',
   createCredentialsToSelectFrom = 'createCredentialsToSelectFrom',
+  prepareAuthorizationRequest = 'prepareAuthorizationRequest',
   getIssuerBranding = 'getIssuerBranding',
   storeIssuerBranding = 'storeIssuerBranding',
   getCredentials = 'getCredentials',
@@ -460,13 +464,16 @@ export type OID4VCIMachine = {
 }
 
 export type StartResult = {
-  authorizationCodeURL?: string
   credentialBranding?: Record<string, Array<IBasicCredentialLocaleBranding>>
   credentialsSupported: Record<string, CredentialConfigurationSupported>
   serverMetadata: EndpointMetadataResult
   oid4vciClientState: OpenID4VCIClientState
 }
 
+export type PrepareAuthorizationResult = {
+  authorizationCodeURL?: string
+}
+
 export type SelectAppLocaleBrandingArgs = {
   locale?: string
   localeBranding?: Array<IBasicCredentialLocaleBranding | IBasicIssuerLocaleBranding>
@@ -507,7 +514,7 @@ export type CredentialToAccept = {
 }
 
 export type GetCredentialConfigsSupportedArgs = {
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   vcFormatPreferences: Array<string>
   format?: Array<string>
   types?: Array<Array<string>>
@@ -519,7 +526,7 @@ export type GetCredentialConfigsSupportedArgs = {
  * It can potentially return multiple results mainly because of different formats.
  */
 export type GetCredentialConfigsSupportedBySingleTypeOrIdArgs = {
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   vcFormatPreferences: Array<string>
   format?: string[]
   types?: string[]
@@ -554,7 +561,7 @@ export type GetDefaultIssuanceOptsArgs = {
 }
 
 export type DefaultIssuanceOpts = {
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
 }
 
 export type GetIdentifierArgs = {
@@ -591,7 +598,7 @@ export type CreateIdentifierCreateOpts = {
 }
 
 export type GetIssuanceOptsArgs = {
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   credentialsSupported: Record<string, CredentialConfigurationSupported>
   serverMetadata: EndpointMetadataResult
   context: RequiredContext
@@ -603,13 +610,13 @@ export type GetIssuanceOptsArgs = {
 
 export type GetIssuanceDidMethodArgs = {
   credentialSupported: CredentialConfigurationSupported
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   didMethodPreferences: Array<SupportedDidMethodEnum>
 }
 
 export type GetIssuanceCryptoSuiteArgs = {
   credentialSupported: CredentialConfigurationSupported
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   jwtCryptographicSuitePreferences: Array<JoseSignatureAlgorithm | JoseSignatureAlgorithmString>
   jsonldCryptographicSuitePreferences: Array<string>
 }
@@ -617,7 +624,7 @@ export type GetIssuanceCryptoSuiteArgs = {
 export type GetCredentialArgs = {
   pin?: string
   issuanceOpt: IssuanceOpts
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   accessTokenOpts?: AccessTokenOpts
 }