github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-08 04:16:40 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #6176] [MERGED] [PM-27290] Remove password unlock method #25757

New Issue
Closed
opened 2026-04-17 01:22:56 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-17 01:22:56 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6176
Author: @andrebispo5
Created: 11/18/2025
Status: ✅ Merged
Merged: 12/4/2025
Merged by: @andrebispo5

Base: main ← Head: pm-27290/remove-password-unlock-method

📝 Commits (7)

  • f53c335 [PM-27290] Remove reference to InitUserCryptoMethod.Password
  • 08d6fb7 [PM-27290] Update tests.
  • 4aa3c44 [PM-27290] Change variables with password value in tests to avoid git warnings.
  • 45d3850 Merge branch 'main' into pm-27290/remove-password-unlock-method
  • f6dc142 Merge branch 'main' into pm-27290/remove-password-unlock-method
  • b7ecefa [PM-27290] PR suggestions
  • 0dc6edd [PM-27290] Remove unnecessary log

📊 Changes

7 files changed (+212 additions, -220 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+6 -12)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt (+6 -16)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt (+8 -14)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/InitUserCryptoMethodExtensions.kt (+5 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+69 -53)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt (+81 -85)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt (+37 -39)

📄 Description

🎟️ Tracking

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

📔 Objective

This pull request refactors authentication and vault unlocking logic to exclusively use the MasterPasswordUnlock method, removing support for the older Password method. This change simplifies the codebase, improves clarity, and prepares for future SDK updates. The test suite and utility extensions have also been updated to reflect this change.

Authentication and Vault Unlocking Logic

  • Refactored AuthRepositoryImpl and VaultRepositoryImpl to use InitUserCryptoMethod.MasterPasswordUnlock exclusively, removing all logic related to InitUserCryptoMethod.Password. This ensures that vault unlocking now requires master password unlock data and no longer relies on a separate user key.

  • Updated VaultLockManagerImpl to only handle the MasterPasswordUnlock method for password hashing and KDF updates, removing branches for the Password method.

Utility Extensions

  • Modified InitUserCryptoMethodExtensions.kt so that logTag no longer supports the Password method. It now throws an exception if an unsupported method is encountered, anticipating future SDK changes.

Test Suite Updates

  • Updated all relevant tests in AuthRepositoryTest.kt to use MasterPasswordUnlock instead of Password, and replaced references to user keys with master password unlock test data. Also updated mock password hash values for consistency.

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) 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/6176 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 11/18/2025 **Status:** ✅ Merged **Merged:** 12/4/2025 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `main` ← **Head:** `pm-27290/remove-password-unlock-method` --- ### 📝 Commits (7) - [`f53c335`](https://github.com/bitwarden/android/commit/f53c335f7b52dcfd7c1a72aafd2d3424365bcded) [PM-27290] Remove reference to InitUserCryptoMethod.Password - [`08d6fb7`](https://github.com/bitwarden/android/commit/08d6fb7e812a484885dc39798eef7befbf2bf1b0) [PM-27290] Update tests. - [`4aa3c44`](https://github.com/bitwarden/android/commit/4aa3c4469c23643fb8908d19d94ad496f6e3256f) [PM-27290] Change variables with password value in tests to avoid git warnings. - [`45d3850`](https://github.com/bitwarden/android/commit/45d385072863061c523c544ce4fd8286865ec6c0) Merge branch 'main' into pm-27290/remove-password-unlock-method - [`f6dc142`](https://github.com/bitwarden/android/commit/f6dc142e13256f63697f69a35cf4a1351d2730fd) Merge branch 'main' into pm-27290/remove-password-unlock-method - [`b7ecefa`](https://github.com/bitwarden/android/commit/b7ecefa38961abba543e51441d5a55164b78a119) [PM-27290] PR suggestions - [`0dc6edd`](https://github.com/bitwarden/android/commit/0dc6edd59ea3294bf02b194cdd6ac99f82e8fb00) [PM-27290] Remove unnecessary log ### 📊 Changes **7 files changed** (+212 additions, -220 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+6 -12) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt` (+6 -16) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt` (+8 -14) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/InitUserCryptoMethodExtensions.kt` (+5 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+69 -53) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt` (+81 -85) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt` (+37 -39) </details> ### 📄 Description ## 🎟️ Tracking <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> https://bitwarden.atlassian.net/browse/PM-27290 ## 📔 Objective <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> This pull request refactors authentication and vault unlocking logic to exclusively use the `MasterPasswordUnlock` method, removing support for the older `Password` method. This change simplifies the codebase, improves clarity, and prepares for future SDK updates. The test suite and utility extensions have also been updated to reflect this change. ### Authentication and Vault Unlocking Logic * Refactored `AuthRepositoryImpl` and `VaultRepositoryImpl` to use `InitUserCryptoMethod.MasterPasswordUnlock` exclusively, removing all logic related to `InitUserCryptoMethod.Password`. This ensures that vault unlocking now requires master password unlock data and no longer relies on a separate user key. * Updated `VaultLockManagerImpl` to only handle the `MasterPasswordUnlock` method for password hashing and KDF updates, removing branches for the `Password` method. ### Utility Extensions * Modified `InitUserCryptoMethodExtensions.kt` so that `logTag` no longer supports the `Password` method. It now throws an exception if an unsupported method is encountered, anticipating future SDK changes. ### Test Suite Updates * Updated all relevant tests in `AuthRepositoryTest.kt` to use `MasterPasswordUnlock` instead of `Password`, and replaced references to user keys with master password unlock test data. Also updated mock password hash values for consistency. ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) 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 2026-04-17 01:22:56 -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#25757
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?