From cbb08403982c539e0001e40af51476245dc13b7f Mon Sep 17 00:00:00 2001 From: Cy Okeke Date: Wed, 30 Oct 2024 14:54:24 +0100 Subject: [PATCH] Remove the feature flag --- .../members/members.component.ts | 36 ++++++------------- ...ganization-subscription-cloud.component.ts | 33 ++++++----------- libs/common/src/enums/feature-flag.enum.ts | 2 -- 3 files changed, 22 insertions(+), 49 deletions(-) diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts index 394c900f8d..6138f0897f 100644 --- a/apps/web/src/app/admin-console/organizations/members/members.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts @@ -40,7 +40,6 @@ import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request"; import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction"; import { isNotSelfUpgradable, ProductTierType } from "@bitwarden/common/billing/enums"; -import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -98,10 +97,6 @@ export class MembersComponent extends BaseMembersComponent protected canUseSecretsManager$: Observable; - protected enableUpgradePasswordManagerSub$ = this.configService.getFeatureFlag$( - FeatureFlag.EnableUpgradePasswordManagerSub, - ); - // Fixed sizes used for cdkVirtualScroll protected rowHeight = 62; protected rowHeightClass = `tw-h-[62px]`; @@ -483,29 +478,20 @@ export class MembersComponent extends BaseMembersComponent this.organization.productTierType === ProductTierType.TeamsStarter || this.organization.productTierType === ProductTierType.Families) ) { - const enableUpgradePasswordManagerSub = await firstValueFrom( - this.enableUpgradePasswordManagerSub$, - ); - if (enableUpgradePasswordManagerSub) { - const reference = openChangePlanDialog(this.dialogService, { - data: { - organizationId: this.organization.id, - subscription: null, - productTierType: this.organization.productTierType, - }, - }); + const reference = openChangePlanDialog(this.dialogService, { + data: { + organizationId: this.organization.id, + subscription: null, + productTierType: this.organization.productTierType, + }, + }); - const result = await lastValueFrom(reference.closed); + const result = await lastValueFrom(reference.closed); - if (result === ChangePlanDialogResultType.Submitted) { - await this.load(); - } - return; - } else { - // Show org upgrade modal - await this.showSeatLimitReachedDialog(); - return; + if (result === ChangePlanDialogResultType.Submitted) { + await this.load(); } + return; } const dialog = openUserAddEditDialog(this.dialogService, { diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts index 591371db08..e9fe02b7cb 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts @@ -70,10 +70,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy FeatureFlag.EnableTimeThreshold, ); - protected enableUpgradePasswordManagerSub$ = this.configService.getFeatureFlag$( - FeatureFlag.EnableUpgradePasswordManagerSub, - ); - protected deprecateStripeSourcesAPI$ = this.configService.getFeatureFlag$( FeatureFlag.AC2476_DeprecateStripeSourcesAPI, ); @@ -388,27 +384,20 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy }; async changePlan() { - const EnableUpgradePasswordManagerSub = await firstValueFrom( - this.enableUpgradePasswordManagerSub$, - ); - if (EnableUpgradePasswordManagerSub) { - const reference = openChangePlanDialog(this.dialogService, { - data: { - organizationId: this.organizationId, - subscription: this.sub, - productTierType: this.userOrg.productTierType, - }, - }); + const reference = openChangePlanDialog(this.dialogService, { + data: { + organizationId: this.organizationId, + subscription: this.sub, + productTierType: this.userOrg.productTierType, + }, + }); - const result = await lastValueFrom(reference.closed); + const result = await lastValueFrom(reference.closed); - if (result === ChangePlanDialogResultType.Closed) { - return; - } - await this.load(); - } else { - this.showChangePlan = !this.showChangePlan; + if (result === ChangePlanDialogResultType.Closed) { + return; } + await this.load(); } isSecretsManagerTrial(): boolean { diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts index 84cf5ed521..e31162dc7d 100644 --- a/libs/common/src/enums/feature-flag.enum.ts +++ b/libs/common/src/enums/feature-flag.enum.ts @@ -23,7 +23,6 @@ export enum FeatureFlag { VaultBulkManagementAction = "vault-bulk-management-action", IdpAutoSubmitLogin = "idp-auto-submit-login", UnauthenticatedExtensionUIRefresh = "unauth-ui-refresh", - EnableUpgradePasswordManagerSub = "AC-2708-upgrade-password-manager-sub", GenerateIdentityFillScriptRefactor = "generate-identity-fill-script-refactor", EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill", DelayFido2PageScriptInitWithinMv2 = "delay-fido2-page-script-init-within-mv2", @@ -69,7 +68,6 @@ export const DefaultFeatureFlagValue = { [FeatureFlag.VaultBulkManagementAction]: FALSE, [FeatureFlag.IdpAutoSubmitLogin]: FALSE, [FeatureFlag.UnauthenticatedExtensionUIRefresh]: FALSE, - [FeatureFlag.EnableUpgradePasswordManagerSub]: FALSE, [FeatureFlag.GenerateIdentityFillScriptRefactor]: FALSE, [FeatureFlag.EnableNewCardCombinedExpiryAutofill]: FALSE, [FeatureFlag.DelayFido2PageScriptInitWithinMv2]: FALSE,