bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 05:43:41 +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

35
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,29 +483,20 @@ 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( const reference = openChangePlanDialog(this.dialogService, {
this.enableUpgradePasswordManagerSub$, data: {
); organizationId: this.organization.id,
if (enableUpgradePasswordManagerSub && this.organization.canEditSubscription) { subscription: null,
const reference = openChangePlanDialog(this.dialogService, { productTierType: this.organization.productTierType,
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) { if (result === ChangePlanDialogResultType.Submitted) {
await this.load(); await this.load();
}
return;
} else {
// Show org upgrade modal
await this.showSeatLimitReachedDialog();
return;
} }
return;
} }
const dialog = openUserAddEditDialog(this.dialogService, { const dialog = openUserAddEditDialog(this.dialogService, {

33
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,27 +356,20 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
}; };
async changePlan() { async changePlan() {
const EnableUpgradePasswordManagerSub = await firstValueFrom( const reference = openChangePlanDialog(this.dialogService, {
this.enableUpgradePasswordManagerSub$, data: {
); organizationId: this.organizationId,
if (EnableUpgradePasswordManagerSub) { subscription: this.sub,
const reference = openChangePlanDialog(this.dialogService, { productTierType: this.userOrg.productTierType,
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) { if (result === ChangePlanDialogResultType.Closed) {
return; return;
}
await this.load();
} else {
this.showChangePlan = !this.showChangePlan;
} }
await this.load();
} }
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,