From 35770b9a00f0eef58b735d05795dc78bfc604385 Mon Sep 17 00:00:00 2001
From: gbubemismith <gsmithwalter@gmail.com>
Date: Tue, 20 Jun 2023 22:51:29 -0400
Subject: [PATCH 1/4] Allowed discoverable Fido2key type to be displayed
 alongside Login type

---
 .../vault-items/vault-cipher-row.component.html    | 14 ++++++++++++++
 .../vault-items/vault-items.component.html         |  5 +----
 .../vault-items/vault-items.component.ts           |  8 ++++++++
 .../vault-filter/shared/models/filter-function.ts  |  7 ++++++-
 .../shared/models/vault-filter.model.ts            |  8 +++++++-
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index 664b3bbc380..15440024153 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -103,6 +103,20 @@
         {{ "launch" | i18n }}
       </a>
     </ng-container>
+    <!-- Fido2Key -->
+    <ng-container *ngIf="cipher.type === CipherType.Fido2Key && !cipher.isDeleted">
+      <a
+        bitMenuItem
+        *ngIf="cipher.fido2Key.canLaunch"
+        type="button"
+        [href]="cipher.fido2Key.launchUri"
+        target="_blank"
+      >
+        <i class="bwi bwi-fw bwi-share-square" aria-hidden="true"></i>
+        {{ "launch" | i18n }}
+      </a>
+    </ng-container>
+
     <button bitMenuItem type="button" (click)="attachments()">
       <i class="bwi bwi-fw bwi-paperclip" aria-hidden="true"></i>
       {{ "attachments" | i18n }}
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index 7179a0dfc83..12872ab3b00 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -89,10 +89,7 @@
           [showGroups]="showGroups"
           [showPremiumFeatures]="showPremiumFeatures"
           [useEvents]="useEvents"
-          [cloneable]="
-            (item.cipher.organizationId && cloneableOrganizationCiphers) ||
-            item.cipher.organizationId == null
-          "
+          [cloneable]="canClone(item)"
           [organizations]="allOrganizations"
           [collections]="allCollections"
           [checked]="selection.isSelected(item)"
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index 8c9ad1ac065..2263229d577 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -164,6 +164,14 @@ export class VaultItemsComponent {
     });
   }
 
