@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth 0.34.1-feature.SSISDK.46.44 → 0.34.1-feature.SSISDK.47.154

package/dist/index.cjs

@@ -4,9 +4,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,354 +18,351 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// src/index.ts
+var index_exports = {};
+__export(index_exports, {
+  SIOPv2RP: () => SIOPv2RP,
+  VerifiedDataMode: () => VerifiedDataMode,
+  schema: () => plugin_schema_default
+});
+module.exports = __toCommonJS(index_exports);
+
 // plugin.schema.json
-var require_plugin_schema = __commonJS({
-  "plugin.schema.json"(exports, module2) {
-    module2.exports = {
-      IDidAuthSiopOpAuthenticator: {
-        components: {
-          schemas: {
-            IGetSiopSessionArgs: {
-              type: "object",
-              properties: {
-                sessionId: {
-                  type: "string"
-                },
-                additionalProperties: false
-              },
-              required: ["sessionId"],
-              description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.getSessionForSiop } "
+var plugin_schema_default = {
+  IDidAuthSiopOpAuthenticator: {
+    components: {
+      schemas: {
+        IGetSiopSessionArgs: {
+          type: "object",
+          properties: {
+            sessionId: {
+              type: "string"
             },
-            IRegisterSiopSessionArgs: {
+            additionalProperties: false
+          },
+          required: ["sessionId"],
+          description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.getSessionForSiop } "
+        },
+        IRegisterSiopSessionArgs: {
+          type: "object",
+          properties: {
+            identifier: {
               type: "object",
               properties: {
-                identifier: {
-                  type: "object",
-                  properties: {
-                    did: {
-                      type: "string"
-                    },
-                    alias: {
-                      type: "string"
-                    },
-                    provider: {
-                      type: "string"
-                    },
-                    controllerKeyId: {
-                      type: "string"
-                    },
-                    keys: {
-                      type: "array",
-                      items: {
-                        type: "object",
-                        properties: {
-                          additionalProperties: true
-                        }
-                      }
-                    },
-                    services: {
-                      type: "array",
-                      items: {
-                        type: "object",
-                        properties: {
-                          additionalProperties: true
-                        }
-                      }
-                    }
-                  },
-                  additionalProperties: false,
-                  required: ["did", "provider", "keys", "services"]
-                },
-                sessionId: {
+                did: {
                   type: "string"
                 },
-                expiresIn: {
-                  type: "number"
-                },
-                additionalProperties: false
-              },
-              required: ["identifier"],
-              description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.registerSessionForSiop } "
-            },
-            IRemoveSiopSessionArgs: {
-              type: "object",
-              properties: {
-                sessionId: {
+                alias: {
                   type: "string"
                 },
-                additionalProperties: false
-              },
-              required: ["sessionId"],
-              description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.removeSessionForSiop } "
-            },
-            IAuthenticateWithSiopArgs: {
-              type: "object",
-              properties: {
-                sessionId: {
+                provider: {
                   type: "string"
                 },
-                stateId: {
+                controllerKeyId: {
                   type: "string"
                 },
-                redirectUrl: {
-                  type: "string"
+                keys: {
+                  type: "array",
+                  items: {
+                    type: "object",
+                    properties: {
+                      additionalProperties: true
+                    }
+                  }
                 },
-                additionalProperties: false
+                services: {
+                  type: "array",
+                  items: {
+                    type: "object",
+                    properties: {
+                      additionalProperties: true
+                    }
+                  }
+                }
               },
-              required: ["sessionId", "stateId", "redirectUrl"],
-              description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.authenticateWithSiop } "
+              additionalProperties: false,
+              required: ["did", "provider", "keys", "services"]
+            },
+            sessionId: {
+              type: "string"
+            },
+            expiresIn: {
+              type: "number"
+            },
+            additionalProperties: false
+          },
+          required: ["identifier"],
+          description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.registerSessionForSiop } "
+        },
+        IRemoveSiopSessionArgs: {
+          type: "object",
+          properties: {
+            sessionId: {
+              type: "string"
+            },
+            additionalProperties: false
+          },
+          required: ["sessionId"],
+          description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.removeSessionForSiop } "
+        },
+        IAuthenticateWithSiopArgs: {
+          type: "object",
+          properties: {
+            sessionId: {
+              type: "string"
+            },
+            stateId: {
+              type: "string"
+            },
+            redirectUrl: {
+              type: "string"
+            },
+            additionalProperties: false
+          },
+          required: ["sessionId", "stateId", "redirectUrl"],
+          description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.authenticateWithSiop } "
+        },
+        IResponse: {
+          type: "object",
+          properties: {
+            status: {
+              type: "number"
+            },
+            additionalProperties: true
+          },
+          required: ["status"],
+          description: "Result of {@link DidAuthSiopOpAuthenticator.authenticateWithSiop & DidAuthSiopOpAuthenticator.sendSiopAuthenticationResponse } "
+        },
+        IGetSiopAuthenticationRequestFromRpArgs: {
+          type: "object",
+          properties: {
+            sessionId: {
+              type: "string"
             },
-            IResponse: {
+            stateId: {
+              type: "string"
+            },
+            redirectUrl: {
+              type: "string"
+            },
+            additionalProperties: false
+          },
+          required: ["sessionId", "stateId", "redirectUrl"],
+          description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.getSiopAuthenticationRequestFromRP } "
+        },
+        ParsedAuthenticationRequestURI: {
+          type: "object",
+          properties: {
+            jwt: {
+              type: "string"
+            },
+            requestPayload: {
               type: "object",
               properties: {
-                status: {
-                  type: "number"
-                },
                 additionalProperties: true
-              },
-              required: ["status"],
-              description: "Result of {@link DidAuthSiopOpAuthenticator.authenticateWithSiop & DidAuthSiopOpAuthenticator.sendSiopAuthenticationResponse } "
+              }
             },
-            IGetSiopAuthenticationRequestFromRpArgs: {
+            registration: {
               type: "object",
               properties: {
-                sessionId: {
-                  type: "string"
-                },
-                stateId: {
-                  type: "string"
-                },
-                redirectUrl: {
-                  type: "string"
-                },
-                additionalProperties: false
-              },
-              required: ["sessionId", "stateId", "redirectUrl"],
-              description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.getSiopAuthenticationRequestFromRP } "
+                additionalProperties: true
+              }
             },
-            ParsedAuthenticationRequestURI: {
+            additionalProperties: false
+          },
+          required: ["jwt", "requestPayload", "registration"],
+          description: "Result of {@link DidAuthSiopOpAuthenticator.getSiopAuthenticationRequestFromRP } "
+        },
+        IGetSiopAuthenticationRequestDetailsArgs: {
+          type: "object",
+          properties: {
+            sessionId: {
+              type: "string"
+            },
+            verifiedAuthenticationRequest: {
               type: "object",
               properties: {
-                jwt: {
-                  type: "string"
-                },
-                requestPayload: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                registration: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                additionalProperties: false
-              },
-              required: ["jwt", "requestPayload", "registration"],
-              description: "Result of {@link DidAuthSiopOpAuthenticator.getSiopAuthenticationRequestFromRP } "
+                additionalProperties: true
+              }
             },
-            IGetSiopAuthenticationRequestDetailsArgs: {
+            credentialFilter: {
               type: "object",
               properties: {
-                sessionId: {
-                  type: "string"
-                },
-                verifiedAuthenticationRequest: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                credentialFilter: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                additionalProperties: false
-              },
-              required: ["sessionId", "verifiedAuthenticationRequest"],
-              description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.getSiopAuthenticationRequestDetails } "
+                additionalProperties: true
+              }
             },
-            IAuthRequestDetails: {
+            additionalProperties: false
+          },
+          required: ["sessionId", "verifiedAuthenticationRequest"],
+          description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.getSiopAuthenticationRequestDetails } "
+        },
+        IAuthRequestDetails: {
+          type: "object",
+          properties: {
+            id: {
+              type: "string"
+            },
+            alsoKnownAs: {
+              type: "array",
+              items: {
+                type: "string"
+              }
+            },
+            vpResponseOpts: {
               type: "object",
               properties: {
-                id: {
-                  type: "string"
-                },
-                alsoKnownAs: {
-                  type: "array",
-                  items: {
-                    type: "string"
-                  }
-                },
-                vpResponseOpts: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                additionalProperties: false
-              },
-              required: ["id", "vpResponseOpts"],
-              description: "Result of {@link DidAuthSiopOpAuthenticator.getSiopAuthenticationRequestDetails } "
+                additionalProperties: true
+              }
             },
-            IVerifySiopAuthenticationRequestUriArgs: {
+            additionalProperties: false
+          },
+          required: ["id", "vpResponseOpts"],
+          description: "Result of {@link DidAuthSiopOpAuthenticator.getSiopAuthenticationRequestDetails } "
+        },
+        IVerifySiopAuthenticationRequestUriArgs: {
+          type: "object",
+          properties: {
+            sessionId: {
+              type: "string"
+            },
+            ParsedAuthenticationRequestURI: {
               type: "object",
               properties: {
-                sessionId: {
-                  type: "string"
-                },
-                ParsedAuthenticationRequestURI: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                additionalProperties: false
-              },
-              required: ["sessionId", "ParsedAuthenticationRequestURI"],
-              description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.verifySiopAuthenticationRequestURI } "
+                additionalProperties: true
+              }
             },
-            VerifiedAuthorizationRequest: {
+            additionalProperties: false
+          },
+          required: ["sessionId", "ParsedAuthenticationRequestURI"],
+          description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.verifySiopAuthenticationRequestURI } "
+        },
+        VerifiedAuthorizationRequest: {
+          type: "object",
+          properties: {
+            payload: {
               type: "object",
               properties: {
-                payload: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                presentationDefinitions: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                verifyOpts: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                additionalProperties: false
-              },
-              required: ["payload", "verifyOpts"],
-              description: "Result of {@link DidAuthSiopOpAuthenticator.verifySiopAuthenticationRequestURI } "
+                additionalProperties: true
+              }
             },
-            ISendSiopAuthenticationResponseArgs: {
+            presentationDefinitions: {
               type: "object",
               properties: {
-                sessionId: {
-                  type: "string"
-                },
-                verifiedAuthenticationRequest: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                verifiablePresentationResponse: {
-                  type: "object",
-                  properties: {
-                    additionalProperties: true
-                  }
-                },
-                additionalProperties: false
-              },
-              required: ["sessionId", "verifiedAuthenticationRequest"],
-              description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.sendSiopAuthenticationResponse } "
-            }
-          },
-          methods: {
-            getSessionForSiop: {
-              description: "Get SIOP session",
-              arguments: {
-                $ref: "#/components/schemas/IGetSiopSessionArgs"
-              },
-              returnType: "object"
-            },
-            registerSessionForSiop: {
-              description: "Register SIOP session",
-              arguments: {
-                $ref: "#/components/schemas/IRegisterSiopSessionArgs"
-              },
-              returnType: "object"
-            },
-            removeSessionForSiop: {
-              description: "Remove SIOP session",
-              arguments: {
-                $ref: "#/components/schemas/IRemoveSiopSessionArgs"
-              },
-              returnType: "boolean"
-            },
-            authenticateWithSiop: {
-              description: "Authenticate using DID Auth SIOP",
-              arguments: {
-                $ref: "#/components/schemas/IAuthenticateWithSiopArgs"
-              },
-              returnType: {
-                $ref: "#/components/schemas/Response"
+                additionalProperties: true
               }
             },
-            getSiopAuthenticationRequestFromRP: {
-              description: "Get authentication request from RP",
-              arguments: {
-                $ref: "#/components/schemas/IGetSiopAuthenticationRequestFromRpArgs"
-              },
-              returnType: {
-                $ref: "#/components/schemas/ParsedAuthenticationRequestURI"
+            verifyOpts: {
+              type: "object",
+              properties: {
+                additionalProperties: true
               }
             },
-            getSiopAuthenticationRequestDetails: {
-              description: "Get authentication request details",
-              arguments: {
-                $ref: "#/components/schemas/IGetSiopAuthenticationRequestDetailsArgs"
-              },
-              returnType: {
-                $ref: "#/components/schemas/IAuthRequestDetails"
-              }
+            additionalProperties: false
+          },
+          required: ["payload", "verifyOpts"],
+          description: "Result of {@link DidAuthSiopOpAuthenticator.verifySiopAuthenticationRequestURI } "
+        },
+        ISendSiopAuthenticationResponseArgs: {
+          type: "object",
+          properties: {
+            sessionId: {
+              type: "string"
             },
-            verifySiopAuthenticationRequestURI: {
-              description: "Verify authentication request URI",
-              arguments: {
-                $ref: "#/components/schemas/IVerifySiopAuthenticationRequestUriArgs"
-              },
-              returnType: {
-                $ref: "#/components/schemas/VerifiedAuthorizationRequest"
+            verifiedAuthenticationRequest: {
+              type: "object",
+              properties: {
+                additionalProperties: true
               }
             },
-            sendSiopAuthenticationResponse: {
-              description: "Send authentication response",
-              arguments: {
-                $ref: "#/components/schemas/ISendSiopAuthenticationResponseArgs"
-              },
-              returnType: {
-                $ref: "#/components/schemas/IRequiredContext"
+            verifiablePresentationResponse: {
+              type: "object",
+              properties: {
+                additionalProperties: true
               }
-            }
+            },
+            additionalProperties: false
+          },
+          required: ["sessionId", "verifiedAuthenticationRequest"],
+          description: "Arguments needed for {@link DidAuthSiopOpAuthenticator.sendSiopAuthenticationResponse } "
+        }
+      },
+      methods: {
+        getSessionForSiop: {
+          description: "Get SIOP session",
+          arguments: {
+            $ref: "#/components/schemas/IGetSiopSessionArgs"
+          },
+          returnType: "object"
+        },
+        registerSessionForSiop: {
+          description: "Register SIOP session",
+          arguments: {
+            $ref: "#/components/schemas/IRegisterSiopSessionArgs"
+          },
+          returnType: "object"
+        },
+        removeSessionForSiop: {
+          description: "Remove SIOP session",
+          arguments: {
+            $ref: "#/components/schemas/IRemoveSiopSessionArgs"
+          },
+          returnType: "boolean"
+        },
+        authenticateWithSiop: {
+          description: "Authenticate using DID Auth SIOP",
+          arguments: {
+            $ref: "#/components/schemas/IAuthenticateWithSiopArgs"
+          },
+          returnType: {
+            $ref: "#/components/schemas/Response"
+          }
+        },
+        getSiopAuthenticationRequestFromRP: {
+          description: "Get authentication request from RP",
+          arguments: {
+            $ref: "#/components/schemas/IGetSiopAuthenticationRequestFromRpArgs"
+          },
+          returnType: {
+            $ref: "#/components/schemas/ParsedAuthenticationRequestURI"
+          }
+        },
+        getSiopAuthenticationRequestDetails: {
+          description: "Get authentication request details",
+          arguments: {
+            $ref: "#/components/schemas/IGetSiopAuthenticationRequestDetailsArgs"
+          },
+          returnType: {
+            $ref: "#/components/schemas/IAuthRequestDetails"
+          }
+        },
+        verifySiopAuthenticationRequestURI: {
+          description: "Verify authentication request URI",
+          arguments: {
+            $ref: "#/components/schemas/IVerifySiopAuthenticationRequestUriArgs"
+          },
+          returnType: {
+            $ref: "#/components/schemas/VerifiedAuthorizationRequest"
+          }
+        },
+        sendSiopAuthenticationResponse: {
+          description: "Send authentication response",
+          arguments: {
+            $ref: "#/components/schemas/ISendSiopAuthenticationResponseArgs"
+          },
+          returnType: {
+            $ref: "#/components/schemas/IRequiredContext"
           }
         }
       }
-    };
+    }
   }
-});
-
-// src/index.ts
-var index_exports = {};
-__export(index_exports, {
-  SIOPv2RP: () => SIOPv2RP,
-  VerifiedDataMode: () => VerifiedDataMode,
-  schema: () => schema
-});
-module.exports = __toCommonJS(index_exports);
+};
 
 // src/agent/SIOPv2RP.ts
 var import_did_auth_siop2 = require("@sphereon/did-auth-siop");
 var import_ssi_sdk_ext4 = require("@sphereon/ssi-sdk-ext.did-utils");
 var import_ssi_types2 = require("@sphereon/ssi-types");
+var import_dcql = require("dcql");
 
 // src/functions.ts
 var import_did_auth_siop = require("@sphereon/did-auth-siop");
@@ -401,8 +395,7 @@ function getPresentationVerificationCallback(idOpts, context) {
   async function presentationVerificationCallback(args, presentationSubmission) {
     if (import_ssi_types.CredentialMapper.isSdJwtEncoded(args)) {
       const result2 = await context.agent.verifySdJwtPresentation({
-        presentation: args,
-        kb: true
+        presentation: args
       });
       return {
         verified: !!result2.payload
@@ -453,9 +446,8 @@ async function createRPBuilder(args) {
     });
     if (presentationDefinitionItems.length > 0) {
       const presentationDefinitionItem = presentationDefinitionItems[0];
-      definition = presentationDefinitionItem.definitionPayload;
       if (!dcqlQuery && presentationDefinitionItem.dcqlPayload) {
-        dcqlQuery = presentationDefinitionItem.dcqlPayload;
+        dcqlQuery = presentationDefinitionItem.dcqlPayload.dcqlQuery;
       }
     }
   }
@@ -525,19 +517,14 @@ async function createRPBuilder(args) {
   }, context)).withRevocationVerification(import_did_auth_siop.RevocationVerification.NEVER).withPresentationVerification(getPresentationVerificationCallback(identifierOpts.idOpts, context));
   const oidfOpts = identifierOpts.oidfOpts;
   if (oidfOpts && (0, import_ssi_sdk_ext2.isExternalIdentifierOIDFEntityIdOpts)(oidfOpts)) {
-    builder.withEntityId(oidfOpts.identifier, import_did_auth_siop.PropertyTarget.REQUEST_OBJECT).withClientIdScheme("entity_id", import_did_auth_siop.PropertyTarget.REQUEST_OBJECT);
+    builder.withEntityId(oidfOpts.identifier, import_did_auth_siop.PropertyTarget.REQUEST_OBJECT);
   } else {
     const resolution = await context.agent.identifierManagedGet(identifierOpts.idOpts);
-    builder.withClientId(resolution.issuer ?? ((0, import_ssi_sdk_ext2.isManagedIdentifierDidResult)(resolution) ? resolution.did : resolution.jwkThumbprint), import_did_auth_siop.PropertyTarget.REQUEST_OBJECT).withClientIdScheme(resolution.clientIdScheme ?? identifierOpts.idOpts.clientIdScheme, import_did_auth_siop.PropertyTarget.REQUEST_OBJECT);
+    builder.withClientId(resolution.issuer ?? ((0, import_ssi_sdk_ext2.isManagedIdentifierDidResult)(resolution) ? resolution.did : resolution.jwkThumbprint), import_did_auth_siop.PropertyTarget.REQUEST_OBJECT);
   }
   if (hasher) {
     builder.withHasher(hasher);
   }
-  if (definition) {
-    builder.withPresentationDefinition({
-      definition
-    }, import_did_auth_siop.PropertyTarget.REQUEST_OBJECT);
-  }
   if (dcqlQuery) {
     builder.withDcqlQuery(dcqlQuery);
   }
@@ -642,7 +629,7 @@ var RPInstance = class {
     }) : void 0;
   }
   async createAuthorizationRequestURI(createArgs, context) {
-    const { correlationId, queryId, claims, requestByReferenceURI, responseURI, responseURIType } = createArgs;
+    const { correlationId, queryId, claims, requestByReferenceURI, responseURI, responseURIType, callback } = createArgs;
     const nonce = createArgs.nonce ?? (0, import_uuid.v4)();
     const state = createArgs.state ?? correlationId;
     let jwtIssuer;
@@ -677,7 +664,8 @@ var RPInstance = class {
       requestByReferenceURI,
       responseURI,
       responseURIType,
-      jwtIssuer
+      jwtIssuer,
+      callback
     }));
   }
   async createAuthorizationRequest(createArgs, context) {
@@ -726,7 +714,7 @@ var SIOPv2RP = class _SIOPv2RP {
   opts;
   static _DEFAULT_OPTS_KEY = "_default";
   instances = /* @__PURE__ */ new Map();
-  schema = schema.IDidAuthSiopOpAuthenticator;
+  schema = plugin_schema_default.IDidAuthSiopOpAuthenticator;
   methods = {
     siopCreateAuthRequestURI: this.createAuthorizationRequestURI.bind(this),
     siopCreateAuthRequestPayloads: this.createAuthorizationRequestPayloads.bind(this),
@@ -861,11 +849,8 @@ var SIOPv2RP = class _SIOPv2RP {
       queryId: args.queryId
     }, context).then((rp) => rp.get(context).then((rp2) => rp2.verifyAuthorizationResponse(authResponse, {
       correlationId: args.correlationId,
-      ...args.presentationDefinitions && !args.dcqlQuery ? {
-        presentationDefinitions: args.presentationDefinitions
-      } : {},
-      ...args.dcqlQuery ? {
-        dcqlQuery: args.dcqlQuery
+      ...args.dcqlQueryPayload ? {
+        dcqlQuery: args.dcqlQueryPayload.dcqlQuery
       } : {},
       audience: args.audience
     })));
@@ -874,12 +859,25 @@ var SIOPv2RP = class _SIOPv2RP {
     const { queries, tenantId, version, versionControlMode } = args;
     await Promise.all(queries.map(async (definitionPair) => {
       const definitionPayload = definitionPair.definitionPayload;
-      await context.agent.pexValidateDefinition({
-        definition: definitionPayload
-      });
-      console.log(`persisting definition ${definitionPayload.id} / ${definitionPayload.name} with versionControlMode ${versionControlMode}`);
+      if (!definitionPayload && !definitionPair.dcqlPayload) {
+        return Promise.reject(Error("Either dcqlPayload or definitionPayload must be suppplied"));
+      }
+      let definitionId;
+      if (definitionPair.dcqlPayload) {
+        import_dcql.DcqlQuery.validate(definitionPair.dcqlPayload.dcqlQuery);
+        console.log(`persisting DCQL definition ${definitionPair.dcqlPayload.queryId} with versionControlMode ${versionControlMode}`);
+        definitionId = definitionPair.dcqlPayload.queryId;
+      }
+      if (definitionPayload) {
+        await context.agent.pexValidateDefinition({
+          definition: definitionPayload
+        });
+        console.log(`persisting PEX definition ${definitionPayload.id} / ${definitionPayload.name} with versionControlMode ${versionControlMode}`);
+        definitionId = definitionPayload.id;
+      }
       return context.agent.pdmPersistDefinition({
         definitionItem: {
+          definitionId,
           tenantId,
           version,
           definitionPayload,
@@ -1007,7 +1005,4 @@ var VerifiedDataMode = /* @__PURE__ */ (function(VerifiedDataMode2) {
   VerifiedDataMode2["CREDENTIAL_SUBJECT_FLATTENED"] = "cs-flat";
   return VerifiedDataMode2;
 })({});
-
-// src/index.ts
-var schema = require_plugin_schema();
 //# sourceMappingURL=index.cjs.map