github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-14 14:16:23 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #3631] [MERGED] [PM-10058] Non-remembered device TDE issue in same session #4300

New Issue
Closed
opened 2025-11-26 23:42:34 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:42:34 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/3631
Author: @dseverns-livefront
Created: 7/25/2024
Status: ✅ Merged
Merged: 8/6/2024
Merged by: @dseverns-livefront

Base: main ← Head: PM-10058/sso-tde-issue

📝 Commits (2)

  • ac376e9 PM-10058 ensure vault is set to locked for a user who is logged out
  • 141898a better naming

📊 Changes

5 files changed (+66 additions, -12 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManager.kt (+9 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerImpl.kt (+11 -0)
➕ app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/LogoutEvent.kt (+9 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt (+17 -5)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt (+20 -7)

📄 Description

🎟️ Tracking

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

📔 Objective

If a user, using SSO TDE logouts out and attempts to log back in during an active app session (app has not been destroyed) they will get stuck in a state where they are unable to fully authenticate with Admin approval or other device.

The root cause found was in debugging

val updatedRootNavState = when {
            userState?.activeAccount?.trustedDevice?.isDeviceTrusted == false &&
                !userState.activeAccount.isVaultUnlocked &&
                !userState.activeAccount.hasManualUnlockMechanism -> RootNavState.TrustedDevice

once the vault was unlocked for the user if it was never set to locked and they logged it, it would always return true.

📸 Screenshots

⏰ 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/3631 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 7/25/2024 **Status:** ✅ Merged **Merged:** 8/6/2024 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `main` ← **Head:** `PM-10058/sso-tde-issue` --- ### 📝 Commits (2) - [`ac376e9`](https://github.com/bitwarden/android/commit/ac376e9509c6178f3806c9e4aa0809dc240d8855) PM-10058 ensure vault is set to locked for a user who is logged out - [`141898a`](https://github.com/bitwarden/android/commit/141898a6e0315f686085d769df4bdb65c8155946) better naming ### 📊 Changes **5 files changed** (+66 additions, -12 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManager.kt` (+9 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerImpl.kt` (+11 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/data/auth/manager/model/LogoutEvent.kt` (+9 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt` (+17 -5) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt` (+20 -7) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-10058 <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective If a user, using SSO TDE logouts out and attempts to log back in during an active app session (app has not been destroyed) they will get stuck in a state where they are unable to fully authenticate with Admin approval or other device. The root cause found was in debugging ``` val updatedRootNavState = when { userState?.activeAccount?.trustedDevice?.isDeviceTrusted == false && !userState.activeAccount.isVaultUnlocked && !userState.activeAccount.hasManualUnlockMechanism -> RootNavState.TrustedDevice ``` once the vault was unlocked for the user if it was never set to locked and they logged it, it would always return true. <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> ## 📸 Screenshots <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. --> ## ⏰ 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:42:34 -06: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#4300
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?