Merge branch 'develop' into feat/e2ei/separate-e2ei-enrollment-steps

wireapp · Nov 17, 2023 · 22ac20b · 22ac20b
2 parents 6493796 + 78a0841
commit 22ac20b
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 45 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCase.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCase.kt
@@ -77,7 +77,10 @@ internal class LogoutUseCaseImpl @Suppress("LongParameterList") constructor(
                 endCallUseCase(it.conversationId)
             }
 
-            logoutRepository.logout()
+            if (reason != LogoutReason.SESSION_EXPIRED) {
+                logoutRepository.logout()
+            }
+
             sessionRepository.logout(userId = userId, reason)
             logoutRepository.onLogout(reason)
             userSessionWorkScheduler.cancelScheduledSendingOfPendingMessages()

diff --git a/...onMain/kotlin/com/wire/kalium/logic/feature/featureConfig/handler/AppLockConfigHandler.kt b/...onMain/kotlin/com/wire/kalium/logic/feature/featureConfig/handler/AppLockConfigHandler.kt
@@ -24,7 +24,6 @@ import com.wire.kalium.logic.data.featureConfig.AppLockModel
 import com.wire.kalium.logic.data.featureConfig.Status
 import com.wire.kalium.logic.functional.Either
 import com.wire.kalium.logic.functional.nullableFold
