Add subconversation test

integration/test/MLS/Util.hs

@@ -575,7 +575,7 @@ consumeMessageWithPredicate p cid mmp ws = do
 consumeMessage :: (HasCallStack) => ClientIdentity -> Maybe MessagePackage -> WebSocket -> App Value
 consumeMessage = consumeMessageWithPredicate isNewMLSMessageNotif
 
--- | like 'consumeMessage' but but will not consume a message where the sender is the backend
+-- | like 'consumeMessage' but will not consume a message where the sender is the backend
 consumeMessageNoExternal :: (HasCallStack) => ClientIdentity -> Maybe MessagePackage -> WebSocket -> App Value
 consumeMessageNoExternal cid = consumeMessageWithPredicate isNewMLSMessageNotifButNoProposal cid
   where
@@ -592,7 +592,7 @@ consumeMessageNoExternal cid = consumeMessageWithPredicate isNewMLSMessageNotifB
           pure $ sender /= Just backendSender
         else pure False
 
-mlsCliConsume :: ClientIdentity -> ByteString -> App ByteString
+mlsCliConsume :: (HasCallStack) => ClientIdentity -> ByteString -> App ByteString
 mlsCliConsume cid msgData =
   mlscli
     cid

integration/test/Test/MLS/SubConversation.hs

@@ -239,3 +239,51 @@ testCreatorRemovesUserFromParent = do
       assertBool "alice and charlie should have access to the conversation" (resp.status == 200)
       mems <- resp.jsonBody %. "members" & asList
       mems `shouldMatchSet` ((renameField "id" "user_id" <=< make) `traverse` [alice1, charlie1, charlie2])
+
+testResendingProposals :: (HasCallStack) => App ()
+testResendingProposals = do
+  [alice, bob, charlie] <- createAndConnectUsers [OwnDomain, OwnDomain, OtherDomain]
+  [alice1, alice2, bob1, bob2, bob3, charlie1] <-
+    traverse
+      (createMLSClient def)
+      [alice, alice, bob, bob, bob, charlie]
+  traverse_ uploadNewKeyPackage [alice2, bob1, bob2, bob3, charlie1]
+
+  (_, conv) <- createNewGroup alice1
+  void $ createAddCommit alice1 [alice, bob, charlie] >>= sendAndConsumeCommitBundle
+
+  createSubConv alice1 "conference"
+
+  void $ createExternalCommit alice2 Nothing >>= sendAndConsumeCommitBundle
+  void $ createExternalCommit bob1 Nothing >>= sendAndConsumeCommitBundle
+  void $ createExternalCommit bob2 Nothing >>= sendAndConsumeCommitBundle
+  void $ createExternalCommit bob3 Nothing >>= sendAndConsumeCommitBundle
+
+  leaveCurrentConv bob1
+  leaveCurrentConv bob2
+  leaveCurrentConv bob3
+
+  mls <- getMLSState
+  withWebSockets (charlie1 : toList mls.members) \wss -> do
+    void $ createExternalCommit charlie1 Nothing >>= sendAndConsumeCommitBundle
+
+    -- consume proposals after backend resends them
+    for_ wss \ws -> do
+      replicateM 3 do
+        msg <- consumeMessage (fromJust ws.client) Nothing ws
+        msg %. "message.content.sender.External" `shouldMatchInt` 0
+
+  void $ createPendingProposalCommit alice1 >>= sendAndConsumeCommitBundle
+
+  sub <- getSubConversation alice1 conv "conference" >>= getJSON 200
+  let members =
+        map
+          ( \cid ->
+              object
+                [ "client_id" .= cid.client,
+                  "user_id" .= cid.user,
+                  "domain" .= cid.domain
+                ]
+          )
+          [alice1, alice2, charlie1]
+  sub %. "members" `shouldMatchSet` members

integration/test/Testlib/Cannon.hs

@@ -61,6 +61,7 @@ import Data.Function
 import Data.Maybe
 import Data.Traversable
 import Data.Word
+import GHC.Records
 import GHC.Stack
 import qualified Network.HTTP.Client as HTTP
 import qualified Network.HTTP.Client as Http
@@ -78,11 +79,22 @@ import UnliftIO (withRunInIO)
 import Prelude
 
 data WebSocket = WebSocket
-  { wsChan :: TChan Value,
+  { wsConnect :: WSConnect,
+    wsChan :: TChan Value,
     wsCloseLatch :: MVar (),
     wsAppThread :: Async ()
   }
 
+instance HasField "client" WebSocket (Maybe ClientIdentity) where
+  getField ws = do
+    c <- ws.wsConnect.client
+    pure
+      ClientIdentity
+        { domain = ws.wsConnect.domain,
+          user = ws.wsConnect.user,
+          client = c
+        }
+
 -- Specifies how a Websocket at cannon should be opened
 data WSConnect = WSConnect
   { user :: String,
@@ -123,7 +135,7 @@ connect wsConnect = do
   nchan <- liftIO newTChanIO
   latch <- liftIO newEmptyMVar
   wsapp <- run wsConnect (clientApp nchan latch)
-  pure $ WebSocket nchan latch wsapp
+  pure $ WebSocket wsConnect nchan latch wsapp
 
 clientApp :: (HasCallStack) => TChan Value -> MVar () -> WS.ClientApp ()
 clientApp wsChan latch conn = do