Skip to content

[PM-2658] Settings Reorganization feature#2695

Closed
fedemkr wants to merge 98 commits intomasterfrom
vault/pm-2658/feature-settings-reorg-tde-based
Closed

[PM-2658] Settings Reorganization feature#2695
fedemkr wants to merge 98 commits intomasterfrom
vault/pm-2658/feature-settings-reorg-tde-based

Conversation

@fedemkr
Copy link
Member

@fedemkr fedemkr commented Aug 16, 2023

Type of change

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

Objective

This is the merge of the Settings Reorganization feature branch into master, but this has been based on TDE feature branch to avoid merge conflicts when that branch gets merged into master.
Each individual PR on the branch has been reviewed.
For now the target of the branch will be the TDE feature branch so only the Settings Reorganization changes are shown.

Code changes

See individual PRs for context.

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

andrebispo5 and others added 30 commits May 17, 2023 17:46
# Conflicts:
#	src/App/Resources/AppResources.resx
#	src/Core/Abstractions/IApiService.cs
#	src/Core/Services/StateService.cs
)

* [PM-1379] add DeviceCryptoService with establish trust logic

* PM-1379 update api location and other minor refactors

* pm-1379 fix encoding

* update trusted device keys api call to Put

* [PM-1379] rename DeviceCryptoService to DeviceTrustCryptoService
- refactors to prevent side effects

* [PM-1379] rearrange methods in DeviceTrustCryptoService

* [PM-1379] rearrange methods in abstraction

* [PM-1379] deconstruct tuples

* [PM-1379] remove extra tasks
# Conflicts:
#	src/Core/Models/Response/DeviceResponse.cs
#	src/Core/Services/ApiService.cs
* [PM-2293] Add AuthRequestType to PasswordlessLoginPage.

* [PM-2293] Add Actions to ApproveWithDevicePage

* [PM-2293] Change screen text based on AuthRequestType

* [PM-2293] Refactor AuthRequestType enum. Add label. Remove unnecessary actions.

* [PM-2293] Change boolean variable expression.

* [PM-2293] Trust device after admin request login.

* code format

* [PM-2287] Add trust device to master password unlock. Change trust device method. Remove email from SSO login page.

* [PM-2293] Fix state variable get set.

* [PM-2287][PM-2289][PM-2293] Rename method
…#2610)

* [PM-1201] Change timeout actions available based on hasMasterPassword
- UserKey
- MasterKey
- UserKeyMasterKey (enc UserKey from User Table)
andrebispo5 and others added 21 commits August 8, 2023 14:15
* [PM-3319] Ignore admin auth request when choosing mp as decryption option.
* [PM-2289] Change header title based on auth request type
* [PM-3333] Check for purged admin auth requests

Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>

---------

Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>
* [PM-3341] Fix timeout action change when navigating
* [PM-3362] Fix auth request approval

* [PM-3362] Add new exception type
…f Key Connector (#2653)

* PM-3102 Added check to see if a user has master password set replacing previous usage of key connector.

* PM-3102 Fix formatting
…#2667)

* [PM-2713] add async to key connector service methods

* [PM-2713] rename ephemeral pin key

* add state for biometric key and accept UserKey instead of string for auto key

* Get UserKey from bio state on unlock

* PM-2713 Fix auto-migrating EncKeyEncrypted into MasterKey encrypted UserKey when requesting DecryptUserKeyWithMasterKeyAsync is called

* renaming bio key and fix build

* PM-3194 Fix biometrics button to be shown on upgrade when no UserKey is present yet

* revert removal of key connector service from auth service

* PM-2713 set user key when using KC

* clear enc user key after migration

* use is true for nullable bool

* PR feedback, refactor kc service

---------

Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>
* [PM-3303] Add condition to biometric unlock
* [PM-3381] Check for vault lock on 2FA screen

* [PM-3381] Move logic to ViewModel

* [PM-3381] Fix null vm error
* [PM-3381] Update login flows

* [PM-3381] Remove _authingWithSso parameter
…ging in with TDE. Also refactor code to be more maintainable (#2687)
* set activeUserId to null when logging in a new account
- Also stop the user key from being set in inactive accounts

* get token for login with device if approving device doesn't have master key

* add comment

* simplify logic

* check for route instead of using isAuthenticated
- we don't clear the user id when logging in new account
- this means we can't trust the state service, so we have to base our logic off the route in login with device

* use authenticated auth request for tde login with device

* [PM-3394] Add authingWithSso parameter to LoginPasswordlessRequestPage.

* pr feedback

* [PM-3394] Refactor condition

Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>

---------

Co-authored-by: André Bispo <abispo@bitwarden.com>
Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>
@fedemkr fedemkr added the hold do not merge yet label Aug 16, 2023
jlf0dev and others added 3 commits August 16, 2023 19:38
* [PM-3462] Handle force password reset on mobile with TDE

* [PM-3462] update references to refactored crypto method
- fix kc bug, we were sending private key instead of user key to server
- rename kc service method to be correct

* [PM-3462] Update TwoFactorPage login logic

* [PM-3462] Added pending admin request check to TwoFactorPage

* [PM-3462] Added new exception types for null keys

---------

Co-authored-by: André Bispo <abispo@bitwarden.com>
* PM-2658 Started settings reorganization (settings main + vault + about)

* PM-2658 Added settings controls based on templates and implemented OtherSettingsPage

* PM-2658 Fix format
@bitwarden-bot
Copy link

bitwarden-bot commented Aug 16, 2023

Logo
Checkmarx One – Scan Summary & Details002f2201-c85c-4f08-b70a-efb28f65e18b

No New Or Fixed Issues Found

@fedemkr fedemkr closed this Aug 17, 2023
@fedemkr fedemkr deleted the vault/pm-2658/feature-settings-reorg-tde-based branch September 27, 2023 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hold do not merge yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants