@sphereon/ssi-sdk.oid4vci-holder 0.34.1-feature.SSISDK.78.280 → 0.34.1-feature.SSISDK.82.and.SSISDK.70.345

package/dist/index.cjs

@@ -391,7 +391,7 @@ var oid4vciRequireAuthorizationGuard = /* @__PURE__ */ __name((ctx, _event) => {
   if (!openID4VCIClientState) {
     throw Error("Missing openID4VCI client state in context");
   }
-  if (openID4VCIClientState.authorizationRequestOpts) {
+  if (openID4VCIClientState.authorizationURL && openID4VCIClientState.authorizationRequestOpts) {
     return !ctx.openID4VCIClientState?.authorizationCodeResponse;
   } else if (openID4VCIClientState.credentialOffer?.supportedFlows?.includes(import_oid4vci_common.AuthzFlowType.AUTHORIZATION_CODE_FLOW)) {
     return !ctx.openID4VCIClientState?.authorizationCodeResponse;
@@ -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,
@@ -678,6 +679,10 @@ var createOID4VCIMachine = /* @__PURE__ */ __name((opts) => {
             target: OID4VCIMachineStates.startFirstPartApplicationFlow,
             cond: OID4VCIMachineGuards.isFirstPartyApplication
           },
+          {
+            target: OID4VCIMachineStates.prepareAuthorizationRequest,
+            cond: OID4VCIMachineGuards.requireAuthorizationGuard
+          },
           {
             target: OID4VCIMachineStates.initiateAuthorizationRequest,
             cond: OID4VCIMachineGuards.requireAuthorizationGuard
@@ -753,6 +758,10 @@ var createOID4VCIMachine = /* @__PURE__ */ __name((opts) => {
             target: OID4VCIMachineStates.startFirstPartApplicationFlow,
             cond: OID4VCIMachineGuards.isFirstPartyApplication
           },
+          {
+            target: OID4VCIMachineStates.prepareAuthorizationRequest,
+            cond: OID4VCIMachineGuards.requireAuthorizationGuard
+          },
           {
             target: OID4VCIMachineStates.verifyPin,
             cond: OID4VCIMachineGuards.requirePinGuard
@@ -1766,7 +1775,7 @@ var mapCredentialToAccept = /* @__PURE__ */ __name(async (args) => {
   });
   let uniformVerifiableCredential;
   if (import_ssi_types.CredentialMapper.isSdJwtDecodedCredential(wrappedVerifiableCredential.credential)) {
-    uniformVerifiableCredential = await (0, import_ssi_types.sdJwtDecodedCredentialToUniformCredential)(wrappedVerifiableCredential.credential);
+    uniformVerifiableCredential = (0, import_ssi_types.sdJwtDecodedCredentialToUniformCredential)(wrappedVerifiableCredential.credential);
   } else if (import_ssi_types.CredentialMapper.isSdJwtEncoded(wrappedVerifiableCredential.credential)) {
     if (!hasher) {
       return Promise.reject("a hasher is required for encoded SD-JWT credentials");
@@ -1912,7 +1921,7 @@ var getCredentialConfigsSupportedBySingleTypeOrId = /* @__PURE__ */ __name(async
   }
   __name(createIdFromTypes, "createIdFromTypes");
   if (configurationId) {
-    const allSupported2 = client.getCredentialsSupported(format);
+    const allSupported2 = client.getCredentialsSupported(void 0, format);
     return Object.fromEntries(Object.entries(allSupported2).filter(([id, supported]) => id === configurationId || supported.id === configurationId || createIdFromTypes(supported) === configurationId));
   }
   if (!client.credentialOffer) {
@@ -2377,7 +2386,7 @@ var OID4VCIHolder = class _OID4VCIHolder {
       ...this.defaultAuthorizationRequestOpts,
       ...args.authorizationRequestOpts
     };
-    authorizationRequestOpts.authorizationDetails = authorizationRequestOpts?.authorizationDetails ? (0, import_utils2.asArray)(authorizationRequestOpts.authorizationDetails).filter((detail) => typeof detail === "string" || this.vcFormatPreferences.includes(detail.format)) : void 0;
+    authorizationRequestOpts.authorizationDetails = authorizationRequestOpts?.authorizationDetails ? (0, import_utils2.asArray)(authorizationRequestOpts.authorizationDetails) : void 0;
     if (!authorizationRequestOpts.redirectUri) {
       authorizationRequestOpts.redirectUri = _OID4VCIHolder.DEFAULT_MOBILE_REDIRECT_URI;
     }
@@ -2392,7 +2401,7 @@ var OID4VCIHolder = class _OID4VCIHolder {
     let oid4vciClient;
     let offer;
     if (requestData.existingClientState) {
-      oid4vciClient = await import_oid4vci_client3.OpenID4VCIClient.fromState({
+      oid4vciClient = await import_oid4vci_client3.OpenID4VCIClientV1_0_15.fromState({
         state: requestData.existingClientState
       });
       offer = oid4vciClient.credentialOffer;
@@ -2409,7 +2418,7 @@ var OID4VCIHolder = class _OID4VCIHolder {
       }
       if (!offer) {
         logger.log(`Issuer url received (no credential offer): ${uri}`);
-        oid4vciClient = await import_oid4vci_client3.OpenID4VCIClient.fromCredentialIssuer({
+        oid4vciClient = await import_oid4vci_client3.OpenID4VCIClientV1_0_15.fromCredentialIssuer({
           credentialIssuer: uri,
           authorizationRequest: authorizationRequestOpts,
           clientId: authorizationRequestOpts.clientId,
@@ -2417,7 +2426,7 @@ var OID4VCIHolder = class _OID4VCIHolder {
         });
       } else {
         logger.log(`Credential offer received: ${uri}`);
-        oid4vciClient = await import_oid4vci_client3.OpenID4VCIClient.fromURI({
+        oid4vciClient = await import_oid4vci_client3.OpenID4VCIClientV1_0_15.fromURI({
           uri,
           authorizationRequest: authorizationRequestOpts,
           clientId: authorizationRequestOpts.clientId,
@@ -2429,7 +2438,7 @@ var OID4VCIHolder = class _OID4VCIHolder {
     if (offer) {
       configurationIds = offer.original_credential_offer.credential_configuration_ids;
     } else {
-      configurationIds = (0, import_utils2.asArray)(authorizationRequestOpts.authorizationDetails).filter((authDetails) => typeof authDetails !== "string").map((authReqOpts) => authReqOpts.credential_configuration_id).filter((id) => !!id);
+      configurationIds = (0, import_utils2.asArray)(authorizationRequestOpts.authorizationDetails).map((authReqOpts) => authReqOpts.credential_configuration_id).filter((id) => !!id);
     }
     const credentialsSupported = await getCredentialConfigsSupportedMerged({
       client: oid4vciClient,
@@ -2545,12 +2554,12 @@ 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"));
     }
-    const client = await import_oid4vci_client3.OpenID4VCIClient.fromState({
+    const client = await import_oid4vci_client3.OpenID4VCIClientV1_0_15.fromState({
       state: openID4VCIClientState
     });
     const credentialsSupported = await getCredentialConfigsSupportedMerged({
@@ -2564,7 +2573,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 && {
@@ -2581,6 +2590,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);
@@ -3132,6 +3151,7 @@ var OID4VCIHolderLinkHandler = class extends import_ssi_sdk4.LinkHandlerAdapter
   stateNavigationListener;
   firstPartyStateNavigationListener;
   noStateMachinePersistence;
+  walletType;
   authorizationRequestOpts;
   clientOpts;
   trustAnchors;
@@ -3143,6 +3163,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;
@@ -3179,7 +3200,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")) {