@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/dist/index.js

@@ -526,7 +526,7 @@ __name(getSigningAlgo, "getSigningAlgo");
 import { calculateSdHash } from "@sphereon/pex/dist/main/lib/utils/index.js";
 import { isManagedIdentifierDidResult } from "@sphereon/ssi-sdk-ext.identifier-resolution";
 import { defaultGenerateDigest } from "@sphereon/ssi-sdk.sd-jwt";
-import { CredentialMapper, Loggers } from "@sphereon/ssi-types";
+import { CredentialMapper, DocumentFormat, Loggers } from "@sphereon/ssi-types";
 
 // src/types/IDidAuthSiopOpAuthenticator.ts
 var LOGGER_NAMESPACE = "sphereon:siopv2-oid4vp:op-auth";
@@ -622,29 +622,6 @@ function extractOriginalCredential(credential) {
   return credential;
 }
 __name(extractOriginalCredential, "extractOriginalCredential");
-function detectCredentialFormat(credential) {
-  if (typeof credential === "string") {
-    if (credential.includes("~")) {
-      return "dc+sd-jwt";
-    }
-    const parts = credential.split(".");
-    if (parts.length === 3) {
-      return "jwt_vc_json";
-    }
-  } else if (typeof credential === "object") {
-    if ("compactSdJwtVc" in credential) {
-      return "dc+sd-jwt";
-    }
-    if ("@context" in credential || "proof" in credential) {
-      return "ldp_vc";
-    }
-    if ("doctype" in credential || "namespaces" in credential) {
-      return "mso_mdoc";
-    }
-  }
-  return "jwt_vc_json";
-}
-__name(detectCredentialFormat, "detectCredentialFormat");
 function getIdentifierString(identifier) {
   if ("opts" in identifier && "method" in identifier) {
     if (isManagedIdentifierDidResult(identifier)) {
@@ -657,10 +634,10 @@ __name(getIdentifierString, "getIdentifierString");
 async function createVerifiablePresentationForFormat(credential, identifier, context) {
   const { nonce, audience, agent, clockSkew = CLOCK_SKEW } = context;
   const originalCredential = extractOriginalCredential(credential);
-  const format = detectCredentialFormat(originalCredential);
-  logger.debug(`Creating VP for format: ${format}`);
-  switch (format) {
-    case "dc+sd-jwt": {
+  const documentFormat = CredentialMapper.detectDocumentType(originalCredential);
+  logger.debug(`Creating VP for format: ${documentFormat}`);
+  switch (documentFormat) {
+    case DocumentFormat.SD_JWT_VC: {
       const decodedSdJwt = await CredentialMapper.decodeSdJwtVcAsync(typeof originalCredential === "string" ? originalCredential : originalCredential.compactSdJwtVc, defaultGenerateDigest);
       const hashAlg = decodedSdJwt.signedPayload._sd_alg ?? "sha-256";
       const sdHash = calculateSdHash(decodedSdJwt.compactSdJwtVc, hashAlg, defaultGenerateDigest);
@@ -678,7 +655,32 @@ async function createVerifiablePresentationForFormat(credential, identifier, con
       });
       return presentationResult.presentation;
     }
-    case "jwt_vc_json": {
+    case DocumentFormat.JSONLD: {
+      const vcObject = typeof originalCredential === "string" ? JSON.parse(originalCredential) : originalCredential;
+      const vpObject = {
+        "@context": [
+          "https://www.w3.org/2018/credentials/v1"
+        ],
+        type: [
+          "VerifiablePresentation"
+        ],
+        verifiableCredential: [
+          vcObject
+        ]
+      };
+      return await agent.createVerifiablePresentation({
+        presentation: vpObject,
+        proofFormat: "lds",
+        challenge: nonce,
+        domain: audience,
+        keyRef: identifier.kmsKeyRef || identifier.kid
+      });
+    }
+    case DocumentFormat.MSO_MDOC: {
+      logger.warning("mso_mdoc format has basic support - production use requires proper mdoc VP token implementation");
+      return originalCredential;
+    }
+    default: {
       const vcJwt = typeof originalCredential === "string" ? originalCredential : JSON.stringify(originalCredential);
       const identifierString = getIdentifierString(identifier);
       const vpPayload = {
@@ -698,7 +700,7 @@ async function createVerifiablePresentationForFormat(credential, identifier, con
           ]
         },
         iat: Math.floor(Date.now() / 1e3 - clockSkew),
-        exp: Math.floor(Date.now() / 1e3 + 600)
+        exp: Math.floor(Date.now() / 1e3 + 600 + clockSkew)
       };
       const vpJwt = await agent.createVerifiablePresentation({
         presentation: vpPayload.vp,
@@ -709,33 +711,6 @@ async function createVerifiablePresentationForFormat(credential, identifier, con
       });
       return vpJwt.proof?.jwt || vpJwt;
     }
-    case "ldp_vc": {
-      const vcObject = typeof originalCredential === "string" ? JSON.parse(originalCredential) : originalCredential;
-      const vpObject = {
-        "@context": [
-          "https://www.w3.org/2018/credentials/v1"
-        ],
-        type: [
-          "VerifiablePresentation"
-        ],
-        verifiableCredential: [
-          vcObject
-        ]
-      };
-      return await agent.createVerifiablePresentation({
-        presentation: vpObject,
-        proofFormat: "lds",
-        challenge: nonce,
-        domain: audience,
-        keyRef: identifier.kmsKeyRef || identifier.kid
-      });
-    }
-    case "mso_mdoc": {
-      logger.warning("mso_mdoc format has basic support - production use requires proper mdoc VP token implementation");
-      return originalCredential;
-    }
-    default:
-      return Promise.reject(Error(`Unsupported credential format: ${format}`));
   }
 }
 __name(createVerifiablePresentationForFormat, "createVerifiablePresentationForFormat");