refactor: Use new common config manager in verifier-api

walt-id · Jun 3, 2024 · 5abdfa5 · 5abdfa5
1 parent 2702218
commit 5abdfa5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/waltid-verifier-api/src/main/kotlin/id/walt/verifier/entra/EntraVerifierApi.kt b/waltid-verifier-api/src/main/kotlin/id/walt/verifier/entra/EntraVerifierApi.kt
@@ -1,10 +1,10 @@
 package id.walt.verifier.entra
 
+import id.walt.config.ConfigManager
 import id.walt.credentials.verification.Verifier.runPolicyRequest
 import id.walt.credentials.verification.models.PolicyRequest
 import id.walt.credentials.verification.models.PolicyRequest.Companion.parsePolicyRequests
 import id.walt.credentials.verification.models.PolicyResult
-import id.walt.verifier.base.config.ConfigManager
 import io.github.smiley4.ktorswaggerui.dsl.get
 import io.github.smiley4.ktorswaggerui.dsl.post
 import io.github.smiley4.ktorswaggerui.dsl.route

diff --git a/waltid-verifier-api/src/main/kotlin/id/walt/verifier/oidc/OIDCVerifierService.kt b/waltid-verifier-api/src/main/kotlin/id/walt/verifier/oidc/OIDCVerifierService.kt
@@ -5,11 +5,11 @@ package id.walt.verifier.oidc
 import COSE.AlgorithmID
 import COSE.OneKey
 import com.upokecenter.cbor.CBORObject
+import id.walt.config.ConfigManager
 import id.walt.credentials.verification.Verifier
 import id.walt.credentials.verification.models.PolicyRequest
 import id.walt.credentials.verification.models.PresentationVerificationResponse
 import id.walt.crypto.keys.Key
-import id.walt.crypto.utils.Base64Utils
 import id.walt.mdoc.COSECryptoProviderKeyInfo
 import id.walt.mdoc.SimpleCOSECryptoProvider
 import id.walt.mdoc.dataelement.EncodedCBORElement
@@ -26,12 +26,10 @@ import id.walt.oid4vc.data.OpenIDClientMetadata
 import id.walt.oid4vc.data.OpenId4VPProfile
 import id.walt.oid4vc.data.ResponseMode
 import id.walt.oid4vc.data.dif.PresentationDefinition
-import id.walt.oid4vc.data.dif.VCFormat
 import id.walt.oid4vc.providers.CredentialVerifierConfig
 import id.walt.oid4vc.providers.OpenIDCredentialVerifier
 import id.walt.oid4vc.providers.PresentationSession
 import id.walt.oid4vc.responses.TokenResponse
-import id.walt.verifier.base.config.ConfigManager
 import id.walt.verifier.base.config.OIDCVerifierServiceConfig
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.runBlocking
@@ -43,7 +41,8 @@ import kotlin.time.Duration
  * OIDC for Verifiable Presentations service provider, implementing abstract base provider from OIDC4VC library.
  */
 object OIDCVerifierService : OpenIDCredentialVerifier(
-    config = CredentialVerifierConfig(ConfigManager.getConfig<OIDCVerifierServiceConfig>().baseUrl.let { "$it/openid4vc/verify" },
+    config = CredentialVerifierConfig(
+        ConfigManager.getConfig<OIDCVerifierServiceConfig>().baseUrl.let { "$it/openid4vc/verify" },
         clientIdMap = ConfigManager.getConfig<OIDCVerifierServiceConfig>().x509SanDnsClientId?.let { mapOf(ClientIdScheme.X509SanDns to it) } ?: emptyMap())
 ) {
     private val logger = KotlinLogging.logger {}

diff --git a/waltid-verifier-api/src/main/kotlin/id/walt/verifier/oidc/RequestSigningCryptoProvider.kt b/waltid-verifier-api/src/main/kotlin/id/walt/verifier/oidc/RequestSigningCryptoProvider.kt
@@ -12,9 +12,9 @@ import com.nimbusds.jose.util.Base64
 import com.nimbusds.jose.util.X509CertChainUtils
 import com.nimbusds.jwt.JWTClaimsSet
 import com.nimbusds.jwt.SignedJWT
+import id.walt.config.ConfigManager
 import id.walt.sdjwt.JWTCryptoProvider
 import id.walt.sdjwt.JwtVerificationResult
-import id.walt.verifier.base.config.ConfigManager
 import id.walt.verifier.base.config.OIDCVerifierServiceConfig
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.JsonObject