Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AC-2355] Remove BulkDeviceApproval feature flag #9931

Merged
merged 3 commits into from
Jul 10, 2024
Merged

[AC-2355] Remove BulkDeviceApproval feature flag #9931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24cef90
Remove BulkDeviceApproval feature flag
eliykat Jul 3, 2024
ebfd4c5
Merge branch 'main' into ac/ac-2355/post-release-remove-bulk-device-a…
eliykat Jul 3, 2024
77305a5
Merge branch 'main' into ac/ac-2355/post-release-remove-bulk-device-a…
eliykat Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions bitwarden_license/bit-cli/src/admin-console/device-approval/device-approval.program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
1 change: 0 additions & 1 deletion ...c/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
></button>
<bit-menu #headerMenu>
<button
*ngIf="bulkDeviceApprovalEnabled$ | async"
type="button"
bitMenuItem
(click)="approveAllRequests()"
Expand Down
4 changes: 0 additions & 4 deletions ...src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions libs/common/src/enums/feature-flag.enum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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,
Expand Down
Loading