Consolidated Problem Reports

Signed-off-by: Varun Chatterji <[email protected]>

Author: codespree

app/src/main/java/org/hyperledger/ariesproject/WalletMainActivity.kt

@@ -20,6 +20,9 @@ import org.hyperledger.ariesframework.agent.AgentEvents
 import org.hyperledger.ariesframework.credentials.models.AcceptOfferOptions
 import org.hyperledger.ariesframework.credentials.models.AutoAcceptCredential
 import org.hyperledger.ariesframework.credentials.models.CredentialState
+import org.hyperledger.ariesframework.problemreports.messages.CredentialProblemReportMessage
+import org.hyperledger.ariesframework.problemreports.messages.MediationProblemReportMessage
+import org.hyperledger.ariesframework.problemreports.messages.PresentationProblemReportMessage
 import org.hyperledger.ariesframework.proofs.models.ProofState
 import org.hyperledger.ariesproject.databinding.ActivityWalletMainBinding
 import org.hyperledger.ariesproject.databinding.MenuItemListContentBinding
@@ -102,16 +105,18 @@ class WalletMainActivity : AppCompatActivity() {
         }
 
         // Show an alert on credential problem report
-        app.agent.eventBus.subscribe<AgentEvents.CredentialProblemReportEvent> {
+        app.agent.eventBus.subscribe<AgentEvents.ProblemReportEvent> {
             lifecycleScope.launch(Dispatchers.Main) {
-                showAlert("Issuer reported a problem while issuing the credential - ${it.message.description.en}")
-            }
-        }
-
-        // Show an alert on presentation problem report
-        app.agent.eventBus.subscribe<AgentEvents.PresentationProblemReportEvent> {
-            lifecycleScope.launch(Dispatchers.Main) {
-                showAlert("Verifier reported a problem with the presentation - ${it.message.description.en}")
+                // Check if message type is a CredentialProblemReport
+                if (it.message is CredentialProblemReportMessage) {
+                    showAlert("Issuer reported a problem while issuing the credential - ${it.message.description.en}")
+                }
+                if (it.message is PresentationProblemReportMessage) {
+                    showAlert("Verifier reported a problem while verifying the presentation - ${it.message.description.en}")
+                }
+                if (it.message is MediationProblemReportMessage) {
+                    showAlert("Mediator reported a problem - ${it.message.description.en}")
+                }
             }
         }
     }

ariesframework/src/main/java/org/hyperledger/ariesframework/agent/Agent.kt

@@ -15,6 +15,7 @@ import org.hyperledger.ariesframework.ledger.LedgerService
 import org.hyperledger.ariesframework.oob.OutOfBandCommand
 import org.hyperledger.ariesframework.oob.OutOfBandService
 import org.hyperledger.ariesframework.oob.repository.OutOfBandRepository
+import org.hyperledger.ariesframework.problemreports.ProblemReportsCommand
 import org.hyperledger.ariesframework.proofs.ProofCommand
 import org.hyperledger.ariesframework.proofs.ProofService
 import org.hyperledger.ariesframework.proofs.RevocationService
