Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-02-20 02:01:47 +01:00
Code Issues Projects 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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 48 deletions
Show Stats 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 enableUpgradePasswordManagerSub$ = this.configService.getFeatureFlag$(
FeatureFlag.EnableUpgradePasswordManagerSub,
);
protected accountDeprovisioningEnabled$: Observable<boolean> = this.configService.getFeatureFlag$(
FeatureFlag.AccountDeprovisioning,
);
@ -487,29 +483,20 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
this.organization.productTierType === ProductTierType.TeamsStarter ||
this.organization.productTierType === ProductTierType.Families)
) {
const enableUpgradePasswordManagerSub = await firstValueFrom(
this.enableUpgradePasswordManagerSub$,
);
if (enableUpgradePasswordManagerSub && this.organization.canEditSubscription) {
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, {

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 teamsStarter = ProductTierType.TeamsStarter;
protected enableUpgradePasswordManagerSub$ = this.configService.getFeatureFlag$(
FeatureFlag.EnableUpgradePasswordManagerSub,
);
protected deprecateStripeSourcesAPI$ = this.configService.getFeatureFlag$(
FeatureFlag.AC2476_DeprecateStripeSourcesAPI,
);
@ -360,27 +356,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 {

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

@ -21,7 +21,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",
@ -72,7 +71,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,