Merge branch 'release/candidate' into fix/wrong_e2ei_information_for_…

…other_users-cherry-pick
wireapp · Jun 27, 2024 · 8c39599 · 8c39599
2 parents ff60fd8 + 8b38a32
commit 8c39599
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/...rc/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt b/...rc/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt
@@ -474,6 +474,7 @@ internal class MLSConversationDataSource(
         allowPartialMemberList: Boolean = false,
     ): Either<CoreFailure, MLSAdditionResult> = withContext(serialDispatcher) {
         commitPendingProposals(groupID).flatMap {
+            kaliumLogger.d("adding $userIdList to MLS group: $groupID")
             produceAndSendCommitWithRetryAndResult(groupID, retryOnStaleMessage = retryOnStaleMessage) {
                 keyPackageRepository.claimKeyPackages(userIdList, cipherSuite).flatMap { result ->
                     if (result.usersWithoutKeyPackagesAvailable.isNotEmpty() && !allowPartialMemberList) {
@@ -600,6 +601,7 @@ internal class MLSConversationDataSource(
         externalSenders: ByteArray,
         allowPartialMemberList: Boolean = false,
     ): Either<CoreFailure, MLSAdditionResult> = withContext(serialDispatcher) {
+        kaliumLogger.d("establish MLS group: $groupID")
         mlsClientProvider.getMLSClient().flatMap { mlsClient ->
             wrapMLSRequest {
                 mlsClient.createConversation(

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/mlsmigration/MLSMigrator.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/mlsmigration/MLSMigrator.kt
@@ -25,15 +25,16 @@ import com.wire.kalium.logic.data.conversation.Conversation.Protocol
 import com.wire.kalium.logic.data.conversation.ConversationRepository
 import com.wire.kalium.logic.data.conversation.MLSConversationRepository
 import com.wire.kalium.logic.data.id.ConversationId
+import com.wire.kalium.logic.data.id.SelfTeamIdProvider
 import com.wire.kalium.logic.data.message.SystemMessageInserter
 import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.data.user.UserRepository
-import com.wire.kalium.logic.data.id.SelfTeamIdProvider
 import com.wire.kalium.logic.functional.Either
 import com.wire.kalium.logic.functional.flatMap
 import com.wire.kalium.logic.functional.flatMapLeft
 import com.wire.kalium.logic.functional.fold
 import com.wire.kalium.logic.functional.foldToEitherWhileRight
+import com.wire.kalium.logic.functional.right
 import com.wire.kalium.logic.kaliumLogger
 import kotlinx.coroutines.flow.first
 
@@ -107,6 +108,7 @@ internal class MLSMigratorImpl(
                         )
                     }
                 }
+                kaliumLogger.i("migrating ${conversationId.toLogString()} to mls")
                 establishConversation(conversationId)
             }.flatMapLeft {
                 kaliumLogger.w("failed to migrate ${conversationId.toLogString()} to mixed: $it")
@@ -135,16 +137,10 @@ internal class MLSMigratorImpl(
             .flatMap { protocolInfo ->
                 when (protocolInfo) {
                     is Conversation.ProtocolInfo.Mixed -> {
-                        mlsConversationRepository.establishMLSGroup(protocolInfo.groupId, emptyList())
-                            .flatMap {
-                                conversationRepository.getConversationMembers(conversationId).flatMap { members ->
-                                    mlsConversationRepository.addMemberToMLSGroup(
-                                        protocolInfo.groupId,
-                                        members,
-                                        protocolInfo.cipherSuite
-                                    )
-                                }
-                            }
+                        conversationRepository.getConversationMembers(conversationId).flatMap { members ->
+                            mlsConversationRepository.establishMLSGroup(protocolInfo.groupId, members)
+                        }
+                        Unit.right()
                     }
                     else -> Either.Right(Unit)
                 }

diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/mlsmigration/MLSMigratorTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/mlsmigration/MLSMigratorTest.kt
@@ -19,6 +19,7 @@ package com.wire.kalium.logic.feature.mlsmigration
 
 import com.wire.kalium.logic.CoreFailure
 import com.wire.kalium.logic.NetworkFailure
+import com.wire.kalium.logic.StorageFailure
 import com.wire.kalium.logic.data.call.CallRepository
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.ConversationRepository
@@ -35,6 +36,8 @@ import com.wire.kalium.logic.framework.TestConversation
 import com.wire.kalium.logic.framework.TestTeam
 import com.wire.kalium.logic.framework.TestUser
 import com.wire.kalium.logic.functional.Either
+import com.wire.kalium.logic.functional.left
+import com.wire.kalium.logic.functional.right
 import com.wire.kalium.logic.test_util.TestNetworkResponseError
 import com.wire.kalium.logic.util.arrangement.CallRepositoryArrangementImpl
 import com.wire.kalium.logic.util.shouldSucceed
@@ -67,7 +70,7 @@ class MLSMigratorTest {
             .withFetchConversationSucceeding()
             .withGetConversationProtocolInfoReturning(Arrangement.MIXED_PROTOCOL_INFO)
             .withEstablishGroupSucceeds(Arrangement.SUCCESSFUL_ADDITION_RESULT)
-            .withGetConversationMembersReturning(Arrangement.MEMBERS)
+            .withGetConversationMembersReturning(Arrangement.MEMBERS.right())
             .withAddMembersSucceeds()
             .withoutAnyEstablishedCall()
             .arrange()
@@ -104,7 +107,7 @@ class MLSMigratorTest {
             .withFetchConversationSucceeding()
             .withGetConversationProtocolInfoReturning(Arrangement.MIXED_PROTOCOL_INFO)
             .withEstablishGroupSucceeds(Arrangement.SUCCESSFUL_ADDITION_RESULT)
-            .withGetConversationMembersReturning(Arrangement.MEMBERS)
+            .withGetConversationMembersReturning(Arrangement.MEMBERS.right())
             .withAddMembersSucceeds()
             .withEstablishedCall()
             .arrange()
@@ -148,6 +151,7 @@ class MLSMigratorTest {
             .withUpdateProtocolReturns()
             .withFetchConversationSucceeding()
             .withGetConversationProtocolInfoReturning(Arrangement.MIXED_PROTOCOL_INFO)
+            .withGetConversationMembersReturning(StorageFailure.DataNotFound.left())
             .withEstablishGroupFails()
             .withoutAnyEstablishedCall()
             .arrange()
@@ -244,10 +248,10 @@ class MLSMigratorTest {
             }.returns(Either.Right(protocolInfo))
         }
 
-        suspend fun withGetConversationMembersReturning(members: List<UserId>) = apply {
+        suspend fun withGetConversationMembersReturning(result: Either<StorageFailure, List<UserId>>) = apply {
             coEvery {
                 conversationRepository.getConversationMembers(any())
-            }.returns(Either.Right(members))
+            }.returns(result)
         }
 
         suspend fun withFetchConversationSucceeding() = apply {