github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-08 21:10:40 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #2642] [MERGED] [PM-2289] [PM-2293] TDE Login with device Admin Request #51917

New Issue
Closed
opened 2026-05-01 15:38:02 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-01 15:38:02 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2642
Author: @andrebispo5
Created: 7/24/2023
Status: ✅ Merged
Merged: 7/27/2023
Merged by: @andrebispo5

Base: feature/pm-1208-f3-options ← Head: auth/pm-2293-tde-auth-requests

📝 Commits (10+)

  • e9ac1e3 [PM-2297] Add DecryptUserKeyWithDeviceKey method
  • 9b6b2c0 [PM-2297] Add methods to DeviceTrustCryptoService update decryption options model
  • 5e1229f [PM-2297] Update account decryption options model
  • 0e45090 [PM-2297] fix TrustedDeviceOption and DeviceResponse model. Change StateService device key get set to have default user id
  • 4e886de [PM-2297] update navigation to decryption options
  • 848e620 [PM-2297] Add missing action navigations to iOS extensions
  • 80eec8d Merge branch 'feature/pm-1208-f3-options' into feature/pm-2297-f2-trusted
  • b7a8e0a Merge branch 'feature/pm-1208-f3-options' into feature/pm-2297-f2-trusted
  • 2465a28 Merge branch 'feature/pm-1208-f3-options' into feature/pm-2297-f2-trusted
  • f12cc69 [PM-2297] Fix trust device bug/typo

📊 Changes

15 files changed (+193 additions, -27 deletions)

View changed files

📝 src/App/Pages/Accounts/LockPageViewModel.cs (+3 -0)
📝 src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs (+72 -11)
📝 src/App/Pages/Accounts/TwoFactorPage.xaml.cs (+8 -0)
📝 src/App/Pages/Accounts/TwoFactorPageViewModel.cs (+26 -1)
📝 src/Core/Abstractions/IApiService.cs (+1 -1)
📝 src/Core/Abstractions/IAuthService.cs (+4 -1)
📝 src/Core/Abstractions/IStateService.cs (+2 -0)
📝 src/Core/Constants.cs (+1 -0)
➕ src/Core/Models/Domain/PendingAdminAuthRequest.cs (+10 -0)
📝 src/Core/Services/ApiService.cs (+2 -2)
📝 src/Core/Services/AuthService.cs (+41 -9)
📝 src/Core/Services/StateService.cs (+20 -2)
📝 src/iOS.Autofill/CredentialProviderViewController.cs (+1 -0)
📝 src/iOS.Extension/LoadingViewController.cs (+1 -0)
📝 src/iOS.ShareExtension/LoadingViewController.cs (+1 -0)

📄 Description

Merge After https://github.com/bitwarden/mobile/pull/2623

Type of change

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

Objective

Change logic on Passwordless login to work with TDE approve with device and request admin approval.

Code changes

- src/Core/Services/AuthService.cs:
Added different decryption methods for TDE options.

Screenshots

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/2642 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 7/24/2023 **Status:** ✅ Merged **Merged:** 7/27/2023 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `feature/pm-1208-f3-options` ← **Head:** `auth/pm-2293-tde-auth-requests` --- ### 📝 Commits (10+) - [`e9ac1e3`](https://github.com/bitwarden/android/commit/e9ac1e3b5bf46ce8cbdd30fbbb64d38ff0b71cd0) [PM-2297] Add DecryptUserKeyWithDeviceKey method - [`9b6b2c0`](https://github.com/bitwarden/android/commit/9b6b2c005e7f78f0eaf632c334ea22c61e26d078) [PM-2297] Add methods to DeviceTrustCryptoService update decryption options model - [`5e1229f`](https://github.com/bitwarden/android/commit/5e1229f943efb60feda275be229295b934248ea5) [PM-2297] Update account decryption options model - [`0e45090`](https://github.com/bitwarden/android/commit/0e450904c5dbbf90147970f7ca394303319b687d) [PM-2297] fix TrustedDeviceOption and DeviceResponse model. Change StateService device key get set to have default user id - [`4e886de`](https://github.com/bitwarden/android/commit/4e886de103e7645d88cc71c111b72dbeac4f5e9b) [PM-2297] update navigation to decryption options - [`848e620`](https://github.com/bitwarden/android/commit/848e62064740c5a8fd922367d7a119da172e57b1) [PM-2297] Add missing action navigations to iOS extensions - [`80eec8d`](https://github.com/bitwarden/android/commit/80eec8d81e3a1543304fd547b6634942228c201b) Merge branch 'feature/pm-1208-f3-options' into feature/pm-2297-f2-trusted - [`b7a8e0a`](https://github.com/bitwarden/android/commit/b7a8e0ab07ca504d15adf64751dd4a608a6f1e42) Merge branch 'feature/pm-1208-f3-options' into feature/pm-2297-f2-trusted - [`2465a28`](https://github.com/bitwarden/android/commit/2465a2866750d7a96bd1662413fff78a1b3b947a) Merge branch 'feature/pm-1208-f3-options' into feature/pm-2297-f2-trusted - [`f12cc69`](https://github.com/bitwarden/android/commit/f12cc69b60525b9ea5fb4a8c4f09d404ed3d619d) [PM-2297] Fix trust device bug/typo ### 📊 Changes **15 files changed** (+193 additions, -27 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Accounts/LockPageViewModel.cs` (+3 -0) 📝 `src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs` (+72 -11) 📝 `src/App/Pages/Accounts/TwoFactorPage.xaml.cs` (+8 -0) 📝 `src/App/Pages/Accounts/TwoFactorPageViewModel.cs` (+26 -1) 📝 `src/Core/Abstractions/IApiService.cs` (+1 -1) 📝 `src/Core/Abstractions/IAuthService.cs` (+4 -1) 📝 `src/Core/Abstractions/IStateService.cs` (+2 -0) 📝 `src/Core/Constants.cs` (+1 -0) ➕ `src/Core/Models/Domain/PendingAdminAuthRequest.cs` (+10 -0) 📝 `src/Core/Services/ApiService.cs` (+2 -2) 📝 `src/Core/Services/AuthService.cs` (+41 -9) 📝 `src/Core/Services/StateService.cs` (+20 -2) 📝 `src/iOS.Autofill/CredentialProviderViewController.cs` (+1 -0) 📝 `src/iOS.Extension/LoadingViewController.cs` (+1 -0) 📝 `src/iOS.ShareExtension/LoadingViewController.cs` (+1 -0) </details> ### 📄 Description Merge After https://github.com/bitwarden/mobile/pull/2623 ## Type of change - [ ] Bug fix - [X] 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--> Change logic on Passwordless login to work with TDE **approve with device** and **request admin approval**. ## 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--> **- src/Core/Services/AuthService.cs:** Added different decryption methods for TDE options. ## Screenshots <!--Required for any UI changes. Delete if not applicable--> ## 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-05-01 15:38:02 -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#51917
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?