github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-09 13:29:18 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #6640] 🍒[PM-33394] fix: Propagate CookieRedirectException error message #12885

New Issue
Closed
opened 2026-04-11 03:52:51 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-11 03:52:51 -05:00
Owner
Copy Link

Original Pull Request: https://github.com/bitwarden/android/pull/6640

State: closed
Merged: Yes

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-33394
Cherry-picked from #6639

📔 Objective

When SSO cookies expire in a load-balanced environment, API actions trigger a CookieRedirectException. After the app completes the "Sync with browser" re-authentication flow, a generic error was shown ("We were unable to process your request") instead of the exception's descriptive message ("Your request was interrupted because the app needed to re-authenticate. Please try again.").

Root cause: CookieRedirectException extends IOException, so toBitwardenError() classified it as BitwardenError.Network. The parseErrorBodyOrNull() function only handles BitwardenError.Http, returning null for network errors — causing the message to be lost.

Fix: Updated toBitwardenError() to intercept CookieRedirectException before the generic IOException check (since it's a subclass). Synthesizes a BitwardenError.Http with a 400 response and JSON body containing the exception message, allowing it to flow through the existing parseErrorBodyOrNull pipeline with zero changes to downstream code.

Scope: Fixes the 26 service methods using recoverCatching + parseErrorBodyOrNull (cipher create/update/archive/unarchive, send CRUD, account operations, identity operations, folder update, cipher import). The 80 service methods without recoverCatching still show a generic error but preserve the exception via "Share Error Details" — to be addressed in a follow-up.

📸 Screenshots

**Original Pull Request:** https://github.com/bitwarden/android/pull/6640 **State:** closed **Merged:** Yes --- ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-33394 Cherry-picked from #6639 ## 📔 Objective When SSO cookies expire in a load-balanced environment, API actions trigger a `CookieRedirectException`. After the app completes the "Sync with browser" re-authentication flow, a **generic error** was shown ("We were unable to process your request") instead of the exception's descriptive message ("Your request was interrupted because the app needed to re-authenticate. Please try again."). **Root cause:** `CookieRedirectException` extends `IOException`, so `toBitwardenError()` classified it as `BitwardenError.Network`. The `parseErrorBodyOrNull()` function only handles `BitwardenError.Http`, returning `null` for network errors — causing the message to be lost. **Fix:** Updated `toBitwardenError()` to intercept `CookieRedirectException` before the generic `IOException` check (since it's a subclass). Synthesizes a `BitwardenError.Http` with a 400 response and JSON body containing the exception message, allowing it to flow through the existing `parseErrorBodyOrNull` pipeline with zero changes to downstream code. **Scope:** Fixes the 26 service methods using `recoverCatching` + `parseErrorBodyOrNull` (cipher create/update/archive/unarchive, send CRUD, account operations, identity operations, folder update, cipher import). The 80 service methods without `recoverCatching` still show a generic error but preserve the exception via "Share Error Details" — to be addressed in a follow-up. ## 📸 Screenshots <video src="https://github.com/user-attachments/assets/d0628145-699f-4696-9d4e-80f6c078b89c" />
GiteaMirror added the pull-request label 2026-04-11 03:52:51 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#12885
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?