[PR #2632] [MERGED] [PM-3097] Fix passkeys can be moved to org on different types #83532

Closed
opened 2026-05-22 17:32:19 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

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

Base: PM-2378-handle-duplicate-passkey-on-moving-item-to-orgHead: vault/pm-3097/fix-passkeys-can-be-moved-on-different-types


📝 Commits (1)

  • 795aba8 PM-3097 Fix issue when moving cipher with passkey to an org where the uniqueness should be taken into consideration on different passkeys types and also the Username

📊 Changes

2 files changed (+9 additions, -4 deletions)

View changed files

📝 src/Core/Models/View/Fido2KeyView.cs (+3 -2)
📝 src/Core/Services/CipherService.cs (+6 -2)

📄 Description

Type of change

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

Objective

Handle Passkeys duplication when moved to org where a different type of passkey is present there with same RpID and Username.

Code changes

  • Fido2KeyView: Added uniqueness check method with RpID and Username
  • CipherService: Augmented the org's ciphers check on different passkey types (discoverable/non-discoverable)

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/2632 **Author:** [@fedemkr](https://github.com/fedemkr) **Created:** 7/20/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-3097/fix-passkeys-can-be-moved-on-different-types` --- ### 📝 Commits (1) - [`795aba8`](https://github.com/bitwarden/android/commit/795aba8ee2c9dbf36191370446020bb7e32655af) PM-3097 Fix issue when moving cipher with passkey to an org where the uniqueness should be taken into consideration on different passkeys types and also the Username ### 📊 Changes **2 files changed** (+9 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `src/Core/Models/View/Fido2KeyView.cs` (+3 -2) 📝 `src/Core/Services/CipherService.cs` (+6 -2) </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--> Handle Passkeys duplication when moved to org where a different type of passkey is present there with same RpID and Username. ## 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--> * **Fido2KeyView:** Added uniqueness check method with RpID and Username * **CipherService:** Augmented the org's ciphers check on different passkey types (discoverable/non-discoverable) ## 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-22 17:32:19 -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#83532