From f03dabb6d6a643d113da5f6e8ad888eb213ccdae Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Thu, 11 Jul 2024 08:47:49 +1000
Subject: [PATCH] Remove BulkDeviceApproval feature flag (#9931)

---
 .../device-approval/device-approval.program.ts              | 6 ------
 .../manage/device-approvals/device-approvals.component.html | 1 -
 .../manage/device-approvals/device-approvals.component.ts   | 4 ----
 libs/common/src/enums/feature-flag.enum.ts                  | 2 --
 4 files changed, 13 deletions(-)

diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/device-approval.program.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/device-approval.program.ts
index 181640a5f8..028eceffa9 100644
--- a/bitwarden_license/bit-cli/src/admin-console/device-approval/device-approval.program.ts
+++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/device-approval.program.ts
@@ -1,7 +1,6 @@
 import { program, Command } from "commander";
 
 import { BaseProgram } from "@bitwarden/cli/base-program";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
 import { ServiceContainer } from "../../service-container";
 
@@ -41,7 +40,6 @@ export class DeviceApprovalProgram extends BaseProgram {
       .description("List all pending requests for an organization")
       .requiredOption("--organizationid <organizationid>", "The organization id (required)")
       .action(async (options: Options) => {
-        await this.exitIfFeatureFlagDisabled(FeatureFlag.BulkDeviceApproval);
         await this.exitIfLocked();
 
         const cmd = ListCommand.create(this.serviceContainer);
@@ -56,7 +54,6 @@ export class DeviceApprovalProgram extends BaseProgram {
       .requiredOption("--organizationid <organizationid>", "The organization id (required)")
       .description("Approve a pending request")
       .action(async (id: string, options: Options) => {
-        await this.exitIfFeatureFlagDisabled(FeatureFlag.BulkDeviceApproval);
         await this.exitIfLocked();
 
         const cmd = ApproveCommand.create(this.serviceContainer);
@@ -70,7 +67,6 @@ export class DeviceApprovalProgram extends BaseProgram {
       .description("Approve all pending requests for an organization")
       .requiredOption("--organizationid <organizationid>", "The organization id (required)")
       .action(async (options: Options) => {
-        await this.exitIfFeatureFlagDisabled(FeatureFlag.BulkDeviceApproval);
         await this.exitIfLocked();
 
         const cmd = ApproveAllCommand.create(this.serviceContainer);
@@ -85,7 +81,6 @@ export class DeviceApprovalProgram extends BaseProgram {
       .requiredOption("--organizationid <organizationid>", "The organization id (required)")
       .description("Deny a pending request")
       .action(async (id: string, options: Options) => {
-        await this.exitIfFeatureFlagDisabled(FeatureFlag.BulkDeviceApproval);
         await this.exitIfLocked();
 
         const cmd = DenyCommand.create(this.serviceContainer);
@@ -99,7 +94,6 @@ export class DeviceApprovalProgram extends BaseProgram {
       .description("Deny all pending requests for an organization")
       .requiredOption("--organizationid <organizationid>", "The organization id (required)")
       .action(async (options: Options) => {
-        await this.exitIfFeatureFlagDisabled(FeatureFlag.BulkDeviceApproval);
         await this.exitIfLocked();
 
         const cmd = DenyAllCommand.create(this.serviceContainer);
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html
index cfc6538dbd..7723324781 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html
@@ -29,7 +29,6 @@
         ></button>
         <bit-menu #headerMenu>
           <button
-            *ngIf="bulkDeviceApprovalEnabled$ | async"
             type="button"
             bitMenuItem
             (click)="approveAllRequests()"
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
index ba4b969ff5..5f00014252 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
@@ -8,7 +8,6 @@ import { OrganizationAuthRequestService } from "@bitwarden/bit-common/admin-cons
 import { PendingAuthRequestView } from "@bitwarden/bit-common/admin-console/auth-requests/pending-auth-request.view";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -43,9 +42,6 @@ export class DeviceApprovalsComponent implements OnInit, OnDestroy {
   actionInProgress = false;
 
   protected readonly Devices = Devices;
-  protected bulkDeviceApprovalEnabled$ = this.configService.getFeatureFlag$(
-    FeatureFlag.BulkDeviceApproval,
-  );
 
   private destroy$ = new Subject<void>();
   private refresh$ = new BehaviorSubject<void>(null);
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 7c0327f9ff..de387480f7 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -16,7 +16,6 @@ export enum FeatureFlag {
   ExtensionRefresh = "extension-refresh",
   RestrictProviderAccess = "restrict-provider-access",
   UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection",
-  BulkDeviceApproval = "bulk-device-approval",
   EmailVerification = "email-verification",
   InlineMenuFieldQualification = "inline-menu-field-qualification",
   MemberAccessReport = "ac-2059-member-access-report",
@@ -50,7 +49,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.ExtensionRefresh]: FALSE,
   [FeatureFlag.RestrictProviderAccess]: FALSE,
   [FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE,
-  [FeatureFlag.BulkDeviceApproval]: FALSE,
   [FeatureFlag.EmailVerification]: FALSE,
   [FeatureFlag.InlineMenuFieldQualification]: FALSE,
   [FeatureFlag.MemberAccessReport]: FALSE,