[PR #2719] [MERGED] [PM-3382] User cannot select Email as a secondary 2FA option following SSO #45369

Closed
opened 2026-04-26 12:39:27 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2719
Author: @andrebispo5
Created: 8/24/2023
Status: Merged
Merged: 9/6/2023
Merged by: @andrebispo5

Base: masterHead: auth/pm-3382/2fa-email


📝 Commits (7)

  • a2aee50 [PM-3382] Update mobile client to receive and use SsoEmail2faSessionToken
  • 876f3f4 code format
  • 5d10ddb [PM-3382] Fix 2FA for autofill
  • 07d674f Merge branch 'master' into auth/pm-3382/2fa-email
  • 553bac6 Revert "[PM-3382] Fix 2FA for autofill"
  • b74209f [PM-3382] Fix null 2fa email with local email on MP login.
  • 1bee4fc Merge branch 'master' into auth/pm-3382/2fa-email

📊 Changes

5 files changed (+10 additions, -3 deletions)

View changed files

📝 src/App/Pages/Accounts/TwoFactorPageViewModel.cs (+2 -1)
📝 src/Core/Abstractions/IAuthService.cs (+1 -0)
📝 src/Core/Models/Request/TwoFactorEmailRequest.cs (+1 -0)
📝 src/Core/Models/Response/IdentityTwoFactorResponse.cs (+2 -0)
📝 src/Core/Services/AuthService.cs (+4 -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 send 2FA code email on mobile client by updating it to receive and use new identity property SsoEmail2faSessionToken.

Code changes

Get new field from identity response and use it in the request for 2FA code email.

Notes for Reviewers

This should match the functionality of the clients PR here: https://github.com/bitwarden/clients/pull/5280

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/2719 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 8/24/2023 **Status:** ✅ Merged **Merged:** 9/6/2023 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `master` ← **Head:** `auth/pm-3382/2fa-email` --- ### 📝 Commits (7) - [`a2aee50`](https://github.com/bitwarden/android/commit/a2aee502b2b4788f7a6dad23575626b2e351d6f4) [PM-3382] Update mobile client to receive and use SsoEmail2faSessionToken - [`876f3f4`](https://github.com/bitwarden/android/commit/876f3f46bb248b1493562c3228ed434be5d86ac3) code format - [`5d10ddb`](https://github.com/bitwarden/android/commit/5d10ddb642cd7b87864c2f6c32d007ddc1ec66ef) [PM-3382] Fix 2FA for autofill - [`07d674f`](https://github.com/bitwarden/android/commit/07d674fc93881f2e38e7b592792fd59cf8602cad) Merge branch 'master' into auth/pm-3382/2fa-email - [`553bac6`](https://github.com/bitwarden/android/commit/553bac6714670bcae0f15164d31c6bdee8650395) Revert "[PM-3382] Fix 2FA for autofill" - [`b74209f`](https://github.com/bitwarden/android/commit/b74209ffe2cb8e05f0755ca8cacaeb7249a08a5b) [PM-3382] Fix null 2fa email with local email on MP login. - [`1bee4fc`](https://github.com/bitwarden/android/commit/1bee4fcf6280266ad1bb4ba83abdc136680cbc88) Merge branch 'master' into auth/pm-3382/2fa-email ### 📊 Changes **5 files changed** (+10 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Accounts/TwoFactorPageViewModel.cs` (+2 -1) 📝 `src/Core/Abstractions/IAuthService.cs` (+1 -0) 📝 `src/Core/Models/Request/TwoFactorEmailRequest.cs` (+1 -0) 📝 `src/Core/Models/Response/IdentityTwoFactorResponse.cs` (+2 -0) 📝 `src/Core/Services/AuthService.cs` (+4 -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 send 2FA code email on mobile client by updating it to receive and use new identity property SsoEmail2faSessionToken. ## 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--> Get new field from identity response and use it in the request for 2FA code email. ## Notes for Reviewers This should match the functionality of the clients PR here: https://github.com/bitwarden/clients/pull/5280 ## 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-26 12:39:27 -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#45369