Adjust filter usage

Author: Pflanzmann

wallet-core/src/main/java/eu/europa/ec/eudi/wallet/issue/openid4vci/CredentialConfigurationFilter.kt

@@ -19,6 +19,7 @@ package eu.europa.ec.eudi.wallet.issue.openid4vci
 import eu.europa.ec.eudi.openid4vci.CredentialConfiguration
 import eu.europa.ec.eudi.openid4vci.MsoMdocCredential
 import eu.europa.ec.eudi.openid4vci.SdJwtVcCredential
+import io.ktor.util.reflect.instanceOf
 import kotlin.reflect.KClass
 
 /**
@@ -60,14 +61,22 @@ internal fun interface CredentialConfigurationFilter {
             FormatFilter(SdJwtVcCredential::class)
 
 
+        internal val SdJwtOrMsoMdocFormatFilter: CredentialConfigurationFilter =
+            CredentialConfigurationFilter {
+                it.instanceOf(SdJwtVcCredential::class) || it.instanceOf(MsoMdocCredential::class)
+            }
+
         /**
          * Filter for [CredentialConfiguration] instances based on the document type.
          * @param docType document type
          * @return [CredentialConfigurationFilter] instance
          */
         @JvmSynthetic
         internal fun DocTypeFilter(docType: String): CredentialConfigurationFilter =
-            Compose(MsoMdocFormatFilter, SdJwtFormatFilter, CredentialConfigurationFilter { conf -> conf.docType == docType })
+            Compose(
+                MsoMdocFormatFilter,
+                SdJwtFormatFilter,
+                CredentialConfigurationFilter { conf -> conf.docType == docType })
 
         /**
          * Filter for [CredentialConfiguration] instances based on the proof type.

wallet-core/src/main/java/eu/europa/ec/eudi/wallet/issue/openid4vci/DefaultOpenId4VciManager.kt

@@ -75,16 +75,17 @@ internal class DefaultOpenId4VciManager(
                     DocTypeFilter(docType),
                     ProofTypeFilter(config.proofTypes)
                 )
+
                 val credentialConfigurationId =
                     credentialIssuerMetadata.credentialConfigurationsSupported.filterValues { conf ->
                         credentialConfigurationFilter(conf)
-                    }.keys.firstOrNull() ?: throw IllegalStateException("No suitable configuration found")
+                    }.keys.takeUnless { it.isEmpty() } ?: throw IllegalStateException("No suitable configuration found")
 
                 val credentialOffer = CredentialOffer(
                     credentialIssuerIdentifier = credentialIssuerId,
                     credentialIssuerMetadata = credentialIssuerMetadata,
                     authorizationServerMetadata = authorizationServerMetadata.first(),
-                    credentialConfigurationIdentifiers = listOf(credentialConfigurationId)
+                    credentialConfigurationIdentifiers = credentialConfigurationId.toList()
                 )
 
                 val offer = DefaultOffer(credentialOffer, credentialConfigurationFilter)