[PR #4059] [MERGED] PM-13301: Fix 2fa with key connector bug #4652

New Issue

GiteaMirror · 2025-11-26T23:47:55-06:00

GiteaMirror commented

2025-11-26 23:47:55 -06:00

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4059
Author: @david-livefront
Created: 10/9/2024
Status: ✅ Merged
Merged: 10/9/2024
Merged by: @david-livefront

Base: main ← Head: PM-13301-key-connector-2fa

📝 Commits (1)

d9d4b21 PM-13301: Fix 2fa with key connector bug

📊 Changes

15 files changed (+110 additions, -49 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+2 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/auth/AuthNavigation.kt (+4 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnNavigation.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt (+5 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceEncryptionNavigation.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginNavigation.kt (+18 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt (+19 -20)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt (+3 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+5 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt (+9 -4)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModelTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreenTest.kt (+1 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt (+38 -16)

📄 Description

🎟️ Tracking

PM-13301

📔 Objective

This PR fixes the key-connector 2fa flow by passing the org identifier through for the proper login logic to be executed.

📸 Screenshots

Before	After

⏰ 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/4059 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 10/9/2024 **Status:** ✅ Merged **Merged:** 10/9/2024 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-13301-key-connector-2fa` --- ### 📝 Commits (1) - [`d9d4b21`](https://github.com/bitwarden/android/commit/d9d4b21e0108ea71342e35764205aaabf5c7cfed) PM-13301: Fix 2fa with key connector bug ### 📊 Changes **15 files changed** (+110 additions, -49 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+2 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/auth/AuthNavigation.kt` (+4 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnNavigation.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt` (+5 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceEncryptionNavigation.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginNavigation.kt` (+18 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt` (+19 -20) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt` (+3 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+5 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt` (+9 -4) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModelTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreenTest.kt` (+1 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt` (+38 -16) </details> ### 📄 Description ## 🎟️ Tracking [PM-13301](https://bitwarden.atlassian.net/browse/PM-13301) ## 📔 Objective This PR fixes the key-connector 2fa flow by passing the org identifier through for the proper login logic to be executed. ## 📸 Screenshots | Before | After | | --- | --- | | <video src="https://github.com/user-attachments/assets/4b28ebc4-a0b0-4bc4-b8a2-241555bf5c64" width="300" /> | <video src="https://github.com/user-attachments/assets/55709009-4995-4739-9b53-4592410bdaae" width="300" /> | ## ⏰ 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 [PM-13301]: https://bitwarden.atlassian.net/browse/PM-13301?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <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:47:55 -06:00

GiteaMirror closed this issue