github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-21 13:52:07 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

PM-19226: Propagate error from create auth request flow to UI (#4867)

Browse Source
This commit is contained in:
David Perez
2025-03-14 10:47:03 -05:00
committed by GitHub
parent 5d0593026f
commit b084987758
6 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt
View File

@@ -70,9 +70,8 @@ class AuthRequestManagerImpl(
email = email,
authRequestType = authRequestType.toAuthRequestTypeJson(),
)
.getOrNull()
?: run {
emit(CreateAuthRequestResult.Error)
.getOrElse {
emit(CreateAuthRequestResult.Error(error = it))
return@flow
}
var authRequest = initialResult.authRequest
@@ -103,7 +102,7 @@ class AuthRequestManagerImpl(
)
}
.fold(
onFailure = { emit(CreateAuthRequestResult.Error) },
onFailure = { emit(CreateAuthRequestResult.Error(error = it)) },
onSuccess = { updateAuthRequest ->
when {
updateAuthRequest.requestApproved -> {

4
app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/CreateAuthRequestResult.kt
View File

@@ -23,7 +23,9 @@ sealed class CreateAuthRequestResult {
/**
* There was a generic error getting the user's auth requests.
*/
data object Error : CreateAuthRequestResult()
data class Error(
val error: Throwable,
) : CreateAuthRequestResult()
/**
* The auth request has been declined.

1
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreen.kt
View File

@@ -258,6 +258,7 @@ private fun LoginWithDeviceDialogs(
is LoginWithDeviceState.DialogState.Error -> BitwardenBasicDialog(
title = state.title?.invoke(),
message = state.message(),
throwable = state.error,
onDismissRequest = onDismissDialog,
)

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

@@ -153,6 +153,7 @@ class LoginWithDeviceViewModel @Inject constructor(
dialogState = LoginWithDeviceState.DialogState.Error(
title = R.string.an_error_has_occurred.asText(),
message = R.string.generic_error_message.asText(),
error = result.error,
),
)
}
@@ -478,6 +479,7 @@ data class LoginWithDeviceState(
@Parcelize
data class Error(
val title: Text? = null,
val error: Throwable? = null,
val message: Text,
) : DialogState()
}

10
app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt
View File

@@ -68,6 +68,7 @@ class AuthRequestManagerTest {
runTest {
val email = "email@email.com"
val authRequestResponse = AUTH_REQUEST_RESPONSE
val error = Throwable("Fail")
coEvery {
authSdkSource.getNewAuthRequest(email = email)
} returns authRequestResponse.asSuccess()
@@ -80,7 +81,7 @@ class AuthRequestManagerTest {
fingerprint = authRequestResponse.fingerprint,
authRequestType = AuthRequestTypeJson.LOGIN_WITH_DEVICE,
)
} returns Throwable("Fail").asFailure()
} returns error.asFailure()
repository
.createAuthRequestWithUpdates(
@@ -88,7 +89,7 @@ class AuthRequestManagerTest {
authRequestType = AuthRequestType.OTHER_DEVICE,
)
.test {
assertEquals(CreateAuthRequestResult.Error, awaitItem())
assertEquals(CreateAuthRequestResult.Error(error = error), awaitItem())
awaitComplete()
}
}
@@ -405,9 +406,10 @@ class AuthRequestManagerTest {
fun `createAuthRequestWithUpdates with authSdkSource getNewAuthRequest error should emit Error`() =
runTest {
val email = "email@email.com"
val error = Throwable("Fail")
coEvery {
authSdkSource.getNewAuthRequest(email = email)
} returns Throwable("Fail").asFailure()
} returns error.asFailure()
repository
.createAuthRequestWithUpdates(
@@ -415,7 +417,7 @@ class AuthRequestManagerTest {
authRequestType = AuthRequestType.OTHER_DEVICE,
)
.test {
assertEquals(CreateAuthRequestResult.Error, awaitItem())
assertEquals(CreateAuthRequestResult.Error(error = error), awaitItem())
awaitComplete()
}
}

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

@@ -647,9 +647,12 @@ class LoginWithDeviceViewModelTest : BaseViewModelTest() {
@Test
fun `on createAuthRequestWithUpdates Error received should show content with error dialog`() {
val error = Throwable("Fail!")
val viewModel = createViewModel()
assertEquals(DEFAULT_STATE, viewModel.stateFlow.value)
mutableCreateAuthRequestWithUpdatesFlow.tryEmit(CreateAuthRequestResult.Error)
mutableCreateAuthRequestWithUpdatesFlow.tryEmit(
value = CreateAuthRequestResult.Error(error = error),
)
assertEquals(
DEFAULT_STATE.copy(
viewState = DEFAULT_CONTENT_VIEW_STATE.copy(
@@ -659,6 +662,7 @@ class LoginWithDeviceViewModelTest : BaseViewModelTest() {
dialogState = LoginWithDeviceState.DialogState.Error(
title = R.string.an_error_has_occurred.asText(),
message = R.string.generic_error_message.asText(),
error = error,
),
),
viewModel.stateFlow.value,