fix: reply condition check ReturnRoute (#88)

It was checking Some(Some(ReturnRoute)) contains all The double option type was wrong.
hyperledger · Aug 18, 2023 · 68c86c8 · 68c86c8
1 parent b757fc4
commit 68c86c8
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/actions/ActionUtils.scala b/mediator/src/main/scala/io/iohk/atala/mediator/actions/ActionUtils.scala
@@ -18,7 +18,7 @@ import io.iohk.atala.mediator.protocols.MissingProtocolExecuter
 object ActionUtils {
 
   def packResponse(
-      plaintextMessage: Option[PlaintextMessage],
+      originalMessage: Option[PlaintextMessage],
       action: Action
   ): ZIO[Operations & Agent & Resolver & MessageDispatcher, MediatorError, Option[EncryptedMessage]] =
     action match {
@@ -79,15 +79,12 @@ object ActionUtils {
                 ) *> ZIO
                 .succeed(msg)
                 .when(
-                  {
-                    plaintextMessage.map(_.return_route).contains(ReturnRoute.all)
-                    && {
-                      plaintextMessage.flatMap(_.from.map(_.asTO)) match {
-                        case None          => false
-                        case Some(replyTo) => send2DIDs.contains(replyTo)
-                      }
+                  originalMessage
+                    .map { oMsg =>
+                      oMsg.return_route.contains(ReturnRoute.all) && // Should replies use the same transport channel?
+                      oMsg.from.map(_.asTO).exists(send2DIDs.contains) // Is the reply back to the original sender?
                     }
-                  } // || action.isInstanceOf[SyncReplyOnly]
+                    .getOrElse(false) // If originalMessage is None
                 )
         } yield maybeSyncReplyMsg
     }