Merge branch 'feature/SPRIND-137' of github.com:Sphereon-Opensource/O…

…ID4VC into feature/SPRIND-137
Sphereon-Opensource · Dec 17, 2024 · 34ec540 · 34ec540
2 parents 1020b5b + 9b4bb1f
commit 34ec540
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/packages/did-auth-siop-adapter/package.json b/packages/did-auth-siop-adapter/package.json
@@ -20,8 +20,7 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/jwt-decode": "^3.1.0",
-    "typescript": "5.4.5"
+        "typescript": "5.4.5"
   },
   "engines": {
     "node": ">=18"

diff --git a/packages/siop-oid4vp/lib/rp/RP.ts b/packages/siop-oid4vp/lib/rp/RP.ts
@@ -424,8 +424,12 @@ export class RP {
       state,
       nonce,
       verification: mergeVerificationOpts(this._verifyResponseOptions, opts),
-      presentationDefinitions: opts?.presentationDefinitions ?? this._verifyResponseOptions.presentationDefinitions,
-      dcqlQuery: opts?.dcqlQuery ?? this._verifyResponseOptions.dcqlQuery,
+      ...(opts?.presentationDefinitions && !opts?.dcqlQuery && {
+        presentationDefinitions: this._verifyResponseOptions.presentationDefinitions
+      }),
+      ...(opts?.dcqlQuery && {
+        dcqlQuery: this._verifyResponseOptions.dcqlQuery
+      })
     }
   }
 

diff --git a/packages/siop-oid4vp/lib/rp/RPBuilder.ts b/packages/siop-oid4vp/lib/rp/RPBuilder.ts
@@ -241,10 +241,16 @@ export class RPBuilder {
       },
       true,
     )
+    this._authorizationRequestPayload.presentation_definition = undefined
+    this._requestObjectPayload.presentation_definition = undefined
     return this
   }
 
   withPresentationDefinition(definitionOpts: { definition: IPresentationDefinition; definitionUri?: string }, targets?: PropertyTargets): RPBuilder {
+    if(this._authorizationRequestPayload.dcql_query) {
+      return this
+    }
+
     const { definition, definitionUri } = definitionOpts
 
     if (this.getSupportedRequestVersion() < SupportedVersion.SIOPv2_D11) {

diff --git a/packages/siop-oid4vp/package.json b/packages/siop-oid4vp/package.json
@@ -51,8 +51,7 @@
     "@transmute/ed25519-signature-2018": "^0.7.0-unstable.82",
     "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.11",
-    "@types/jwt-decode": "^3.1.0",
-    "@types/language-tags": "^1.0.4",
+        "@types/language-tags": "^1.0.4",
     "@types/qs": "^6.9.11",
     "@typescript-eslint/eslint-plugin": "^5.52.0",
     "@typescript-eslint/parser": "^5.52.0",

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