@sphereon/ssi-sdk.siopv2-oid4vp-op-auth 0.33.1-feature.vcdm2.tsup.26 → 0.33.1-feature.vcdm2.tsup.28

package/dist/index.js

@@ -813,7 +813,7 @@ import { CredentialMapper, parseDid } from "@sphereon/ssi-types";
 import { v4 } from "uuid";
 import { PEX } from "@sphereon/pex";
 import { Loggers } from "@sphereon/ssi-types";
-var debug = Loggers.DEFAULT.get("sphereon:oid4vp:OpSession").debug;
+var logger = Loggers.DEFAULT.get("sphereon:oid4vp:OpSession");
 var OpSession = class _OpSession {
   static {
     __name(this, "OpSession");
@@ -879,9 +879,9 @@ var OpSession = class _OpSession {
       didPrefix,
       agentMethods
     });
-    debug(`RP supports subject syntax types: ${JSON.stringify(this.getSubjectSyntaxTypesSupported())}`);
+    logger.debug(`RP supports subject syntax types: ${JSON.stringify(this.getSubjectSyntaxTypesSupported())}`);
     if (rpMethods.dids.length === 0) {
-      debug(`RP does not support DIDs. Supported: ${JSON.stringify(this.getSubjectSyntaxTypesSupported())}`);
+      logger.debug(`RP does not support DIDs. Supported: ${JSON.stringify(this.getSubjectSyntaxTypesSupported())}`);
       return [];
     }
     let intersection;
@@ -899,7 +899,7 @@ var OpSession = class _OpSession {
   }
   getAgentDIDMethodsSupported(opts) {
     const agentMethods = this.options.supportedDIDMethods?.map((method) => convertDidMethod(method, opts.didPrefix));
-    debug(`agent methods: ${JSON.stringify(agentMethods)}`);
+    logger.debug(`agent methods: ${JSON.stringify(agentMethods)}`);
     return agentMethods;
   }
   async getSubjectSyntaxTypesSupported() {
@@ -910,15 +910,15 @@ var OpSession = class _OpSession {
   async getRPDIDMethodsSupported(opts) {
     let keyType;
     const agentMethods = (opts.agentMethods ?? this.getAgentDIDMethodsSupported(opts))?.map((method) => convertDidMethod(method, opts.didPrefix)) ?? [];
-    debug(`agent methods supported: ${JSON.stringify(agentMethods)}`);
+    logger.debug(`agent methods supported: ${JSON.stringify(agentMethods)}`);
     const authReq = await this.getAuthorizationRequest();
     const subjectSyntaxTypesSupported = authReq.registrationMetadataPayload?.subject_syntax_types_supported?.map((method) => convertDidMethod(method, opts.didPrefix)).filter((val) => !val.startsWith("did"));
-    debug(`subject syntax types supported in rp method supported: ${JSON.stringify(subjectSyntaxTypesSupported)}`);
+    logger.debug(`subject syntax types supported in rp method supported: ${JSON.stringify(subjectSyntaxTypesSupported)}`);
     const aud = await authReq.authorizationRequest.getMergedProperty("aud");
     let rpMethods = [];
     if (aud && aud.startsWith("did:")) {
       const didMethod = convertDidMethod(parseDid(aud).method, opts.didPrefix);
-      debug(`aud did method: ${didMethod}`);
+      logger.debug(`aud did method: ${didMethod}`);
       if (subjectSyntaxTypesSupported && subjectSyntaxTypesSupported.length > 0 && !subjectSyntaxTypesSupported.includes("did") && !subjectSyntaxTypesSupported.includes(didMethod)) {
         throw Error(`The aud DID method ${didMethod} is not in the supported types ${subjectSyntaxTypesSupported}`);
       }
@@ -933,7 +933,7 @@ var OpSession = class _OpSession {
     const isEBSI = rpMethods.length === 0 && (authReq.issuer?.includes(".ebsi.eu") || (await authReq.authorizationRequest.getMergedProperty("client_id"))?.includes(".ebsi.eu"));
     let codecName = void 0;
     if (isEBSI && (!aud || !aud.startsWith("http"))) {
-      debug(`EBSI detected, adding did:key to supported DID methods for RP`);
+      logger.debug(`EBSI detected, adding did:key to supported DID methods for RP`);
       const didKeyMethod = convertDidMethod("did:key", opts.didPrefix);
       if (!agentMethods?.includes(didKeyMethod)) {
         throw Error(`EBSI detected, but agent did not support did:key. Please reconfigure agent`);
@@ -952,13 +952,13 @@ var OpSession = class _OpSession {
   }
   async getSupportedIdentifiers(opts) {
     const methods = await this.getSupportedDIDMethods(true);
-    debug(`supported DID methods (did: prefix = true): ${JSON.stringify(methods)}`);
+    logger.debug(`supported DID methods (did: prefix = true): ${JSON.stringify(methods)}`);
     if (methods.length === 0) {
       throw Error(`No DID methods are supported`);
     }
     const identifiers = await this.context.agent.didManagerFind().then((ids) => ids.filter((id) => methods.includes(id.provider)));
     if (identifiers.length === 0) {
-      debug(`No identifiers available in agent supporting methods ${JSON.stringify(methods)}`);
+      logger.debug(`No identifiers available in agent supporting methods ${JSON.stringify(methods)}`);
       if (opts?.createInCaseNoDIDFound !== false) {
         const { codecName, keyType } = await this.getRPDIDMethodsSupported({
           didPrefix: true,
@@ -972,11 +972,11 @@ var OpSession = class _OpSession {
             type: keyType
           }
         });
-        debug(`Created a new identifier for the SIOP interaction: ${identifier.did}`);
+        logger.debug(`Created a new identifier for the SIOP interaction: ${identifier.did}`);
         identifiers.push(identifier);
       }
     }
-    debug(`supported identifiers: ${JSON.stringify(identifiers.map((id) => id.did))}`);
+    logger.debug(`supported identifiers: ${JSON.stringify(identifiers.map((id) => id.did))}`);
     return identifiers;
   }
   async getSupportedDIDs() {
@@ -1200,7 +1200,7 @@ var translate = Localization.translate;
 
 // src/machine/Siopv2Machine.ts
 import { Loggers as Loggers2 } from "@sphereon/ssi-types";
-var logger = Loggers2.DEFAULT.get(LOGGER_NAMESPACE);
+var logger2 = Loggers2.DEFAULT.get(LOGGER_NAMESPACE);
 var Siopv2HasNoContactGuard = /* @__PURE__ */ __name((_ctx, _event) => {
   const { contact } = _ctx;
   return contact === void 0;
@@ -1530,7 +1530,7 @@ var Siopv2Machine = class {
     __name(this, "Siopv2Machine");
   }
   static newInstance(opts) {
-    logger.info("New Siopv2Machine instance");
+    logger2.info("New Siopv2Machine instance");
     const interpreter = interpret(createSiopv2Machine(opts).withConfig({
       services: {
         ...opts?.services
@@ -1558,7 +1558,7 @@ var Siopv2Machine = class {
       });
     }
     interpreter.onTransition((snapshot) => {
-      logger.info("onTransition to new state", snapshot.value);
+      logger2.info("onTransition to new state", snapshot.value);
     });
     return {
       interpreter
@@ -1642,9 +1642,9 @@ function convertToDcqlCredentials(credential, hasher) {
 __name(convertToDcqlCredentials, "convertToDcqlCredentials");
 
 // src/services/Siopv2MachineService.ts
-var logger2 = Loggers3.DEFAULT.get(LOGGER_NAMESPACE);
+var logger3 = Loggers3.DEFAULT.get(LOGGER_NAMESPACE);
 var createEbsiIdentifier = /* @__PURE__ */ __name(async (agentContext) => {
-  logger2.log(`No EBSI key present yet. Creating a new one...`);
+  logger3.log(`No EBSI key present yet. Creating a new one...`);
   const { result: newIdentifier, created } = await getOrCreatePrimaryIdentifier(agentContext, {
     method: SupportedDidMethodEnum.DID_KEY,
     createOpts: {
@@ -1654,7 +1654,7 @@ var createEbsiIdentifier = /* @__PURE__ */ __name(async (agentContext) => {
       }
     }
   });
-  logger2.log(`EBSI key created: ${newIdentifier.did}`);
+  logger3.log(`EBSI key created: ${newIdentifier.did}`);
   if (created) {
     await agentContext.agent.emit(Siopv2HolderEvent.IDENTIFIER_CREATED, {
       result: newIdentifier
@@ -1684,8 +1684,8 @@ var siopSendAuthorizationResponse = /* @__PURE__ */ __name(async (connectionType
   });
   const request = await session.getAuthorizationRequest();
   const aud = await request.authorizationRequest.getMergedProperty("aud");
-  logger2.debug(`AUD: ${aud}`);
-  logger2.debug(JSON.stringify(request.authorizationRequest));
+  logger3.debug(`AUD: ${aud}`);
+  logger3.debug(JSON.stringify(request.authorizationRequest));
   let presentationsAndDefs;
   let presentationSubmission;
   if (await session.hasPresentationDefinitions()) {
@@ -1694,7 +1694,7 @@ var siopSendAuthorizationResponse = /* @__PURE__ */ __name(async (connectionType
     });
     const credentialsAndDefinitions = args.verifiableCredentialsWithDefinition ? args.verifiableCredentialsWithDefinition : await oid4vp.filterCredentialsAgainstAllDefinitions(CredentialRole.HOLDER);
     const domain = await request.authorizationRequest.getMergedProperty("client_id") ?? request.issuer ?? (request.versions.includes(SupportedVersion2.JWT_VC_PRESENTATION_PROFILE_v1) ? "https://self-issued.me/v2/openid-vc" : "https://self-issued.me/v2");
-    logger2.log(`NONCE: ${session.nonce}, domain: ${domain}`);
+    logger3.log(`NONCE: ${session.nonce}, domain: ${domain}`);
     const firstUniqueDC = credentialsAndDefinitions[0].credentials[0];
     if (typeof firstUniqueDC !== "object" || !("digitalCredential" in firstUniqueDC)) {
       return Promise.reject(Error("SiopMachine only supports UniqueDigitalCredentials for now"));
@@ -1715,7 +1715,7 @@ var siopSendAuthorizationResponse = /* @__PURE__ */ __name(async (connectionType
           identifier: holder
         });
       } catch (e) {
-        logger2.debug(`Holder DID not found: ${holder}`);
+        logger3.debug(`Holder DID not found: ${holder}`);
         throw e;
       }
     } else if (isOID4VCIssuerIdentifier2(digitalCredential.kmsKeyRef)) {
@@ -1748,7 +1748,7 @@ var siopSendAuthorizationResponse = /* @__PURE__ */ __name(async (connectionType
     if (identifier === void 0 && idOpts2 !== void 0 && await hasEbsiClient(request.authorizationRequest)) {
       identifier = await createEbsiIdentifier(agentContext);
     }
-    logger2.debug(`Identifier`, identifier);
+    logger3.debug(`Identifier`, identifier);
     presentationsAndDefs = await oid4vp.createVerifiablePresentations(CredentialRole.HOLDER, credentialsAndDefinitions, {
       idOpts: identifier,
       proofOpts: {
@@ -1763,8 +1763,8 @@ var siopSendAuthorizationResponse = /* @__PURE__ */ __name(async (connectionType
     }
     idOpts2 = presentationsAndDefs[0].idOpts;
     presentationSubmission = presentationsAndDefs[0].presentationSubmission;
-    logger2.log(`Definitions and locations:`, JSON.stringify(presentationsAndDefs?.[0]?.verifiablePresentations, null, 2));
-    logger2.log(`Presentation Submission:`, JSON.stringify(presentationSubmission, null, 2));
+    logger3.log(`Definitions and locations:`, JSON.stringify(presentationsAndDefs?.[0]?.verifiablePresentations, null, 2));
+    logger3.log(`Presentation Submission:`, JSON.stringify(presentationSubmission, null, 2));
     const mergedVerifiablePresentations = presentationsAndDefs?.flatMap((pd) => pd.verifiablePresentations) || [];
     return await session.sendAuthorizationResponse({
       ...presentationsAndDefs && {
@@ -1781,7 +1781,7 @@ var siopSendAuthorizationResponse = /* @__PURE__ */ __name(async (connectionType
     if (args.verifiableCredentialsWithDefinition !== void 0 && args.verifiableCredentialsWithDefinition !== null) {
       const vcs = args.verifiableCredentialsWithDefinition.flatMap((vcd) => vcd.credentials);
       const domain = await request.authorizationRequest.getMergedProperty("client_id") ?? request.issuer ?? (request.versions.includes(SupportedVersion2.JWT_VC_PRESENTATION_PROFILE_v1) ? "https://self-issued.me/v2/openid-vc" : "https://self-issued.me/v2");
-      logger2.debug(`NONCE: ${session.nonce}, domain: ${domain}`);
+      logger3.debug(`NONCE: ${session.nonce}, domain: ${domain}`);
       const firstUniqueDC = vcs[0];
       if (typeof firstUniqueDC !== "object" || !("digitalCredential" in firstUniqueDC)) {
         return Promise.reject(Error("SiopMachine only supports UniqueDigitalCredentials for now"));
@@ -1802,7 +1802,7 @@ var siopSendAuthorizationResponse = /* @__PURE__ */ __name(async (connectionType
             identifier: holder
           });
         } catch (e) {
-          logger2.debug(`Holder DID not found: ${holder}`);
+          logger3.debug(`Holder DID not found: ${holder}`);
           throw e;
         }
       } else if (isOID4VCIssuerIdentifier2(digitalCredential.kmsKeyRef)) {
@@ -1857,7 +1857,7 @@ var siopSendAuthorizationResponse = /* @__PURE__ */ __name(async (connectionType
           }
         }
       });
-      logger2.debug(`Response: `, response);
+      logger3.debug(`Response: `, response);
       return response;
     }
   }
@@ -1952,7 +1952,7 @@ var translateCorrelationIdToName = /* @__PURE__ */ __name(async (correlationId,
 }, "translateCorrelationIdToName");
 
 // src/agent/DidAuthSiopOpAuthenticator.ts
-var logger3 = Loggers4.DEFAULT.options(LOGGER_NAMESPACE, {}).get(LOGGER_NAMESPACE);
+var logger4 = Loggers4.DEFAULT.options(LOGGER_NAMESPACE, {}).get(LOGGER_NAMESPACE);
 var didAuthSiopOpAuthenticatorMethods = [
   "cmGetContacts",
   "cmGetContact",
@@ -2106,7 +2106,7 @@ var DidAuthSiopOpAuthenticator = class {
         hasher: this.hasher
       }
     }));
-    logger3.debug(`session: ${JSON.stringify(session.id, null, 2)}`);
+    logger4.debug(`session: ${JSON.stringify(session.id, null, 2)}`);
     const verifiedAuthorizationRequest = await session.getAuthorizationRequest();
     const clientName = verifiedAuthorizationRequest.registrationMetadataPayload?.client_name;
     const url = verifiedAuthorizationRequest.responseURI ?? (args.url.includes("request_uri") ? decodeURIComponent(args.url.split("?request_uri=")[1].trim()) : verifiedAuthorizationRequest.issuer ?? verifiedAuthorizationRequest.registrationMetadataPayload?.client_id);
@@ -2186,7 +2186,7 @@ var DidAuthSiopOpAuthenticator = class {
         contactId: contact.id,
         identity: addedIdentity
       });
-      logger3.info(`Contact identity created: ${JSON.stringify(addedIdentity)}`);
+      logger4.info(`Contact identity created: ${JSON.stringify(addedIdentity)}`);
     }
   }
   async siopSendResponse(args, context) {
@@ -2308,7 +2308,7 @@ var DidAuthSiopOpAuthenticator = class {
 
 // src/machine/CallbackStateListener.ts
 import { Loggers as Loggers5, LogLevel, LogMethod } from "@sphereon/ssi-types";
-var logger4 = Loggers5.DEFAULT.options("sphereon:siopv2-oid4vp:op-auth", {
+var logger5 = Loggers5.DEFAULT.options("sphereon:siopv2-oid4vp:op-auth", {
   defaultLogLevel: LogLevel.DEBUG,
   methods: [
     LogMethod.CONSOLE
@@ -2317,21 +2317,21 @@ var logger4 = Loggers5.DEFAULT.options("sphereon:siopv2-oid4vp:op-auth", {
 var OID4VPCallbackStateListener = /* @__PURE__ */ __name((callbacks) => {
   return async (oid4vciMachine, state) => {
     if (state._event.type === "internal") {
-      logger4.debug("oid4vpCallbackStateListener: internal event");
+      logger5.debug("oid4vpCallbackStateListener: internal event");
       return;
     }
-    logger4.info(`VP state listener state: ${JSON.stringify(state.value)}`);
+    logger5.info(`VP state listener state: ${JSON.stringify(state.value)}`);
     if (!callbacks || callbacks.size === 0) {
-      logger4.info(`VP no callbacks registered for state: ${JSON.stringify(state.value)}`);
+      logger5.info(`VP no callbacks registered for state: ${JSON.stringify(state.value)}`);
       return;
     }
     for (const [stateKey, callback] of callbacks) {
       if (state.matches(stateKey)) {
-        logger4.log(`VP state callback for state: ${JSON.stringify(state.value)}, will execute...`);
-        await callback(oid4vciMachine, state).then(() => logger4.log(`VP state callback executed for state: ${JSON.stringify(state.value)}`)).catch((error) => {
-          logger4.error(`VP state callback failed for state: ${JSON.stringify(state.value)}, error: ${JSON.stringify(error?.message)}, ${JSON.stringify(state.event)}`);
+        logger5.log(`VP state callback for state: ${JSON.stringify(state.value)}, will execute...`);
+        await callback(oid4vciMachine, state).then(() => logger5.log(`VP state callback executed for state: ${JSON.stringify(state.value)}`)).catch((error) => {
+          logger5.error(`VP state callback failed for state: ${JSON.stringify(state.value)}, error: ${JSON.stringify(error?.message)}, ${JSON.stringify(state.event)}`);
           if (error.stack) {
-            logger4.error(error.stack);
+            logger5.error(error.stack);
           }
         });
         break;
@@ -2345,7 +2345,7 @@ import { contextHasPlugin } from "@sphereon/ssi-sdk.agent-config";
 import { LinkHandlerAdapter } from "@sphereon/ssi-sdk.core";
 import { interpreterStartOrResume } from "@sphereon/ssi-sdk.xstate-machine-persistence";
 import { Loggers as Loggers6 } from "@sphereon/ssi-types";
-var logger5 = Loggers6.DEFAULT.options(LOGGER_NAMESPACE, {}).get(LOGGER_NAMESPACE);
+var logger6 = Loggers6.DEFAULT.options(LOGGER_NAMESPACE, {}).get(LOGGER_NAMESPACE);
 var Siopv2OID4VPLinkHandler = class extends LinkHandlerAdapter {
   static {
     __name(this, "Siopv2OID4VPLinkHandler");
@@ -2365,7 +2365,7 @@ var Siopv2OID4VPLinkHandler = class extends LinkHandlerAdapter {
     this.idOpts = args.idOpts;
   }
   async handle(url, opts) {
-    logger5.debug(`handling SIOP link: ${url}`);
+    logger6.debug(`handling SIOP link: ${url}`);
     const siopv2Machine = await this.context.agent.siopGetMachineInterpreter({
       url,
       idOpts: opts?.idOpts ?? this.idOpts,
@@ -2381,10 +2381,10 @@ var Siopv2OID4VPLinkHandler = class extends LinkHandlerAdapter {
         singletonCheck: true,
         noRegistration: this.noStateMachinePersistence
       });
-      logger5.debug(`SIOP machine started for link: ${url}`, init);
+      logger6.debug(`SIOP machine started for link: ${url}`, init);
     } else {
       interpreter.start(opts?.machineState);
-      logger5.debug(`SIOP machine started for link: ${url}`);
+      logger6.debug(`SIOP machine started for link: ${url}`);
     }
   }
 };