mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-24 02:15:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

PM-14597 remove notification if device login is decleined (#4256)

Browse source
This commit is contained in:
Dave Severns 2024-11-11 16:02:35 -05:00 committed by GitHub
parent 771e719963
commit fd4a7c5716
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModel.kt
View file

@ -157,31 +157,8 @@ class LoginWithDeviceViewModel @Inject constructor(
} }
} }
CreateAuthRequestResult.Declined -> {
when (state.loginWithDeviceType) {
LoginWithDeviceType.OTHER_DEVICE,
LoginWithDeviceType.SSO_OTHER_DEVICE,
-> {
mutableStateFlow.update {
it.copy(
viewState = LoginWithDeviceState.ViewState.Content(
loginWithDeviceType = it.loginWithDeviceType,
fingerprintPhrase = "",
isResendNotificationLoading = false,
),
dialogState = LoginWithDeviceState.DialogState.Error(
title = null,
message = R.string.this_request_is_no_longer_valid.asText(),
),
)
}
}
LoginWithDeviceType.SSO_ADMIN_APPROVAL -> {
// Do nothing, the user should not be informed of this state // Do nothing, the user should not be informed of this state
} CreateAuthRequestResult.Declined -> Unit
}
}
CreateAuthRequestResult.Expired -> { CreateAuthRequestResult.Expired -> {
mutableStateFlow.update { mutableStateFlow.update {

22
app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModelTest.kt
View file

@ -524,23 +524,17 @@ class LoginWithDeviceViewModelTest : BaseViewModelTest() {
@Suppress("MaxLineLength") @Suppress("MaxLineLength")
@Test @Test
fun `on createAuthRequestWithUpdates with OTHER_DEVICE, Declined received should show error dialog`() { fun `on createAuthRequestWithUpdates with OTHER_DEVICE, Declined received should show unchanged content`() {
val viewModel = createViewModel() val initialState = DEFAULT_STATE.copy(
assertEquals(DEFAULT_STATE, viewModel.stateFlow.value) loginWithDeviceType = LoginWithDeviceType.OTHER_DEVICE,
mutableCreateAuthRequestWithUpdatesFlow.tryEmit(CreateAuthRequestResult.Declined)
assertEquals(
DEFAULT_STATE.copy(
viewState = DEFAULT_CONTENT_VIEW_STATE.copy( viewState = DEFAULT_CONTENT_VIEW_STATE.copy(
fingerprintPhrase = "", loginWithDeviceType = LoginWithDeviceType.OTHER_DEVICE,
isResendNotificationLoading = false,
), ),
dialogState = LoginWithDeviceState.DialogState.Error(
title = null,
message = R.string.this_request_is_no_longer_valid.asText(),
),
),
viewModel.stateFlow.value,
) )
val viewModel = createViewModel(state = initialState)
assertEquals(initialState, viewModel.stateFlow.value)
mutableCreateAuthRequestWithUpdatesFlow.tryEmit(CreateAuthRequestResult.Declined)
assertEquals(initialState, viewModel.stateFlow.value)
} }
@Suppress("MaxLineLength") @Suppress("MaxLineLength")