allow subconversations for MLS 1-1 conversation (#4150)

changelog.d/2-features/WPB-9773

@@ -0,0 +1 @@
+allow subconversations for MLS 1-1 conversations

integration/test/Test/MLS/SubConversation.hs

@@ -30,7 +30,29 @@ testJoinSubConv = do
     createExternalCommit alice1 Nothing
       >>= sendAndConsumeCommitBundle
 
-testDeleteParentOfSubConv :: HasCallStack => Domain -> App ()
+testJoinOne2OneSubConv :: App ()
+testJoinOne2OneSubConv = do
+  [alice, bob] <- createAndConnectUsers [OwnDomain, OwnDomain]
+  [alice1, bob1, bob2] <- traverse (createMLSClient def) [alice, bob, bob]
+  traverse_ uploadNewKeyPackage [bob1, bob2]
+  conv <- getMLSOne2OneConversation alice bob >>= getJSON 200
+  resetGroup alice1 conv
+
+  void $ createAddCommit alice1 [bob] >>= sendAndConsumeCommitBundle
+  createSubConv bob1 "conference"
+
+  -- bob adds his first client to the subconversation
+  sub' <- getSubConversation bob conv "conference" >>= getJSON 200
+  do
+    tm <- sub' %. "epoch_timestamp"
+    assertBool "Epoch timestamp should not be null" (tm /= Null)
+
+  -- now alice joins with her own client
+  void $
+    createExternalCommit alice1 Nothing
+      >>= sendAndConsumeCommitBundle
+
+testDeleteParentOfSubConv :: (HasCallStack) => Domain -> App ()
 testDeleteParentOfSubConv secondDomain = do
   (alice, tid, _) <- createTeam OwnDomain 1
   bob <- randomUser secondDomain def

services/galley/src/Galley/API/MLS/SubConversation.hs

@@ -113,7 +113,7 @@ getLocalSubConversation ::
 getLocalSubConversation qusr lconv sconv = do
   c <- getConversationAndCheckMembership qusr lconv
 
-  unless (Data.convType c == RegularConv) $
+  unless (Data.convType c == RegularConv || Data.convType c == One2OneConv) $
     throwS @'MLSSubConvUnsupportedConvType
 
   msub <- Eff.getSubConversation (tUnqualified lconv) sconv