Enable sdjwt filter

Author: Pflanzmann

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

@@ -18,6 +18,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 kotlin.reflect.KClass
 
 /**
@@ -51,14 +52,22 @@ internal fun interface CredentialConfigurationFilter {
         internal val MsoMdocFormatFilter: CredentialConfigurationFilter =
             FormatFilter(MsoMdocCredential::class)
 
+        /**
+         * Filter for [CredentialConfiguration] instances for sd-jwt format
+         */
+        @JvmSynthetic
+        internal val SdJwtFormatFilter: CredentialConfigurationFilter =
+            FormatFilter(SdJwtVcCredential::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, 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/DefaultOffer.kt

@@ -20,6 +20,7 @@ import eu.europa.ec.eudi.openid4vci.CredentialConfiguration
 import eu.europa.ec.eudi.openid4vci.CredentialIssuerMetadata
 import eu.europa.ec.eudi.openid4vci.CredentialOffer
 import eu.europa.ec.eudi.openid4vci.MsoMdocCredential
+import eu.europa.ec.eudi.openid4vci.SdJwtVcCredential
 
 /**
  * Default implementation of [Offer].
@@ -61,5 +62,6 @@ internal val CredentialConfiguration.name: String
 internal val CredentialConfiguration.docType: String
     @JvmSynthetic get() = when (this) {
         is MsoMdocCredential -> docType
+        is SdJwtVcCredential -> docType
         else -> "unknown"
     }

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

@@ -29,6 +29,7 @@ import eu.europa.ec.eudi.wallet.issue.openid4vci.CredentialConfigurationFilter.C
 import eu.europa.ec.eudi.wallet.issue.openid4vci.CredentialConfigurationFilter.Companion.DocTypeFilter
 import eu.europa.ec.eudi.wallet.issue.openid4vci.CredentialConfigurationFilter.Companion.MsoMdocFormatFilter
 import eu.europa.ec.eudi.wallet.issue.openid4vci.CredentialConfigurationFilter.Companion.ProofTypeFilter
+import eu.europa.ec.eudi.wallet.issue.openid4vci.CredentialConfigurationFilter.Companion.SdJwtFormatFilter
 import eu.europa.ec.eudi.wallet.issue.openid4vci.IssueEvent.Companion.failure
 import eu.europa.ec.eudi.wallet.issue.openid4vci.ProofSigner.UserAuthStatus
 import kotlinx.coroutines.*
@@ -88,7 +89,6 @@ internal class DefaultOpenId4VciManager(
 
                 val offer = DefaultOffer(credentialOffer, credentialConfigurationFilter)
                 doIssueDocumentByOffer(offer, config, authorizationHandler, listener)
-
             } catch (e: Throwable) {
                 Log.e(TAG, "issueDocumentByDocType failed", e)
                 listener(failure(e))
@@ -130,6 +130,7 @@ internal class DefaultOpenId4VciManager(
                         DefaultOffer(
                             it, Compose(
                                 MsoMdocFormatFilter,
+                                SdJwtFormatFilter,
                                 ProofTypeFilter(config.proofTypes)
                             )
                         )
@@ -151,7 +152,11 @@ internal class DefaultOpenId4VciManager(
         launch(onResolvedOffer.wrap(executor)) { coroutineScope, callback ->
             try {
                 val credentialOffer = CredentialOfferRequestResolver().resolve(offerUri).getOrThrow()
-                val offer = DefaultOffer(credentialOffer, Compose(MsoMdocFormatFilter, ProofTypeFilter(config.proofTypes)))
+                val offer = DefaultOffer(credentialOffer.also {
+                    Log.d(
+                        "DefaultOpenId4VciManager",
+                        "DefaultOpenId4VciManager.resolveDocumentOffer: $it"
+                    ) }, Compose(MsoMdocFormatFilter, SdJwtFormatFilter, ProofTypeFilter(config.proofTypes)))
                 offerUriCache[offerUri] = offer
                 Log.d(TAG, "OfferUri $offerUri resolved")
                 callback(OfferResult.Success(offer))