-import kotlin.time.Duration.Companion.seconds
 
 class AppLockConfigHandler(
     private val userConfigRepository: UserConfigRepository
@@ -37,8 +36,8 @@ class AppLockConfigHandler(
             },
             {
                 val newStatus = appLockConfig.status == Status.ENABLED
-                ((it.isEnabled != newStatus) ||
-                        (newStatus && it.timeout != appLockConfig.inactivityTimeoutSecs.seconds))
+                if (it.isEnabled != newStatus) true
+                else it.isStatusChanged
             }
         )
         return userConfigRepository.setAppLockStatus(

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/network/SessionManagerImpl.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/network/SessionManagerImpl.kt
@@ -66,18 +66,14 @@ class SessionManagerImpl internal constructor(
 
     private var serverConfig: ServerConfigDTO? = null
 
-    override suspend fun session(): SessionDTO = withContext(coroutineContext) {
+    override suspend fun session(): SessionDTO? = withContext(coroutineContext) {
         wrapStorageRequest { tokenStorage.getToken(userId.toDao()) }
             .map { sessionMapper.fromEntityToSessionDTO(it) }
-            .fold(
+            .nullableFold(
                 {
-                    error(
-                        """SESSION MANAGER: 
-                    |"error": "missing user session",
-                    |"cause": "$it" """.trimMargin()
-                    )
+                    logout(LogoutReason.SESSION_EXPIRED)
+                    null
                 }, { session ->
-                    kaliumLogger.i("_TOKEN_ FOUND SESSION = $session")
                     session
                 }
             )

diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt
@@ -82,9 +82,7 @@ class LogoutUseCaseTest {
             verify(arrangement.deregisterTokenUseCase)
                 .suspendFunction(arrangement.deregisterTokenUseCase::invoke)
                 .wasInvoked(exactly = once)
-            verify(arrangement.logoutRepository)
-                .suspendFunction(arrangement.logoutRepository::logout)
-                .wasInvoked(exactly = once)
+
             verify(arrangement.sessionRepository)
                 .suspendFunction(arrangement.sessionRepository::logout)
                 .with(any(), eq(reason))
@@ -211,6 +209,10 @@ class LogoutUseCaseTest {
         logoutUseCase.invoke(reason)
         arrangement.globalTestScope.advanceUntilIdle()
 
+        verify(arrangement.logoutRepository)
+            .suspendFunction(arrangement.logoutRepository::logout)
+            .wasNotInvoked()
+
         verify(arrangement.clearClientDataUseCase)
             .suspendFunction(arrangement.clearClientDataUseCase::invoke)
             .wasInvoked(exactly = once)
@@ -238,9 +240,14 @@ class LogoutUseCaseTest {
             logoutUseCase.invoke(reason)
             arrangement.globalTestScope.advanceUntilIdle()
 
+            verify(arrangement.logoutRepository)
+                .suspendFunction(arrangement.logoutRepository::logout)
+                .wasInvoked(exactly = once)
+
             verify(arrangement.clearClientDataUseCase)
                 .suspendFunction(arrangement.clearClientDataUseCase::invoke)
                 .wasInvoked(exactly = once)
+
             verify(arrangement.clearUserDataUseCase)
                 .suspendFunction(arrangement.clearUserDataUseCase::invoke)
                 .wasNotInvoked()
@@ -271,6 +278,10 @@ class LogoutUseCaseTest {
         logoutUseCase.invoke(reason)
         arrangement.globalTestScope.advanceUntilIdle()
 
+        verify(arrangement.logoutRepository)
+            .suspendFunction(arrangement.logoutRepository::logout)
+            .wasInvoked(exactly = once)
+
         verify(arrangement.clearClientDataUseCase)
             .suspendFunction(arrangement.clearClientDataUseCase::invoke)
             .wasNotInvoked()
@@ -307,6 +318,10 @@ class LogoutUseCaseTest {
         logoutUseCase.invoke(reason)
         arrangement.globalTestScope.advanceUntilIdle()
 
+        verify(arrangement.logoutRepository)
+            .suspendFunction(arrangement.logoutRepository::logout)
+            .wasInvoked(exactly = once)
+
         verify(arrangement.observeEstablishedCallsUseCase)
             .suspendFunction(arrangement.observeEstablishedCallsUseCase::invoke)
             .wasInvoked(exactly = once)

diff --git a/...st/kotlin/com/wire/kalium/logic/feature/featureConfig/handler/AppLockConfigHandlerTest.kt b/...st/kotlin/com/wire/kalium/logic/feature/featureConfig/handler/AppLockConfigHandlerTest.kt
@@ -82,7 +82,7 @@ class AppLockConfigHandlerTest {
     }
 
     @Test
-    fun givenNewStatusSameAsCurrent_whenHandlingTheEvent_ThenSetAppLockWithStatusChangedFalse() {
+    fun givenNewStatusSameAsCurrent_whenHandlingTheEvent_ThenSetAppLockWithOldStatusChangedValue() {
         val appLockModel = AppLockModel(Status.ENABLED, 44)
         val (arrangement, appLockConfigHandler) = Arrangement()
             .withAppLocked()
@@ -99,30 +99,7 @@ class AppLockConfigHandlerTest {
             .with(
                 eq(appLockModel.status.toBoolean()),
                 eq(appLockModel.inactivityTimeoutSecs),
-                eq(false)
-            )
-            .wasInvoked(exactly = once)
-    }
-
-    @Test
-    fun givenStatusEnabledAndTimeoutDifferentFromCurrent_whenHandlingTheEvent_ThenSetAppLockWithStatusChangedTrue() {
-        val appLockModel = AppLockModel(Status.ENABLED, 20)
-        val (arrangement, appLockConfigHandler) = Arrangement()
-            .withAppLocked()
-            .arrange()
-
-        appLockConfigHandler.handle(appLockModel)
-
-        verify(arrangement.userConfigRepository)
-            .function(arrangement.userConfigRepository::isTeamAppLockEnabled)
-            .wasInvoked(exactly = once)
-
-        verify(arrangement.userConfigRepository)
-            .function(arrangement.userConfigRepository::setAppLockStatus)
-            .with(
-                eq(appLockModel.status.toBoolean()),
-                eq(appLockModel.inactivityTimeoutSecs),
-                eq(true)
+                eq(appLockTeamConfigEnabled.isStatusChanged)
             )
             .wasInvoked(exactly = once)
     }

diff --git a/...mmonMain/kotlin/com/wire/kalium/network/networkContainer/AuthenticatedNetworkContainer.kt b/...mmonMain/kotlin/com/wire/kalium/network/networkContainer/AuthenticatedNetworkContainer.kt
@@ -48,7 +48,6 @@ import com.wire.kalium.network.api.v2.authenticated.networkContainer.Authenticat
 import com.wire.kalium.network.api.v3.authenticated.networkContainer.AuthenticatedNetworkContainerV3
 import com.wire.kalium.network.api.v4.authenticated.networkContainer.AuthenticatedNetworkContainerV4
 import com.wire.kalium.network.api.v5.authenticated.networkContainer.AuthenticatedNetworkContainerV5
-import com.wire.kalium.network.kaliumLogger
 import com.wire.kalium.network.session.CertificatePinning
 import com.wire.kalium.network.session.SessionManager
 import com.wire.kalium.network.tools.ServerConfigDTO
@@ -202,8 +201,9 @@ internal class AuthenticatedHttpClientProviderImpl(
     }
 
     private val loadToken: suspend () -> BearerTokens? = {
-        val session = sessionManager.session() ?: error("missing user session")
-        BearerTokens(accessToken = session.accessToken, refreshToken = session.refreshToken)
+        sessionManager.session()?.let { session ->
+            BearerTokens(accessToken = session.accessToken, refreshToken = session.refreshToken)
+        }
     }
 
     private val refreshToken: suspend RefreshTokensParams.() -> BearerTokens = {

diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/utils/CustomErrors.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/utils/CustomErrors.kt
@@ -23,11 +23,15 @@ import com.wire.kalium.network.exceptions.KaliumException
 import com.wire.kalium.network.exceptions.NetworkErrorLabel
 
 object CustomErrors {
+
+    private const val MISSING_REFRESH_TOKEN_CODE = -1
+    private const val MISSING_NONCE_CODE = -2
+
     val MISSING_REFRESH_TOKEN =
         NetworkResponse.Error(
             KaliumException.ServerError(
                 ErrorResponse(
-                    500,
+                    MISSING_REFRESH_TOKEN_CODE,
                     "no cookie was found",
                     NetworkErrorLabel.KaliumCustom.MISSING_REFRESH_TOKEN
                 )
@@ -38,10 +42,11 @@ object CustomErrors {
         NetworkResponse.Error(
             KaliumException.ServerError(
                 ErrorResponse(
-                    500,
+                    MISSING_NONCE_CODE,
                     "no nonce found",
                     NetworkErrorLabel.KaliumCustom.MISSING_NONCE
                 )
             )
         )
+
 }