@sphereon/ssi-sdk.oid4vci-holder 0.36.1-next.11 → 0.36.1-next.113

package/dist/index.cjs

@@ -413,6 +413,7 @@ var createOID4VCIMachine = /* @__PURE__ */ __name((opts) => {
     // TODO WAL-671 we need to store the data from OpenIdProvider here in the context and make sure we can restart the machine with it and init the OpenIdProvider
     accessTokenOpts: opts?.accessTokenOpts,
     requestData: opts?.requestData,
+    walletType: opts?.walletType ?? "NATURAL_PERSON",
     trustAnchors: opts?.trustAnchors ?? [],
     issuanceOpt: opts?.issuanceOpt,
     didMethodPreferences: opts?.didMethodPreferences,
@@ -577,7 +578,7 @@ var createOID4VCIMachine = /* @__PURE__ */ __name((opts) => {
             cond: OID4VCIMachineGuards.isFirstPartyApplication
           },
           {
-            target: OID4VCIMachineStates.initiateAuthorizationRequest,
+            target: OID4VCIMachineStates.prepareAuthorizationRequest,
             cond: OID4VCIMachineGuards.requireAuthorizationGuard
           },
           {
@@ -682,10 +683,6 @@ var createOID4VCIMachine = /* @__PURE__ */ __name((opts) => {
             target: OID4VCIMachineStates.prepareAuthorizationRequest,
             cond: OID4VCIMachineGuards.requireAuthorizationGuard
           },
-          {
-            target: OID4VCIMachineStates.initiateAuthorizationRequest,
-            cond: OID4VCIMachineGuards.requireAuthorizationGuard
-          },
           {
             target: OID4VCIMachineStates.verifyPin,
             cond: OID4VCIMachineGuards.requirePinGuard
@@ -765,10 +762,6 @@ var createOID4VCIMachine = /* @__PURE__ */ __name((opts) => {
             target: OID4VCIMachineStates.verifyPin,
             cond: OID4VCIMachineGuards.requirePinGuard
           },
-          {
-            target: OID4VCIMachineStates.prepareAuthorizationRequest,
-            cond: OID4VCIMachineGuards.requireAuthorizationGuard
-          },
           {
             target: OID4VCIMachineStates.getCredentials
           }
@@ -1814,7 +1807,7 @@ var extractCredentialFromResponse = /* @__PURE__ */ __name((credentialResponse)
   return credential;
 }, "extractCredentialFromResponse");
 var getIdentifierOpts = /* @__PURE__ */ __name(async (args) => {
-  const { issuanceOpt, context } = args;
+  const { issuanceOpt, context, defaultHolderIdentifier } = args;
   const { identifier: identifierArg } = issuanceOpt;
   if (identifierArg && (0, import_ssi_sdk_ext3.isManagedIdentifierResult)(identifierArg)) {
     return identifierArg;
@@ -1837,6 +1830,11 @@ var getIdentifierOpts = /* @__PURE__ */ __name(async (args) => {
     agent: context.agent
   };
   if ((!identifierArg || (0, import_ssi_sdk_ext3.isIIdentifier)(identifierArg.identifier)) && supportedPreferredDidMethod && (!supportedBindingMethods || supportedBindingMethods.length === 0 || supportedBindingMethods.filter((method) => method.startsWith("did")))) {
+    const identifierFilter = defaultHolderIdentifier ? defaultHolderIdentifier.startsWith("did:") ? {
+      did: defaultHolderIdentifier
+    } : {
+      alias: defaultHolderIdentifier
+    } : {};
     const { result, created } = await (0, import_ssi_sdk_ext2.getOrCreatePrimaryIdentifier)(agentContext, {
       method: supportedPreferredDidMethod,
       createOpts: {
@@ -1844,7 +1842,8 @@ var getIdentifierOpts = /* @__PURE__ */ __name(async (args) => {
           type: issuanceOpt.keyType,
           use: import_ssi_sdk_ext.KeyUse.Signature,
           codecName: issuanceOpt.codecName,
-          kms: issuanceOpt.kms
+          kms: issuanceOpt.kms,
+          ...identifierFilter
         }
       }
     });
@@ -2223,6 +2222,7 @@ var OID4VCIHolder = class _OID4VCIHolder {
     __name(this, "OID4VCIHolder");
   }
   hasher;
+  defaultHolderIdentifier;
   eventTypes = [
     OID4VCIHolderEvent.CONTACT_IDENTITY_CREATED,
     OID4VCIHolderEvent.CREDENTIAL_STORED,
@@ -2280,10 +2280,11 @@ var OID4VCIHolder = class _OID4VCIHolder {
   onIdentifierCreated;
   onVerifyEBSICredentialIssuer;
   constructor(options) {
-    const { onContactIdentityCreated, onCredentialStored, onIdentifierCreated, onVerifyEBSICredentialIssuer, vcFormatPreferences, jsonldCryptographicSuitePreferences, didMethodPreferences, jwtCryptographicSuitePreferences, defaultAuthorizationRequestOptions, hasher = import_ssi_sdk2.defaultHasher } = {
+    const { onContactIdentityCreated, onCredentialStored, onIdentifierCreated, onVerifyEBSICredentialIssuer, vcFormatPreferences, jsonldCryptographicSuitePreferences, didMethodPreferences, jwtCryptographicSuitePreferences, defaultAuthorizationRequestOptions, hasher = import_ssi_sdk2.defaultHasher, defaultHolderIdentifier } = {
       ...options
     };
     this.hasher = hasher;
+    this.defaultHolderIdentifier = defaultHolderIdentifier;
     if (vcFormatPreferences !== void 0 && vcFormatPreferences.length > 0) {
       this.vcFormatPreferences = vcFormatPreferences;
     }
@@ -2473,7 +2474,7 @@ var OID4VCIHolder = class _OID4VCIHolder {
     if (!clientId) {
       return Promise.reject(Error(`Missing client id in contact's connectionConfig`));
     }
-    const client = await import_oid4vci_client3.OpenID4VCIClient.fromState({
+    const client = await import_oid4vci_client3.OpenID4VCIClientV1_0_15.fromState({
       state: openID4VCIClientState
     });
     const authorizationCodeURL = await client.createAuthorizationRequestUrl({
@@ -2556,7 +2557,7 @@ var OID4VCIHolder = class _OID4VCIHolder {
     return party;
   }
   async oid4vciHolderGetCredentials(args, context) {
-    const { verificationCode, openID4VCIClientState, didMethodPreferences = this.didMethodPreferences, issuanceOpt, accessTokenOpts } = args;
+    const { verificationCode, openID4VCIClientState, didMethodPreferences, issuanceOpt, accessTokenOpts, walletType } = args;
     logger.debug(`Getting credentials`, issuanceOpt, accessTokenOpts);
     if (!openID4VCIClientState) {
       return Promise.reject(Error("Missing openID4VCI client state in context"));
@@ -2575,7 +2576,7 @@ var OID4VCIHolder = class _OID4VCIHolder {
       credentialsSupported,
       serverMetadata,
       context,
-      didMethodPreferences: Array.isArray(didMethodPreferences) && didMethodPreferences.length > 0 ? didMethodPreferences : this.didMethodPreferences,
+      didMethodPreferences: this.selectDidMethodPreferences(didMethodPreferences, walletType),
       jwtCryptographicSuitePreferences: this.jwtCryptographicSuitePreferences,
       jsonldCryptographicSuitePreferences: this.jsonldCryptographicSuitePreferences,
       ...issuanceOpt && {
@@ -2592,6 +2593,16 @@ var OID4VCIHolder = class _OID4VCIHolder {
     logger.log(`Credentials received`, allCredentials);
     return allCredentials;
   }
+  selectDidMethodPreferences(didMethodPreferences, walletType) {
+    const supportedDidMethodEnums = Array.isArray(didMethodPreferences) && didMethodPreferences.length > 0 ? didMethodPreferences : this.didMethodPreferences;
+    if (walletType === "ORGANIZATIONAL") {
+      return [
+        import_ssi_sdk_ext5.SupportedDidMethodEnum.DID_WEB,
+        ...supportedDidMethodEnums
+      ];
+    }
+    return supportedDidMethodEnums;
+  }
   async oid4vciHolderGetCredential(args, context) {
     const { issuanceOpt, pin, client, accessTokenOpts } = args;
     logger.info(`Getting credential`, issuanceOpt);
@@ -2600,7 +2611,8 @@ var OID4VCIHolder = class _OID4VCIHolder {
     }
     const identifier = await getIdentifierOpts({
       issuanceOpt,
-      context
+      context,
+      defaultHolderIdentifier: this.defaultHolderIdentifier
     });
     issuanceOpt.identifier = identifier;
     logger.info(`ID opts`, identifier);
@@ -2659,6 +2671,9 @@ var OID4VCIHolder = class _OID4VCIHolder {
         format: issuanceOpt.format,
         // TODO: We need to update the machine and add notifications support for actual deferred credentials instead of just waiting/retrying
         deferredCredentialAwait: true,
+        ...issuanceOpt.id && typeof issuanceOpt.id === "string" ? {
+          credentialConfigurationId: issuanceOpt.id
+        } : void 0,
         ...!jwk && {
           kid
         },
@@ -3143,6 +3158,7 @@ var OID4VCIHolderLinkHandler = class extends import_ssi_sdk4.LinkHandlerAdapter
   stateNavigationListener;
   firstPartyStateNavigationListener;
   noStateMachinePersistence;
+  walletType;
   authorizationRequestOpts;
   clientOpts;
   trustAnchors;
@@ -3154,6 +3170,7 @@ var OID4VCIHolderLinkHandler = class extends import_ssi_sdk4.LinkHandlerAdapter
     this.authorizationRequestOpts = args.authorizationRequestOpts;
     this.clientOpts = args.clientOpts;
     this.context = args.context;
+    this.walletType = args.walletType ?? "NATURAL_PERSON";
     this.noStateMachinePersistence = args.noStateMachinePersistence === true;
     this.stateNavigationListener = args.stateNavigationListener;
     this.firstPartyStateNavigationListener = args.firstPartyStateNavigationListener;
@@ -3190,7 +3207,8 @@ var OID4VCIHolderLinkHandler = class extends import_ssi_sdk4.LinkHandlerAdapter
         clientOpts
       },
       stateNavigationListener: this.stateNavigationListener,
-      firstPartyStateNavigationListener: this.firstPartyStateNavigationListener
+      firstPartyStateNavigationListener: this.firstPartyStateNavigationListener,
+      walletType: this.walletType
     });
     const interpreter = oid4vciMachine.interpreter;
     if (!opts?.machineState && this.context.agent.availableMethods().includes("machineStatesFindActive")) {