refactor: Checking whether PDs and DCQL are present

Sphereon-Opensource · Jan 8, 2025 · 43420cf · 43420cf
1 parent d002379
commit 43420cf
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/packages/siop-oid4vp/lib/rp/RP.ts b/packages/siop-oid4vp/lib/rp/RP.ts
@@ -415,6 +415,16 @@ export class RP {
       }
     }
 
+    const hasPD = (this._verifyResponseOptions.presentationDefinitions !== undefined && this._verifyResponseOptions.presentationDefinitions !== null || (Array.isArray(this._verifyResponseOptions.presentationDefinitions) && this._verifyResponseOptions.presentationDefinitions.length > 0)) ||
+      (opts.presentationDefinitions !== undefined && opts.presentationDefinitions !== null || (Array.isArray(opts.presentationDefinitions) && opts.presentationDefinitions.length > 0))
+    const hasDcql = (this._verifyResponseOptions.dcqlQuery !== undefined && this._verifyResponseOptions.dcqlQuery !== null) || (opts.dcqlQuery !== undefined && opts.dcqlQuery !== null)
+
+    if (hasPD && hasDcql) {
+      throw Error(`Only Presentation Definitions or DCQL is required`)
+    } else if (!hasPD && !hasDcql) {
+      throw Error(`Either a Presentation Definition or DCQL is required`)
+    }
+
     return {
       ...this._verifyResponseOptions,
       verifyJwtCallback: this._verifyResponseOptions.verifyJwtCallback,
@@ -424,12 +434,8 @@ export class RP {
       state,
       nonce,
       verification: mergeVerificationOpts(this._verifyResponseOptions, opts),
-      ...(opts?.presentationDefinitions && !opts?.dcqlQuery && {
-        presentationDefinitions: this._verifyResponseOptions.presentationDefinitions ?? opts?.presentationDefinitions
-      }),
-      ...(opts?.dcqlQuery && !opts?.presentationDefinitions && {
-        dcqlQuery: this._verifyResponseOptions.dcqlQuery ?? opts?.dcqlQuery
-      })
+      presentationDefinitions: this._verifyResponseOptions.presentationDefinitions ?? opts?.presentationDefinitions,
+      dcqlQuery: this._verifyResponseOptions.dcqlQuery ?? opts?.dcqlQuery
     }
   }