fix: E2EI enroll twice on login (#2638)

* Commit with unresolved merge conflicts outside of * Fix merge conflicts afte cherry-pick * Fix codeStyle --------- Co-authored-by: boris <[email protected]>
wireapp · Mar 15, 2024 · bb07ad1 · bb07ad1
1 parent 3b7b82d
commit bb07ad1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/...commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/GetE2EICertificateUseCase.kt b/...commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/GetE2EICertificateUseCase.kt
@@ -17,7 +17,6 @@
  */
 package com.wire.kalium.logic.feature.e2ei.usecase
 
-import com.wire.kalium.logic.StorageFailure
 import com.wire.kalium.logic.data.conversation.ClientId
 import com.wire.kalium.logic.data.conversation.MLSConversationRepository
 import com.wire.kalium.logic.feature.e2ei.CertificateStatusMapper
@@ -37,10 +36,7 @@ class GetE2eiCertificateUseCaseImpl internal constructor(
 ) : GetE2eiCertificateUseCase {
     override suspend operator fun invoke(clientId: ClientId): GetE2EICertificateUseCaseResult =
         mlsConversationRepository.getClientIdentity(clientId).fold(
-            {
-                if (it is StorageFailure.DataNotFound) GetE2EICertificateUseCaseResult.NotActivated
-                else GetE2EICertificateUseCaseResult.Failure
-            },
+            { GetE2EICertificateUseCaseResult.Failure },
             {
                 it?.let {
                     val certificate = E2eiCertificate(

diff --git a/...src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetE2eiCertificateUseCaseTest.kt b/...src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetE2eiCertificateUseCaseTest.kt
@@ -20,7 +20,9 @@ package com.wire.kalium.logic.feature.e2ei
 import com.wire.kalium.cryptography.CryptoCertificateStatus
 import com.wire.kalium.cryptography.CryptoQualifiedClientId
 import com.wire.kalium.cryptography.WireIdentity
+import com.wire.kalium.logic.CoreFailure
 import com.wire.kalium.logic.E2EIFailure
+import com.wire.kalium.logic.StorageFailure
 import com.wire.kalium.logic.data.conversation.ClientId
 import com.wire.kalium.logic.data.conversation.MLSConversationRepository
 import com.wire.kalium.logic.data.id.toCrypto
@@ -57,6 +59,22 @@ class GetE2eiCertificateUseCaseTest {
         assertEquals(GetE2EICertificateUseCaseResult.Failure, result)
     }
 
+    @Test
+    fun givenRepositoryReturnsStorageFailure_whenRunningUseCase_thenReturnFailure() = runTest {
+        val (arrangement, getE2eiCertificateUseCase) = Arrangement()
+            .withRepositoryFailure(StorageFailure.DataNotFound)
+            .arrange()
+
+        val result = getE2eiCertificateUseCase.invoke(CLIENT_ID)
+
+        verify(arrangement.mlsConversationRepository)
+            .suspendFunction(arrangement.mlsConversationRepository::getClientIdentity)
+            .with(any())
+            .wasInvoked(once)
+
+        assertEquals(GetE2EICertificateUseCaseResult.Failure, result)
+    }
+
     @Test
     fun givenRepositoryReturnsValidCertificateString_whenRunningUseCase_thenReturnCertificate() =
         runTest {
@@ -115,11 +133,11 @@ class GetE2eiCertificateUseCaseTest {
             certificateStatusMapper = certificateStatusMapper
         )
 
-        fun withRepositoryFailure() = apply {
+        fun withRepositoryFailure(failure: CoreFailure = E2EIFailure.Generic(Exception())) = apply {
             given(mlsConversationRepository)
                 .suspendFunction(mlsConversationRepository::getClientIdentity)
                 .whenInvokedWith(any())
-                .thenReturn(Either.Left(E2EIFailure.Generic(Exception())))
+                .thenReturn(Either.Left(failure))
         }
 
         fun withRepositoryValidCertificate(identity: WireIdentity?) = apply {