@sphereon/ssi-sdk.siopv2-oid4vp-op-auth 0.34.1-feature.SSISDK.44.finish.dcql.314 → 0.34.1-feature.SSISDK.44.finish.dcql.317

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth",
-  "version": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
+  "version": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -31,21 +31,21 @@
     "@sphereon/oid4vc-common": "0.19.1-next.220",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.data-store-types": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.pd-manager": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.presentation-exchange": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.data-store-types": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.pd-manager": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.presentation-exchange": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
     "@sphereon/wellknown-dids-client": "^0.1.3",
     "@veramo/core": "4.2.0",
     "@veramo/credential-w3c": "4.2.0",
@@ -59,8 +59,8 @@
   },
   "devDependencies": {
     "@sphereon/did-uni-client": "^0.6.3",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.44.finish.dcql.314+59d60d84",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.44.finish.dcql.317+652e05fc",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",
     "@types/sha.js": "^2.4.4",
@@ -102,5 +102,5 @@
     "OpenID Connect",
     "Authenticator"
   ],
-  "gitHead": "59d60d84f31e97df4514617f94bf862ea40e7b35"
+  "gitHead": "652e05fcd2cf9e149125ada93fa20719258efc67"
 }

package/src/session/OID4VP.ts

@@ -5,6 +5,7 @@ import { UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
 import { defaultGenerateDigest } from '@sphereon/ssi-sdk.sd-jwt'
 import {
   CredentialMapper,
+  DocumentFormat,
   HasherSync,
   Loggers,
   OriginalVerifiableCredential,
@@ -52,39 +53,6 @@ function extractOriginalCredential(
   return credential as OriginalVerifiableCredential
 }
 
-/**
- * Determines the format of a credential
- */
-function detectCredentialFormat(credential: OriginalVerifiableCredential): string {
-  if (typeof credential === 'string') {
-    // Could be JWT or SD-JWT
-    if (credential.includes('~')) {
-      return 'dc+sd-jwt'
-    }
-    // Check if it's a compact JWT format (3 parts)
-    const parts = credential.split('.')
-    if (parts.length === 3) {
-      return 'jwt_vc_json'
-    }
-  } else if (typeof credential === 'object') {
-    // Check for SD-JWT decoded format
-    if ('compactSdJwtVc' in credential) {
-      return 'dc+sd-jwt'
-    }
-    // Check for JSON-LD
-    if ('@context' in credential || 'proof' in credential) {
-      return 'ldp_vc'
-    }
-    // Check for mdoc
-    if ('doctype' in credential || 'namespaces' in credential) {
-      return 'mso_mdoc'
-    }
-  }
-
-  // Default to JWT
-  return 'jwt_vc_json'
-}
-
 /**
  * Gets the issuer/holder identifier from ManagedIdentifierOptsOrResult
  */
@@ -113,12 +81,12 @@ export async function createVerifiablePresentationForFormat(
   const { nonce, audience, agent, clockSkew = CLOCK_SKEW } = context
 
   const originalCredential = extractOriginalCredential(credential)
-  const format = detectCredentialFormat(originalCredential)
+  const documentFormat = CredentialMapper.detectDocumentType(originalCredential)
 
-  logger.debug(`Creating VP for format: ${format}`)
+  logger.debug(`Creating VP for format: ${documentFormat}`)
 
-  switch (format) {
-    case 'dc+sd-jwt': {
+  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,
@@ -145,40 +113,7 @@ export async function createVerifiablePresentationForFormat(
       return presentationResult.presentation
     }
 
-    case 'jwt_vc_json': {
-      // 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), // 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
-    }
-
-    case 'ldp_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
 
@@ -198,7 +133,7 @@ export async function createVerifiablePresentationForFormat(
       })
     }
 
-    case 'mso_mdoc': {
+    case DocumentFormat.MSO_MDOC: {
       // ISO mdoc - create mdoc VP token
       // This is a placeholder implementation
       // Full implementation would require:
@@ -210,7 +145,37 @@ export async function createVerifiablePresentationForFormat(
       return originalCredential
     }
 
-    default:
-      return Promise.reject(Error(`Unsupported credential format: ${format}`))
+    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
+    }
   }
 }