+  protected canClone(vaultItem: VaultItem) {
+    return (
+      ((vaultItem.cipher.organizationId && this.cloneableOrganizationCiphers) ||
+        vaultItem.cipher.organizationId == null) &&
+      vaultItem.cipher.fido2Key == null
+    );
+  }
+
   private refreshItems() {
     const collections: VaultItem[] = this.collections.map((collection) => ({ collection }));
     const ciphers: VaultItem[] = this.ciphers.map((cipher) => ({ cipher }));
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts
index c8d21e314d6..285e48ef151 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts
@@ -16,7 +16,12 @@ export function createFilterFunction(filter: RoutedVaultFilterModel): FilterFunc
     if (filter.type === "identity" && cipher.type !== CipherType.Identity) {
       return false;
     }
-    if (filter.type === "login" && cipher.type !== CipherType.Login) {
+    // Login and Fido2Key are both login types
+    if (
+      filter.type === "login" &&
+      cipher.type !== CipherType.Login &&
+      cipher.type !== CipherType.Fido2Key
+    ) {
       return false;
     }
     if (filter.type === "note" && cipher.type !== CipherType.SecureNote) {
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
index 45b06232da2..1280e3d94b0 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
@@ -120,7 +120,13 @@ export class VaultFilter {
         cipherPassesFilter = cipher.isDeleted;
       }
       if (this.cipherType && cipherPassesFilter) {
-        cipherPassesFilter = cipher.type === this.cipherType;
+        //Fido2Key's should also be included in the Login type
+        if (this.cipherType === CipherType.Login) {
+          cipherPassesFilter =
+            cipher.type === this.cipherType || cipher.type === CipherType.Fido2Key;
+        } else {
+          cipherPassesFilter = cipher.type === this.cipherType;
+        }
       }
       if (this.selectedFolderNode) {
         // No folder

From 0a49227aa2fc0e260acc779a065a7e08fec07738 Mon Sep 17 00:00:00 2001
From: gbubemismith <gsmithwalter@gmail.com>
Date: Wed, 21 Jun 2023 12:26:32 -0400
Subject: [PATCH 2/4] Added view during edit for discoverable and
 non-discoverable passkeys

---
 .../individual-vault/add-edit.component.html  | 101 ++++++++++++++++++
 .../individual-vault/add-edit.component.ts    |   3 +-
 apps/web/src/locales/en/messages.json         |  15 +++
 3 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.html b/apps/web/src/app/vault/individual-vault/add-edit.component.html
index a23332a2f96..1cd596dcaa8 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.html
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.html
@@ -191,6 +191,24 @@ <h1 class="modal-title" id="cipherAddEditTitle">{{ title }}</h1>
               </button>
             </div>
           </div>
+          <ng-container *ngIf="cipher.login.fido2Key"></ng-container>
+          <div class="row">
+            <div class="col-6 form-group">
+              <label for="loginFido2key">{{ "typePasskey" | i18n }}</label>
+              <div class="input-group">
+                <input
+                  id="loginFido2key"
+                  class="form-control"
+                  type="text"
+                  name="Login.Fido2key"
+                  [value]="'passkeyTwoStepLogin' | i18n"
+                  appInputVerbatim
+                  [disabled]="true"
+                  [readonly]="true"
+                />
+              </div>
+            </div>
+          </div>
           <div class="tw-flex tw-flex-row">
             <div class="tw-mb-4 tw-w-1/2">
               <label for="loginTotp">{{ "authenticatorKeyTotp" | i18n }}</label>
@@ -813,6 +831,89 @@ <h1 class="modal-title" id="cipherAddEditTitle">{{ title }}</h1>
             </div>
           </div>
         </ng-container>
+        <!-- Fido2Key -->
+        <ng-container *ngIf="cipher.type === cipherType.Fido2Key">
+          <div class="row">
+            <div class="col-6 form-group">
+              <label for="fido2keyUsername">{{ "username" | i18n }}</label>
+              <div class="input-group">
+                <input
+                  id="fido2keyUsername"
+                  class="form-control"
+                  type="text"
+                  name="Fido2key.Username"
+                  [(ngModel)]="cipher.fido2Key.userName"
+                  appInputVerbatim
+                  [disabled]="cipher.isDeleted || viewOnly"
+                  [readonly]="!cipher.edit && editMode"
+                />
+                <div class="input-group-append" *ngIf="!cipher.isDeleted">
+                  <button
+                    type="button"
+                    class="btn btn-outline-secondary"
+                    appA11yTitle="{{ 'copyUsername' | i18n }}"
+                    (click)="copy(cipher.fido2Key.userName, 'username', 'Username')"
+                  >
+                    <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
+                  </button>
+                </div>
+              </div>
+            </div>
+
+            <div class="col-6 form-group">
+              <label for="fido2keyCreationDate">{{ "typePasskey" | i18n }}</label>
+              <div class="input-group">
+                <input
+                  id="fido2keyCreationDate"
+                  class="form-control"
+                  type="text"
+                  name="Fido2key.CreationDate"
+                  [value]="('dateCreated' | i18n) + ' ' + (cipher.creationDate | date : 'MM/dd/y')"
+                  appInputVerbatim
+                  [disabled]="true"
+                  [readonly]="true"
+                />
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-12 form-group">
+              <label for="fido2keyApplication">{{ "application" | i18n }}</label>
+              <div class="input-group">
+                <input
+                  class="form-control"
+                  id="fido2keyApplication"
+                  type="text"
+                  name="Fido2key.Application"
+                  [value]="cipher.fido2Key.rpId"
+                  [disabled]="true"
+                  [readonly]="true"
+                  appInputVerbatim
+                />
+                <div class="input-group-append">
+                  <button
+                    type="button"
+                    class="btn btn-outline-secondary"
+                    appA11yTitle="{{ 'launch' | i18n }}"
+                    (click)="launch(cipher.fido2Key)"
+                  >
+                    <i class="bwi bwi-lg bwi-share-square" aria-hidden="true"></i>
+                  </button>
+                  <button
+                    type="button"
+                    class="btn btn-outline-secondary"
+                    appA11yTitle="{{ 'copyUri' | i18n }}"
+                    (click)="copy(cipher.fido2Key.launchUri, 'uri', 'URI')"
+                  >
+                    <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
+                  </button>
+                </div>
+              </div>
+              <small class="form-text text-muted">{{ "passkeyEditInformation" | i18n }}</small>
+            </div>
+          </div>
+        </ng-container>
         <div class="form-group">
           <label for="notes">{{ "notes" | i18n }}</label>
           <textarea
diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
index 460942c3046..575c2fa1ef3 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
@@ -20,6 +20,7 @@ import { CollectionService } from "@bitwarden/common/vault/abstractions/collecti
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { Fido2KeyView } from "@bitwarden/common/vault/models/view/fido2-key.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 
 @Component({
@@ -131,7 +132,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
     }
   }
 
-  launch(uri: LoginUriView) {
+  launch(uri: LoginUriView | Fido2KeyView) {
     if (!uri.canLaunch) {
       return;
     }
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 9224bfe8d11..d94ef0609db 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -6844,5 +6844,20 @@
   },
   "updatedTempPassword": {
     "message": "User updated a password issued through account recovery."
+  },
+  "typePasskey": {
+    "message": "Passkey"
+  },
+  "application": {
+    "message": "Application"
+  },
+  "passkeyEditInformation": {
+    "message": "You cannot edit passkey application because it would invalidate the passkey."
+  },
+  "duplicatePasskey": {
+    "message": "A passkey with this ID already exists in this organization."
+  },
+  "passkeyTwoStepLogin": {
+    "message": "Available for two-step login"
   }
 }

From b6ebc85bbe2ee0bd75101d500ea14543aea64a07 Mon Sep 17 00:00:00 2001
From: gbubemismith <gsmithwalter@gmail.com>
Date: Mon, 26 Jun 2023 14:40:58 -0400
Subject: [PATCH 3/4] Fixed PR comments, added relvant tests to domain changes

---
 .../individual-vault/add-edit.component.html  | 12 +++++-----
 .../individual-vault/add-edit.component.ts    |  6 ++---
 .../shared/models/filter-function.spec.ts     | 11 ++++++++++
 .../shared/models/vault-filter.model.spec.ts  | 22 +++++++++++++++++++
 .../common/src/vault/interfaces/launchable.ts |  4 ++++
 5 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 libs/common/src/vault/interfaces/launchable.ts

diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.html b/apps/web/src/app/vault/individual-vault/add-edit.component.html
index 1cd596dcaa8..cc86418b086 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.html
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.html
@@ -203,8 +203,8 @@ <h1 class="modal-title" id="cipherAddEditTitle">{{ title }}</h1>
                   name="Login.Fido2key"
                   [value]="'passkeyTwoStepLogin' | i18n"
                   appInputVerbatim
-                  [disabled]="true"
-                  [readonly]="true"
+                  disabled
+                  readonly
                 />
               </div>
             </div>
@@ -870,8 +870,8 @@ <h1 class="modal-title" id="cipherAddEditTitle">{{ title }}</h1>
                   name="Fido2key.CreationDate"
                   [value]="('dateCreated' | i18n) + ' ' + (cipher.creationDate | date : 'MM/dd/y')"
                   appInputVerbatim
-                  [disabled]="true"
-                  [readonly]="true"
+                  disabled
+                  readonly
                 />
               </div>
             </div>
@@ -887,8 +887,8 @@ <h1 class="modal-title" id="cipherAddEditTitle">{{ title }}</h1>
                   type="text"
                   name="Fido2key.Application"
                   [value]="cipher.fido2Key.rpId"
-                  [disabled]="true"
-                  [readonly]="true"
+                  disabled
+                  readonly
                   appInputVerbatim
                 />
                 <div class="input-group-append">
diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
index 575c2fa1ef3..b339ac36401 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
@@ -20,8 +20,8 @@ import { CollectionService } from "@bitwarden/common/vault/abstractions/collecti
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
-import { Fido2KeyView } from "@bitwarden/common/vault/models/view/fido2-key.view";
-import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
+
+import { Launchable } from "./../../../../../../libs/common/src/vault/interfaces/launchable";
 
 @Component({
   selector: "app-vault-add-edit",
@@ -132,7 +132,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
     }
   }
 
-  launch(uri: LoginUriView | Fido2KeyView) {
+  launch(uri: Launchable) {
     if (!uri.canLaunch) {
       return;
     }
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts
index adb0d5d4f80..b9cec8ee6c3 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts
@@ -211,6 +211,17 @@ describe("createFilter", () => {
       expect(result).toBe(true);
     });
   });
+
+  describe("given a cipher with Fido2Key type", () => {
+    it("should return true when filter is login", () => {
+      const cipher = createCipher({ type: CipherType.Fido2Key });
+      const filterFunction = createFilterFunction({ type: "login" });
+
+      const result = filterFunction(cipher);
+
+      expect(result).toBe(true);
+    });
+  });
 });
 
 function createCipher(options: Partial<CipherView> = {}) {
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts
index a754f0151bb..b7bb4d4055b 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts
@@ -42,6 +42,15 @@ describe("VaultFilter", () => {
       },
       null
     );
+    const loginCiphersFilter = new TreeNode<CipherTypeFilter>(
+      {
+        id: "login",
+        name: "login",
+        type: CipherType.Login,
+        icon: "bwi-globe",
+      },
+      null
+    );
     const trashFilter = new TreeNode<CipherTypeFilter>(
       {
         id: "trash",
@@ -279,6 +288,19 @@ describe("VaultFilter", () => {
         expect(result).toBe(true);
       });
     });
+
+    describe("given a cipher with Fido2Key type", () => {
+      it("should return true when filter is login", () => {
+        const cipher = createCipher({ type: CipherType.Fido2Key });
+        const filterFunction = createFilterFunction({
+          selectedCipherTypeNode: loginCiphersFilter,
+        });
+
+        const result = filterFunction(cipher);
+
+        expect(result).toBe(true);
+      });
+    });
   });
 });
 
