fix: update dcql and incorporate feedback

Sphereon-Opensource · Nov 25, 2024 · 76be4cc · 76be4cc
1 parent c654a7b
commit 76be4cc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/packages/siop-oid4vp/lib/authorization-request/Payload.ts b/packages/siop-oid4vp/lib/authorization-request/Payload.ts
@@ -35,13 +35,13 @@ export const createPresentationDefinitionClaimsProperties = (opts: ClaimPayloadO
 
   return {
     ...(opts.id_token ? { id_token: opts.id_token } : {}),
-    ...((opts.vp_token.presentation_definition || opts.vp_token.presentation_definition_uri || opts.vp_token.dcql_query) && {
+    ...((opts.vp_token.presentation_definition || opts.vp_token.presentation_definition_uri) && {
       vp_token: {
         ...(!opts.vp_token.presentation_definition_uri && { presentation_definition: opts.vp_token.presentation_definition }),
         ...(opts.vp_token.presentation_definition_uri && { presentation_definition_uri: opts.vp_token.presentation_definition_uri }),
-        ...(opts.vp_token.dcql_query && { dcql_query: opts.vp_token.dcql_query }),
       },
     }),
+    ...(opts.vp_token.dcql_query && { vp_token: { dcql_query: opts.vp_token.dcql_query } }),
   }
 }
 

diff --git a/packages/siop-oid4vp/lib/authorization-response/AuthorizationResponse.ts b/packages/siop-oid4vp/lib/authorization-response/AuthorizationResponse.ts
@@ -130,7 +130,7 @@ export class AuthorizationResponse {
 
     if (responseOpts.presentationExchange) {
       const wrappedPresentations = response.payload.vp_token
-        ? await extractPresentationsFromVpToken(response.payload.vp_token, {
+        ? extractPresentationsFromVpToken(response.payload.vp_token, {
             hasher: verifyOpts.hasher,
           })
         : []
@@ -144,14 +144,12 @@ export class AuthorizationResponse {
           hasher: verifyOpts.hasher,
         },
       })
-    } else {
-      const dcqlQuery = verifiedAuthorizationRequest.dcqlQuery
-      if (!dcqlQuery) {
-        throw new Error('vp_token is present, but no presentation definitions or dcql query provided')
-      }
-      assertValidDcqlPresentationResult(responseOpts.dcqlQuery.dcqlPresentation as DcqlPresentation, dcqlQuery, {
+    } else if (verifiedAuthorizationRequest.dcqlQuery) {
+      assertValidDcqlPresentationResult(responseOpts.dcqlQuery.dcqlPresentation as DcqlPresentation, verifiedAuthorizationRequest.dcqlQuery, {
         hasher: verifyOpts.hasher,
       })
+    } else {
+      throw new Error('vp_token is present, but no presentation definitions or dcql query provided')
     }
 
     return response

diff --git a/packages/siop-oid4vp/lib/authorization-response/Dcql.ts b/packages/siop-oid4vp/lib/authorization-response/Dcql.ts
@@ -43,10 +43,10 @@ export const getDcqlPresentationResult = (record: DcqlPresentation | string, dcq
       if (p.format === 'mso_mdoc') {
         return [
           queryId,
-          { credentialFormat: 'mso_mdoc', doctype: p.vcs[0].credential.toJson().docType, namespaces: p.vcs[0].decoded } satisfies DcqlMdocCredential,
+          { credential_format: 'mso_mdoc', doctype: p.vcs[0].credential.toJson().docType, namespaces: p.vcs[0].decoded } satisfies DcqlMdocCredential,
         ]
       } else if (p.format === 'vc+sd-jwt') {
-        return [queryId, { credentialFormat: 'vc+sd-jwt', vct: p.vcs[0].decoded.vct, claims: p.vcs[0].decoded } satisfies DcqlSdJwtVcCredential]
+        return [queryId, { credential_format: 'vc+sd-jwt', vct: p.vcs[0].decoded.vct, claims: p.vcs[0].decoded } satisfies DcqlSdJwtVcCredential]
       } else {
         throw new Error('DcqlPresentation atm only supports mso_mdoc and vc+sd-jwt')
       }

diff --git a/packages/siop-oid4vp/lib/authorization-response/OpenID4VP.ts b/packages/siop-oid4vp/lib/authorization-response/OpenID4VP.ts
@@ -113,7 +113,7 @@ export const verifyPresentations = async (
     }
   } else {
     const presentations = authorizationResponse.payload.vp_token
-      ? await extractPresentationsFromVpToken(authorizationResponse.payload.vp_token, { hasher: verifyOpts.hasher })
+      ? extractPresentationsFromVpToken(authorizationResponse.payload.vp_token, { hasher: verifyOpts.hasher })
       : []
     wrappedPresentations = Array.isArray(presentations) ? presentations : [presentations]
 

diff --git a/packages/siop-oid4vp/package.json b/packages/siop-oid4vp/package.json
@@ -18,7 +18,7 @@
     "@sphereon/jarm": "workspace:*",
     "@sphereon/oid4vc-common": "workspace:*",
     "@sphereon/pex": "5.0.0-unstable.24",
-    "dcql": "^0.2.13",
+    "dcql": "^0.2.15",
     "@sphereon/pex-models": "^2.3.1",
     "@sphereon/ssi-types": "0.30.2-next.279",
     "cross-fetch": "^4.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml