From 811b97cef5cef45fea777f0d74a3bc392958683f Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 4 Dec 2024 17:04:08 +0100
Subject: [PATCH] [PM-15541] Hide ssh key filter behind feature flag (#12239)

* Hide ssh key filter behind feature flag

* Hide ssh keys in web client by featureflag

* Fix build
---
 .../components/vault/vault-filter.component.html |  1 +
 .../components/vault/vault-filter.component.ts   |  7 +++++++
 .../filters/type-filter.component.html           |  1 +
 .../filters/type-filter.component.ts             | 16 ++++++++++++++--
 .../components/vault-filter.component.ts         | 12 +++++++++---
 .../vault-filter/vault-filter.component.ts       |  3 +++
 6 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/apps/browser/src/vault/popup/components/vault/vault-filter.component.html b/apps/browser/src/vault/popup/components/vault/vault-filter.component.html
index f5c28b2beb..bf557f7460 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-filter.component.html
+++ b/apps/browser/src/vault/popup/components/vault/vault-filter.component.html
@@ -118,6 +118,7 @@
           type="button"
           class="box-content-row"
           appStopClick
+          *ngIf="isSshKeysEnabled"
           (click)="selectType(cipherType.SshKey)"
         >
           <div class="row-main">
diff --git a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts
index 448f85a8cb..d12b2fd801 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts
@@ -7,7 +7,9 @@ import { first, switchMap, takeUntil } from "rxjs/operators";
 import { CollectionView } from "@bitwarden/admin-console/common";
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
@@ -62,6 +64,8 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   selectedOrganization: string = null;
   showCollections = true;
 
+  isSshKeysEnabled = false;
+
   private loadedTimeout: number;
   private selectedTimeout: number;
   private preventSelected = false;
@@ -95,6 +99,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     private location: Location,
     private vaultFilterService: VaultFilterService,
     private vaultBrowserStateService: VaultBrowserStateService,
+    private configService: ConfigService,
   ) {
     this.noFolderListSize = 100;
   }
@@ -166,6 +171,8 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
       .subscribe((isSearchable) => {
         this.isSearchable = isSearchable;
       });
+
+    this.isSshKeysEnabled = await this.configService.getFeatureFlag(FeatureFlag.SSHKeyVaultItem);
   }
 
   ngOnDestroy() {
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
index c3dcd191df..55e10980ad 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
@@ -82,6 +82,7 @@
   <li
     class="filter-option"
     [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.SshKey }"
+    *ngIf="isSshKeysEnabled"
   >
     <span class="filter-buttons">
       <button
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
index beb3e8d9bb..e4a46ddbf7 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
@@ -1,9 +1,21 @@
-import { Component } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 
 import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/type-filter.component";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 @Component({
   selector: "app-type-filter",
   templateUrl: "type-filter.component.html",
 })
-export class TypeFilterComponent extends BaseTypeFilterComponent {}
+export class TypeFilterComponent extends BaseTypeFilterComponent implements OnInit {
+  isSshKeysEnabled = false;
+
+  constructor(private configService: ConfigService) {
+    super();
+  }
+
+  async ngOnInit(): Promise<void> {
+    this.isSshKeysEnabled = await this.configService.getFeatureFlag(FeatureFlag.SSHKeyVaultItem);
+  }
+}
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
index 2f8a429e42..3dff5f2e5a 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
@@ -6,6 +6,8 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
@@ -94,6 +96,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     protected platformUtilsService: PlatformUtilsService,
     protected billingApiService: BillingApiServiceAbstraction,
     protected dialogService: DialogService,
+    protected configService: ConfigService,
   ) {}
 
   async ngOnInit(): Promise<void> {
@@ -258,13 +261,16 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
         type: CipherType.SecureNote,
         icon: "bwi-sticky-note",
       },
-      {
+    ];
+
+    if (await this.configService.getFeatureFlag(FeatureFlag.SSHKeyVaultItem)) {
+      allTypeFilters.push({
         id: "sshKey",
         name: this.i18nService.t("typeSshKey"),
         type: CipherType.SshKey,
         icon: "bwi-key",
-      },
-    ];
+      });
+    }
 
     const typeFilterSection: VaultFilterSection = {
       data$: this.vaultFilterService.buildTypeTree(
diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts
index 211d234623..797fb0e74b 100644
--- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts
@@ -4,6 +4,7 @@ import { firstValueFrom, Subject } from "rxjs";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
@@ -42,6 +43,7 @@ export class VaultFilterComponent
     protected platformUtilsService: PlatformUtilsService,
     protected billingApiService: BillingApiServiceAbstraction,
     protected dialogService: DialogService,
+    protected configService: ConfigService,
   ) {
     super(
       vaultFilterService,
@@ -50,6 +52,7 @@ export class VaultFilterComponent
       platformUtilsService,
       billingApiService,
       dialogService,
+      configService,
     );
   }