[PR #2653] [MERGED] [PM-3102] Update Master password reprompt to be based on MP instead of Key Connector #97088

Closed
opened 2026-05-30 21:30:55 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2653
Author: @fedemkr
Created: 7/31/2023
Status: Merged
Merged: 8/10/2023
Merged by: @fedemkr

Base: feature/pm-1029-tde-loginHead: vault/pm-3102/bypass-mp-reprompt-users-no-mp


📝 Commits (3)

  • d59dc18 PM-3102 Added check to see if a user has master password set replacing previous usage of key connector.
  • 0b04f86 Merge branch 'feature/pm-1029-tde-login' into vault/pm-3102/bypass-mp-reprompt-users-no-mp
  • 7b0f1b6 PM-3102 Fix formatting

📊 Changes

18 files changed (+83 additions, -91 deletions)

View changed files

📝 src/Android/MainApplication.cs (+2 -1)
📝 src/App/Abstractions/IPasswordRepromptService.cs (+0 -2)
📝 src/App/Pages/Accounts/LockPage.xaml.cs (+1 -1)
📝 src/App/Pages/Accounts/LockPageViewModel.cs (+10 -25)
📝 src/App/Pages/Settings/ExportVaultPageViewModel.cs (+5 -7)
📝 src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs (+4 -5)
📝 src/App/Pages/Vault/CipherAddEditPage.xaml.cs (+4 -4)
📝 src/App/Services/MobilePasswordRepromptService.cs (+1 -9)
📝 src/App/Utilities/VerificationActionsFlowHelper.cs (+7 -4)
📝 src/Core/Abstractions/IKeyConnectorService.cs (+2 -3)
📝 src/Core/Abstractions/IUserVerificationService.cs (+1 -0)
📝 src/Core/Services/KeyConnectorService.cs (+2 -2)
📝 src/Core/Services/UserVerificationService.cs (+16 -1)
📝 src/Core/Services/VaultTimeoutService.cs (+4 -4)
📝 src/Core/Utilities/ServiceContainer.cs (+5 -5)
📝 src/iOS.Core/Controllers/BaseLockPasswordViewController.cs (+7 -7)
📝 src/iOS.Core/Controllers/LockPasswordViewController.cs (+10 -10)
📝 src/iOS.Core/Utilities/iOSCoreHelpers.cs (+2 -1)

📄 Description

Type of change

  • Bug fix
  • New feature development
  • Tech debt (refactoring, code cleanup, dependency upgrades, etc)
  • Build/deploy pipeline (DevOps)
  • Other

Objective

Update master password reprompt to be based on HasMasterPassword from the decrypt options instead of the Key connector. However, still use key connector as a default in case it's an old state.

Based on client's change https://github.com/bitwarden/clients/commit/87468a2aa65f500d5f2a24637296da91c1aa65ee

Code changes

  • UserVerificationService: Added HasMasterPasswordAsync() to check whether the user has a MP set up defaulting to check the key connector.
  • PasswordRepromptService: Removed Enabled() given that it's not being used.
  • Others: Updated all the references to IKeyConnectorService.GetUsesKeyConnector() to the new check on the IUserVerificationService, inverting the bool check given that it's the opposite now.

Before you submit

  • Please check for formatting errors (dotnet format --verify-no-changes) (required)
  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team

🔄 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/2653 **Author:** [@fedemkr](https://github.com/fedemkr) **Created:** 7/31/2023 **Status:** ✅ Merged **Merged:** 8/10/2023 **Merged by:** [@fedemkr](https://github.com/fedemkr) **Base:** `feature/pm-1029-tde-login` ← **Head:** `vault/pm-3102/bypass-mp-reprompt-users-no-mp` --- ### 📝 Commits (3) - [`d59dc18`](https://github.com/bitwarden/android/commit/d59dc18af56159ee064e1cc55ca7d8c6dd7488d6) PM-3102 Added check to see if a user has master password set replacing previous usage of key connector. - [`0b04f86`](https://github.com/bitwarden/android/commit/0b04f86aceff058b2db491116d5c1aebdb462de1) Merge branch 'feature/pm-1029-tde-login' into vault/pm-3102/bypass-mp-reprompt-users-no-mp - [`7b0f1b6`](https://github.com/bitwarden/android/commit/7b0f1b6c1490e95bf759c0aa5b6a19f2ff4145ee) PM-3102 Fix formatting ### 📊 Changes **18 files changed** (+83 additions, -91 deletions) <details> <summary>View changed files</summary> 📝 `src/Android/MainApplication.cs` (+2 -1) 📝 `src/App/Abstractions/IPasswordRepromptService.cs` (+0 -2) 📝 `src/App/Pages/Accounts/LockPage.xaml.cs` (+1 -1) 📝 `src/App/Pages/Accounts/LockPageViewModel.cs` (+10 -25) 📝 `src/App/Pages/Settings/ExportVaultPageViewModel.cs` (+5 -7) 📝 `src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs` (+4 -5) 📝 `src/App/Pages/Vault/CipherAddEditPage.xaml.cs` (+4 -4) 📝 `src/App/Services/MobilePasswordRepromptService.cs` (+1 -9) 📝 `src/App/Utilities/VerificationActionsFlowHelper.cs` (+7 -4) 📝 `src/Core/Abstractions/IKeyConnectorService.cs` (+2 -3) 📝 `src/Core/Abstractions/IUserVerificationService.cs` (+1 -0) 📝 `src/Core/Services/KeyConnectorService.cs` (+2 -2) 📝 `src/Core/Services/UserVerificationService.cs` (+16 -1) 📝 `src/Core/Services/VaultTimeoutService.cs` (+4 -4) 📝 `src/Core/Utilities/ServiceContainer.cs` (+5 -5) 📝 `src/iOS.Core/Controllers/BaseLockPasswordViewController.cs` (+7 -7) 📝 `src/iOS.Core/Controllers/LockPasswordViewController.cs` (+10 -10) 📝 `src/iOS.Core/Utilities/iOSCoreHelpers.cs` (+2 -1) </details> ### 📄 Description ## Type of change - [ ] Bug fix - [X] New feature development - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Build/deploy pipeline (DevOps) - [ ] Other ## Objective <!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding--> Update master password reprompt to be based on `HasMasterPassword` from the decrypt options instead of the Key connector. However, still use key connector as a default in case it's an old state. Based on client's change https://github.com/bitwarden/clients/commit/87468a2aa65f500d5f2a24637296da91c1aa65ee ## Code changes <!--Explain the changes you've made to each file or major component. This should help the reviewer understand your changes--> <!--Also refer to any related changes or PRs in other repositories--> * **UserVerificationService:** Added `HasMasterPasswordAsync()` to check whether the user has a MP set up defaulting to check the key connector. * **PasswordRepromptService:** Removed `Enabled()` given that it's not being used. * **Others:** Updated all the references to `IKeyConnectorService.GetUsesKeyConnector()` to the new check on the `IUserVerificationService`, inverting the bool check given that it's the opposite now. ## Before you submit - Please check for formatting errors (`dotnet format --verify-no-changes`) (required) - Please add **unit tests** where it makes sense to do so (encouraged but not required) - If this change requires a **documentation update** - notify the documentation team - If this change has particular **deployment requirements** - notify the DevOps team --- <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-05-30 21:30:55 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#97088