diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html index fa0a7bd85a..9dd3a791b6 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html +++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html @@ -134,17 +134,11 @@ type="checkbox" bitCheckbox formControlName="manageUsers" - (change)="handleDependentPermissions()" /> {{ "manageUsers" | i18n }} - + {{ "manageAccountRecovery" | i18n }} diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts index 9adfb1db3f..c6a60165fe 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts @@ -33,7 +33,6 @@ import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permi import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; 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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { @@ -453,28 +452,6 @@ export class MemberDialogComponent implements OnDestroy { return Object.assign(p, partialPermissions); } - async handleDependentPermissions() { - const separateCustomRolePermissions = await this.configService.getFeatureFlag( - FeatureFlag.SeparateCustomRolePermissions, - ); - if (separateCustomRolePermissions) { - return; - } - // Manage Password Reset (Account Recovery) must have Manage Users enabled - if ( - this.permissionsGroup.value.manageResetPassword && - !this.permissionsGroup.value.manageUsers - ) { - this.permissionsGroup.value.manageUsers = true; - (document.getElementById("manageUsers") as HTMLInputElement).checked = true; - this.toastService.showToast({ - variant: "info", - title: null, - message: this.i18nService.t("accountRecoveryManageUsers"), - }); - } - } - submit = async () => { this.formGroup.markAllAsTouched(); 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 0247a8c881..3f567c9673 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 @@ -244,18 +244,8 @@ export class MembersComponent extends BaseMembersComponent ) .subscribe(); - // Setup feature flag-dependent observables - const separateCustomRolePermissionsEnabled$ = this.configService.getFeatureFlag$( - FeatureFlag.SeparateCustomRolePermissions, - ); - this.showUserManagementControls$ = combineLatest([ - separateCustomRolePermissionsEnabled$, - organization$, - ]).pipe( - map( - ([separateCustomRolePermissionsEnabled, organization]) => - !separateCustomRolePermissionsEnabled || organization.canManageUsers, - ), + this.showUserManagementControls$ = organization$.pipe( + map((organization) => organization.canManageUsers), ); } diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts index 5e227dff7c..da14f7dada 100644 --- a/libs/common/src/enums/feature-flag.enum.ts +++ b/libs/common/src/enums/feature-flag.enum.ts @@ -11,7 +11,6 @@ import { ServerConfig } from "../platform/abstractions/config/server-config"; // eslint-disable-next-line @bitwarden/platform/no-enums export enum FeatureFlag { /* Admin Console Team */ - SeparateCustomRolePermissions = "pm-19917-separate-custom-role-permissions", CreateDefaultLocation = "pm-19467-create-default-location", /* Auth */ @@ -78,7 +77,6 @@ const FALSE = false as boolean; */ export const DefaultFeatureFlagValue = { /* Admin Console Team */ - [FeatureFlag.SeparateCustomRolePermissions]: FALSE, [FeatureFlag.CreateDefaultLocation]: FALSE, /* Autofill */