[PR #2774] [MERGED] [PM-3811] Passkeys unification #29809

Closed
opened 2026-04-18 13:42:54 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2774
Author: @fedemkr
Created: 9/14/2023
Status: Merged
Merged: 9/22/2023
Merged by: @fedemkr

Base: masterHead: vault/pm-3811/passkeys-view-unification


📝 Commits (7)

  • 48e3803 PM-3811 Unified passkeys view and moved both inside Login as an array of FIdo2Key
  • 8642074 PM-3811 Passkeys unification => updated cipher details view an helpers
  • 044f752 Merge branch 'master' into vault/pm-3811/passkeys-view-unification
  • 34fac25 PM-3811 Updated passkeys creation date time format
  • 9f8fdf6 Merge branch 'master' into vault/pm-3811/passkeys-view-unification
  • 17bc451 Merge branch 'master' into vault/pm-3811/passkeys-view-unification
  • 1f5fc95 Merge branch 'master' into vault/pm-3811/passkeys-view-unification

📊 Changes

28 files changed (+4280 additions, -1931 deletions)

View changed files

📝 src/App/Pages/Vault/BaseCipherViewModel.cs (+1 -1)
📝 src/App/Pages/Vault/CipherAddEditPage.xaml (+2 -34)
📝 src/App/Pages/Vault/CipherAddEditPageViewModel.cs (+2 -3)
📝 src/App/Pages/Vault/CipherDetailsPage.xaml (+3 -61)
📝 src/App/Pages/Vault/CipherDetailsPageViewModel.cs (+3 -15)
📝 src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs (+0 -6)
📝 src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs (+2 -4)
📝 src/App/Resources/AppResources.Designer.cs (+4205 -1680)
📝 src/App/Resources/AppResources.resx (+5 -1)
📝 src/App/Utilities/AppHelpers.cs (+1 -12)
📝 src/App/Utilities/IconGlyphExtensions.cs (+0 -2)
📝 src/App/Utilities/IconImageConverter.cs (+4 -26)
📝 src/Core/Enums/CipherType.cs (+1 -2)
📝 src/Core/Models/Api/Fido2KeyApi.cs (+4 -3)
📝 src/Core/Models/Api/LoginApi.cs (+1 -1)
📝 src/Core/Models/Data/CipherData.cs (+0 -4)
📝 src/Core/Models/Data/Fido2KeyData.cs (+4 -2)
📝 src/Core/Models/Data/LoginData.cs (+2 -2)
📝 src/Core/Models/Domain/Cipher.cs (+1 -11)
📝 src/Core/Models/Domain/Fido2Key.cs (+4 -2)

...and 8 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

Unify both passkeys to be displayed inside a Login cipher, also change the Login Fido2Key to be an array where the passkeys will be stored.

Code changes

  • Cipher/Data/Request/Response/View: Removed Fido2Key and added some helpers given that the passkeys will be stored inside the Login item.
  • Login/Data/Api: Changed Fido2Key to be an array and added some helpers inside to handle it easier. Also added MainFido2Key given that for the moment only one Fido2Key will exist in the array.
  • CipherAddEditPage/ViewModel / CipherDetailsPage/ViewModel: Unified to only display CreationDate as Passkey data.
  • CipherDetailsPageViewModel: Updated can clone logic.
  • Others: Updated logic for new array approach.

Screenshots

Cipher details Light

Cipher details Light

Cipher details Dark

Cipher details Dark

Cipher edition Light

Cipher edition Light

Cipher edition Dark

Cipher edition Dark

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/2774 **Author:** [@fedemkr](https://github.com/fedemkr) **Created:** 9/14/2023 **Status:** ✅ Merged **Merged:** 9/22/2023 **Merged by:** [@fedemkr](https://github.com/fedemkr) **Base:** `master` ← **Head:** `vault/pm-3811/passkeys-view-unification` --- ### 📝 Commits (7) - [`48e3803`](https://github.com/bitwarden/android/commit/48e380320b68727f078a931b487919b3c77fd8c0) PM-3811 Unified passkeys view and moved both inside Login as an array of FIdo2Key - [`8642074`](https://github.com/bitwarden/android/commit/86420740b46a08c081ce1f36855f222c84dd3a98) PM-3811 Passkeys unification => updated cipher details view an helpers - [`044f752`](https://github.com/bitwarden/android/commit/044f7521a37ed5f1f89c0c3cd4e4458ba14f29a6) Merge branch 'master' into vault/pm-3811/passkeys-view-unification - [`34fac25`](https://github.com/bitwarden/android/commit/34fac25714407fecb9044f1b1d656291cdf7c01f) PM-3811 Updated passkeys creation date time format - [`9f8fdf6`](https://github.com/bitwarden/android/commit/9f8fdf6eaca3b44552587c851d438a325ea0c01d) Merge branch 'master' into vault/pm-3811/passkeys-view-unification - [`17bc451`](https://github.com/bitwarden/android/commit/17bc451c95ee80154b74dc44f7f47d2b5d12a5bd) Merge branch 'master' into vault/pm-3811/passkeys-view-unification - [`1f5fc95`](https://github.com/bitwarden/android/commit/1f5fc95ee4b6a42bb75c15658591368d50acb13b) Merge branch 'master' into vault/pm-3811/passkeys-view-unification ### 📊 Changes **28 files changed** (+4280 additions, -1931 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Vault/BaseCipherViewModel.cs` (+1 -1) 📝 `src/App/Pages/Vault/CipherAddEditPage.xaml` (+2 -34) 📝 `src/App/Pages/Vault/CipherAddEditPageViewModel.cs` (+2 -3) 📝 `src/App/Pages/Vault/CipherDetailsPage.xaml` (+3 -61) 📝 `src/App/Pages/Vault/CipherDetailsPageViewModel.cs` (+3 -15) 📝 `src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs` (+0 -6) 📝 `src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs` (+2 -4) 📝 `src/App/Resources/AppResources.Designer.cs` (+4205 -1680) 📝 `src/App/Resources/AppResources.resx` (+5 -1) 📝 `src/App/Utilities/AppHelpers.cs` (+1 -12) 📝 `src/App/Utilities/IconGlyphExtensions.cs` (+0 -2) 📝 `src/App/Utilities/IconImageConverter.cs` (+4 -26) 📝 `src/Core/Enums/CipherType.cs` (+1 -2) 📝 `src/Core/Models/Api/Fido2KeyApi.cs` (+4 -3) 📝 `src/Core/Models/Api/LoginApi.cs` (+1 -1) 📝 `src/Core/Models/Data/CipherData.cs` (+0 -4) 📝 `src/Core/Models/Data/Fido2KeyData.cs` (+4 -2) 📝 `src/Core/Models/Data/LoginData.cs` (+2 -2) 📝 `src/Core/Models/Domain/Cipher.cs` (+1 -11) 📝 `src/Core/Models/Domain/Fido2Key.cs` (+4 -2) _...and 8 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--> Unify both passkeys to be displayed inside a Login cipher, also change the Login `Fido2Key` to be an array where the passkeys will be stored. ## 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--> * **Cipher/Data/Request/Response/View:** Removed `Fido2Key` and added some helpers given that the passkeys will be stored inside the `Login` item. * **Login/Data/Api:** Changed `Fido2Key` to be an array and added some helpers inside to handle it easier. Also added `MainFido2Key` given that for the moment only one `Fido2Key` will exist in the array. * **CipherAddEditPage/ViewModel / CipherDetailsPage/ViewModel:** Unified to only display `CreationDate` as `Passkey` data. * **CipherDetailsPageViewModel:** Updated can clone logic. * **Others:** Updated logic for new array approach. ## Screenshots <!--Required for any UI changes. Delete if not applicable--> ### Cipher details Light <img width="314" alt="Cipher details Light" src="https://github.com/bitwarden/mobile/assets/15682323/6492bd57-0958-4cb9-9282-a5b806e0bcdb"> ### Cipher details Dark <img width="314" alt="Cipher details Dark" src="https://github.com/bitwarden/mobile/assets/15682323/9930a661-e971-4be3-89fe-db63d109016f"> ### Cipher edition Light <img width="314" alt="Cipher edition Light" src="https://github.com/bitwarden/mobile/assets/15682323/2ee389ce-27d6-4b0d-9929-aa21b5aae91b"> ### Cipher edition Dark <img width="314" alt="Cipher edition Dark" src="https://github.com/bitwarden/mobile/assets/15682323/cb3a3d8b-fd06-47a8-949b-58305364f2dc"> ## 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-18 13:42:54 -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#29809