Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-02-18 01:41:27 +01:00
Code Issues Projects Releases Wiki Activity

[PM-14525] remove member access feature flag (#11972)

Browse Source 
* Remove member access feature flag

* removing unused code
This commit is contained in:
Tom 2024-11-18 10:37:08 -05:00 committed by GitHub
parent d875ded8fa
commit f1538e1a5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.ts
View File

@ -6,10 +6,8 @@ import {
RouterStateSnapshot, RouterStateSnapshot,
} from "@angular/router"; } from "@angular/router";
import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { ProductTierType } from "@bitwarden/common/billing/enums"; import { ProductTierType } from "@bitwarden/common/billing/enums";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { DialogService } from "@bitwarden/components"; import { DialogService } from "@bitwarden/components";
/** /**
@ -31,11 +29,6 @@ export function isEnterpriseOrgGuard(): CanActivateFn {
return router.createUrlTree(["/"]); return router.createUrlTree(["/"]);
} }
// TODO: Remove on "MemberAccessReport" feature flag cleanup
if (!canAccessFeature(FeatureFlag.MemberAccessReport)) {
return router.createUrlTree(["/"]);
}
if (org.productTierType != ProductTierType.Enterprise) { if (org.productTierType != ProductTierType.Enterprise) {
// Users without billing permission can't access billing // Users without billing permission can't access billing
if (!org.canEditSubscription) { if (!org.canEditSubscription) {

21
apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts
View File

@ -1,11 +1,9 @@
import { Component, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { ActivatedRoute, NavigationEnd, Router } from "@angular/router"; import { ActivatedRoute, NavigationEnd, Router } from "@angular/router";
import { filter, map, Observable, startWith, concatMap, firstValueFrom } from "rxjs"; import { filter, map, Observable, startWith, concatMap } from "rxjs";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { ProductTierType } from "@bitwarden/common/billing/enums"; import { 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 { ReportVariant, reports, ReportType, ReportEntry } from "../../../tools/reports"; import { ReportVariant, reports, ReportType, ReportEntry } from "../../../tools/reports";
@ -17,21 +15,13 @@ export class ReportsHomeComponent implements OnInit {
reports$: Observable<ReportEntry[]>; reports$: Observable<ReportEntry[]>;
homepage$: Observable<boolean>; homepage$: Observable<boolean>;
private isMemberAccessReportEnabled: boolean;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
private organizationService: OrganizationService, private organizationService: OrganizationService,
private router: Router, private router: Router,
private configService: ConfigService,
) {} ) {}
async ngOnInit() { async ngOnInit() {
// TODO: Remove on "MemberAccessReport" feature flag cleanup
this.isMemberAccessReportEnabled = await firstValueFrom(
this.configService.getFeatureFlag$(FeatureFlag.MemberAccessReport),
);
this.homepage$ = this.router.events.pipe( this.homepage$ = this.router.events.pipe(
filter((event) => event instanceof NavigationEnd), filter((event) => event instanceof NavigationEnd),
map((event) => this.isReportsHomepageRouteUrl((event as NavigationEnd).urlAfterRedirects)), map((event) => this.isReportsHomepageRouteUrl((event as NavigationEnd).urlAfterRedirects)),
@ -69,17 +59,14 @@ export class ReportsHomeComponent implements OnInit {
...reports[ReportType.Inactive2fa], ...reports[ReportType.Inactive2fa],
variant: reportRequiresUpgrade, variant: reportRequiresUpgrade,
}, },
]; {
if (this.isMemberAccessReportEnabled) {
reportsArray.push({
...reports[ReportType.MemberAccessReport], ...reports[ReportType.MemberAccessReport],
variant: variant:
productType == ProductTierType.Enterprise productType == ProductTierType.Enterprise
? ReportVariant.Enabled ? ReportVariant.Enabled
: ReportVariant.RequiresEnterprise, : ReportVariant.RequiresEnterprise,
}); },
} ];
return reportsArray; return reportsArray;
} }

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

@ -14,7 +14,6 @@ export enum FeatureFlag {
UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection", UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection",
EmailVerification = "email-verification", EmailVerification = "email-verification",
InlineMenuFieldQualification = "inline-menu-field-qualification", InlineMenuFieldQualification = "inline-menu-field-qualification",
MemberAccessReport = "ac-2059-member-access-report",
TwoFactorComponentRefactor = "two-factor-component-refactor", TwoFactorComponentRefactor = "two-factor-component-refactor",
InlineMenuPositioningImprovements = "inline-menu-positioning-improvements", InlineMenuPositioningImprovements = "inline-menu-positioning-improvements",
ProviderClientVaultPrivacyBanner = "ac-2833-provider-client-vault-privacy-banner", ProviderClientVaultPrivacyBanner = "ac-2833-provider-client-vault-privacy-banner",
@ -64,7 +63,6 @@ export const DefaultFeatureFlagValue = {
[FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE, [FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE,
[FeatureFlag.EmailVerification]: FALSE, [FeatureFlag.EmailVerification]: FALSE,
[FeatureFlag.InlineMenuFieldQualification]: FALSE, [FeatureFlag.InlineMenuFieldQualification]: FALSE,
[FeatureFlag.MemberAccessReport]: FALSE,
[FeatureFlag.TwoFactorComponentRefactor]: FALSE, [FeatureFlag.TwoFactorComponentRefactor]: FALSE,
[FeatureFlag.InlineMenuPositioningImprovements]: FALSE, [FeatureFlag.InlineMenuPositioningImprovements]: FALSE,
[FeatureFlag.ProviderClientVaultPrivacyBanner]: FALSE, [FeatureFlag.ProviderClientVaultPrivacyBanner]: FALSE,