bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 14:23:32 +00:00
Code Issues Releases Wiki Activity

[PM-13868]Remove Upgrade password manager flag (#11789)

Browse Source 
* Remove the feature flag

* Add the feature flag reference
This commit is contained in:
cyprain-okeke
2024-11-14 15:57:54 +01:00
committed by GitHub
parent b4aea05169
commit 2e6d98938a
3 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/web/src/app/admin-console/organizations/members/members.component.ts
View File

@@ -98,10 +98,6 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
protected canUseSecretsManager$: Observable<boolean>; protected canUseSecretsManager$: Observable<boolean>;
protected enableUpgradePasswordManagerSub$ = this.configService.getFeatureFlag$(
FeatureFlag.EnableUpgradePasswordManagerSub,
);
protected accountDeprovisioningEnabled$: Observable<boolean> = this.configService.getFeatureFlag$( protected accountDeprovisioningEnabled$: Observable<boolean> = this.configService.getFeatureFlag$(
FeatureFlag.AccountDeprovisioning, FeatureFlag.AccountDeprovisioning,
); );
@@ -487,10 +483,6 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
this.organization.productTierType === ProductTierType.TeamsStarter || this.organization.productTierType === ProductTierType.TeamsStarter ||
this.organization.productTierType === ProductTierType.Families) this.organization.productTierType === ProductTierType.Families)
) { ) {
const enableUpgradePasswordManagerSub = await firstValueFrom(
this.enableUpgradePasswordManagerSub$,
);
if (enableUpgradePasswordManagerSub && this.organization.canEditSubscription) {
const reference = openChangePlanDialog(this.dialogService, { const reference = openChangePlanDialog(this.dialogService, {
data: { data: {
organizationId: this.organization.id, organizationId: this.organization.id,
@@ -505,11 +497,6 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
await this.load(); await this.load();
} }
return; return;
} else {
// Show org upgrade modal
await this.showSeatLimitReachedDialog();
return;
}
} }
const dialog = openUserAddEditDialog(this.dialogService, { const dialog = openUserAddEditDialog(this.dialogService, {

11
apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
View File

@@ -60,10 +60,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
protected readonly subscriptionHiddenIcon = SubscriptionHiddenIcon; protected readonly subscriptionHiddenIcon = SubscriptionHiddenIcon;
protected readonly teamsStarter = ProductTierType.TeamsStarter; protected readonly teamsStarter = ProductTierType.TeamsStarter;
protected enableUpgradePasswordManagerSub$ = this.configService.getFeatureFlag$(
FeatureFlag.EnableUpgradePasswordManagerSub,
);
protected deprecateStripeSourcesAPI$ = this.configService.getFeatureFlag$( protected deprecateStripeSourcesAPI$ = this.configService.getFeatureFlag$(
FeatureFlag.AC2476_DeprecateStripeSourcesAPI, FeatureFlag.AC2476_DeprecateStripeSourcesAPI,
); );
@@ -360,10 +356,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
}; };
async changePlan() { async changePlan() {
const EnableUpgradePasswordManagerSub = await firstValueFrom(
this.enableUpgradePasswordManagerSub$,
);
if (EnableUpgradePasswordManagerSub) {
const reference = openChangePlanDialog(this.dialogService, { const reference = openChangePlanDialog(this.dialogService, {
data: { data: {
organizationId: this.organizationId, organizationId: this.organizationId,
@@ -378,9 +370,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
return; return;
} }
await this.load(); await this.load();
} else {
this.showChangePlan = !this.showChangePlan;
}
} }
isSecretsManagerTrial(): boolean { isSecretsManagerTrial(): boolean {

2
libs/common/src/enums/feature-flag.enum.ts
View File

@@ -21,7 +21,6 @@ export enum FeatureFlag {
VaultBulkManagementAction = "vault-bulk-management-action", VaultBulkManagementAction = "vault-bulk-management-action",
IdpAutoSubmitLogin = "idp-auto-submit-login", IdpAutoSubmitLogin = "idp-auto-submit-login",
UnauthenticatedExtensionUIRefresh = "unauth-ui-refresh", UnauthenticatedExtensionUIRefresh = "unauth-ui-refresh",
EnableUpgradePasswordManagerSub = "AC-2708-upgrade-password-manager-sub",
GenerateIdentityFillScriptRefactor = "generate-identity-fill-script-refactor", GenerateIdentityFillScriptRefactor = "generate-identity-fill-script-refactor",
EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill", EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill",
DelayFido2PageScriptInitWithinMv2 = "delay-fido2-page-script-init-within-mv2", DelayFido2PageScriptInitWithinMv2 = "delay-fido2-page-script-init-within-mv2",
@@ -72,7 +71,6 @@ export const DefaultFeatureFlagValue = {
[FeatureFlag.VaultBulkManagementAction]: FALSE, [FeatureFlag.VaultBulkManagementAction]: FALSE,
[FeatureFlag.IdpAutoSubmitLogin]: FALSE, [FeatureFlag.IdpAutoSubmitLogin]: FALSE,
[FeatureFlag.UnauthenticatedExtensionUIRefresh]: FALSE, [FeatureFlag.UnauthenticatedExtensionUIRefresh]: FALSE,
[FeatureFlag.EnableUpgradePasswordManagerSub]: FALSE,
[FeatureFlag.GenerateIdentityFillScriptRefactor]: FALSE, [FeatureFlag.GenerateIdentityFillScriptRefactor]: FALSE,
[FeatureFlag.EnableNewCardCombinedExpiryAutofill]: FALSE, [FeatureFlag.EnableNewCardCombinedExpiryAutofill]: FALSE,
[FeatureFlag.DelayFido2PageScriptInitWithinMv2]: FALSE, [FeatureFlag.DelayFido2PageScriptInitWithinMv2]: FALSE,