Remove deprecated code elements

Author: nodh

mobile-driving-licence-credential

@@ -7,7 +7,6 @@ import io.matthewnelson.encoding.base64.Base64
 import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonPrimitive
 
 /**
  * Selective Disclosure item in SD-JWT format
@@ -19,14 +18,6 @@ data class SelectiveDisclosureItem(
     val claimValue: JsonElement,
 ) {
 
-    @Deprecated(
-        "Replaced with fromAnyValue",
-        ReplaceWith("SelectiveDisclosureItem.fromAnyValue(salt, claimName, claimValue)"),
-        DeprecationLevel.ERROR
-    )
-    constructor(salt: ByteArray, claimName: String?, claimValue: Any)
-            : this(salt, claimName, JsonPrimitive(claimValue.toString()))
-
     /**
      * Creates a disclosure, as described in section 5.2 of
      * [draft-ietf-oauth-selective-disclosure-jwt-08](https://datatracker.ietf.org/doc/draft-ietf-oauth-selective-disclosure-jwt/)

openid-data-classes/src/commonMain/kotlin/at/asitplus/wallet/lib/data/SelectiveDisclosureItem.kt

@@ -45,14 +45,6 @@ interface AuthorizationService {
         clientAttestationPop: String? = null,
     ): KmmResult<PushedAuthenticationResponseParameters>
 
-    @Deprecated("Use `authorize` with `loadUserFun` instead")
-    suspend fun authorize(input: String):
-            KmmResult<AuthenticationResponseResult.Redirect>
-
-    @Deprecated("Use `authorize` with `loadUserFun` instead")
-    suspend fun authorize(input: AuthenticationRequestParameters):
-            KmmResult<AuthenticationResponseResult.Redirect>
-
     /**
      * Builds the authentication response for this specific user from [loadUserFun].
      * Send this result as HTTP Header `Location` in a 302 response to the client.

rqes-data-classes/src/commonMain/kotlin/at/asitplus/rqes/CscAuthorizationDetailsDep.kt

@@ -23,7 +23,6 @@ import at.asitplus.wallet.lib.oidvci.CredentialIssuer
 import at.asitplus.wallet.lib.oidvci.DefaultCodeService
 import at.asitplus.wallet.lib.oidvci.DefaultMapStore
 import at.asitplus.wallet.lib.oidvci.DefaultNonceService
-import at.asitplus.wallet.lib.oidvci.FallbackAdapter
 import at.asitplus.wallet.lib.oidvci.MapStore
 import at.asitplus.wallet.lib.oidvci.OAuth2AuthorizationServerAdapter
 import at.asitplus.wallet.lib.oidvci.OAuth2Exception
@@ -59,8 +58,6 @@ class SimpleAuthorizationService(
     /** Used to filter authorization details and scopes. */
     private val strategy: AuthorizationServiceStrategy,
     /** Used to load the actual user data during [authorize]. */
-    @Suppress("DEPRECATION") @Deprecated("Use callback from `OAuth2LoadUserFun` in `authorize` instead")
-    private val dataProvider: at.asitplus.wallet.lib.oidvci.OAuth2DataProvider? = null,
     /** Used to create and verify authorization codes during issuing. */
     private val codeService: CodeService = DefaultCodeService(),
     /** Used in several fields in [OAuth2AuthorizationServerMetadata], to provide endpoint URLs to clients. */
@@ -231,23 +228,6 @@ class SimpleAuthorizationService(
         )
     }
 
-    @Suppress("DEPRECATION")
-    @Deprecated("Use `authorize` with `loadUserFun` instead")
-    override suspend fun authorize(input: String) = catching {
-        requestParser.parseRequestParameters(input).getOrThrow()
-            .let { it.parameters as? AuthenticationRequestParameters }
-            ?.let { authorize(it).getOrThrow() }
-            ?: run {
-                Napier.w("authorize: could not parse request parameters from $input")
-                throw InvalidRequest("Could not parse request parameters from $input")
-            }
-    }
-
-    @Suppress("DEPRECATION")
-    @Deprecated("Use `authorize` with `loadUserFun` instead")
-    override suspend fun authorize(input: AuthenticationRequestParameters) =
-        authorize(input, FallbackAdapter(dataProvider))
-
     /**
      * Builds the authentication response.
      * Send this result as HTTP Header `Location` in a 302 response to the client.

vck-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oauth2/AuthorizationService.kt

@@ -34,20 +34,3 @@ data class CredentialDataProviderInput(
     val credentialRepresentation: ConstantIndex.CredentialRepresentation,
 )
 
-/** Adapter for deprecated code, to be removed > 5.8.0 */
-@Suppress("DEPRECATION")
-class CredentialIssuerDataProviderAdapter(
-    val credentialDataProvider: CredentialIssuerDataProvider,
-) : CredentialDataProviderFun {
-    override suspend fun invoke(
-        input: CredentialDataProviderInput,
-    ): KmmResult<CredentialToBeIssued> =
-        credentialDataProvider.getCredential(
-            input.userInfo,
-            input.subjectPublicKey,
-            input.credentialScheme,
-            input.credentialRepresentation,
-            null
-        )
-
-}

