github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-04-29 20:38:41 -05:00
Code Issues 936 Packages Projects Releases 122 Wiki Activity

PM-27770: Update error parsing when creating or updating a cipher (#6118)

Browse Source
This commit is contained in:
David Perez
2025-11-04 13:08:10 -06:00
committed by GitHub
parent 4b7fcdb6ea
commit 14e833247d
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt
View File

@@ -91,7 +91,10 @@ class CipherManagerImpl(
.map { response -> .map { response ->
when (response) { when (response) {
is CreateCipherResponseJson.Invalid -> { is CreateCipherResponseJson.Invalid -> {
CreateCipherResult.Error(errorMessage = response.message, error = null) CreateCipherResult.Error(
errorMessage = response.firstValidationErrorMessage,
error = null,
)
} }
is CreateCipherResponseJson.Success -> { is CreateCipherResponseJson.Success -> {
@@ -131,7 +134,10 @@ class CipherManagerImpl(
.map { response -> .map { response ->
when (response) { when (response) {
is CreateCipherResponseJson.Invalid -> { is CreateCipherResponseJson.Invalid -> {
CreateCipherResult.Error(errorMessage = response.message, error = null) CreateCipherResult.Error(
errorMessage = response.firstValidationErrorMessage,
error = null,
)
} }
is CreateCipherResponseJson.Success -> { is CreateCipherResponseJson.Success -> {
@@ -301,7 +307,10 @@ class CipherManagerImpl(
.map { response -> .map { response ->
when (response) { when (response) {
is UpdateCipherResponseJson.Invalid -> { is UpdateCipherResponseJson.Invalid -> {
UpdateCipherResult.Error(errorMessage = response.message, error = null) UpdateCipherResult.Error(
errorMessage = response.firstValidationErrorMessage,
error = null,
)
} }
is UpdateCipherResponseJson.Success -> { is UpdateCipherResponseJson.Success -> {
@@ -581,9 +590,7 @@ class CipherManagerImpl(
.flatMap { response -> .flatMap { response ->
when (response) { when (response) {
is UpdateCipherResponseJson.Invalid -> { is UpdateCipherResponseJson.Invalid -> {
IllegalStateException( IllegalStateException(response.firstValidationErrorMessage)
response.message,
)
.asFailure() .asFailure()
} }

6
network/src/main/kotlin/com/bitwarden/network/model/CreateCipherResponseJson.kt
View File

@@ -24,9 +24,9 @@ sealed class CreateCipherResponseJson {
@Serializable @Serializable
data class Invalid( data class Invalid(
@SerialName("message") @SerialName("message")
val message: String?, override val message: String,
@SerialName("validationErrors") @SerialName("validationErrors")
val validationErrors: Map<String, List<String>>?, override val validationErrors: Map<String, List<String>>?,
) : CreateCipherResponseJson() ) : CreateCipherResponseJson(), InvalidJsonResponse
} }

6
network/src/main/kotlin/com/bitwarden/network/model/UpdateCipherResponseJson.kt
View File

@@ -25,9 +25,9 @@ sealed class UpdateCipherResponseJson {
@Serializable @Serializable
data class Invalid( data class Invalid(
@SerialName("message") @SerialName("message")
val message: String?, override val message: String,
@SerialName("validationErrors") @SerialName("validationErrors")
val validationErrors: Map<String, List<String>>?, override val validationErrors: Map<String, List<String>>?,
) : UpdateCipherResponseJson() ) : UpdateCipherResponseJson(), InvalidJsonResponse
} }