Add return_route to Recipient's messages for mediatorcoordination2, m…

…ediatorcoordination3, pickup3
FabioPinheiro · Aug 16, 2023 · 72e42fc · 72e42fc
1 parent 2e008a2
commit 72e42fc
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 3 deletions.
diff --git a/did/shared/src/main/scala/fmgp/did/comm/protocol/mediatorcoordination2/Keylist.scala b/did/shared/src/main/scala/fmgp/did/comm/protocol/mediatorcoordination2/Keylist.scala
@@ -52,6 +52,7 @@ final case class KeylistUpdate(id: MsgID = MsgID(), from: FROM, to: TO, updates:
           )
           .toJSON_RFC7159
       ),
+      return_route = Some(ReturnRoute.all), // Protocol expect recipient to get reply on the same channel
     )
   def makeKeylistResponse(updated: Seq[(FROMTO, KeylistAction, KeylistResult)]) =
     KeylistResponse(thid = id, to = from.asTO, from = to.asFROM, updated)
@@ -223,6 +224,7 @@ final case class KeylistQuery(
           .Body(paginate = paginate)
           .toJSON_RFC7159
       ),
+      return_route = Some(ReturnRoute.all), // Protocol expect recipient to get reply on the same channel
     )
 }
 object KeylistQuery {

diff --git a/...ed/src/main/scala/fmgp/did/comm/protocol/mediatorcoordination2/MediatorCoordination.scala b/...ed/src/main/scala/fmgp/did/comm/protocol/mediatorcoordination2/MediatorCoordination.scala
@@ -28,6 +28,7 @@ final case class MediateRequest(id: MsgID = MsgID(), from: FROM, to: TO) {
       `type` = piuri,
       to = Some(Set(to)),
       from = Some(from),
+      return_route = Some(ReturnRoute.all), // Protocol expect recipient to get reply on the same channel
     )
   def makeRespondMediateGrant =
     MediateGrant(

diff --git a/...ed/src/main/scala/fmgp/did/comm/protocol/mediatorcoordination3/MediatorCoordination.scala b/...ed/src/main/scala/fmgp/did/comm/protocol/mediatorcoordination3/MediatorCoordination.scala
@@ -28,6 +28,7 @@ final case class MediateRequest(id: MsgID = MsgID(), from: FROM, to: TO) {
       `type` = piuri,
       to = Some(Set(to)),
       from = Some(from),
+      return_route = Some(ReturnRoute.all), // Protocol expect recipient to get reply on the same channel
     )
   def makeRespondMediateGrant =
     MediateGrant(

diff --git a/did/shared/src/main/scala/fmgp/did/comm/protocol/mediatorcoordination3/Recipient.scala b/did/shared/src/main/scala/fmgp/did/comm/protocol/mediatorcoordination3/Recipient.scala
@@ -52,6 +52,7 @@ final case class RecipientUpdate(id: MsgID = MsgID(), from: FROM, to: TO, update
           )
           .toJSON_RFC7159
       ),
+      return_route = Some(ReturnRoute.all), // Protocol expect recipient to get reply on the same channel
     )
   def makeRecipientResponse(updated: Seq[(FROMTO, RecipientAction, RecipientResult)]) =
     RecipientResponse(thid = id, to = from.asTO, from = to.asFROM, updated)
@@ -223,6 +224,7 @@ final case class RecipientQuery(
           .Body(paginate = paginate)
           .toJSON_RFC7159
       ),
+      return_route = Some(ReturnRoute.all), // Protocol expect recipient to get reply on the same channel
     )
 }
 object RecipientQuery {

diff --git a/did/shared/src/main/scala/fmgp/did/comm/protocol/pickup3/LiveModeChange.scala b/did/shared/src/main/scala/fmgp/did/comm/protocol/pickup3/LiveModeChange.scala
@@ -23,7 +23,8 @@ final case class LiveModeChange(id: MsgID = MsgID(), from: FROM, to: TO, live_de
       id = id,
       to = Some(Set(to)),
       from = Some(from),
-      body = Some(LiveModeChange.Body(live_delivery = live_delivery).toJSON_RFC7159)
+      body = Some(LiveModeChange.Body(live_delivery = live_delivery).toJSON_RFC7159),
+      return_route = Some(ReturnRoute.all), // Protocol expect recipient to get reply on the same channel
     )
 }
 object LiveModeChange {

diff --git a/did/shared/src/main/scala/fmgp/did/comm/protocol/pickup3/MessageDelivery.scala b/did/shared/src/main/scala/fmgp/did/comm/protocol/pickup3/MessageDelivery.scala
@@ -36,7 +36,8 @@ final case class MessageDelivery(
       body = Some(MessageDelivery.Body(recipient_did = recipient_did).toJSON_RFC7159),
       attachments = Some(
         attachments.toSeq.map(e => Attachment(id = Some(e._1), data = AttachmentDataBase64(Base64.encode(e._2.toJson))))
-      )
+      ),
+      return_route = Some(ReturnRoute.all), // Protocol expect recipient to get reply on the same channel
     )
 }
 object MessageDelivery {

diff --git a/did/shared/src/main/scala/fmgp/did/comm/protocol/pickup3/MessagesReceived.scala b/did/shared/src/main/scala/fmgp/did/comm/protocol/pickup3/MessagesReceived.scala
@@ -30,7 +30,8 @@ final case class MessagesReceived(
       thid = thid,
       to = Some(Set(to)),
       from = Some(from),
-      body = Some(MessagesReceived.Body(message_id_list = message_id_list).toJSON_RFC7159)
+      body = Some(MessagesReceived.Body(message_id_list = message_id_list).toJSON_RFC7159),
+      return_route = Some(ReturnRoute.all), // Protocol expect recipient to get reply on the same channel
     )
 }
 object MessagesReceived {

diff --git a/did/shared/src/main/scala/fmgp/did/comm/protocol/pickup3/StatusRequest.scala b/did/shared/src/main/scala/fmgp/did/comm/protocol/pickup3/StatusRequest.scala
@@ -23,6 +23,7 @@ final case class StatusRequest(id: MsgID = MsgID(), from: FROM, to: TO, recipien
       `type` = piuri,
       to = Some(Set(to)),
       from = Some(from),
+      return_route = Some(ReturnRoute.all), // Protocol expect recipient to get reply on the same channel
     )
 }
 object StatusRequest {