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

[PR #4712] [MERGED] [PM-8223] Add new device verification when no OTP #5150

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4712
Author: @aj-rosado
Created: 2/11/2025
Status: ✅ Merged
Merged: 2/14/2025
Merged by: @aj-rosado

Base: main ← Head: PM-8223/router-user-email-otp-entry

📝 Commits (10+)

  • 783fc07 Redirecting after receiving new device verification error
  • b23f21d Add logic to send newDeviceOtp code
  • aa934e9 resend new device otp logic
  • fab09fd Added tests
  • a90adfc Merge branch 'main' into PM-8223/router-user-email-otp-entry
  • 9065f28 Updated 2FA screen for new device verification
  • 11f8fa3 set newDeviceVerification as null when navigating to 2FA Required scenario
  • de0c64d Merge branch 'main' into PM-8223/router-user-email-otp-entry
  • b2e68f2 Fixed TwoFactorAuthMethodExtension test
  • 687fbf1 improved code readibility

📊 Changes

32 files changed (+786 additions, -80 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedAccountsApi.kt (+6 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedIdentityApi.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/GetTokenResponseJson.kt (+22 -0)
➕ app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/ResendNewDeviceOtpRequestJson.kt (+20 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsService.kt (+6 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceImpl.kt (+6 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityService.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt (+2 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt (+18 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+73 -3)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/LoginResult.kt (+5 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/auth/AuthNavigation.kt (+2 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt (+15 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt (+5 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt (+6 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModel.kt (+13 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModel.kt (+15 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginNavigation.kt (+11 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt (+74 -41)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt (+42 -13)

...and 12 more files

📄 Description

🎟️ Tracking

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

📔 Objective

This adds a new login scenario when the user has no 2FA and is logging in on a new device.
This is returned as an error and not as an 2FA, so the existing enum is not used and a new variable is saved on AuthRepository and verified.

Screen is slightly different from email 2FA (no remember, different text, different title)
ResendCode has a different endpoint for 2FA email and new device verification.
2FA email also has a new image

📸 Screenshots

New Device Verification 2FA Email

https://github.com/user-attachments/assets/7324879e-3ba9-4b17-993c-ec3deb960491

⏰ 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/4712 **Author:** [@aj-rosado](https://github.com/aj-rosado) **Created:** 2/11/2025 **Status:** ✅ Merged **Merged:** 2/14/2025 **Merged by:** [@aj-rosado](https://github.com/aj-rosado) **Base:** `main` ← **Head:** `PM-8223/router-user-email-otp-entry` --- ### 📝 Commits (10+) - [`783fc07`](https://github.com/bitwarden/android/commit/783fc07b767c87bae2356ed400d8e9ba532c2270) Redirecting after receiving new device verification error - [`b23f21d`](https://github.com/bitwarden/android/commit/b23f21d214beea428323fefa50ce080385d2810d) Add logic to send newDeviceOtp code - [`aa934e9`](https://github.com/bitwarden/android/commit/aa934e993d56940c9289f75d572b10d8a753db7d) resend new device otp logic - [`fab09fd`](https://github.com/bitwarden/android/commit/fab09fd76fffc657415828279f84e2dcc72602dc) Added tests - [`a90adfc`](https://github.com/bitwarden/android/commit/a90adfc783a97cef8cbc74702842a71a994ea528) Merge branch 'main' into PM-8223/router-user-email-otp-entry - [`9065f28`](https://github.com/bitwarden/android/commit/9065f2824a9a5d1bbb609acd166584ac502e4c26) Updated 2FA screen for new device verification - [`11f8fa3`](https://github.com/bitwarden/android/commit/11f8fa36316b263ea9239e7e67cb38e76b86e346) set newDeviceVerification as null when navigating to 2FA Required scenario - [`de0c64d`](https://github.com/bitwarden/android/commit/de0c64d03cb6a701c8bd234a72757736df527c83) Merge branch 'main' into PM-8223/router-user-email-otp-entry - [`b2e68f2`](https://github.com/bitwarden/android/commit/b2e68f2e295991bd11da572281775839504864f7) Fixed TwoFactorAuthMethodExtension test - [`687fbf1`](https://github.com/bitwarden/android/commit/687fbf1736ba5ef4289a15b33d4a13032c6b2735) improved code readibility ### 📊 Changes **32 files changed** (+786 additions, -80 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedAccountsApi.kt` (+6 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedIdentityApi.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/GetTokenResponseJson.kt` (+22 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/ResendNewDeviceOtpRequestJson.kt` (+20 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsService.kt` (+6 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceImpl.kt` (+6 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityService.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt` (+2 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt` (+18 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+73 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/LoginResult.kt` (+5 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/auth/AuthNavigation.kt` (+2 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt` (+15 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt` (+5 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt` (+6 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModel.kt` (+13 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModel.kt` (+15 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginNavigation.kt` (+11 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt` (+74 -41) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt` (+42 -13) _...and 12 more files_ </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-8223 ## 📔 Objective This adds a new login scenario when the user has no 2FA and is logging in on a new device. This is returned as an error and not as an 2FA, so the existing enum is not used and a new variable is saved on AuthRepository and verified. Screen is slightly different from email 2FA (no remember, different text, different title) ResendCode has a different endpoint for 2FA email and new device verification. 2FA email also has a new image ## 📸 Screenshots <img width="314" alt="New Device Verification" src="https://github.com/user-attachments/assets/21d26ec6-5ddd-41e7-a5ba-051cfaeab151"> <img width="314" alt="2FA Email" src="https://github.com/user-attachments/assets/7c96a9d7-89fc-40d8-97e5-cd69daa0960f"> https://github.com/user-attachments/assets/7324879e-3ba9-4b17-993c-ec3deb960491 ## ⏰ 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:54:42 -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#5150
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?