diff --git a/libs/common/src/vault/interfaces/launchable.ts b/libs/common/src/vault/interfaces/launchable.ts
new file mode 100644
index 00000000000..512fc15419b
--- /dev/null
+++ b/libs/common/src/vault/interfaces/launchable.ts
@@ -0,0 +1,4 @@
+export interface Launchable {
+  launchUri: string;
+  canLaunch: boolean;
+}

From edac07c66c446d975167b0e1dc85b9248e533286 Mon Sep 17 00:00:00 2001
From: gbubemismith <gsmithwalter@gmail.com>
Date: Tue, 27 Jun 2023 08:10:55 -0400
Subject: [PATCH 4/4] Fixed imports and updated the launch function to use the
 Launchable interface

---
 .../web/src/app/vault/individual-vault/add-edit.component.ts | 3 +--
 libs/angular/src/vault/components/view.component.ts          | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
index b339ac36401..8def52774ba 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
@@ -20,8 +20,7 @@ import { CollectionService } from "@bitwarden/common/vault/abstractions/collecti
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
-
-import { Launchable } from "./../../../../../../libs/common/src/vault/interfaces/launchable";
+import { Launchable } from "@bitwarden/common/vault/interfaces/launchable";
 
 @Component({
   selector: "app-vault-add-edit",
diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts
index 15182a744e3..a122fea4c72 100644
--- a/libs/angular/src/vault/components/view.component.ts
+++ b/libs/angular/src/vault/components/view.component.ts
@@ -30,11 +30,10 @@ import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folde
 import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { Launchable } from "@bitwarden/common/vault/interfaces/launchable";
 import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { Fido2KeyView } from "@bitwarden/common/vault/models/view/fido2-key.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
-import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 
 import { DialogServiceAbstraction, SimpleDialogType } from "../../services/dialog";
 
@@ -305,7 +304,7 @@ export class ViewComponent implements OnDestroy, OnInit {
     }
   }
 
-  launch(uri: LoginUriView | Fido2KeyView, cipherId?: string) {
+  launch(uri: Launchable, cipherId?: string) {
     if (!uri.canLaunch) {
       return;
     }