fix: JWT VP sometimes was constructed as a JSON LD VP with JwtProof2020

Sphereon-Opensource · Feb 3, 2024 · abb012c · abb012c
1 parent 42c89b2
commit abb012c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/packages/siopv2-oid4vp-op-auth/src/session/OID4VP.ts b/packages/siopv2-oid4vp-op-auth/src/session/OID4VP.ts
@@ -126,8 +126,17 @@ export class OID4VP {
       }
     )
 
+    const verifiablePresentation =
+      typeof presentationResult.verifiablePresentation !== 'string' &&
+      'proof' in presentationResult.verifiablePresentation &&
+      'jwt' in presentationResult.verifiablePresentation.proof &&
+      presentationResult.verifiablePresentation.proof.jwt
+        ? presentationResult.verifiablePresentation.proof.jwt
+        : presentationResult.verifiablePresentation
+
     return {
       ...presentationResult,
+      verifiablePresentation,
       verifiableCredentials: vcs.credentials,
       definition: selectedVerifiableCredentials.definition,
       identifierOpts: idOpts,

diff --git a/packages/siopv2-oid4vp-op-auth/src/session/functions.ts b/packages/siopv2-oid4vp-op-auth/src/session/functions.ts
@@ -52,7 +52,7 @@ export async function createOPBuilder({
 }): Promise<OPBuilder> {
   const eventEmitter = opOptions.eventEmitter ?? new EventEmitter()
   const builder = OP.builder()
-    .withResponseMode(opOptions.responseMode ?? ResponseMode.POST)
+    .withResponseMode(opOptions.responseMode ?? ResponseMode.DIRECT_POST)
     .withSupportedVersions(
       opOptions.supportedVersions ?? [
         SupportedVersion.SIOPv2_ID1,

diff --git a/packages/ssi-types/src/mapper/credential-mapper.ts b/packages/ssi-types/src/mapper/credential-mapper.ts
@@ -476,7 +476,7 @@ export class CredentialMapper {
       ...vc,
     }
 
-    const maxSkewInMS = opts?.maxTimeSkewInMS !== undefined ? opts.maxTimeSkewInMS : 999
+    const maxSkewInMS = opts?.maxTimeSkewInMS ?? 1500
 
     if (exp) {
       const expDate = credential.expirationDate
@@ -597,6 +597,8 @@ export class CredentialMapper {
       }
     } else if (type === DocumentFormat.JWT && 'vc' in credential) {
       return CredentialMapper.toCompactJWT(credential)
+    } else if ('proof' in credential && credential.proof.type === 'JwtProof2020' && credential.proof.jwt) {
+      return credential.proof.jwt
     }
     return credential as W3CVerifiableCredential
   }
@@ -611,6 +613,8 @@ export class CredentialMapper {
       }
     } else if (type === DocumentFormat.JWT && 'vp' in presentation) {
       return CredentialMapper.toCompactJWT(presentation)
+    } else if ('proof' in presentation && presentation.proof.type === 'JwtProof2020' && presentation.proof.jwt) {
+      return presentation.proof.jwt
     }
     return presentation as W3CVerifiablePresentation
   }
@@ -626,9 +630,9 @@ export class CredentialMapper {
     }
     let proof: string | undefined
     if ('vp' in jwtDocument) {
-      proof = jwtDocument.vp.proof
+      proof = 'jwt' in jwtDocument.vp.proof ? jwtDocument.vp.proof.jwt : jwtDocument.vp.proof
     } else if ('vc' in jwtDocument) {
-      proof = jwtDocument.vc.proof
+      proof = 'jwt' in jwtDocument.vc.proof ? jwtDocument.vc.proof.jwt : jwtDocument.vc.proof
     } else {
       proof = Array.isArray(jwtDocument.proof) ? jwtDocument.proof[0].jwt : jwtDocument.proof.jwt
     }