Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wait for logout to be completed when handling user events [WPB-9689] [WPB-10310] #2914

Merged
merged 3 commits into from
Jul 30, 2024
Merged

fix: wait for logout to be completed when handling user events [WPB-9689] [WPB-10310] #2914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bf58a5
fix: wait for logout to be completed when handling user events [WPB-9…
saleniuk Jul 29, 2024
210b9b1
Merge branch 'release/candidate' into fix/wait-for-logout-when-handli…
vitorhugods Jul 30, 2024
7f93d12
Merge branch 'release/candidate' into fix/wait-for-logout-when-handli…
MohamadJaara Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/UserEventReceiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ internal class UserEventReceiverImpl internal constructor(
return currentClientIdProvider().map { currentClientId ->
if (currentClientId == event.clientId) {
logger.logSuccess("info" to "CURRENT_CLIENT")
logout(LogoutReason.REMOVED_CLIENT)
logout(LogoutReason.REMOVED_CLIENT, waitUntilCompletes = true)
} else {
logger.logSuccess("info" to "OTHER_CLIENT")
}
Expand All @@ -148,7 +148,7 @@ internal class UserEventReceiverImpl internal constructor(
private suspend fun handleUserDelete(event: Event.User.UserDelete): Either<CoreFailure, Unit> {
val logger = kaliumLogger.createEventProcessingLogger(event)
return if (selfUserId == event.userId) {
logout(LogoutReason.DELETED_ACCOUNT)
logout(LogoutReason.DELETED_ACCOUNT, waitUntilCompletes = true)
Either.Right(Unit)
} else {
userRepository.markUserAsDeletedAndRemoveFromGroupConversations(event.userId)
Expand Down
4 changes: 2 additions & 2 deletions logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/UserEventReceiverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class UserEventReceiverTest {
eventReceiver.onEvent(event, TestEvent.liveDeliveryInfo)

coVerify {
arrangement.logoutUseCase.invoke(eq(LogoutReason.REMOVED_CLIENT), any())
arrangement.logoutUseCase.invoke(eq(LogoutReason.REMOVED_CLIENT), eq(true))
}.wasInvoked(exactly = once)
}

Expand Down Expand Up @@ -99,7 +99,7 @@ class UserEventReceiverTest {
eventReceiver.onEvent(event, TestEvent.liveDeliveryInfo)

coVerify {
arrangement.logoutUseCase.invoke(eq(LogoutReason.DELETED_ACCOUNT), any())
arrangement.logoutUseCase.invoke(eq(LogoutReason.DELETED_ACCOUNT), eq(true))
}.wasInvoked(exactly = once)
}

Expand Down
Loading