[PR #2637] [MERGED] [PM-3096] Fix non discoverable passkey removal on moving to org #16450

Closed
opened 2026-04-15 02:15:31 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2637
Author: @fedemkr
Created: 7/21/2023
Status: Merged
Merged: 7/21/2023
Merged by: @fedemkr

Base: PM-2378-handle-duplicate-passkey-on-moving-item-to-orgHead: vault/pm-3096/fix-non-discoverable-passkey-removal-on-moving-to-org


📝 Commits (1)

  • c1cafac PM-3096 Fix non-discoverable passkey to be taken into account when encrypting a cipher which was causing the passkey to be removed when moving to an org

📊 Changes

2 files changed (+24 additions, -54 deletions)

View changed files

📝 src/Core/Models/Domain/Fido2Key.cs (+18 -41)
📝 src/Core/Services/CipherService.cs (+6 -13)

📄 Description

Type of change

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

Objective

Fix when moving to org the non-discoverable passkey shouldn't be removed.

Code changes

  • Fido2Key: Added EncryptableProperties to improve code reuse.
  • CipherService: Replaced hashSet of properties with the new one in the Fido2Key and also added the non-discoverable passkey (cipher.Login.Fido2Key) to be taken into account when encrypting a cipher.

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/2637 **Author:** [@fedemkr](https://github.com/fedemkr) **Created:** 7/21/2023 **Status:** ✅ Merged **Merged:** 7/21/2023 **Merged by:** [@fedemkr](https://github.com/fedemkr) **Base:** `PM-2378-handle-duplicate-passkey-on-moving-item-to-org` ← **Head:** `vault/pm-3096/fix-non-discoverable-passkey-removal-on-moving-to-org` --- ### 📝 Commits (1) - [`c1cafac`](https://github.com/bitwarden/android/commit/c1cafac274a82cdc56a9ba8f1822efb5ef3be214) PM-3096 Fix non-discoverable passkey to be taken into account when encrypting a cipher which was causing the passkey to be removed when moving to an org ### 📊 Changes **2 files changed** (+24 additions, -54 deletions) <details> <summary>View changed files</summary> 📝 `src/Core/Models/Domain/Fido2Key.cs` (+18 -41) 📝 `src/Core/Services/CipherService.cs` (+6 -13) </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 when moving to org the non-discoverable passkey shouldn't be removed. ## 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--> * **Fido2Key:** Added `EncryptableProperties` to improve code reuse. * **CipherService:** Replaced hashSet of properties with the new one in the `Fido2Key` and also added the non-discoverable passkey (`cipher.Login.Fido2Key`) to be taken into account when encrypting a cipher. ## 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-15 02:15:31 -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#16450