vck-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oauth2/SimpleAuthorizationService.kt

@@ -10,17 +10,12 @@ import at.asitplus.openid.JwtVcIssuerMetadata
 import at.asitplus.openid.OidcUserInfoExtended
 import at.asitplus.openid.OpenIdConstants
 import at.asitplus.openid.SupportedAlgorithmsContainer
-import at.asitplus.signum.indispensable.CryptoPublicKey
 import at.asitplus.signum.indispensable.SignatureAlgorithm
 import at.asitplus.signum.indispensable.josef.JsonWebKeySet
 import at.asitplus.signum.indispensable.josef.JweAlgorithm
 import at.asitplus.signum.indispensable.josef.JweEncryption
 import at.asitplus.signum.indispensable.josef.JweHeader
-import at.asitplus.signum.indispensable.josef.JwsAlgorithm
-import at.asitplus.signum.indispensable.josef.JwsSigned
-import at.asitplus.signum.indispensable.josef.KeyAttestationJwt
 import at.asitplus.signum.indispensable.josef.toJwsAlgorithm
-import at.asitplus.wallet.lib.agent.CredentialToBeIssued
 import at.asitplus.wallet.lib.agent.EphemeralKeyWithoutCert
 import at.asitplus.wallet.lib.agent.Issuer
 import at.asitplus.wallet.lib.agent.IssuerAgent
@@ -29,18 +24,12 @@ import at.asitplus.wallet.lib.data.ConstantIndex
 import at.asitplus.wallet.lib.data.ConstantIndex.CredentialScheme
 import at.asitplus.wallet.lib.jws.EncryptJwe
 import at.asitplus.wallet.lib.jws.EncryptJweFun
-import at.asitplus.wallet.lib.jws.VerifyJwsObject
-import at.asitplus.wallet.lib.jws.VerifyJwsObjectFun
 import at.asitplus.wallet.lib.oauth2.RequestInfo
 import at.asitplus.wallet.lib.oidvci.CredentialSchemeMapping.decodeFromCredentialIdentifier
 import at.asitplus.wallet.lib.oidvci.CredentialSchemeMapping.toSupportedCredentialFormat
 import at.asitplus.wallet.lib.oidvci.OAuth2Exception.*
 import io.github.aakira.napier.Napier
-import kotlin.time.Clock
-import kotlin.time.Clock.System
 import kotlin.coroutines.cancellation.CancellationException
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.minutes
 
 /**
  * Server implementation to issue credentials using OID4VCI.
@@ -72,23 +61,8 @@ class CredentialIssuer(
      * to that URI (which starts with [publicContext]) to [nonce].
      */
     private val nonceEndpointPath: String = "/nonce",
-    @Suppress("DEPRECATION") @Deprecated("Use `credentialDataProvider` in method `credential` instead")
-    private val credentialProvider: CredentialIssuerDataProvider = FallbackCredentialIssuerDataProvider(),
-    /** Used to verify the signature of proof elements in credential requests. */
-    @Deprecated("Use `proofValidator` instead")
-    private val verifyJwsObject: VerifyJwsObjectFun = VerifyJwsObject(),
-    @Deprecated("Use `proofValidator` instead")
-    private val supportedAlgorithms: Collection<JwsAlgorithm.Signature> = listOf(JwsAlgorithm.Signature.ES256),
-    @Deprecated("Use `proofValidator` instead")
-    private val clock: Clock = System,
-    @Deprecated("Use `proofValidator` instead")
-    private val timeLeeway: Duration = 5.minutes,
-    @Deprecated("Use `proofValidator` instead")
-    private val verifyAttestationProof: (JwsSigned<KeyAttestationJwt>) -> Boolean = { true },
     /** Turn on to require key attestation support in the [metadata]. */
     private val requireKeyAttestation: Boolean = false,
-    @Deprecated("Use `proofValidator` instead")
-    private val clientNonceService: NonceService = DefaultNonceService(),
     /** Used to optionally encrypt the credential response, if requested by the client. */
     private val encryptCredentialRequest: EncryptJweFun = EncryptJwe(EphemeralKeyWithoutCert()),
     /** Whether to indicate in [metadata] if credential response encryption is required. */
