fix: recover when getting error for updating connection status [WPB-1…

…6146] (#3297) * fix: recover from error when updating connection status * detekt
wireapp · Feb 20, 2025 · 2d609a4 · 2d609a4
1 parent d2d82b8
commit 2d609a4
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 4 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepository.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepository.kt
@@ -55,6 +55,8 @@ import com.wire.kalium.logic.wrapStorageRequest
 import com.wire.kalium.network.api.base.authenticated.connection.ConnectionApi
 import com.wire.kalium.network.api.authenticated.connection.ConnectionDTO
 import com.wire.kalium.network.api.authenticated.connection.ConnectionStateDTO
+import com.wire.kalium.network.exceptions.KaliumException
+import com.wire.kalium.network.exceptions.isBadConnectionStatusUpdate
 import com.wire.kalium.persistence.dao.ConnectionDAO
 import com.wire.kalium.persistence.dao.ConnectionEntity
 import com.wire.kalium.persistence.dao.UserDAO
@@ -128,14 +130,29 @@ internal class ConnectionDataSource(
         }.map { }
     }
 
-    private suspend fun updateRemoteConnectionStatus(userId: UserId, connectionState: ConnectionState): Either<CoreFailure, ConnectionDTO> {
+    suspend fun updateRemoteConnectionStatus(userId: UserId, connectionState: ConnectionState): Either<CoreFailure, ConnectionDTO> {
         val isValidConnectionState = isValidConnectionState(connectionState)
         val newConnectionStatus = connectionStatusMapper.toApiModel(connectionState)
         if (!isValidConnectionState || newConnectionStatus == null) {
             return Either.Left(InvalidMappingFailure)
         }
 
-        return wrapApiRequest { connectionApi.updateConnection(userId.toApi(), newConnectionStatus) }
+        return wrapApiRequest {
+            connectionApi.updateConnection(userId.toApi(), newConnectionStatus)
+        }.onFailure { networkFailure ->
+            if (networkFailure is NetworkFailure.ServerMiscommunication &&
+                networkFailure.kaliumException is KaliumException.InvalidRequestError &&
+                networkFailure.kaliumException.isBadConnectionStatusUpdate()
+            ) {
+                kaliumLogger.e(
+                    "Failed to update connection status for ${userId.toLogString()}" +
+                            " to $connectionState, probably due to internal data error recovering"
+                )
+                wrapApiRequest { connectionApi.userConnectionInfo(userId.toApi()) }.flatMap {
+                    persistConnection(connectionMapper.fromApiToModel(it))
+                }
+            }
+        }
     }
 
     override suspend fun updateConnectionStatus(userId: UserId, connectionState: ConnectionState): Either<CoreFailure, Connection> =
@@ -272,7 +289,7 @@ internal class ConnectionDataSource(
     }
 
     override suspend fun getConnection(conversationId: ConversationId) = wrapStorageRequest {
-            connectionDAO.getConnection(conversationId.toDao())?.let { connectionMapper.fromDaoToConversationDetails(it) }
+        connectionDAO.getConnection(conversationId.toDao())?.let { connectionMapper.fromDaoToConversationDetails(it) }
     }
 
     /**

diff --git a/...c/src/commonTest/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepositoryTest.kt b/...c/src/commonTest/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepositoryTest.kt
@@ -23,6 +23,7 @@ import com.wire.kalium.logic.StorageFailure
 import com.wire.kalium.logic.data.conversation.ConversationRepository
 import com.wire.kalium.logic.data.id.SelfTeamIdProvider
 import com.wire.kalium.logic.data.id.TeamId
+import com.wire.kalium.logic.data.id.toApi
 import com.wire.kalium.logic.data.id.toDao
 import com.wire.kalium.logic.data.id.toModel
 import com.wire.kalium.logic.data.user.ConnectionState
@@ -31,6 +32,7 @@ import com.wire.kalium.logic.framework.TestConnection
 import com.wire.kalium.logic.framework.TestConversation
 import com.wire.kalium.logic.framework.TestUser
 import com.wire.kalium.logic.functional.Either
+import com.wire.kalium.logic.kaliumLogger
 import com.wire.kalium.logic.util.arrangement.dao.MemberDAOArrangement
 import com.wire.kalium.logic.util.arrangement.dao.MemberDAOArrangementImpl
 import com.wire.kalium.logic.util.shouldFail
@@ -41,6 +43,7 @@ import com.wire.kalium.network.api.authenticated.connection.ConnectionResponse
 import com.wire.kalium.network.api.authenticated.connection.ConnectionStateDTO
 import com.wire.kalium.network.api.base.authenticated.userDetails.UserDetailsApi
 import com.wire.kalium.network.api.model.ConversationId
+import com.wire.kalium.network.api.model.ErrorResponse
 import com.wire.kalium.network.api.model.FederationUnreachableResponse
 import com.wire.kalium.network.api.model.LegalHoldStatusDTO
 import com.wire.kalium.network.api.model.QualifiedID
@@ -406,6 +409,41 @@ class ConnectionRepositoryTest {
             }.wasInvoked(exactly = once)
         }
 
+    @Test
+    fun givenBadConnectionRequestError_whenUpdatingRemote_thenRecoverByGettingTheCorrectStatus() = runTest {
+        // given
+        val userId = UserId("user_id", "domain_id")
+        val expectedRecoveryResponse = Arrangement.stubConnectionOne.copy(
+            qualifiedToId = userId.toApi(),
+            status = ConnectionStateDTO.BLOCKED
+        )
+        val (arrangement, connectionRepository) = Arrangement()
+            .withErrorUpdatingConnectionStatusResponse(
+                userId = userId.toApi(),
+                exception = KaliumException.InvalidRequestError(
+                    ErrorResponse(
+                        message = "bad connection update",
+                        code = 403,
+                        label = "bad-conn-update"
+                    )
+                )
+            ).withUserConnectionInfo(
+                result = NetworkResponse.Success(
+                    expectedRecoveryResponse,
+                    emptyMap(),
+                    200
+                ),
+                userId = EqualsMatcher(userId.toApi())
+            )
+            .arrange()
+
+        connectionRepository.updateRemoteConnectionStatus(userId, ConnectionState.ACCEPTED)
+
+        coVerify {
+            arrangement.connectionDAO.insertConnection(ConnectionMapperImpl().fromApiToDao(expectedRecoveryResponse))
+        }.wasInvoked(exactly = 1)
+    }
+
     private class Arrangement :
         MemberDAOArrangement by MemberDAOArrangementImpl() {
         @Mock
@@ -576,6 +614,17 @@ class ConnectionRepositoryTest {
             }.returns(NetworkResponse.Error(exception))
         }
 
+        suspend fun withUserConnectionInfo(
+            result: NetworkResponse<ConnectionDTO>,
+            userId: Matcher<com.wire.kalium.network.api.model.UserId>
+        ) = apply {
+            coEvery {
+                connectionApi.userConnectionInfo(
+                    matches { userId.matches(it) }
+                )
+            }.returns(result)
+        }
+
         suspend fun withDeleteConnectionDataAndConversation(conversationId: QualifiedIDEntity): Arrangement = apply {
             coEvery {
                 connectionDAO.deleteConnectionDataAndConversation(eq(conversationId))

diff --git a/...monMain/kotlin/com/wire/kalium/network/api/base/authenticated/connection/ConnectionApi.kt b/...monMain/kotlin/com/wire/kalium/network/api/base/authenticated/connection/ConnectionApi.kt
@@ -25,8 +25,8 @@ import com.wire.kalium.network.api.model.UserId
 import com.wire.kalium.network.utils.NetworkResponse
 
 interface ConnectionApi {
-
     suspend fun fetchSelfUserConnections(pagingState: String?): NetworkResponse<ConnectionResponse>
     suspend fun createConnection(userId: UserId): NetworkResponse<ConnectionDTO>
     suspend fun updateConnection(userId: UserId, connectionStatus: ConnectionStateDTO): NetworkResponse<ConnectionDTO>
+    suspend fun userConnectionInfo(userId: UserId): NetworkResponse<ConnectionDTO>
 }
diff --git a/...ork/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/ConnectionApiV0.kt b/...ork/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/ConnectionApiV0.kt
@@ -28,6 +28,7 @@ import com.wire.kalium.network.api.model.PaginationRequest
 import com.wire.kalium.network.api.model.UserId
 import com.wire.kalium.network.utils.NetworkResponse
 import com.wire.kalium.network.utils.wrapKaliumResponse
+import io.ktor.client.request.get
 import io.ktor.client.request.post
 import io.ktor.client.request.put
 import io.ktor.client.request.setBody
@@ -56,6 +57,10 @@ internal open class ConnectionApiV0 internal constructor(private val authenticat
             }
         }
 
+    override suspend fun userConnectionInfo(userId: UserId): NetworkResponse<ConnectionDTO> = wrapKaliumResponse {
+        httpClient.get("$PATH_CONNECTIONS_ENDPOINTS/${userId.domain}/${userId.value}")
+    }
+
     protected companion object {
         const val PATH_CONNECTIONS = "list-connections"
         const val PATH_CONNECTIONS_ENDPOINTS = "connections"

diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/exceptions/KaliumException.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/exceptions/KaliumException.kt
@@ -27,6 +27,7 @@ import com.wire.kalium.network.api.model.ErrorResponse
 import com.wire.kalium.network.api.model.FederationConflictResponse
 import com.wire.kalium.network.api.model.FederationUnreachableResponse
 import com.wire.kalium.network.exceptions.NetworkErrorLabel.ACCESS_DENIED
+import com.wire.kalium.network.exceptions.NetworkErrorLabel.BAD_CONNECTION_UPDATE
 import com.wire.kalium.network.exceptions.NetworkErrorLabel.BAD_REQUEST
 import com.wire.kalium.network.exceptions.NetworkErrorLabel.BLACKLISTED_EMAIL
 import com.wire.kalium.network.exceptions.NetworkErrorLabel.DOMAIN_BLOCKED_FOR_REGISTRATION
@@ -234,6 +235,10 @@ fun KaliumException.InvalidRequestError.isWrongConversationPassword(): Boolean {
             (errorResponse.label == BAD_REQUEST && errorResponse.message.contains("password"))
 }
 
+fun KaliumException.InvalidRequestError.isBadConnectionStatusUpdate(): Boolean {
+    return errorResponse.label == BAD_CONNECTION_UPDATE
+}
+
 val KaliumException.InvalidRequestError.authenticationCodeFailure: AuthenticationCodeFailure?
     get() = AuthenticationCodeFailure.entries.firstOrNull {
         errorResponse.label == it.responseLabel

diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/exceptions/NetworkErrorLabel.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/exceptions/NetworkErrorLabel.kt
@@ -58,6 +58,8 @@ internal object NetworkErrorLabel {
     const val FEDERATION_NOT_ENABLED = "federation-not-enabled"
     const val FEDERATION_UNREACHABLE_DOMAINS = "federation-unreachable-domains-error"
 
+    // connection
+    const val BAD_CONNECTION_UPDATE = "bad-conn-update"
     object KaliumCustom {
         const val MISSING_REFRESH_TOKEN = "missing-refresh_token"
         const val MISSING_NONCE = "missing-nonce"