@sphereon/ssi-sdk.siopv2-oid4vp-op-auth 0.34.1-next.91 → 0.36.0

package/src/session/OID4VP.ts

@@ -1,333 +1,181 @@
-// import { PresentationDefinitionWithLocation, PresentationExchange } from '@sphereon/did-auth-siop'
-// import { SelectResults, Status, SubmissionRequirementMatch } from '@sphereon/pex'
-//import { Format } from '@sphereon/pex-models'
-// import {
-//   //isManagedIdentifierDidResult,
-//   isOID4VCIssuerIdentifier,
-//   ManagedIdentifierOptsOrResult,
-//   ManagedIdentifierResult,
-// } from '@sphereon/ssi-sdk-ext.identifier-resolution'
-// import { defaultHasher,
-//  // ProofOptions
-// } from '@sphereon/ssi-sdk.core'
-//import { UniqueDigitalCredential, verifiableCredentialForRoleFilter } from '@sphereon/ssi-sdk.credential-store'
-//import { CredentialRole, FindDigitalCredentialArgs } from '@sphereon/ssi-sdk.data-store'
+import type { PartialSdJwtKbJwt } from '@sphereon/pex/dist/main/lib/index.js'
+import { calculateSdHash } from '@sphereon/pex/dist/main/lib/utils/index.js'
+import { isManagedIdentifierDidResult, ManagedIdentifierOptsOrResult } from '@sphereon/ssi-sdk-ext.identifier-resolution'
+import { UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
+import { defaultGenerateDigest } from '@sphereon/ssi-sdk.sd-jwt'
 import {
-  //CompactJWT,
+  CredentialMapper,
+  DocumentFormat,
   HasherSync,
-  //IProof, OriginalVerifiableCredential
+  Loggers,
+  OriginalVerifiableCredential,
+  SdJwtDecodedVerifiableCredential,
+  WrappedVerifiableCredential,
 } from '@sphereon/ssi-types'
-import {
-  //DEFAULT_JWT_PROOF_TYPE,
-  //IGetPresentationExchangeArgs,
-  IOID4VPArgs,
-  //VerifiableCredentialsWithDefinition,
-  //VerifiablePresentationWithDefinition,
-} from '../types'
-//import { createOID4VPPresentationSignCallback } from './functions'
-import { OpSession } from './OpSession'
+import { LOGGER_NAMESPACE, RequiredContext } from '../types'
 
-// FIXME SSISDK-44 add support for DCQL presentations
+const CLOCK_SKEW = 120
+const logger = Loggers.DEFAULT.get(LOGGER_NAMESPACE)
 
-export class OID4VP {
-  //private readonly session: OpSession
-  // private readonly allIdentifiers: string[]
-  // private readonly hasher?: HasherSync
+export interface PresentationBuilderContext {
+  nonce: string
+  audience: string // clientId or origin
+  agent: RequiredContext['agent']
+  clockSkew?: number
+  hasher?: HasherSync
+}
 
-  private constructor(args: IOID4VPArgs) {
-    // const { session,
-    //   // allIdentifiers, hasher = defaultHasher
-    // } = args
+/**
+ * Extracts the original credential from a UniqueDigitalCredential or WrappedVerifiableCredential
+ */
+function extractOriginalCredential(
+  credential: UniqueDigitalCredential | WrappedVerifiableCredential | OriginalVerifiableCredential,
+): OriginalVerifiableCredential {
+  if (typeof credential === 'string') {
+    return credential
+  }
+
+  if ('digitalCredential' in credential) {
+    // UniqueDigitalCredential
+    const udc = credential as UniqueDigitalCredential
+    if (udc.originalVerifiableCredential) {
+      return udc.originalVerifiableCredential
+    }
+    return udc.uniformVerifiableCredential as OriginalVerifiableCredential
+  }
 
-    //this.session = session
-    // this.allIdentifiers = allIdentifiers ?? []
-    // this.hasher = hasher
+  if ('original' in credential) {
+    // WrappedVerifiableCredential
+    return credential.original
   }
 
-  public static async init(session: OpSession, allIdentifiers: string[], hasher?: HasherSync): Promise<OID4VP> {
-    return new OID4VP({ session, allIdentifiers: allIdentifiers ?? (await session.getSupportedDIDs()), hasher })
+  // Already an OriginalVerifiableCredential
+  return credential as OriginalVerifiableCredential
+}
+
+/**
+ * Gets the issuer/holder identifier from ManagedIdentifierOptsOrResult
+ */
+function getIdentifierString(identifier: ManagedIdentifierOptsOrResult): string {
+  // Check if it's a result type (has 'method' and 'opts' properties)
+  if ('opts' in identifier && 'method' in identifier) {
+    // It's a ManagedIdentifierResult
+    if (isManagedIdentifierDidResult(identifier)) {
+      return identifier.did
+    }
   }
+  // For opts types or other result types, use issuer if available, otherwise kid
+  return identifier.issuer ?? identifier.kid ?? ''
+}
+
+/**
+ * Creates a Verifiable Presentation for a given credential in the appropriate format
+ * Ensures nonce/aud (or challenge/domain) are set according to OID4VP draft 28
+ */
+export async function createVerifiablePresentationForFormat(
+  credential: UniqueDigitalCredential | WrappedVerifiableCredential | OriginalVerifiableCredential,
+  identifier: ManagedIdentifierOptsOrResult,
+  context: PresentationBuilderContext,
+): Promise<string | object> {
+  // FIXME find proper types
+  const { nonce, audience, agent, clockSkew = CLOCK_SKEW } = context
+
+  const originalCredential = extractOriginalCredential(credential)
+  const documentFormat = CredentialMapper.detectDocumentType(originalCredential)
 
-  // public async getPresentationDefinitions(): Promise<PresentationDefinitionWithLocation[] | undefined> {
-  //   const definitions = await this.session.getPresentationDefinitions()
-  //   if (definitions) {
-  //     PresentationExchange.assertValidPresentationDefinitionWithLocations(definitions)
-  //   }
-  //   return definitions
-  // }
+  logger.debug(`Creating VP for format: ${documentFormat}`)
 
-  // private getPresentationExchange(args: IGetPresentationExchangeArgs): PresentationExchange {
-  //   const { verifiableCredentials, allIdentifiers, hasher } = args
-  //
-  //   return new PresentationExchange({
-  //     allDIDs: allIdentifiers ?? this.allIdentifiers,
-  //     allVerifiableCredentials: verifiableCredentials,
-  //     hasher: hasher ?? this.hasher,
-  //   })
-  // }
+  switch (documentFormat) {
+    case DocumentFormat.SD_JWT_VC: {
+      // SD-JWT with KB-JWT
+      const decodedSdJwt = await CredentialMapper.decodeSdJwtVcAsync(
+        typeof originalCredential === 'string' ? originalCredential : (originalCredential as SdJwtDecodedVerifiableCredential).compactSdJwtVc,
+        defaultGenerateDigest,
+      )
 
-  // public async createVerifiablePresentations(
-  //   credentialRole: CredentialRole,
-  //   credentialsWithDefinitions: VerifiableCredentialsWithDefinition[],
-  //   opts?: {
-  //     forceNoCredentialsInVP?: boolean // Allow to create a VP without credentials, like EBSI is using it. Defaults to false
-  //     restrictToFormats?: Format
-  //     restrictToDIDMethods?: string[]
-  //     proofOpts?: ProofOptions
-  //     idOpts?: ManagedIdentifierOptsOrResult
-  //     skipDidResolution?: boolean
-  //     holderDID?: string
-  //     subjectIsHolder?: boolean
-  //     hasher?: HasherSync
-  //     applyFilter?: boolean
-  //   },
-  // ): Promise<VerifiablePresentationWithDefinition[]> {
-  //   return await Promise.all(credentialsWithDefinitions.map((cred) => this.createVerifiablePresentation(credentialRole, cred, opts)))
-  // }
+      const hashAlg = decodedSdJwt.signedPayload._sd_alg ?? 'sha-256'
+      const sdHash = calculateSdHash(decodedSdJwt.compactSdJwtVc, hashAlg, defaultGenerateDigest)
 
-//   public async createVerifiablePresentation(
-//     credentialRole: CredentialRole,
-//     selectedVerifiableCredentials: VerifiableCredentialsWithDefinition,
-//     opts?: {
-//       forceNoCredentialsInVP?: boolean // Allow to create a VP without credentials, like EBSI is using it. Defaults to false
-//       restrictToFormats?: Format
-//       restrictToDIDMethods?: string[]
-//       proofOpts?: ProofOptions
-//       idOpts?: ManagedIdentifierOptsOrResult
-//       skipDidResolution?: boolean
-//       holder?: string
-//       subjectIsHolder?: boolean
-//       applyFilter?: boolean
-//       hasher?: HasherSync
-//     },
-//   ): Promise<VerifiablePresentationWithDefinition> {
-//     const { subjectIsHolder, holder, forceNoCredentialsInVP = false } = { ...opts }
-//     if (subjectIsHolder && holder) {
-//       throw Error('Cannot both have subject is holder and a holderDID value at the same time (programming error)')
-//     }
-//     if (forceNoCredentialsInVP) {
-//       selectedVerifiableCredentials.credentials = []
-//     } else if (!selectedVerifiableCredentials?.credentials || selectedVerifiableCredentials.credentials.length === 0) {
-//       throw Error('No verifiable verifiableCredentials provided for presentation definition')
-//     }
-//
-//     // const proofOptions: ProofOptions = {
-//     //   ...opts?.proofOpts,
-//     //   challenge: opts?.proofOpts?.nonce ?? opts?.proofOpts?.challenge ?? this.session.nonce,
-//     //   domain: opts?.proofOpts?.domain ?? (await this.session.getRedirectUri()),
-//     // }
-//
-//     let idOpts = opts?.idOpts
-//     if (!idOpts) {
-//       if (opts?.subjectIsHolder) {
-//         if (forceNoCredentialsInVP) {
-//           return Promise.reject(
-//             Error(
-//               `Cannot have subject is holder, when force no credentials is being used, as we could never determine the holder then. Please provide holderDID`,
-//             ),
-//           )
-//         }
-//         const firstUniqueDC = selectedVerifiableCredentials.credentials[0]
-//         //        const firstVC = firstUniqueDC.uniformVerifiableCredential!
-//         if (typeof firstUniqueDC !== 'object' || !('digitalCredential' in firstUniqueDC)) {
-//           return Promise.reject(Error('If no opts provided, credentials should be of type UniqueDigitalCredential'))
-//         }
-//
-//         idOpts = isOID4VCIssuerIdentifier(firstUniqueDC.digitalCredential.kmsKeyRef)
-//           ? await this.session.context.agent.identifierManagedGetByIssuer({
-//               identifier: firstUniqueDC.digitalCredential.kmsKeyRef,
-//             })
-//           : await this.session.context.agent.identifierManagedGetByKid({
-//               identifier: firstUniqueDC.digitalCredential.kmsKeyRef,
-//               kmsKeyRef: firstUniqueDC.digitalCredential.kmsKeyRef,
-//             })
-//
-//         /*
-//         const holder = CredentialMapper.isSdJwtDecodedCredential(firstVC)
-//           ? firstVC.decodedPayload.cnf?.jwk
-//             ? //TODO SDK-19: convert the JWK to hex and search for the appropriate key and associated DID
-//               //doesn't apply to did:jwk only, as you can represent any DID key as a JWK. So whenever you encounter a JWK it doesn't mean it had to come from a did:jwk in the system. It just can always be represented as a did:jwk
-//               `did:jwk:${encodeJoseBlob(firstVC.decodedPayload.cnf?.jwk)}#0`
-//             : firstVC.decodedPayload.sub
-//           : Array.isArray(firstVC.credentialSubject)
-//             ? firstVC.credentialSubject[0].id
-//             : firstVC.credentialSubject.id
-//         if (holder) {
-//           idOpts = { identifier: holder }
-//         }
-// */
-//       } else if (opts?.holder) {
-//         idOpts = { identifier: opts.holder }
-//       }
-//     }
-//
-//     // We are making sure to filter, in case the user submitted all verifiableCredentials in the wallet/agent. We also make sure to get original formats back
-//     const vcs = forceNoCredentialsInVP
-//       ? selectedVerifiableCredentials
-//       : opts?.applyFilter
-//         ? await this.filterCredentials(credentialRole, selectedVerifiableCredentials.dcqlQuery, {
-//             restrictToFormats: opts?.restrictToFormats,
-//             restrictToDIDMethods: opts?.restrictToDIDMethods,
-//             filterOpts: {
-//               verifiableCredentials: selectedVerifiableCredentials.credentials,
-//             },
-//           })
-//         : {
-//             definition: selectedVerifiableCredentials.dcqlQuery,
-//             credentials: selectedVerifiableCredentials.credentials,
-//           }
-//
-//     if (!idOpts) {
-//       return Promise.reject(Error(`No identifier options present at this point`))
-//     }
-//
-//     // const signCallback = await createOID4VPPresentationSignCallback({
-//     //   presentationSignCallback: this.session.options.presentationSignCallback,
-//     //   idOpts,
-//     //   context: this.session.context,
-//     //   domain: proofOptions.domain,
-//     //   challenge: proofOptions.challenge,
-//     //   format: opts?.restrictToFormats ?? selectedVerifiableCredentials.dcqlQuery.dcqlQuery.format,
-//     //   skipDidResolution: opts?.skipDidResolution ?? false,
-//     // })
-//     const identifier: ManagedIdentifierResult = await this.session.context.agent.identifierManagedGet(idOpts)
-//     const verifiableCredentials = vcs.credentials.map((credential) =>
-//       typeof credential === 'object' && 'digitalCredential' in credential ? credential.originalVerifiableCredential! : credential,
-//     )
-//     // const presentationResult = await this.getPresentationExchange({
-//     //   verifiableCredentials: verifiableCredentials,
-//     //   allIdentifiers: this.allIdentifiers,
-//     //   hasher: opts?.hasher,
-//     // }).createVerifiablePresentation(vcs.dcqlQuery.dcqlQuery, verifiableCredentials, signCallback, {
-//     //   proofOptions,
-//     //   // fixme: Update to newer siop-vp to not require dids here. But when Veramo is creating the VP it's still looking at this field to pass into didManagerGet
-//     //   ...(identifier && isManagedIdentifierDidResult(identifier) && { holderDID: identifier.did }),
-//     // })
-//
-//     const verifiablePresentations = presentationResult.verifiablePresentations.map((verifiablePresentation) =>
-//       typeof verifiablePresentation !== 'string' &&
-//       'proof' in verifiablePresentation &&
-//       'jwt' in verifiablePresentation.proof &&
-//       verifiablePresentation.proof.jwt
-//         ? verifiablePresentation.proof.jwt
-//         : verifiablePresentation,
-//     )
-//
-//     return {
-//       ...presentationResult,
-//       verifiablePresentations,
-//       verifiableCredentials: verifiableCredentials,
-//       dcqlQuery: selectedVerifiableCredentials.dcqlQuery,
-//       idOpts,
-//     }
-//   }
+      const kbJwtPayload: PartialSdJwtKbJwt['payload'] = {
+        iat: Math.floor(Date.now() / 1000 - clockSkew),
+        sd_hash: sdHash,
+        nonce, // Always use the Authorization Request nonce
+        aud: audience, // Always use the Client Identifier or Origin
+      }
 
-  // public async filterCredentialsAgainstAllDefinitions(
-  //   credentialRole: CredentialRole,
-  //   opts?: {
-  //     filterOpts?: {
-  //       verifiableCredentials?: UniqueDigitalCredential[]
-  //       filter?: FindDigitalCredentialArgs
-  //     }
-  //     holderDIDs?: string[]
-  //     restrictToFormats?: Format
-  //     restrictToDIDMethods?: string[]
-  //   },
-  // ): Promise<VerifiableCredentialsWithDefinition[]> {
-  //   const defs = await this.getPresentationDefinitions()
-  //   const result: VerifiableCredentialsWithDefinition[] = []
-  //   if (defs) {
-  //     for (const definition of defs) {
-  //       result.push(await this.filterCredentials(credentialRole, definition, opts))
-  //     }
-  //   }
-  //   return result
-  // }
+      const presentationResult = await agent.createSdJwtPresentation({
+        presentation: decodedSdJwt.compactSdJwtVc,
+        kb: {
+          payload: kbJwtPayload as any, // FIXME
+        },
+      })
 
-  // public async filterCredentials(
-  //   credentialRole: CredentialRole,
-  //   presentationDefinition: PresentationDefinitionWithLocation,
-  //   opts?: {
-  //     filterOpts?: { verifiableCredentials?: (UniqueDigitalCredential | OriginalVerifiableCredential)[]; filter?: FindDigitalCredentialArgs }
-  //     holderDIDs?: string[]
-  //     restrictToFormats?: Format
-  //     restrictToDIDMethods?: string[]
-  //   },
-  // ): Promise<VerifiableCredentialsWithDefinition> {
-  //   const udcMap = new Map<OriginalVerifiableCredential, UniqueDigitalCredential | OriginalVerifiableCredential>()
-  //   opts?.filterOpts?.verifiableCredentials?.forEach((credential) => {
-  //     if (typeof credential === 'object' && 'digitalCredential' in credential) {
-  //       udcMap.set(credential.originalVerifiableCredential!, credential)
-  //     } else {
-  //       udcMap.set(credential, credential)
-  //     }
-  //   })
-  //
-  //   const credentials = (
-  //     await this.filterCredentialsWithSelectionStatus(credentialRole, presentationDefinition, {
-  //       ...opts,
-  //       filterOpts: {
-  //         verifiableCredentials: opts?.filterOpts?.verifiableCredentials?.map((credential) => {
-  //           if (typeof credential === 'object' && 'digitalCredential' in credential) {
-  //             return credential.originalVerifiableCredential!
-  //           } else {
-  //             return credential
-  //           }
-  //         }),
-  //       },
-  //     })
-  //   ).verifiableCredential
-  //
-  //   return {
-  //     dcqlQuery: presentationDefinition,
-  //     credentials: credentials?.map((vc) => udcMap.get(vc)!) ?? [],
-  //   }
-  // }
+      return presentationResult.presentation
+    }
 
-//   public async filterCredentialsWithSelectionStatus(
-//     credentialRole: CredentialRole,
-//     presentationDefinition: PresentationDefinitionWithLocation,
-//     opts?: {
-//       filterOpts?: { verifiableCredentials?: OriginalVerifiableCredential[]; filter?: FindDigitalCredentialArgs }
-//       holderDIDs?: string[]
-//       restrictToFormats?: Format
-//       restrictToDIDMethods?: string[]
-//     },
-//   ): Promise<SelectResults> {
-//     const selectionResults: SelectResults = await this.getPresentationExchange({
-//       verifiableCredentials: await this.getCredentials(credentialRole, opts?.filterOpts),
-//     }).selectVerifiableCredentialsForSubmission(presentationDefinition.definition, opts)
-//     if (selectionResults.errors && selectionResults.errors.length > 0) {
-//       throw Error(JSON.stringify(selectionResults.errors))
-//     } else if (selectionResults.areRequiredCredentialsPresent === Status.ERROR) {
-//       throw Error(`Not all required credentials are available to satisfy the relying party's request`)
-//     }
-//
-//     const matches: SubmissionRequirementMatch[] | undefined = selectionResults.matches
-//     if (!matches || matches.length === 0 || !selectionResults.verifiableCredential || selectionResults.verifiableCredential.length === 0) {
-//       throw Error(JSON.stringify(selectionResults.errors))
-//     }
-//     return selectionResults
-//   }
-//
-//   private async getCredentials(
-//     credentialRole: CredentialRole,
-//     filterOpts?: {
-//       verifiableCredentials?: OriginalVerifiableCredential[]
-//       filter?: FindDigitalCredentialArgs
-//     },
-//   ): Promise<OriginalVerifiableCredential[]> {
-//     if (filterOpts?.verifiableCredentials && filterOpts.verifiableCredentials.length > 0) {
-//       return filterOpts.verifiableCredentials
-//     }
-//
-//     const filter = verifiableCredentialForRoleFilter(credentialRole, filterOpts?.filter)
-//     const uniqueCredentials = await this.session.context.agent.crsGetUniqueCredentials({ filter })
-//     return uniqueCredentials.map((uniqueVC: UniqueDigitalCredential) => {
-//       const vc = uniqueVC.uniformVerifiableCredential!
-//       const proof = Array.isArray(vc.proof) ? vc.proof : [vc.proof]
-//       const jwtProof = proof.find((p: IProof) => p?.type === DEFAULT_JWT_PROOF_TYPE)
-//       return jwtProof ? (jwtProof.jwt as CompactJWT) : vc
-//     })
-//   }
+    case DocumentFormat.JSONLD: {
+      // JSON-LD VC - create JSON-LD VP with challenge and domain in proof
+      const vcObject = typeof originalCredential === 'string' ? JSON.parse(originalCredential) : originalCredential
+
+      const vpObject = {
+        '@context': ['https://www.w3.org/2018/credentials/v1'],
+        type: ['VerifiablePresentation'],
+        verifiableCredential: [vcObject],
+      }
+
+      // Create JSON-LD VP with proof
+      return await agent.createVerifiablePresentation({
+        presentation: vpObject,
+        proofFormat: 'lds',
+        challenge: nonce, // Authorization Request nonce as challenge
+        domain: audience, // Client Identifier or Origin as domain
+        keyRef: identifier.kmsKeyRef || identifier.kid,
+      })
+    }
+
+    case DocumentFormat.MSO_MDOC: {
+      // ISO mdoc - create mdoc VP token
+      // This is a placeholder implementation
+      // Full implementation would require:
+      // 1. Decode the mdoc using CredentialMapper or mdoc utilities
+      // 2. Build proper mdoc VP token with session transcript
+      // 3. Include nonce/audience in the session transcript
+      logger.warning('mso_mdoc format has basic support - production use requires proper mdoc VP token implementation')
+
+      return originalCredential
+    }
+
+    default: {
+      // JWT VC - create JWT VP with nonce and aud in payload
+      const vcJwt = typeof originalCredential === 'string' ? originalCredential : JSON.stringify(originalCredential)
+
+      const identifierString = getIdentifierString(identifier)
+
+      // Create VP JWT using agent method
+      const vpPayload = {
+        iss: identifierString,
+        aud: audience, // Client Identifier or Origin
+        nonce, // Authorization Request nonce
+        vp: {
+          '@context': ['https://www.w3.org/2018/credentials/v1'],
+          type: ['VerifiablePresentation'],
+          holder: identifierString,
+          verifiableCredential: [vcJwt],
+        },
+        iat: Math.floor(Date.now() / 1000 - clockSkew),
+        exp: Math.floor(Date.now() / 1000 + 600 + clockSkew), // 10 minutes
+      }
+
+      // Use the agent's JWT creation capability
+      const vpJwt = await agent.createVerifiablePresentation({
+        presentation: vpPayload.vp,
+        proofFormat: 'jwt',
+        domain: audience,
+        challenge: nonce,
+        keyRef: identifier.kmsKeyRef || identifier.kid,
+      })
+
+      return vpJwt.proof?.jwt || vpJwt
+    }
+  }
 }

package/src/session/OpSession.ts

@@ -7,26 +7,18 @@ import {
   SupportedVersion,
   URI,
   Verification,
-  VerifiedAuthorizationRequest
+  VerifiedAuthorizationRequest,
 } from '@sphereon/did-auth-siop'
 import { ResolveOpts } from '@sphereon/did-auth-siop-adapter'
 import { JwtIssuer } from '@sphereon/oid4vc-common'
 import { getAgentDIDMethods, getAgentResolver } from '@sphereon/ssi-sdk-ext.did-utils'
 import { JweAlg, JweEnc } from '@sphereon/ssi-sdk-ext.jwt-service'
 import { encodeBase64url } from '@sphereon/ssi-sdk.core'
-import { parseDid } from '@sphereon/ssi-types'
+import { Loggers, parseDid } from '@sphereon/ssi-types'
 import { IIdentifier, TKeyType } from '@veramo/core'
 import { v4 } from 'uuid'
-import {
-  IOPOptions,
-  IOpSessionArgs,
-  IOpSessionGetOID4VPArgs,
-  IOpsSendSiopAuthorizationResponseArgs,
-  IRequiredContext
-} from '../types'
+import { IOPOptions, IOpSessionArgs, IOpsSendSiopAuthorizationResponseArgs, IRequiredContext } from '../types'
 import { createOP } from './functions'
-import { OID4VP } from './OID4VP'
-import { Loggers } from '@sphereon/ssi-types'
 
 const logger = Loggers.DEFAULT.get('sphereon:oid4vp:OpSession')
 
@@ -213,10 +205,6 @@ export class OpSession {
     return Promise.resolve(this.verifiedAuthorizationRequest!.responseURI!)
   }
 
-  public async getOID4VP(args: IOpSessionGetOID4VPArgs): Promise<OID4VP> {
-    return await OID4VP.init(this, args.allIdentifiers ?? [], args.hasher)
-  }
-
   private async createJarmResponseCallback({
     responseOpts,
   }: {
@@ -259,11 +247,7 @@ export class OpSession {
   }
 
   public async sendAuthorizationResponse(args: IOpsSendSiopAuthorizationResponseArgs): Promise<Response> {
-    const {
-      responseSignerOpts,
-      dcqlResponse,
-      isFirstParty,
-    } = args
+    const { responseSignerOpts, dcqlResponse, isFirstParty } = args
 
     const resolveOpts: ResolveOpts = this.options.resolveOpts ?? {
       resolver: getAgentResolver(this.context, {

package/src/session/functions.ts

@@ -60,14 +60,7 @@ export async function createOPBuilder({
   const eventEmitter = opOptions.eventEmitter ?? new EventEmitter()
   const builder = OP.builder()
     .withResponseMode(opOptions.responseMode ?? ResponseMode.DIRECT_POST)
-    .withSupportedVersions(
-      opOptions.supportedVersions ?? [
-        SupportedVersion.SIOPv2_ID1,
-        SupportedVersion.JWT_VC_PRESENTATION_PROFILE_v1,
-        SupportedVersion.SIOPv2_D11,
-        SupportedVersion.SIOPv2_D12_OID4VP_D18,
-      ],
-    )
+    .withSupportedVersions(opOptions.supportedVersions ?? [SupportedVersion.OID4VP_v1, SupportedVersion.SIOPv2_OID4VP_D28])
     .withExpiresIn(opOptions.expiresIn ?? 300)
     .withEventEmitter(eventEmitter)
     .withRegistration({

package/src/types/IDidAuthSiopOpAuthenticator.ts

@@ -12,7 +12,7 @@ import { DIDDocument } from '@sphereon/did-uni-client'
 import { IIdentifierResolution, ManagedIdentifierOptsOrResult } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 import { IJwtService } from '@sphereon/ssi-sdk-ext.jwt-service'
 import { ICredentialStore } from '@sphereon/ssi-sdk.credential-store'
-import { Party } from '@sphereon/ssi-sdk.data-store'
+import { Party } from '@sphereon/ssi-sdk.data-store-types'
 import { IPDManager } from '@sphereon/ssi-sdk.pd-manager'
 import { ISDJwtPlugin } from '@sphereon/ssi-sdk.sd-jwt'
 import { HasherSync, PresentationSubmission, W3CVerifiablePresentation } from '@sphereon/ssi-types'

package/src/types/machine/index.ts

@@ -1,6 +1,6 @@
 import { VerifiedAuthorizationRequest } from '@sphereon/did-auth-siop'
 import { ManagedIdentifierOptsOrResult } from '@sphereon/ssi-sdk-ext.identifier-resolution'
-import { DidAuthConfig, Party } from '@sphereon/ssi-sdk.data-store'
+import { DidAuthConfig, Party } from '@sphereon/ssi-sdk.data-store-types'
 import { BaseActionObject, Interpreter, ResolveTypegenMeta, ServiceMap, State, StateMachine, TypegenDisabled } from 'xstate'
 import { ErrorDetails } from '../error'
 import { SelectableCredentialsMap, Siopv2AuthorizationRequestData, Siopv2AuthorizationResponseData } from '../siop-service'

package/src/types/siop-service/index.ts

@@ -1,13 +1,10 @@
-import {
-  PresentationSignCallback,
-  RPRegistrationMetadataPayload,
-  VerifiedAuthorizationRequest,
-} from '@sphereon/did-auth-siop'
+import { PresentationSignCallback, RPRegistrationMetadataPayload, VerifiedAuthorizationRequest } from '@sphereon/did-auth-siop'
 import { IIdentifierResolution, ManagedIdentifierOptsOrResult } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 import { IContactManager } from '@sphereon/ssi-sdk.contact-manager'
 import { ICredentialStore, UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
-import { DidAuthConfig, ICredentialLocaleBranding, Identity, Party } from '@sphereon/ssi-sdk.data-store'
+import { DidAuthConfig, ICredentialLocaleBranding, Identity, Party } from '@sphereon/ssi-sdk.data-store-types'
 import { IIssuanceBranding } from '@sphereon/ssi-sdk.issuance-branding'
+import { ISDJwtPlugin } from '@sphereon/ssi-sdk.sd-jwt'
 import { IAgentContext, IDIDManager, IIdentifier, IResolver } from '@veramo/core'
 import { IDidAuthSiopOpAuthenticator } from '../IDidAuthSiopOpAuthenticator'
 import { Siopv2MachineContext, Siopv2MachineInterpreter, Siopv2MachineState } from '../machine'
@@ -90,5 +87,12 @@ export type OnIdentifierCreatedArgs = {
 }
 
 export type RequiredContext = IAgentContext<
-  IContactManager & IDidAuthSiopOpAuthenticator & IDIDManager & IResolver & IIdentifierResolution & ICredentialStore & IIssuanceBranding
+  IContactManager &
+    IDidAuthSiopOpAuthenticator &
+    IDIDManager &
+    IResolver &
+    IIdentifierResolution &
+    ICredentialStore &
+    IIssuanceBranding &
+    ISDJwtPlugin
 >

package/src/utils/CredentialUtils.ts

@@ -25,7 +25,7 @@ const getCredentialFromProofOrWrapped = (cred: any, hasher?: HasherSync): Origin
     return cred.proof.jwt
   }
 
-  return CredentialMapper.toWrappedVerifiableCredential(cred as OriginalVerifiableCredential, { hasher }).original
+  return CredentialMapper.toWrappedVerifiableCredential(cred as OriginalVerifiableCredential, { hasher }).original as OriginalVerifiableCredential // FIXME SSISDK-59
 }
 
 export const isUniqueDigitalCredential = (credential: InputCredential): credential is UniqueDigitalCredential => {