@@ -47,6 +48,7 @@ class Agent(val context: Context, val agentConfig: AgentConfig) {
     val proofService = ProofService(this)
     val proofs = ProofCommand(this, dispatcher)
     val basicMessages = BasicMessageCommand(this, dispatcher)
+    val problemReports = ProblemReportsCommand(this, dispatcher)
 
     private var _isInitialized = false
 

ariesframework/src/main/java/org/hyperledger/ariesframework/agent/AgentEvents.kt

@@ -1,10 +1,9 @@
 package org.hyperledger.ariesframework.agent
 
 import org.hyperledger.ariesframework.connection.repository.ConnectionRecord
-import org.hyperledger.ariesframework.credentials.messages.CredentialProblemReportMessage
 import org.hyperledger.ariesframework.credentials.repository.CredentialExchangeRecord
 import org.hyperledger.ariesframework.oob.repository.OutOfBandRecord
-import org.hyperledger.ariesframework.proofs.messages.PresentationProblemReportMessage
+import org.hyperledger.ariesframework.problemreports.messages.BaseProblemReportMessage
 import org.hyperledger.ariesframework.proofs.repository.ProofExchangeRecord
 import org.hyperledger.ariesframework.routing.repository.MediationRecord
 
@@ -15,6 +14,5 @@ sealed interface AgentEvents {
     class CredentialEvent(val record: CredentialExchangeRecord) : AgentEvents
     class ProofEvent(val record: ProofExchangeRecord) : AgentEvents
     class BasicMessageEvent(val message: String) : AgentEvents
-    class CredentialProblemReportEvent(val message: CredentialProblemReportMessage) : AgentEvents
-    class PresentationProblemReportEvent(val message: PresentationProblemReportMessage) : AgentEvents
+    class ProblemReportEvent(val message: BaseProblemReportMessage) : AgentEvents
 }

ariesframework/src/main/java/org/hyperledger/ariesframework/credentials/CredentialService.kt

@@ -15,7 +15,6 @@ import org.hyperledger.ariesframework.agent.MessageSerializer
 import org.hyperledger.ariesframework.agent.decorators.Attachment
 import org.hyperledger.ariesframework.agent.decorators.ThreadDecorator
 import org.hyperledger.ariesframework.credentials.messages.CredentialAckMessage
-import org.hyperledger.ariesframework.credentials.messages.CredentialProblemReportMessage
 import org.hyperledger.ariesframework.credentials.messages.IssueCredentialMessage
 import org.hyperledger.ariesframework.credentials.messages.OfferCredentialMessage
 import org.hyperledger.ariesframework.credentials.messages.ProposeCredentialMessage
@@ -31,6 +30,7 @@ import org.hyperledger.ariesframework.credentials.models.CredentialValues
 import org.hyperledger.ariesframework.credentials.models.IndyCredential
 import org.hyperledger.ariesframework.credentials.repository.CredentialExchangeRecord
 import org.hyperledger.ariesframework.credentials.repository.CredentialRecordBinding
+import org.hyperledger.ariesframework.problemreports.messages.CredentialProblemReportMessage
 import org.hyperledger.ariesframework.storage.BaseRecord
 import org.hyperledger.ariesframework.storage.DidCommMessageRole
 import org.hyperledger.indy.sdk.anoncreds.Anoncreds

ariesframework/src/main/java/org/hyperledger/ariesframework/credentials/CredentialsCommand.kt

@@ -7,12 +7,10 @@ import org.hyperledger.ariesframework.agent.Agent
 import org.hyperledger.ariesframework.agent.Dispatcher
 import org.hyperledger.ariesframework.agent.MessageSerializer
 import org.hyperledger.ariesframework.credentials.handlers.CredentialAckHandler
-import org.hyperledger.ariesframework.credentials.handlers.CredentialProblemReportHandler
 import org.hyperledger.ariesframework.credentials.handlers.IssueCredentialHandler
 import org.hyperledger.ariesframework.credentials.handlers.OfferCredentialHandler
 import org.hyperledger.ariesframework.credentials.handlers.RequestCredentialHandler
 import org.hyperledger.ariesframework.credentials.messages.CredentialAckMessage
-import org.hyperledger.ariesframework.credentials.messages.CredentialProblemReportMessage
 import org.hyperledger.ariesframework.credentials.messages.IssueCredentialMessage
 import org.hyperledger.ariesframework.credentials.messages.OfferCredentialMessage
 import org.hyperledger.ariesframework.credentials.messages.ProposeCredentialMessage
@@ -38,7 +36,6 @@ class CredentialsCommand(val agent: Agent, private val dispatcher: Dispatcher) {
         dispatcher.registerHandler(IssueCredentialHandler(agent))
         dispatcher.registerHandler(OfferCredentialHandler(agent))
         dispatcher.registerHandler(RequestCredentialHandler(agent))
-        dispatcher.registerHandler(CredentialProblemReportHandler(agent))
     }
 
     private fun registerMessages() {
@@ -47,7 +44,6 @@ class CredentialsCommand(val agent: Agent, private val dispatcher: Dispatcher) {
         MessageSerializer.registerMessage(OfferCredentialMessage.type, OfferCredentialMessage::class)
         MessageSerializer.registerMessage(ProposeCredentialMessage.type, ProposeCredentialMessage::class)
         MessageSerializer.registerMessage(RequestCredentialMessage.type, RequestCredentialMessage::class)
-        MessageSerializer.registerMessage(CredentialProblemReportMessage.type, CredentialProblemReportMessage::class)
     }
 
     /**

ariesframework/src/main/java/org/hyperledger/ariesframework/credentials/handlers/CredentialProblemReportHandler.kt

@@ -0,0 +1,31 @@
+package org.hyperledger.ariesframework.problemreports
+
+import org.hyperledger.ariesframework.agent.Agent
+import org.hyperledger.ariesframework.agent.Dispatcher
+import org.hyperledger.ariesframework.agent.MessageSerializer
+import org.hyperledger.ariesframework.problemreports.handlers.ProblemReportHandler
+import org.hyperledger.ariesframework.problemreports.messages.CredentialProblemReportMessage
+import org.hyperledger.ariesframework.problemreports.messages.MediationProblemReportMessage
+import org.hyperledger.ariesframework.problemreports.messages.PresentationProblemReportMessage
+import org.slf4j.LoggerFactory
+
+class ProblemReportsCommand(val agent: Agent, private val dispatcher: Dispatcher) {
+    private val logger = LoggerFactory.getLogger(ProblemReportsCommand::class.java)
+
+    init {
+        registerHandlers(dispatcher)
+        registerMessages()
+    }
+
+    private fun registerHandlers(dispatcher: Dispatcher) {
+        dispatcher.registerHandler(ProblemReportHandler(agent, PresentationProblemReportMessage.type))
+        dispatcher.registerHandler(ProblemReportHandler(agent, CredentialProblemReportMessage.type))
+        dispatcher.registerHandler(ProblemReportHandler(agent, MediationProblemReportMessage.type))
+    }
+
+    private fun registerMessages() {
+        MessageSerializer.registerMessage(PresentationProblemReportMessage.type, PresentationProblemReportMessage::class)
+        MessageSerializer.registerMessage(CredentialProblemReportMessage.type, CredentialProblemReportMessage::class)
+        MessageSerializer.registerMessage(MediationProblemReportMessage.type, MediationProblemReportMessage::class)
+    }
+}

ariesframework/src/main/java/org/hyperledger/ariesframework/problemreports/ProblemReportsCommand.kt

@@ -0,0 +1,16 @@
+package org.hyperledger.ariesframework.problemreports.handlers
+
+import org.hyperledger.ariesframework.InboundMessageContext
+import org.hyperledger.ariesframework.OutboundMessage
+import org.hyperledger.ariesframework.agent.Agent
+import org.hyperledger.ariesframework.agent.AgentEvents
+import org.hyperledger.ariesframework.agent.MessageHandler
+import org.hyperledger.ariesframework.problemreports.messages.BaseProblemReportMessage
+
+class ProblemReportHandler(val agent: Agent, override val messageType: String) : MessageHandler {
+    override suspend fun handle(messageContext: InboundMessageContext): OutboundMessage? {
+        val message = messageContext.message as BaseProblemReportMessage
+        agent.eventBus.publish(AgentEvents.ProblemReportEvent(message))
+        return null
+    }
+}

ariesframework/src/main/java/org/hyperledger/ariesframework/problemreports/handlers/ProblemReportHandler.kt

@@ -1,7 +1,8 @@
-package org.hyperledger.ariesframework.agent
+package org.hyperledger.ariesframework.problemreports.messages
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import org.hyperledger.ariesframework.agent.AgentMessage
 
 @Serializable
 data class DescriptionOptions(
@@ -19,7 +20,7 @@ open class BaseProblemReportMessage(
     open val description: DescriptionOptions,
     @SerialName("fix_hint")
     open val fixHint: FixHintOptions? = null,
-) : AgentMessage(generateId(), BaseProblemReportMessage.type) {
+) : AgentMessage(generateId(), type) {
     constructor() : this(DescriptionOptions("", ""), null) {
         throw Exception("Creating a ProblemReportMessage is not supported")
     }

ariesframework/src/main/java/org/hyperledger/ariesframework/agent/BaseProblemReportMessage.kt renamed to ariesframework/src/main/java/org/hyperledger/ariesframework/problemreports/messages/BaseProblemReportMessage.kt

@@ -1,7 +1,5 @@
-package org.hyperledger.ariesframework.credentials.messages
+package org.hyperledger.ariesframework.problemreports.messages
 import kotlinx.serialization.Serializable
-import org.hyperledger.ariesframework.agent.BaseProblemReportMessage
-import org.hyperledger.ariesframework.agent.DescriptionOptions
 import org.hyperledger.ariesframework.agent.decorators.ThreadDecorator
 
 @Serializable
@@ -15,7 +13,7 @@ class CredentialProblemReportMessage private constructor() : BaseProblemReportMe
 ) {
     constructor(threadId: String) : this() {
         thread = ThreadDecorator(threadId)
-        type = CredentialProblemReportMessage.type
+        type = Companion.type
     }
     companion object {
         const val type = "https://didcomm.org/issue-credential/1.0/problem-report"

ariesframework/src/main/java/org/hyperledger/ariesframework/credentials/messages/CredentialProblemReportMessage.kt renamed to ariesframework/src/main/java/org/hyperledger/ariesframework/problemreports/messages/CredentialProblemReportMessage.kt

@@ -0,0 +1,10 @@
+package org.hyperledger.ariesframework.problemreports.messages
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+class MediationProblemReportMessage() : BaseProblemReportMessage() {
+    companion object {
+        const val type = "https://didcomm.org/coordinate-mediation/1.0/problem-report"
+    }
+}

ariesframework/src/main/java/org/hyperledger/ariesframework/problemreports/messages/MediationProblemReportMessage.kt

@@ -1,8 +1,6 @@
-package org.hyperledger.ariesframework.proofs.messages
+package org.hyperledger.ariesframework.problemreports.messages
 
 import kotlinx.serialization.Serializable
-import org.hyperledger.ariesframework.agent.BaseProblemReportMessage
-import org.hyperledger.ariesframework.agent.DescriptionOptions
 import org.hyperledger.ariesframework.agent.decorators.ThreadDecorator
 
 @Serializable
@@ -16,7 +14,7 @@ class PresentationProblemReportMessage private constructor() : BaseProblemReport
 ) {
     constructor(threadId: String) : this() {
         thread = ThreadDecorator(threadId)
-        type = PresentationProblemReportMessage.type
+        type = Companion.type
     }
     companion object {
         const val type = "https://didcomm.org/present-proof/1.0/problem-report"

ariesframework/src/main/java/org/hyperledger/ariesframework/proofs/messages/PresentationProblemReportMessage.kt renamed to ariesframework/src/main/java/org/hyperledger/ariesframework/problemreports/messages/PresentationProblemReportMessage.kt

@@ -8,11 +8,9 @@ import org.hyperledger.ariesframework.agent.Dispatcher
 import org.hyperledger.ariesframework.agent.MessageSerializer
 import org.hyperledger.ariesframework.proofs.handlers.PresentationAckHandler
 import org.hyperledger.ariesframework.proofs.handlers.PresentationHandler
-import org.hyperledger.ariesframework.proofs.handlers.PresentationProblemReportHandler
 import org.hyperledger.ariesframework.proofs.handlers.RequestPresentationHandler
 import org.hyperledger.ariesframework.proofs.messages.PresentationAckMessage
 import org.hyperledger.ariesframework.proofs.messages.PresentationMessage
-import org.hyperledger.ariesframework.proofs.messages.PresentationProblemReportMessage
 import org.hyperledger.ariesframework.proofs.messages.RequestPresentationMessage
 import org.hyperledger.ariesframework.proofs.models.AutoAcceptProof
 import org.hyperledger.ariesframework.proofs.models.ProofRequest
@@ -33,14 +31,12 @@ class ProofCommand(val agent: Agent, private val dispatcher: Dispatcher) {
         dispatcher.registerHandler(RequestPresentationHandler(agent))
         dispatcher.registerHandler(PresentationHandler(agent))
         dispatcher.registerHandler(PresentationAckHandler(agent))
-        dispatcher.registerHandler(PresentationProblemReportHandler(agent))
     }
 
     private fun registerMessages() {
         MessageSerializer.registerMessage(RequestPresentationMessage.type, RequestPresentationMessage::class)
         MessageSerializer.registerMessage(PresentationMessage.type, PresentationMessage::class)
         MessageSerializer.registerMessage(PresentationAckMessage.type, PresentationAckMessage::class)
-        MessageSerializer.registerMessage(PresentationProblemReportMessage.type, PresentationProblemReportMessage::class)
     }
 
     /**

ariesframework/src/main/java/org/hyperledger/ariesframework/proofs/ProofCommand.kt

@@ -17,9 +17,9 @@ import org.hyperledger.ariesframework.agent.MessageSerializer
 import org.hyperledger.ariesframework.agent.decorators.Attachment
 import org.hyperledger.ariesframework.agent.decorators.ThreadDecorator
 import org.hyperledger.ariesframework.connection.repository.ConnectionRecord
+import org.hyperledger.ariesframework.problemreports.messages.PresentationProblemReportMessage
 import org.hyperledger.ariesframework.proofs.messages.PresentationAckMessage
 import org.hyperledger.ariesframework.proofs.messages.PresentationMessage
-import org.hyperledger.ariesframework.proofs.messages.PresentationProblemReportMessage
 import org.hyperledger.ariesframework.proofs.messages.RequestPresentationMessage
 import org.hyperledger.ariesframework.proofs.models.AutoAcceptProof
 import org.hyperledger.ariesframework.proofs.models.CredentialsForProof

ariesframework/src/main/java/org/hyperledger/ariesframework/proofs/ProofService.kt

@@ -19,7 +19,6 @@ import org.hyperledger.ariesframework.routing.handlers.BatchHandler
 import org.hyperledger.ariesframework.routing.handlers.KeylistUpdateResponseHandler
 import org.hyperledger.ariesframework.routing.handlers.MediationDenyHandler
 import org.hyperledger.ariesframework.routing.handlers.MediationGrantHandler
-import org.hyperledger.ariesframework.routing.handlers.ProblemReportHandler
 import org.hyperledger.ariesframework.routing.messages.BatchMessage
 import org.hyperledger.ariesframework.routing.messages.BatchPickupMessage
 import org.hyperledger.ariesframework.routing.messages.KeylistUpdate
@@ -29,7 +28,6 @@ import org.hyperledger.ariesframework.routing.messages.KeylistUpdateResponseMess
 import org.hyperledger.ariesframework.routing.messages.MediationDenyMessage
 import org.hyperledger.ariesframework.routing.messages.MediationGrantMessage
 import org.hyperledger.ariesframework.routing.messages.MediationRequestMessage
-import org.hyperledger.ariesframework.routing.messages.ProblemReportMessage
 import org.hyperledger.ariesframework.routing.repository.MediationRecord
 import org.hyperledger.ariesframework.routing.repository.MediationRepository
 import org.hyperledger.ariesframework.routing.repository.MediationRole
@@ -58,7 +56,6 @@ class MediationRecipient(private val agent: Agent, private val dispatcher: Dispa
         dispatcher.registerHandler(MediationGrantHandler(agent))
         dispatcher.registerHandler(BatchHandler(agent))
         dispatcher.registerHandler(KeylistUpdateResponseHandler(agent))
-        dispatcher.registerHandler(ProblemReportHandler(agent))
     }
 
     private fun registerMessages() {
@@ -69,7 +66,6 @@ class MediationRecipient(private val agent: Agent, private val dispatcher: Dispa
         MessageSerializer.registerMessage(MediationDenyMessage.type, MediationDenyMessage::class)
         MessageSerializer.registerMessage(MediationGrantMessage.type, MediationGrantMessage::class)
         MessageSerializer.registerMessage(MediationRequestMessage.type, MediationRequestMessage::class)
-        MessageSerializer.registerMessage(ProblemReportMessage.type, ProblemReportMessage::class)
     }
 
     suspend fun getRouting(): Routing {