refactor: linting issues, dependency leaks and fix tests after all th…

…e changes Signed-off-by: Cristian G <[email protected]>
hyperledger · Jul 29, 2024 · 5016bea · 5016bea
1 parent a0442c4
commit 5016bea
Show file tree

Hide file tree

Showing 19 changed files with 157 additions and 139 deletions.
diff --git a/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/apollo/ApolloImpl.kt b/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/apollo/ApolloImpl.kt
@@ -38,8 +38,8 @@ import org.hyperledger.identus.walletsdk.domain.models.keyManagement.PublicKey
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.RawKey
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.SeedKey
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.StorableKey
-import org.hyperledger.identus.walletsdk.domain.models.keyManagement.TypeKey
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.StorablePrivateKey
+import org.hyperledger.identus.walletsdk.domain.models.keyManagement.TypeKey
 
 /**
  * Apollo defines the set of cryptographic operations that are used in the Atala PRISM.

diff --git a/...mmonMain/kotlin/org/hyperledger/identus/walletsdk/castor/resolvers/PrismDIDApiResolver.kt b/...mmonMain/kotlin/org/hyperledger/identus/walletsdk/castor/resolvers/PrismDIDApiResolver.kt
@@ -21,8 +21,8 @@ import org.hyperledger.identus.walletsdk.domain.models.DID
 import org.hyperledger.identus.walletsdk.domain.models.DIDDocument
 import org.hyperledger.identus.walletsdk.domain.models.DIDDocumentCoreProperty
 import org.hyperledger.identus.walletsdk.domain.models.DIDResolver
-import org.hyperledger.identus.walletsdk.domain.models.httpClient
 import org.hyperledger.identus.walletsdk.domain.models.KeyValue
+import org.hyperledger.identus.walletsdk.domain.models.httpClient
 
 class PrismDIDApiResolver(
     private val apollo: Apollo,

diff --git a/...dk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/domain/buildingblocks/Pluto.kt b/...dk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/domain/buildingblocks/Pluto.kt
@@ -9,8 +9,8 @@ import org.hyperledger.identus.walletsdk.domain.models.PeerDID
 import org.hyperledger.identus.walletsdk.domain.models.PrismDIDInfo
 import org.hyperledger.identus.walletsdk.domain.models.StorableCredential
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.StorableKey
-import org.hyperledger.identus.walletsdk.pluto.CredentialRecovery
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.StorablePrivateKey
+import org.hyperledger.identus.walletsdk.pluto.CredentialRecovery
 import org.hyperledger.identus.walletsdk.pluto.backup.models.BackupV0_0_1
 import org.hyperledger.identus.walletsdk.pluto.data.AvailableClaims
 import org.hyperledger.identus.walletsdk.pollux.models.CredentialRequestMeta

diff --git a/...k/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/domain/buildingblocks/Pollux.kt b/...k/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/domain/buildingblocks/Pollux.kt
@@ -14,7 +14,6 @@ import org.hyperledger.identus.walletsdk.domain.models.PresentationClaims
 import org.hyperledger.identus.walletsdk.domain.models.StorableCredential
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.PrivateKey
 import org.hyperledger.identus.walletsdk.edgeagent.protocols.proofOfPresentation.PresentationOptions
-import org.hyperledger.identus.walletsdk.pollux.models.PresentationSubmission
 import org.hyperledger.identus.walletsdk.edgeagent.protocols.proofOfPresentation.PresentationSubmissionOptions
 import java.security.interfaces.ECPublicKey
 

diff --git a/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/domain/models/Api.kt b/edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/domain/models/Api.kt
@@ -1,6 +1,5 @@
 package org.hyperledger.identus.walletsdk.domain.models
 
-import org.hyperledger.identus.walletsdk.domain.models.KeyValue
 import io.ktor.client.HttpClient as KtorClient
 
 /**

diff --git a/...gent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/domain/models/ApiImpl.kt b/...gent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/domain/models/ApiImpl.kt
@@ -5,7 +5,6 @@ import io.ktor.client.request.request
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.HttpMethod
 import io.ktor.http.Url
-import org.hyperledger.identus.walletsdk.domain.models.KeyValue
 import org.hyperledger.identus.walletsdk.edgeagent.shared.PrismShared
 
 /**

diff --git a/...ent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/domain/models/KeyValue.kt b/...ent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/domain/models/KeyValue.kt
@@ -12,4 +12,4 @@ import kotlinx.serialization.Serializable
 data class KeyValue(
     val key: String,
     val value: String
-)
+)
diff --git a/...-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/edgeagent/EdgeAgent.kt b/...-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/edgeagent/EdgeAgent.kt
@@ -47,6 +47,7 @@ import org.hyperledger.identus.walletsdk.apollo.utils.Secp256k1KeyPair
 import org.hyperledger.identus.walletsdk.apollo.utils.Secp256k1PrivateKey
 import org.hyperledger.identus.walletsdk.apollo.utils.X25519KeyPair
 import org.hyperledger.identus.walletsdk.apollo.utils.X25519PrivateKey
+import org.hyperledger.identus.walletsdk.domain.DIDCOMM_MESSAGING
 import org.hyperledger.identus.walletsdk.domain.buildingblocks.Apollo
 import org.hyperledger.identus.walletsdk.domain.buildingblocks.Castor
 import org.hyperledger.identus.walletsdk.domain.buildingblocks.Mercury
@@ -110,10 +111,7 @@ import org.hyperledger.identus.walletsdk.logger.PrismLoggerImpl
 import org.hyperledger.identus.walletsdk.pluto.PlutoBackupTask
 import org.hyperledger.identus.walletsdk.pluto.PlutoRestoreTask
 import org.hyperledger.identus.walletsdk.pluto.backup.models.BackupV0_0_1
-import org.hyperledger.identus.walletsdk.pollux.models.AnonCredential
 import org.hyperledger.identus.walletsdk.pollux.models.CredentialRequestMeta
-import org.hyperledger.identus.walletsdk.pollux.models.JWTCredential
-import org.hyperledger.identus.walletsdk.pollux.models.SDJWTCredential
 import org.kotlincrypto.hash.sha2.SHA256
 import kotlin.text.encodeToByteArray
 
@@ -967,101 +965,102 @@ class EdgeAgent {
         credential: T
     ): Presentation where T : Credential, T : ProvableCredential {
         val attachmentFormat = request.attachments.first().format ?: CredentialType.Unknown.type
-        if (attachmentFormat == CredentialType.PRESENTATION_EXCHANGE_DEFINITIONS.type) {
-            request.attachments.find { it.data::class == AttachmentBase64::class }
-                ?: throw EdgeAgentError.AttachmentTypeNotSupported()
-            // Presentation Exchange
-            return handlePresentationDefinitionRequest(request, credential)
-        } else {
-            // Presentation request from agent
-            var mediaType: String? = null
-            var presentationString: String?
-            when (credential::class) {
-                JWTCredential::class -> {
-                    val subjectDID = credential.subject?.let {
-                        DID(it)
-                    } ?: DID("")
-                    if (subjectDID.method != PRISM) {
-                        throw PolluxError.InvalidPrismDID()
-                    }
+        // Presentation request from agent
+        var mediaType: String? = null
+        var presentationString: String?
+        when (attachmentFormat) {
+            CredentialType.PRESENTATION_EXCHANGE_DEFINITIONS.type -> {
+                request.attachments.find { it.data::class == AttachmentBase64::class }
+                    ?: throw EdgeAgentError.AttachmentTypeNotSupported()
+                // Presentation Exchange
+                return handlePresentationDefinitionRequest(request, credential)
+            }
 
-                    val privateKeyKeyPath = pluto.getPrismDIDKeyPathIndex(subjectDID).first()
-                    val keyPair =
-                        Secp256k1KeyPair.generateKeyPair(
-                            seed,
-                            KeyCurve(Curve.SECP256K1, privateKeyKeyPath)
-                        )
-                    val requestData = request.attachments.firstNotNullOf {
-                        when (it.data) {
-                            is AttachmentJsonData -> it.data.data
-                            else -> null
-                        }
+            CredentialType.ANONCREDS_PROOF_REQUEST.type -> {
+                val format = pollux.extractCredentialFormatFromMessage(request.attachments)
+                if (format != CredentialType.ANONCREDS_PROOF_REQUEST) {
+                    throw EdgeAgentError.InvalidCredentialFormatError(CredentialType.ANONCREDS_PROOF_REQUEST)
+                }
+                val requestData = request.attachments.mapNotNull {
+                    when (it.data) {
+                        is AttachmentJsonData -> it.data.data
+                        else -> null
                     }
-                    presentationString = credential.presentation(
-                        requestData.encodeToByteArray(),
-                        listOf(
-                            CredentialOperationsOptions.SubjectDID(subjectDID),
-                            CredentialOperationsOptions.ExportableKey(keyPair.privateKey)
-                        )
+                }.first()
+                val linkSecret = getLinkSecret()
+                presentationString = credential.presentation(
+                    requestData.encodeToByteArray(),
+                    listOf(
+                        CredentialOperationsOptions.LinkSecret("", linkSecret.getValue()),
+                        CredentialOperationsOptions.SchemaDownloader(api),
+                        CredentialOperationsOptions.CredentialDefinitionDownloader(api)
                     )
-                    mediaType = JWT_MEDIA_TYPE
+                )
+            }
+
+            CredentialType.JWT.type -> {
+                val subjectDID = credential.subject?.let {
+                    DID(it)
+                } ?: DID("")
+                if (subjectDID.method != PRISM) {
+                    throw PolluxError.InvalidPrismDID()
                 }
 
-                AnonCredential::class -> {
-                    val format = pollux.extractCredentialFormatFromMessage(request.attachments)
-                    if (format != CredentialType.ANONCREDS_PROOF_REQUEST) {
-                        throw EdgeAgentError.InvalidCredentialFormatError(CredentialType.ANONCREDS_PROOF_REQUEST)
-                    }
-                    val requestData = request.attachments.mapNotNull {
-                        when (it.data) {
-                            is AttachmentJsonData -> it.data.data
-                            else -> null
-                        }
-                    }.first()
-                    val linkSecret = getLinkSecret()
-                    presentationString = credential.presentation(
-                        requestData.encodeToByteArray(),
-                        listOf(
-                            CredentialOperationsOptions.LinkSecret("", linkSecret.getValue()),
-                            CredentialOperationsOptions.SchemaDownloader(api),
-                            CredentialOperationsOptions.CredentialDefinitionDownloader(api)
-                        )
+                val privateKeyKeyPath = pluto.getPrismDIDKeyPathIndex(subjectDID).first()
+                val keyPair =
+                    Secp256k1KeyPair.generateKeyPair(
+                        seed,
+                        KeyCurve(Curve.SECP256K1, privateKeyKeyPath)
                     )
+                val requestData = request.attachments.firstNotNullOf {
+                    when (it.data) {
+                        is AttachmentJsonData -> it.data.data
+                        else -> null
+                    }
                 }
-
-                SDJWTCredential::class -> {
-                    val requestData = request.attachments.mapNotNull {
-                        when (it.data) {
-                            is AttachmentJsonData -> it.data.data
-                            else -> null
-                        }
-                    }.first().encodeToByteArray()
-                    presentationString = credential.presentation(
-                        requestData,
-                        listOf(CredentialOperationsOptions.DisclosingClaims(listOf(credential.claims.toString())))
+                presentationString = credential.presentation(
+                    requestData.encodeToByteArray(),
+                    listOf(
+                        CredentialOperationsOptions.SubjectDID(subjectDID),
+                        CredentialOperationsOptions.ExportableKey(keyPair.privateKey)
                     )
+                )
+                mediaType = JWT_MEDIA_TYPE
+            }
 
-                    mediaType = SD_JWT_VC_TYPE
-                }
+            CredentialType.SDJWT.type -> {
+                val requestData = request.attachments.mapNotNull {
+                    when (it.data) {
+                        is AttachmentJsonData -> it.data.data
+                        else -> null
+                    }
+                }.first().encodeToByteArray()
+                presentationString = credential.presentation(
+                    requestData,
+                    listOf(CredentialOperationsOptions.DisclosingClaims(listOf(credential.claims.toString())))
+                )
 
-                else -> {
-                    throw EdgeAgentError.InvalidCredentialError(credential)
-                }
+                mediaType = SD_JWT_VC_TYPE
             }
 
-            val attachmentDescriptor =
-                AttachmentDescriptor(
-                    mediaType = mediaType,
-                    data = AttachmentBase64(presentationString.base64UrlEncoded)
-                )
-            return Presentation(
-                from = request.to,
-                to = request.from,
-                thid = request.thid,
-                body = Presentation.Body(request.body.goalCode, request.body.comment),
-                attachments = arrayOf(attachmentDescriptor)
-            )
+            else -> {
+                throw EdgeAgentError.InvalidCredentialError(credential)
+            }
         }
+
+        val attachmentDescriptor =
+            AttachmentDescriptor(
+                mediaType = mediaType,
+                data = AttachmentBase64(presentationString.base64UrlEncoded)
+            )
+
+        return Presentation(
+            from = request.to,
+            to = request.from,
+            thid = request.thid,
+            body = Presentation.Body(request.body.goalCode, request.body.comment),
+            attachments = arrayOf(attachmentDescriptor)
+        )
     }
 
     suspend fun initiatePresentationRequest(
@@ -1105,7 +1104,7 @@ class EdgeAgent {
         requestPresentation: RequestPresentation,
         credential: Credential
     ): Presentation {
-        if (credential::class != JWTCredential::class) {
+        if (credential !is ProvableCredential) {
             throw EdgeAgentError.InvalidCredentialError(credential)
         }
 
@@ -1132,7 +1131,7 @@ class EdgeAgent {
         val attachmentDescriptor = AttachmentDescriptor(
             mediaType = "application/json",
             format = CredentialType.PRESENTATION_EXCHANGE_SUBMISSION.type,
-            data = AttachmentBase64(Json.encodeToString(presentationSubmissionProof).base64UrlEncoded)
+            data = AttachmentBase64(presentationSubmissionProof.base64UrlEncoded)
         )
         return Presentation(
             body = Presentation.Body(),

diff --git a/...-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/mercury/MercuryImpl.kt b/...-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/mercury/MercuryImpl.kt
@@ -10,9 +10,9 @@ import org.hyperledger.identus.walletsdk.domain.buildingblocks.Mercury
 import org.hyperledger.identus.walletsdk.domain.models.Api
 import org.hyperledger.identus.walletsdk.domain.models.DID
 import org.hyperledger.identus.walletsdk.domain.models.DIDDocument
+import org.hyperledger.identus.walletsdk.domain.models.KeyValue
 import org.hyperledger.identus.walletsdk.domain.models.MercuryError
 import org.hyperledger.identus.walletsdk.domain.models.Message
-import org.hyperledger.identus.walletsdk.domain.models.KeyValue
 import org.hyperledger.identus.walletsdk.logger.LogComponent
 import org.hyperledger.identus.walletsdk.logger.LogLevel
 import org.hyperledger.identus.walletsdk.logger.Metadata

diff --git a/...mmonMain/kotlin/org/hyperledger/identus/walletsdk/mercury/resolvers/DIDCommDIDResolver.kt b/...mmonMain/kotlin/org/hyperledger/identus/walletsdk/mercury/resolvers/DIDCommDIDResolver.kt
@@ -13,6 +13,7 @@ import org.didcommx.didcomm.diddoc.DIDCommService
 import org.didcommx.didcomm.diddoc.DIDDoc
 import org.didcommx.didcomm.diddoc.DIDDocResolver
 import org.didcommx.didcomm.diddoc.VerificationMethod
+import org.hyperledger.identus.walletsdk.domain.DIDCOMM_MESSAGING
 import org.hyperledger.identus.walletsdk.domain.buildingblocks.Castor
 import org.hyperledger.identus.walletsdk.domain.models.CastorError
 import org.hyperledger.identus.walletsdk.domain.models.Curve
@@ -21,8 +22,7 @@ import org.hyperledger.identus.walletsdk.domain.models.OctetPublicKey
 import org.hyperledger.identus.walletsdk.mercury.CRV
 import org.hyperledger.identus.walletsdk.mercury.MULTIBASE_BYTES_SIZE
 import org.hyperledger.identus.walletsdk.mercury.X
-import java.util.Optional
-import org.hyperledger.identus.walletsdk.domain.DIDCOMM_MESSAGING
+import java.util.*
 
 /**
  * A resolver that resolves a Decentralized Identifier (DID) to its corresponding DID Document.

diff --git a/...k/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pollux/models/AnonCredential.kt b/...k/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pollux/models/AnonCredential.kt
@@ -27,11 +27,11 @@ import org.hyperledger.identus.walletsdk.domain.models.Claim
 import org.hyperledger.identus.walletsdk.domain.models.ClaimType
 import org.hyperledger.identus.walletsdk.domain.models.Credential
 import org.hyperledger.identus.walletsdk.domain.models.CredentialOperationsOptions
+import org.hyperledger.identus.walletsdk.domain.models.KeyValue
 import org.hyperledger.identus.walletsdk.domain.models.PolluxError
 import org.hyperledger.identus.walletsdk.domain.models.ProvableCredential
 import org.hyperledger.identus.walletsdk.domain.models.StorableCredential
 import org.hyperledger.identus.walletsdk.domain.models.UnknownError
-import org.hyperledger.identus.walletsdk.domain.models.KeyValue
 import org.hyperledger.identus.walletsdk.pluto.PlutoRestoreTask
 import org.hyperledger.identus.walletsdk.pluto.PlutoRestoreTask.AnonCredentialBackUp.RevocationRegistry
 

diff --git a/...agent-sdk/src/commonTest/kotlin/org/hyperledger/identus/walletsdk/castor/DIDCreateTest.kt b/...agent-sdk/src/commonTest/kotlin/org/hyperledger/identus/walletsdk/castor/DIDCreateTest.kt
@@ -7,14 +7,14 @@ import org.hyperledger.identus.apollo.base64.base64UrlDecodedBytes
 import org.hyperledger.identus.walletsdk.apollo.ApolloImpl
 import org.hyperledger.identus.walletsdk.apollo.utils.Ed25519KeyPair
 import org.hyperledger.identus.walletsdk.apollo.utils.X25519KeyPair
+import org.hyperledger.identus.walletsdk.domain.DIDCOMM_MESSAGING
 import org.hyperledger.identus.walletsdk.domain.models.Curve
 import org.hyperledger.identus.walletsdk.domain.models.DIDDocument
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.CurveKey
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.KeyPair
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.KeyTypes
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.RawKey
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.TypeKey
-import org.hyperledger.identus.walletsdk.edgeagent.DIDCOMM_MESSAGING
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...agent-sdk/src/commonTest/kotlin/org/hyperledger/identus/walletsdk/edgeagent/CastorMock.kt b/...agent-sdk/src/commonTest/kotlin/org/hyperledger/identus/walletsdk/edgeagent/CastorMock.kt
@@ -1,5 +1,6 @@
 package org.hyperledger.identus.walletsdk.edgeagent
 
+import org.hyperledger.identus.walletsdk.domain.DIDCOMM_MESSAGING
 import org.hyperledger.identus.walletsdk.domain.buildingblocks.Castor
 import org.hyperledger.identus.walletsdk.domain.models.DID
 import org.hyperledger.identus.walletsdk.domain.models.DIDDocument