Simplify and cleanup MLS message handling (#2844)

* Store group info outside commit processing

* Extract external commit logic

* Avoid multiple pattern matches on sender

* Remove redundand epoch check

* Add ClientId to MLS messaging API

* Add CHANGELOG entry

* Store group info bundle after processing commit

changelog.d/5-internal/refactor-mls-message

@@ -0,0 +1 @@
+Refactor and simplify MLS message handling logic

libs/wire-api/src/Wire/API/Routes/Public.hs

@@ -25,6 +25,7 @@ module Wire.API.Routes.Public
     ZLocalUser,
     ZConn,
     ZOptUser,
+    ZOptClient,
     ZOptConn,
     ZBot,
     ZConversation,
@@ -179,6 +180,8 @@ type ZProvider = ZAuthServant 'ZAuthProvider InternalAuthDefOpts
 
 type ZOptUser = ZAuthServant 'ZAuthUser '[Servant.Optional, Servant.Strict]
 
+type ZOptClient = ZAuthServant 'ZAuthClient '[Servant.Optional, Servant.Strict]
+
 type ZOptConn = ZAuthServant 'ZAuthConn '[Servant.Optional, Servant.Strict]
 
 instance HasSwagger api => HasSwagger (ZAuthServant 'ZAuthUser _opts :> api) where

libs/wire-api/src/Wire/API/Routes/Public/Galley/MLS.hs

@@ -65,6 +65,7 @@ type MLSMessagingAPI =
                :> CanThrow 'MissingLegalholdConsent
                :> CanThrow MLSProposalFailure
                :> "messages"
+               :> ZOptClient
                :> ZConn
                :> ReqBody '[MLS] (RawMLS SomeMessage)
                :> MultiVerb1 'POST '[JSON] (Respond 201 "Message sent" [Event])
@@ -91,6 +92,7 @@ type MLSMessagingAPI =
                :> CanThrow 'MissingLegalholdConsent
                :> CanThrow MLSProposalFailure
                :> "messages"
+               :> ZOptClient
                :> ZConn
                :> ReqBody '[MLS] (RawMLS SomeMessage)
                :> MultiVerb1 'POST '[JSON] (Respond 201 "Message sent" MLSMessageSendingStatus)
@@ -118,6 +120,7 @@ type MLSMessagingAPI =
                :> CanThrow 'MissingLegalholdConsent
                :> CanThrow MLSProposalFailure
                :> "commit-bundles"
+               :> ZOptClient
                :> ZConn
                :> ReqBody '[CommitBundleMimeType] CommitBundle
                :> MultiVerb1 'POST '[JSON] (Respond 201 "Commit accepted and forwarded" MLSMessageSendingStatus)

services/galley/src/Galley/API/Federation.hs

@@ -636,7 +636,7 @@ sendMLSCommitBundle remoteDomain msr =
         qcnv <- E.getConversationIdByGroupId (msgGroupId msg) >>= noteS @'ConvNotFound
         when (qUnqualified qcnv /= F.msrConvId msr) $ throwS @'MLSGroupConversationMismatch
         F.MLSMessageResponseUpdates . map lcuUpdate
-          <$> postMLSCommitBundle loc (qUntagged sender) qcnv Nothing bundle
+          <$> postMLSCommitBundle loc (qUntagged sender) Nothing qcnv Nothing bundle
 
 sendMLSMessage ::
   ( Members
@@ -680,7 +680,7 @@ sendMLSMessage remoteDomain msr =
             qcnv <- E.getConversationIdByGroupId (msgGroupId msg) >>= noteS @'ConvNotFound
             when (qUnqualified qcnv /= F.msrConvId msr) $ throwS @'MLSGroupConversationMismatch
             F.MLSMessageResponseUpdates . map lcuUpdate
-              <$> postMLSMessage loc (qUntagged sender) qcnv Nothing raw
+              <$> postMLSMessage loc (qUntagged sender) Nothing qcnv Nothing raw
 
 class ToGalleyRuntimeError (effs :: EffectRow) r where
   mapToGalleyError ::