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

[PR #2608] [MERGED] [PM-2287][PM-2289][PM-2293] Approval Options #9819

New Issue
Closed
opened 2026-04-11 02:29:42 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-11 02:29:42 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2608
Author: @andrebispo5
Created: 7/10/2023
Status: ✅ Merged
Merged: 7/12/2023
Merged by: @andrebispo5

Base: feature/pm-1208-f3-options ← Head: feature/pm-2293-admin-approval

📝 Commits (10+)

  • 9dc6a72 [PM-2293] Add AuthRequestType to PasswordlessLoginPage.
  • d2b6c73 [PM-2293] Add Actions to ApproveWithDevicePage
  • 109a846 [PM-2293] Change screen text based on AuthRequestType
  • 7bcf1c3 [PM-2293] Refactor AuthRequestType enum. Add label. Remove unnecessary actions.
  • fc300f3 Merge branch 'feature/pm-1208-f3-options' into feature/pm-2293-admin-approval
  • 8a59e17 Merge branch 'feature/pm-1208-f3-options' into feature/pm-2293-admin-approval
  • a15269b [PM-2293] Change boolean variable expression.
  • ce55750 [PM-2293] Trust device after admin request login.
  • 8a39923 code format
  • 2014d7f [PM-2287] Add trust device to master password unlock. Change trust device method. Remove email from SSO login page.

📊 Changes

22 files changed (+261 additions, -29 deletions)

View changed files

📝 src/App/Pages/Accounts/LockPageViewModel.cs (+3 -1)
📝 src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs (+31 -1)
📝 src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs (+24 -8)
📝 src/App/Pages/Accounts/LoginPage.xaml.cs (+2 -1)
📝 src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml (+5 -4)
📝 src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs (+3 -1)
📝 src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs (+85 -1)
📝 src/App/Resources/AppResources.Designer.cs (+36 -0)
📝 src/App/Resources/AppResources.resx (+12 -0)
📝 src/Core/Abstractions/IAuthService.cs (+1 -1)
📝 src/Core/Abstractions/IDeviceTrustCryptoService.cs (+3 -0)
📝 src/Core/Abstractions/IStateService.cs (+2 -0)
📝 src/Core/Constants.cs (+1 -0)
➕ src/Core/Enums/AuthRequestType.cs (+11 -0)
📝 src/Core/Models/Request/PasswordlessCreateLoginRequest.cs (+2 -6)
📝 src/Core/Services/AuthService.cs (+2 -2)
📝 src/Core/Services/DeviceTrustCryptoService.cs (+22 -0)
📝 src/Core/Services/StateService.cs (+10 -0)
📝 src/Core/Utilities/ServiceContainer.cs (+2 -0)
📝 src/iOS.Autofill/CredentialProviderViewController.cs (+1 -1)

...and 2 more files

📄 Description

Type of change

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

Objective

Create navigation and logic to trust a device on the 3 available device approval options: device, admin and master password.

Code changes

Change existing LoginPasswordlessRequestPage to work with both types of auth requests, admin and login with device, by accepting an AuthRequestType and passing it the the service. Also added to this page a check to perform a device trust on successful login.
Master password also has a check to make the device trusted on successful login.

Screenshots

New Screen:
image

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/2608 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 7/10/2023 **Status:** ✅ Merged **Merged:** 7/12/2023 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `feature/pm-1208-f3-options` ← **Head:** `feature/pm-2293-admin-approval` --- ### 📝 Commits (10+) - [`9dc6a72`](https://github.com/bitwarden/android/commit/9dc6a725cf08647c2810f635aa4ff6f2e3e5b413) [PM-2293] Add AuthRequestType to PasswordlessLoginPage. - [`d2b6c73`](https://github.com/bitwarden/android/commit/d2b6c73a7543ac9079559037c6fb5ebd701453fe) [PM-2293] Add Actions to ApproveWithDevicePage - [`109a846`](https://github.com/bitwarden/android/commit/109a84607a42d0c48faacb5a1050be1eda36bd64) [PM-2293] Change screen text based on AuthRequestType - [`7bcf1c3`](https://github.com/bitwarden/android/commit/7bcf1c377fbf615ffd2d92d33cb7c797ece6160b) [PM-2293] Refactor AuthRequestType enum. Add label. Remove unnecessary actions. - [`fc300f3`](https://github.com/bitwarden/android/commit/fc300f3e3fd2d791d740a4109aacd13b1b9c4a2c) Merge branch 'feature/pm-1208-f3-options' into feature/pm-2293-admin-approval - [`8a59e17`](https://github.com/bitwarden/android/commit/8a59e17fc995ffb1551900bb12689978fa03d274) Merge branch 'feature/pm-1208-f3-options' into feature/pm-2293-admin-approval - [`a15269b`](https://github.com/bitwarden/android/commit/a15269bafe2a70f1213428d95a137c47d7799ba7) [PM-2293] Change boolean variable expression. - [`ce55750`](https://github.com/bitwarden/android/commit/ce55750e60b0613b698fb3606cdedb932d518adb) [PM-2293] Trust device after admin request login. - [`8a39923`](https://github.com/bitwarden/android/commit/8a399235f459b27048cff947a8211c8eb4ca74a8) code format - [`2014d7f`](https://github.com/bitwarden/android/commit/2014d7f562aa86b42c4c1c953df736fbf0e213f5) [PM-2287] Add trust device to master password unlock. Change trust device method. Remove email from SSO login page. ### 📊 Changes **22 files changed** (+261 additions, -29 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Accounts/LockPageViewModel.cs` (+3 -1) 📝 `src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs` (+31 -1) 📝 `src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs` (+24 -8) 📝 `src/App/Pages/Accounts/LoginPage.xaml.cs` (+2 -1) 📝 `src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml` (+5 -4) 📝 `src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs` (+3 -1) 📝 `src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs` (+85 -1) 📝 `src/App/Resources/AppResources.Designer.cs` (+36 -0) 📝 `src/App/Resources/AppResources.resx` (+12 -0) 📝 `src/Core/Abstractions/IAuthService.cs` (+1 -1) 📝 `src/Core/Abstractions/IDeviceTrustCryptoService.cs` (+3 -0) 📝 `src/Core/Abstractions/IStateService.cs` (+2 -0) 📝 `src/Core/Constants.cs` (+1 -0) ➕ `src/Core/Enums/AuthRequestType.cs` (+11 -0) 📝 `src/Core/Models/Request/PasswordlessCreateLoginRequest.cs` (+2 -6) 📝 `src/Core/Services/AuthService.cs` (+2 -2) 📝 `src/Core/Services/DeviceTrustCryptoService.cs` (+22 -0) 📝 `src/Core/Services/StateService.cs` (+10 -0) 📝 `src/Core/Utilities/ServiceContainer.cs` (+2 -0) 📝 `src/iOS.Autofill/CredentialProviderViewController.cs` (+1 -1) _...and 2 more files_ </details> ### 📄 Description ## 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--> Create navigation and logic to trust a device on the 3 available device approval options: device, admin and master password. ## 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--> Change existing `LoginPasswordlessRequestPage` to work with both types of auth requests, admin and login with device, by accepting an AuthRequestType and passing it the the service. Also added to this page a check to perform a device trust on successful login. Master password also has a check to make the device trusted on successful login. ## Screenshots <!--Required for any UI changes. Delete if not applicable--> New Screen: <img width="436" alt="image" src="https://github.com/bitwarden/mobile/assets/4648522/788007a9-f8cc-441a-b807-2d04d1bf714a"> ## 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-11 02:29:42 -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#9819
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?