[PR #4112] [MERGED] [PM-13396] Add support for legacy error response model in getToken #4694

Closed
opened 2025-11-26 23:48:30 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4112
Author: @SaintPatrck
Created: 10/17/2024
Status: Merged
Merged: 10/21/2024
Merged by: @SaintPatrck

Base: mainHead: PM-13396/legacy-error-messages


📝 Commits (1)

  • b55741a PM-13396 Add support for legacy error response model in getToken

📊 Changes

4 files changed (+59 additions, -4 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/GetTokenResponseJson.kt (+21 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt (+32 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+4 -1)

📄 Description

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-13396

📔 Objective

This commit adds support for the legacy error response model returned by the getToken endpoint.

The legacy model uses lowercase keys for error messages, while the current model uses uppercase keys. This change ensures that the app can handle both models correctly.

Additionally, the unit tests were updated to cover the scenario where the server returns a legacy error response.

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed
    issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/4112 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 10/17/2024 **Status:** ✅ Merged **Merged:** 10/21/2024 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `PM-13396/legacy-error-messages` --- ### 📝 Commits (1) - [`b55741a`](https://github.com/bitwarden/android/commit/b55741adf1bf349a1f962f5f8b9e0dcb952c2b0b) PM-13396 Add support for legacy error response model in getToken ### 📊 Changes **4 files changed** (+59 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/GetTokenResponseJson.kt` (+21 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt` (+32 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+4 -1) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-13396 ## 📔 Objective This commit adds support for the legacy error response model returned by the `getToken` endpoint. The legacy model uses lowercase keys for error messages, while the current model uses uppercase keys. This change ensures that the app can handle both models correctly. Additionally, the unit tests were updated to cover the scenario where the server returns a legacy error response. ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-26 23:48:30 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#4694