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 #2678] [MERGED] [PM-3381] Fix TDE login 2FA flow #29738

New Issue
Closed
opened 2026-04-18 13:39:19 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-18 13:39:19 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2678
Author: @andrebispo5
Created: 8/11/2023
Status: ✅ Merged
Merged: 8/11/2023
Merged by: @andrebispo5

Base: feature/pm-1029-tde-login ← Head: auth/pm-3381-2fa

📝 Commits (7)

  • 3c9485c [PM-3381] Check for vault lock on 2FA screen
  • d90c243 [PM-3381] Fix login with biometrics.
  • cfa677b Revert "[PM-3381] Fix login with biometrics."
  • 8a85bec [PM-3381] Move logic to ViewModel
  • 1f3a5b3 [PM-3381] Code refactor
  • 05e0147 code format
  • 61569da [PM-3381] Fix null vm error

📊 Changes

2 files changed (+34 additions, -16 deletions)

View changed files

📝 src/App/Pages/Accounts/TwoFactorPage.xaml.cs (+15 -14)
📝 src/App/Pages/Accounts/TwoFactorPageViewModel.cs (+19 -2)

📄 Description

Type of change

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

Objective

Fix SSO TDE login flow when the user has 2FA enabled.

Code changes

Check for vault lock before navigating to the Lock Page on the 2FA Page.

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/2678 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 8/11/2023 **Status:** ✅ Merged **Merged:** 8/11/2023 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `feature/pm-1029-tde-login` ← **Head:** `auth/pm-3381-2fa` --- ### 📝 Commits (7) - [`3c9485c`](https://github.com/bitwarden/android/commit/3c9485cf8358b71957c107e128616cccac3c390f) [PM-3381] Check for vault lock on 2FA screen - [`d90c243`](https://github.com/bitwarden/android/commit/d90c24397054c1991c42407f2549486db18a736b) [PM-3381] Fix login with biometrics. - [`cfa677b`](https://github.com/bitwarden/android/commit/cfa677be736bbcc4e9c07e787f0e53619c363b6e) Revert "[PM-3381] Fix login with biometrics." - [`8a85bec`](https://github.com/bitwarden/android/commit/8a85bec0a98344997d6458216d7cc8810c7e856a) [PM-3381] Move logic to ViewModel - [`1f3a5b3`](https://github.com/bitwarden/android/commit/1f3a5b3c48eebd828efa23e72c8d13f198fb1688) [PM-3381] Code refactor - [`05e0147`](https://github.com/bitwarden/android/commit/05e014757c9fbc5b222067601b60590069d666cd) code format - [`61569da`](https://github.com/bitwarden/android/commit/61569da866616f4b67f7273bf3cc8723866d6e89) [PM-3381] Fix null vm error ### 📊 Changes **2 files changed** (+34 additions, -16 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Accounts/TwoFactorPage.xaml.cs` (+15 -14) 📝 `src/App/Pages/Accounts/TwoFactorPageViewModel.cs` (+19 -2) </details> ### 📄 Description ## Type of change - [X] Bug fix - [ ] 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--> Fix SSO TDE login flow when the user has 2FA enabled. ## 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--> Check for vault lock before navigating to the Lock Page on the 2FA Page. ## 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-04-18 13:39:19 -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#29738
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?