@@ -100,13 +74,7 @@ class CredentialIssuer(
     /** Used to verify proof of posession of key material in credential requests. */
     private val proofValidator: ProofValidator = ProofValidator(
         publicContext = publicContext,
-        verifyJwsObject = verifyJwsObject,
-        supportedAlgorithms = supportedAlgorithms,
-        clock = clock,
-        timeLeeway = timeLeeway,
-        verifyAttestationProof = verifyAttestationProof,
         requireKeyAttestation = requireKeyAttestation,
-        clientNonceService = clientNonceService,
     ),
 ) {
     private val supportedSigningAlgorithms = cryptoAlgorithms
@@ -167,31 +135,6 @@ class CredentialIssuer(
      */
     suspend fun nonce() = proofValidator.nonce()
 
-    /**
-     * Verifies the [authorizationHeader] to contain a token from [authorizationService],
-     * verifies the proof sent by the client (must contain a nonce sent from [authorizationService]),
-     * and issues credentials to the client.
-     *
-     * Callers need to send the result JSON-serialized back to the client.
-     * HTTP status code MUST be 202.
-     *
-     * @param authorizationHeader value of HTTP header `Authorization` sent by the client, with all prefixes
-     * @param params Parameters the client sent JSON-serialized in the HTTP body
-     * @param request information about the HTTP request the client has made, to validate authentication
-     */
-    @Suppress("DEPRECATION")
-    @Deprecated("Use `credential` with parameter `credentialDataProvider` instead")
-    suspend fun credential(
-        authorizationHeader: String,
-        params: CredentialRequestParameters,
-        request: RequestInfo? = null,
-    ): KmmResult<CredentialResponseParameters> = credential(
-        authorizationHeader = authorizationHeader,
-        params = params,
-        credentialDataProvider = CredentialIssuerDataProviderAdapter(credentialProvider),
-        request = request,
-    )
-
     /**
      * Verifies the [authorizationHeader] to contain a token from [authorizationService],
      * verifies the proof sent by the client (must contain a nonce sent from [authorizationService]),
@@ -296,40 +239,3 @@ class CredentialIssuer(
     }
 
 }
-
-@Deprecated("Use `CredentialDataProviderFun` instead")
-fun interface CredentialIssuerDataProvider {
-
-    /**
-     * Gets called with the user authorized in [userInfo],
-     * a resolved [credentialScheme],
-     * the holder key in [subjectPublicKey],
-     * and the requested credential [representation].
-     * Callers may optionally define some attribute names from [ConstantIndex.CredentialScheme.claimNames] in
-     * [claimNames] to request only some claims (if supported by the representation).
-     */
-    fun getCredential(
-        userInfo: OidcUserInfoExtended,
-        subjectPublicKey: CryptoPublicKey,
-        credentialScheme: CredentialScheme,
-        representation: ConstantIndex.CredentialRepresentation,
-        claimNames: Collection<String>?,
-    ): KmmResult<CredentialToBeIssued>
-}
-
-/** Fallback for deprecated constructor parameter, which should never be called, because when clients
- * migrate away from deprecated code, it's never used from our code,
- * when not, clients did set a correct implementation and that one is used. */
-@Suppress("DEPRECATION")
-private class FallbackCredentialIssuerDataProvider : CredentialIssuerDataProvider {
-    override fun getCredential(
-        userInfo: OidcUserInfoExtended,
-        subjectPublicKey: CryptoPublicKey,
-        credentialScheme: CredentialScheme,
-        representation: ConstantIndex.CredentialRepresentation,
-        claimNames: Collection<String>?,
-    ): KmmResult<CredentialToBeIssued> = catching {
-        TODO()
-    }
-
-}

vck-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidvci/CredentialDataProviderFun.kt

@@ -7,22 +7,10 @@ import at.asitplus.signum.indispensable.cosef.io.coseCompliantSerializer
 import at.asitplus.signum.indispensable.io.Base64UrlStrict
 import at.asitplus.wallet.lib.agent.Issuer
 import at.asitplus.wallet.lib.data.ConstantIndex.CredentialRepresentation
-import at.asitplus.wallet.lib.data.ConstantIndex.CredentialScheme
-import at.asitplus.wallet.lib.oidvci.CredentialSchemeMapping.toCredentialIdentifier
 import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
 import kotlinx.serialization.encodeToByteArray
 import kotlinx.serialization.json.JsonPrimitive
 
-// TODO In 5.4.0, use DC_SD_JWT instead of VC_SD_JWT
-@Suppress("DEPRECATION")
-@Deprecated("Use extension method in CredentialSchemeMapping instead")
-fun CredentialScheme.toCredentialIdentifier() = toCredentialIdentifier()
-
-// TODO In 5.4.0, use DC_SD_JWT instead of VC_SD_JWT
-@Suppress("DEPRECATION")
-@Deprecated("Use extension method in CredentialSchemeMapping instead")
-fun CredentialScheme.toCredentialIdentifier(rep: CredentialRepresentation) = toCredentialIdentifier(rep)
-
 fun CredentialRepresentation.toFormat(): CredentialFormatEnum = when (this) {
     CredentialRepresentation.PLAIN_JWT -> CredentialFormatEnum.JWT_VC
     CredentialRepresentation.SD_JWT -> CredentialFormatEnum.DC_SD_JWT

vck-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidvci/CredentialIssuer.kt

@@ -62,7 +62,7 @@ class OpenId4VpInteropTest : FreeSpec({
         holderKeyMaterial = EphemeralKeyWithoutCert()
         holderAgent = HolderAgent(
             holderKeyMaterial,
-            validator = Validator(
+            validatorSdJwt = ValidatorSdJwt(
                 verifyJwsObject = VerifyJwsObject(publicKeyLookup = { setOf(issuerKeyMaterial.publicKey.toJsonWebKey()) })
             )
         )