mirror of
https://github.com/bitwarden/android.git
synced 2026-11-19 17:40:12 -06:00
[BIT-2361] Display account deletion error message provided by network response (#1389)
This commit is contained in:
committed by
Álison Fernandes
parent
5d5c5809d1
commit
6ff39e486d
@@ -18,6 +18,7 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetRea
|
||||
import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson
|
||||
import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
|
||||
import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource
|
||||
import com.x8bit.bitwarden.data.auth.datasource.network.model.DeleteAccountResponseJson
|
||||
import com.x8bit.bitwarden.data.auth.datasource.network.model.GetTokenResponseJson
|
||||
import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
|
||||
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
|
||||
@@ -601,7 +602,7 @@ class AuthRepositoryTest {
|
||||
masterPasswordHash = hashedMasterPassword,
|
||||
oneTimePassword = null,
|
||||
)
|
||||
} returns Unit.asSuccess()
|
||||
} returns DeleteAccountResponseJson.Success.asSuccess()
|
||||
fakeAuthDiskSource.userState = SINGLE_USER_STATE_1
|
||||
|
||||
repository.userStateFlow.test {
|
||||
@@ -625,7 +626,7 @@ class AuthRepositoryTest {
|
||||
fun `delete account fails if not logged in`() = runTest {
|
||||
val masterPassword = "hello world"
|
||||
val result = repository.deleteAccountWithMasterPassword(masterPassword = masterPassword)
|
||||
assertEquals(DeleteAccountResult.Error, result)
|
||||
assertEquals(DeleteAccountResult.Error(message = null), result)
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -639,7 +640,7 @@ class AuthRepositoryTest {
|
||||
|
||||
val result = repository.deleteAccountWithMasterPassword(masterPassword = masterPassword)
|
||||
|
||||
assertEquals(DeleteAccountResult.Error, result)
|
||||
assertEquals(DeleteAccountResult.Error(message = null), result)
|
||||
coVerify {
|
||||
authSdkSource.hashPassword(EMAIL, masterPassword, kdf, HashPurpose.SERVER_AUTHORIZATION)
|
||||
}
|
||||
@@ -663,7 +664,7 @@ class AuthRepositoryTest {
|
||||
|
||||
val result = repository.deleteAccountWithMasterPassword(masterPassword = masterPassword)
|
||||
|
||||
assertEquals(DeleteAccountResult.Error, result)
|
||||
assertEquals(DeleteAccountResult.Error(message = null), result)
|
||||
coVerify {
|
||||
authSdkSource.hashPassword(EMAIL, masterPassword, kdf, HashPurpose.SERVER_AUTHORIZATION)
|
||||
accountsService.deleteAccount(
|
||||
@@ -687,7 +688,7 @@ class AuthRepositoryTest {
|
||||
masterPasswordHash = hashedMasterPassword,
|
||||
oneTimePassword = null,
|
||||
)
|
||||
} returns Unit.asSuccess()
|
||||
} returns DeleteAccountResponseJson.Success.asSuccess()
|
||||
|
||||
val result = repository.deleteAccountWithMasterPassword(masterPassword = masterPassword)
|
||||
|
||||
@@ -710,7 +711,7 @@ class AuthRepositoryTest {
|
||||
masterPasswordHash = null,
|
||||
oneTimePassword = oneTimePassword,
|
||||
)
|
||||
} returns Unit.asSuccess()
|
||||
} returns DeleteAccountResponseJson.Success.asSuccess()
|
||||
|
||||
val result = repository.deleteAccountWithOneTimePassword(
|
||||
oneTimePassword = oneTimePassword,
|
||||
|
||||
@@ -451,7 +451,7 @@ class LoginViewModelTest : BaseViewModelTest() {
|
||||
savedStateHandle = SavedStateHandle().also {
|
||||
it["email_address"] = EMAIL
|
||||
it["state"] = state
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
companion object {
|
||||
|
||||
+1
-1
@@ -126,7 +126,7 @@ class DeleteAccountViewModelTest : BaseViewModelTest() {
|
||||
val masterPassword = "ckasb kcs ja"
|
||||
coEvery {
|
||||
authRepo.deleteAccountWithMasterPassword(masterPassword)
|
||||
} returns DeleteAccountResult.Error
|
||||
} returns DeleteAccountResult.Error(message = null)
|
||||
|
||||
viewModel.trySendAction(DeleteAccountAction.DeleteAccountConfirmDialogClick(masterPassword))
|
||||
|
||||
|
||||
+3
-3
@@ -119,11 +119,11 @@ class DeleteAccountConfirmationViewModelTest : BaseViewModelTest() {
|
||||
|
||||
@Test
|
||||
@Suppress("MaxLineLength")
|
||||
fun `on DeleteAccountClick with DeleteAccountResult Error should set dialog to Error`() =
|
||||
fun `on DeleteAccountClick with DeleteAccountResult Error should set dialog to Error with message`() =
|
||||
runTest {
|
||||
coEvery {
|
||||
authRepo.deleteAccountWithOneTimePassword("123456")
|
||||
} returns DeleteAccountResult.Error
|
||||
} returns DeleteAccountResult.Error(message = "Delete account error")
|
||||
val initialState = DEFAULT_STATE.copy(
|
||||
verificationCode = "123456",
|
||||
)
|
||||
@@ -144,7 +144,7 @@ class DeleteAccountConfirmationViewModelTest : BaseViewModelTest() {
|
||||
assertEquals(
|
||||
initialState.copy(
|
||||
dialog = DeleteAccountConfirmationState.DeleteAccountConfirmationDialog.Error(
|
||||
message = R.string.generic_error_message.asText(),
|
||||
message = "Delete account error".asText(),
|
||||
),
|
||||
),
|
||||
awaitItem(),
|
||||
|
||||
Reference in New Issue
Block a user