[PM-29506] Rid of old feature flag for members feature flag (#18884)

* [PM-31750] Refactor members routing and user confirmation logic

* Simplified user confirmation process by removing feature flag checks.
* Updated routing to directly use the new members component without feature flagging.
* Removed deprecated members component references from routing modules.
* Cleaned up feature flag enum by removing unused entries.

* trigger claude

* [PM-31750] Refactor members component and remove deprecated files

* Renamed vNextMembersComponent to MembersComponent for consistency.
* Removed deprecated_members.component.ts and associated HTML files.
* Updated routing and references to use the new MembersComponent.
* Cleaned up related tests to reflect the component name change.

* Refactor import statements in security-tasks.service.ts for improved readability

* Update apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts

Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>

* Remove BaseMembersComponent and related imports from the admin console, streamlining member management functionality.

* Remove unused ConfigService import from UserConfirmComponent to clean up code.

* Implement feature flag logic for user restoration in MemberDialogComponent, allowing conditional restoration based on DefaultUserCollectionRestore flag.

---------

Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>

apps/web/src/app/admin-console/common/base-members.component.ts

@@ -1,245 +0,0 @@
-import { Directive } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { FormControl } from "@angular/forms";
-import { firstValueFrom, lastValueFrom, debounceTime, combineLatest, BehaviorSubject } from "rxjs";
-
-import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service";
-import {
-  OrganizationUserStatusType,
-  OrganizationUserType,
-  ProviderUserStatusType,
-  ProviderUserType,
-} from "@bitwarden/common/admin-console/enums";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { ProviderUserUserDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user.response";
-import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
-
-import { OrganizationUserView } from "../organizations/core/views/organization-user.view";
-import { UserConfirmComponent } from "../organizations/manage/user-confirm.component";
-import { MemberActionResult } from "../organizations/members/services/member-actions/member-actions.service";
-
-import { PeopleTableDataSource, peopleFilter } from "./people-table-data-source";
-
-export type StatusType = OrganizationUserStatusType | ProviderUserStatusType;
-export type UserViewTypes = ProviderUserUserDetailsResponse | OrganizationUserView;
-
-/**
- * A refactored copy of BasePeopleComponent, using the component library table and other modern features.
- * This will replace BasePeopleComponent once all subclasses have been changed over to use this class.
- */
-@Directive()
-export abstract class BaseMembersComponent<UserView extends UserViewTypes> {
-  /**
-   * Shows a banner alerting the admin that users need to be confirmed.
-   */
-  get showConfirmUsers(): boolean {
-    return (
-      this.dataSource.activeUserCount > 1 &&
-      this.dataSource.confirmedUserCount > 0 &&
-      this.dataSource.confirmedUserCount < 3 &&
-      this.dataSource.acceptedUserCount > 0
-    );
-  }
-
-  get showBulkConfirmUsers(): boolean {
-    return this.dataSource
-      .getCheckedUsers()
-      .every((member) => member.status == this.userStatusType.Accepted);
-  }
-
-  get showBulkReinviteUsers(): boolean {
-    return this.dataSource
-      .getCheckedUsers()
-      .every((member) => member.status == this.userStatusType.Invited);
-  }
-
-  abstract userType: typeof OrganizationUserType | typeof ProviderUserType;
-  abstract userStatusType: typeof OrganizationUserStatusType | typeof ProviderUserStatusType;
-
-  protected abstract dataSource: PeopleTableDataSource<UserView>;
-
-  firstLoaded: boolean = false;
-
-  /**
-   * The currently selected status filter, or undefined to show all active users.
-   */
-  status?: StatusType;
-
-  /**
-   * The currently executing promise - used to avoid multiple user actions executing at once.
-   */
-  actionPromise?: Promise<MemberActionResult>;
-
-  protected searchControl = new FormControl("", { nonNullable: true });
-  protected statusToggle = new BehaviorSubject<StatusType | undefined>(undefined);
-
-  constructor(
-    protected apiService: ApiService,
-    protected i18nService: I18nService,
-    protected keyService: KeyService,
-    protected validationService: ValidationService,
-    protected logService: LogService,
-    protected userNamePipe: UserNamePipe,
-    protected dialogService: DialogService,
-    protected organizationManagementPreferencesService: OrganizationManagementPreferencesService,
-    protected toastService: ToastService,
-  ) {
-    // Connect the search input and status toggles to the table dataSource filter
-    combineLatest([this.searchControl.valueChanges.pipe(debounceTime(200)), this.statusToggle])
-      .pipe(takeUntilDestroyed())
-      .subscribe(
-        ([searchText, status]) => (this.dataSource.filter = peopleFilter(searchText, status)),
-      );
-  }
-
-  abstract edit(user: UserView, organization?: Organization): void;
-  abstract getUsers(organization?: Organization): Promise<ListResponse<UserView> | UserView[]>;
-  abstract removeUser(id: string, organization?: Organization): Promise<MemberActionResult>;
-  abstract reinviteUser(id: string, organization?: Organization): Promise<MemberActionResult>;
-  abstract confirmUser(
-    user: UserView,
-    publicKey: Uint8Array,
-    organization?: Organization,
-  ): Promise<MemberActionResult>;
-  abstract invite(organization?: Organization): void;
-
-  async load(organization?: Organization) {
-    // Load new users from the server
-    const response = await this.getUsers(organization);
-
-    // GetUsers can return a ListResponse or an Array
-    if (response instanceof ListResponse) {
-      this.dataSource.data = response.data != null && response.data.length > 0 ? response.data : [];
-    } else if (Array.isArray(response)) {
-      this.dataSource.data = response;
-    }
-
-    this.firstLoaded = true;
-  }
-
-  protected async removeUserConfirmationDialog(user: UserView) {
-    return this.dialogService.openSimpleDialog({
-      title: this.userNamePipe.transform(user),
-      content: { key: "removeUserConfirmation" },
-      type: "warning",
-    });
-  }
-
-  async remove(user: UserView, organization?: Organization) {
-    const confirmed = await this.removeUserConfirmationDialog(user);
-    if (!confirmed) {
-      return false;
-    }
-
-    this.actionPromise = this.removeUser(user.id, organization);
-    try {
-      const result = await this.actionPromise;
-      if (result.success) {
-        this.toastService.showToast({
-          variant: "success",
-          message: this.i18nService.t("removedUserId", this.userNamePipe.transform(user)),
-        });
-        this.dataSource.removeUser(user);
-      } else {
-        throw new Error(result.error);
-      }
-    } catch (e) {
-      this.validationService.showError(e);
-    }
-    this.actionPromise = undefined;
-  }
-
-  async reinvite(user: UserView, organization?: Organization) {
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    this.actionPromise = this.reinviteUser(user.id, organization);
-    try {
-      const result = await this.actionPromise;
-      if (result.success) {
-        this.toastService.showToast({
-          variant: "success",
-          message: this.i18nService.t("hasBeenReinvited", this.userNamePipe.transform(user)),
-        });
-      } else {
-        throw new Error(result.error);
-      }
-    } catch (e) {
-      this.validationService.showError(e);
-    }
-    this.actionPromise = undefined;
-  }
-
-  async confirm(user: UserView, organization?: Organization) {
-    const confirmUser = async (publicKey: Uint8Array) => {
-      try {
-        this.actionPromise = this.confirmUser(user, publicKey, organization);
-        const result = await this.actionPromise;
-        if (result.success) {
-          user.status = this.userStatusType.Confirmed;
-          this.dataSource.replaceUser(user);
-
-          this.toastService.showToast({
-            variant: "success",
-            message: this.i18nService.t("hasBeenConfirmed", this.userNamePipe.transform(user)),
-          });
-        } else {
-          throw new Error(result.error);
-        }
-      } catch (e) {
-        this.validationService.showError(e);
-        throw e;
-      } finally {
-        this.actionPromise = undefined;
-      }
-    };
-
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    try {
-      const publicKeyResponse = await this.apiService.getUserPublicKey(user.userId);
-      const publicKey = Utils.fromB64ToArray(publicKeyResponse.publicKey);
-
-      const autoConfirm = await firstValueFrom(
-        this.organizationManagementPreferencesService.autoConfirmFingerPrints.state$,
-      );
-      if (user == null) {
-        throw new Error("Cannot confirm null user.");
-      }
-      if (autoConfirm == null || !autoConfirm) {
-        const dialogRef = UserConfirmComponent.open(this.dialogService, {
-          data: {
-            name: this.userNamePipe.transform(user),
-            userId: user.userId,
-            publicKey: publicKey,
-            confirmUser: () => confirmUser(publicKey),
-          },
-        });
-        await lastValueFrom(dialogRef.closed);
-
-        return;
-      }
-
-      try {
-        const fingerprint = await this.keyService.getFingerprint(user.userId, publicKey);
-        this.logService.info(`User's fingerprint: ${fingerprint.join("-")}`);
-      } catch (e) {
-        this.logService.error(e);
-      }
-      await confirmUser(publicKey);
-    } catch (e) {
-      this.logService.error(`Handled exception: ${e}`);
-    }
-  }
-}

apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts

@@ -2,11 +2,8 @@
 // @ts-strict-ignore
 import { Component, Inject, OnInit } from "@angular/core";
 import { FormControl, FormGroup } from "@angular/forms";
-import { firstValueFrom } from "rxjs";
 
 import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { DIALOG_DATA, DialogConfig, DialogRef, DialogService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
@@ -17,8 +14,6 @@ export type UserConfirmDialogData = {
   name: string;
   userId: string;
   publicKey: Uint8Array;
-  // @TODO remove this when doing feature flag cleanup for members component refactor.
-  confirmUser?: (publicKey: Uint8Array) => Promise<void>;
 };
 
 // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
@@ -46,7 +41,6 @@ export class UserConfirmComponent implements OnInit {
     private keyService: KeyService,
     private logService: LogService,
     private organizationManagementPreferencesService: OrganizationManagementPreferencesService,
-    private configService: ConfigService,
   ) {
     this.name = data.name;
     this.userId = data.userId;
@@ -76,13 +70,6 @@ export class UserConfirmComponent implements OnInit {
       await this.organizationManagementPreferencesService.autoConfirmFingerPrints.set(true);
     }
 
-    const membersComponentRefactorEnabled = await firstValueFrom(
-      this.configService.getFeatureFlag$(FeatureFlag.MembersComponentRefactor),
-    );
-    if (!membersComponentRefactorEnabled) {
-      await this.data.confirmUser(this.publicKey);
-    }
-
     this.dialogRef.close(true);
   };
 

apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts

@@ -195,9 +195,9 @@ export class MemberDialogComponent implements OnDestroy {
     private accountService: AccountService,
     organizationService: OrganizationService,
     private toastService: ToastService,
-    private configService: ConfigService,
     private deleteManagedMemberWarningService: DeleteManagedMemberWarningService,
     private organizationUserService: OrganizationUserService,
+    private configService: ConfigService,
   ) {
     this.organization$ = accountService.activeAccount$.pipe(
       getUserId,

apps/web/src/app/admin-console/organizations/members/deprecated_members.component.html

@@ -1,495 +0,0 @@
-@let organization = this.organization();
-@if (organization) {
-  <app-organization-free-trial-warning
-    [organization]="organization"
-    (clicked)="billingConstraint.navigateToPaymentMethod(organization)"
-  >
-  </app-organization-free-trial-warning>
-  <app-header>
-    <bit-search
-      class="tw-grow"
-      [formControl]="searchControl"
-      [placeholder]="'searchMembers' | i18n"
-    ></bit-search>
-
-    <button
-      type="button"
-      bitButton
-      buttonType="primary"
-      (click)="invite(organization)"
-      [disabled]="!firstLoaded"
-      *ngIf="showUserManagementControls()"
-    >
-      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-      {{ "inviteMember" | i18n }}
-    </button>
-  </app-header>
-
-  <div class="tw-mb-4 tw-flex tw-flex-col tw-space-y-4">
-    <bit-toggle-group
-      [selected]="status"
-      (selectedChange)="statusToggle.next($event)"
-      [attr.aria-label]="'memberStatusFilter' | i18n"
-      *ngIf="showUserManagementControls()"
-    >
-      <bit-toggle [value]="null">
-        {{ "all" | i18n }}
-        <span bitBadge variant="info" *ngIf="dataSource.activeUserCount as allCount">{{
-          allCount
-        }}</span>
-      </bit-toggle>
-
-      <bit-toggle [value]="userStatusType.Invited">
-        {{ "invited" | i18n }}
-        <span bitBadge variant="info" *ngIf="dataSource.invitedUserCount as invitedCount">{{
-          invitedCount
-        }}</span>
-      </bit-toggle>
-
-      <bit-toggle [value]="userStatusType.Accepted">
-        {{ "needsConfirmation" | i18n }}
-        <span bitBadge variant="info" *ngIf="dataSource.acceptedUserCount as acceptedUserCount">{{
-          acceptedUserCount
-        }}</span>
-      </bit-toggle>
-
-      <bit-toggle [value]="userStatusType.Revoked">
-        {{ "revoked" | i18n }}
-        <span bitBadge variant="info" *ngIf="dataSource.revokedUserCount as revokedCount">{{
-          revokedCount
-        }}</span>
-      </bit-toggle>
-    </bit-toggle-group>
-  </div>
-  <ng-container *ngIf="!firstLoaded">
-    <i
-      class="bwi bwi-spinner bwi-spin tw-text-muted"
-      title="{{ 'loading' | i18n }}"
-      aria-hidden="true"
-    ></i>
-    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-  </ng-container>
-  <ng-container *ngIf="firstLoaded">
-    <p *ngIf="!dataSource.filteredData.length">{{ "noMembersInList" | i18n }}</p>
-    <ng-container *ngIf="dataSource.filteredData.length">
-      <bit-callout
-        type="info"
-        title="{{ 'confirmUsers' | i18n }}"
-        icon="bwi-check-circle"
-        *ngIf="showConfirmUsers"
-      >
-        {{ "usersNeedConfirmed" | i18n }}
-      </bit-callout>
-      <!-- The padding on the bottom of the cdk-virtual-scroll-viewport element is required to prevent table row content
-    from overflowing the <main> element. -->
-      <cdk-virtual-scroll-viewport bitScrollLayout [itemSize]="rowHeight" class="tw-pb-8">
-        <bit-table [dataSource]="dataSource">
-          <ng-container header>
-            <tr>
-              <th bitCell class="tw-w-20" *ngIf="showUserManagementControls()">
-                <input
-                  type="checkbox"
-                  bitCheckbox
-                  class="tw-mr-1"
-                  (change)="dataSource.checkAllFilteredUsers($any($event.target).checked)"
-                  id="selectAll"
-                />
-                <label class="tw-mb-0 !tw-font-medium !tw-text-muted" for="selectAll">{{
-                  "all" | i18n
-                }}</label>
-              </th>
-              <th bitCell bitSortable="email" default>{{ "name" | i18n }}</th>
-              <th bitCell>{{ (organization.useGroups ? "groups" : "collections") | i18n }}</th>
-              <th bitCell bitSortable="type">{{ "role" | i18n }}</th>
-              <th bitCell>{{ "policies" | i18n }}</th>
-              <th bitCell>
-                <div class="tw-flex tw-flex-row tw-items-center tw-justify-end tw-gap-2">
-                  <button
-                    type="button"
-                    bitIconButton="bwi-download"
-                    size="small"
-                    [bitAction]="exportMembers"
-                    [disabled]="!firstLoaded"
-                    label="{{ 'export' | i18n }}"
-                  ></button>
-                  <button
-                    [bitMenuTriggerFor]="headerMenu"
-                    type="button"
-                    bitIconButton="bwi-ellipsis-v"
-                    size="small"
-                    label="{{ 'options' | i18n }}"
-                    *ngIf="showUserManagementControls()"
-                  ></button>
-                </div>
-
-                <bit-menu #headerMenu>
-                  <ng-container *ngIf="canUseSecretsManager()">
-                    <button type="button" bitMenuItem (click)="bulkEnableSM(organization)">
-                      {{ "activateSecretsManager" | i18n }}
-                    </button>
-                    <bit-menu-divider></bit-menu-divider>
-                  </ng-container>
-                  <button
-                    type="button"
-                    bitMenuItem
-                    (click)="bulkReinvite(organization)"
-                    *ngIf="showBulkReinviteUsers"
-                  >
-                    <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
-                    {{ (isSingleInvite ? "resendInvitation" : "reinviteSelected") | i18n }}
-                  </button>
-                  <button
-                    type="button"
-                    bitMenuItem
-                    (click)="bulkConfirm(organization)"
-                    *ngIf="showBulkConfirmUsers"
-                  >
-                    <span class="tw-text-success">
-                      <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
-                      {{ "confirmSelected" | i18n }}
-                    </span>
-                  </button>
-                  <button
-                    type="button"
-                    bitMenuItem
-                    (click)="bulkRestore(organization)"
-                    *ngIf="showBulkRestoreUsers"
-                  >
-                    <i class="bwi bwi-fw bwi-plus-circle" aria-hidden="true"></i>
-                    {{ "restoreAccess" | i18n }}
-                  </button>
-                  <button
-                    type="button"
-                    bitMenuItem
-                    (click)="bulkRevoke(organization)"
-                    *ngIf="showBulkRevokeUsers"
-                  >
-                    <i class="bwi bwi-fw bwi-minus-circle" aria-hidden="true"></i>
-                    {{ "revokeAccess" | i18n }}
-                  </button>
-                  <button
-                    type="button"
-                    bitMenuItem
-                    (click)="bulkRemove(organization)"
-                    *ngIf="showBulkRemoveUsers"
-                  >
-                    <span class="tw-text-danger">
-                      <i aria-hidden="true" class="bwi bwi-fw bwi-close"></i>
-                      {{ "remove" | i18n }}
-                    </span>
-                  </button>
-                  <button
-                    type="button"
-                    bitMenuItem
-                    (click)="bulkDelete(organization)"
-                    *ngIf="showBulkDeleteUsers"
-                  >
-                    <span class="tw-text-danger">
-                      <i aria-hidden="true" class="bwi bwi-fw bwi-trash"></i>
-                      {{ "delete" | i18n }}
-                    </span>
-                  </button>
-                </bit-menu>
-              </th>
-            </tr>
-          </ng-container>
-          <ng-template body let-rows$>
-            <tr
-              bitRow
-              *cdkVirtualFor="let u of rows$"
-              alignContent="middle"
-              [ngClass]="rowHeightClass"
-            >
-              <td bitCell (click)="dataSource.checkUser(u)" *ngIf="showUserManagementControls()">
-                <input type="checkbox" bitCheckbox [(ngModel)]="$any(u).checked" />
-              </td>
-              <ng-container *ngIf="showUserManagementControls(); else readOnlyUserInfo">
-                <td bitCell (click)="edit(u, organization)" class="tw-cursor-pointer">
-                  <div class="tw-flex tw-items-center">
-                    <bit-avatar
-                      size="small"
-                      [text]="u | userName"
-                      [id]="u.userId"
-                      [color]="u.avatarColor"
-                      class="tw-mr-3"
-                    ></bit-avatar>
-                    <div class="tw-flex tw-flex-col">
-                      <div class="tw-flex tw-flex-row tw-gap-2">
-                        <button type="button" bitLink>
-                          {{ u.name ?? u.email }}
-                        </button>
-                        <span
-                          bitBadge
-                          class="tw-text-xs"
-                          variant="secondary"
-                          *ngIf="u.status === userStatusType.Invited"
-                        >
-                          {{ "invited" | i18n }}
-                        </span>
-                        <span
-                          bitBadge
-                          class="tw-text-xs"
-                          variant="warning"
-                          *ngIf="u.status === userStatusType.Accepted"
-                        >
-                          {{ "needsConfirmation" | i18n }}
-                        </span>
-                        <span
-                          bitBadge
-                          class="tw-text-xs"
-                          variant="secondary"
-                          *ngIf="u.status === userStatusType.Revoked"
-                        >
-                          {{ "revoked" | i18n }}
-                        </span>
-                      </div>
-                      <div class="tw-text-sm tw-text-muted" *ngIf="u.name">
-                        {{ u.email }}
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </ng-container>
-              <ng-template #readOnlyUserInfo>
-                <td bitCell>
-                  <div class="tw-flex tw-items-center">
-                    <bit-avatar
-                      size="small"
-                      [text]="u | userName"
-                      [id]="u.userId"
-                      [color]="u.avatarColor"
-                      class="tw-mr-3"
-                    ></bit-avatar>
-                    <div class="tw-flex tw-flex-col">
-                      <div class="tw-flex tw-flex-row tw-gap-2">
-                        <span>{{ u.name ?? u.email }}</span>
-                        <span
-                          bitBadge
-                          class="tw-text-xs"
-                          variant="secondary"
-                          *ngIf="u.status === userStatusType.Invited"
-                        >
-                          {{ "invited" | i18n }}
-                        </span>
-                        <span
-                          bitBadge
-                          class="tw-text-xs"
-                          variant="warning"
-                          *ngIf="u.status === userStatusType.Accepted"
-                        >
-                          {{ "needsConfirmation" | i18n }}
-                        </span>
-                        <span
-                          bitBadge
-                          class="tw-text-xs"
-                          variant="secondary"
-                          *ngIf="u.status === userStatusType.Revoked"
-                        >
-                          {{ "revoked" | i18n }}
-                        </span>
-                      </div>
-                      <div class="tw-text-sm tw-text-muted" *ngIf="u.name">
-                        {{ u.email }}
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </ng-template>
-
-              <ng-container *ngIf="showUserManagementControls(); else readOnlyGroupsCell">
-                <td
-                  bitCell
-                  (click)="
-                    edit(
-                      u,
-                      organization,
-                      organization.useGroups ? memberTab.Groups : memberTab.Collections
-                    )
-                  "
-                  class="tw-cursor-pointer"
-                >
-                  <bit-badge-list
-                    [items]="organization.useGroups ? u.groupNames : u.collectionNames"
-                    [maxItems]="3"
-                    variant="secondary"
-                  ></bit-badge-list>
-                </td>
-              </ng-container>
-              <ng-template #readOnlyGroupsCell>
-                <td bitCell>
-                  <bit-badge-list
-                    [items]="organization.useGroups ? u.groupNames : u.collectionNames"
-                    [maxItems]="3"
-                    variant="secondary"
-                  ></bit-badge-list>
-                </td>
-              </ng-template>
-
-              <ng-container *ngIf="showUserManagementControls(); else readOnlyRoleCell">
-                <td
-                  bitCell
-                  (click)="edit(u, organization, memberTab.Role)"
-                  class="tw-cursor-pointer tw-text-sm tw-text-muted"
-                >
-                  {{ u.type | userType }}
-                </td>
-              </ng-container>
-              <ng-template #readOnlyRoleCell>
-                <td bitCell class="tw-text-sm tw-text-muted">
-                  {{ u.type | userType }}
-                </td>
-              </ng-template>
-
-              <td bitCell class="tw-text-muted">
-                <ng-container *ngIf="u.twoFactorEnabled">
-                  <i
-                    class="bwi bwi-lock"
-                    title="{{ 'userUsingTwoStep' | i18n }}"
-                    aria-hidden="true"
-                  ></i>
-                  <span class="tw-sr-only">{{ "userUsingTwoStep" | i18n }}</span>
-                </ng-container>
-                @let resetPasswordPolicyEnabled = resetPasswordPolicyEnabled$ | async;
-                <ng-container
-                  *ngIf="showEnrolledStatus($any(u), organization, resetPasswordPolicyEnabled)"
-                >
-                  <i
-                    class="bwi bwi-key"
-                    title="{{ 'enrolledAccountRecovery' | i18n }}"
-                    aria-hidden="true"
-                  ></i>
-                  <span class="tw-sr-only">{{ "enrolledAccountRecovery" | i18n }}</span>
-                </ng-container>
-              </td>
-              <td bitCell>
-                <div class="tw-flex tw-flex-row tw-items-center tw-justify-end tw-gap-2">
-                  <div class="tw-w-[32px]"></div>
-                  <button
-                    [bitMenuTriggerFor]="rowMenu"
-                    type="button"
-                    bitIconButton="bwi-ellipsis-v"
-                    size="small"
-                    label="{{ 'options' | i18n }}"
-                  ></button>
-                </div>
-
-                <bit-menu #rowMenu>
-                  <ng-container *ngIf="showUserManagementControls()">
-                    <button
-                      type="button"
-                      bitMenuItem
-                      (click)="reinvite(u, organization)"
-                      *ngIf="u.status === userStatusType.Invited"
-                    >
-                      <i aria-hidden="true" class="bwi bwi-envelope"></i>
-                      {{ "resendInvitation" | i18n }}
-                    </button>
-                    <button
-                      type="button"
-                      bitMenuItem
-                      (click)="confirm(u, organization)"
-                      *ngIf="u.status === userStatusType.Accepted"
-                    >
-                      <span class="tw-text-success">
-                        <i aria-hidden="true" class="bwi bwi-check"></i> {{ "confirm" | i18n }}
-                      </span>
-                    </button>
-                    <bit-menu-divider
-                      *ngIf="
-                        u.status === userStatusType.Accepted || u.status === userStatusType.Invited
-                      "
-                    ></bit-menu-divider>
-                    <button
-                      type="button"
-                      bitMenuItem
-                      (click)="edit(u, organization, memberTab.Role)"
-                    >
-                      <i aria-hidden="true" class="bwi bwi-user"></i> {{ "memberRole" | i18n }}
-                    </button>
-                    <button
-                      type="button"
-                      bitMenuItem
-                      (click)="edit(u, organization, memberTab.Groups)"
-                      *ngIf="organization.useGroups"
-                    >
-                      <i aria-hidden="true" class="bwi bwi-users"></i> {{ "groups" | i18n }}
-                    </button>
-                    <button
-                      type="button"
-                      bitMenuItem
-                      (click)="edit(u, organization, memberTab.Collections)"
-                    >
-                      <i aria-hidden="true" class="bwi bwi-collection-shared"></i>
-                      {{ "collections" | i18n }}
-                    </button>
-                    <bit-menu-divider></bit-menu-divider>
-                    <button
-                      type="button"
-                      bitMenuItem
-                      (click)="openEventsDialog(u, organization)"
-                      *ngIf="organization.useEvents && u.status === userStatusType.Confirmed"
-                    >
-                      <i aria-hidden="true" class="bwi bwi-file-text"></i> {{ "eventLogs" | i18n }}
-                    </button>
-                  </ng-container>
-
-                  <!-- Account recovery is available to all users with appropriate permissions -->
-                  <button
-                    type="button"
-                    bitMenuItem
-                    (click)="resetPassword(u, organization)"
-                    *ngIf="allowResetPassword(u, organization, resetPasswordPolicyEnabled)"
-                  >
-                    <i aria-hidden="true" class="bwi bwi-key"></i> {{ "recoverAccount" | i18n }}
-                  </button>
-
-                  <ng-container *ngIf="showUserManagementControls()">
-                    <button
-                      type="button"
-                      bitMenuItem
-                      (click)="restore(u, organization)"
-                      *ngIf="u.status === userStatusType.Revoked"
-                    >
-                      <i aria-hidden="true" class="bwi bwi-plus-circle"></i>
-                      {{ "restoreAccess" | i18n }}
-                    </button>
-                    <button
-                      type="button"
-                      bitMenuItem
-                      (click)="revoke(u, organization)"
-                      *ngIf="u.status !== userStatusType.Revoked"
-                    >
-                      <i aria-hidden="true" class="bwi bwi-minus-circle"></i>
-                      {{ "revokeAccess" | i18n }}
-                    </button>
-                    <button
-                      *ngIf="!u.managedByOrganization"
-                      type="button"
-                      bitMenuItem
-                      (click)="remove(u, organization)"
-                    >
-                      <span class="tw-text-danger">
-                        <i aria-hidden="true" class="bwi bwi-close"></i> {{ "remove" | i18n }}
-                      </span>
-                    </button>
-                    <button
-                      *ngIf="u.managedByOrganization"
-                      type="button"
-                      bitMenuItem
-                      (click)="deleteUser(u, organization)"
-                    >
-                      <span class="tw-text-danger">
-                        <i class="bwi bwi-trash" aria-hidden="true"></i>
-                        {{ "delete" | i18n }}
-                      </span>
-                    </button>
-                  </ng-container>
-                </bit-menu>
-              </td>
-            </tr>
-          </ng-template>
-        </bit-table>
-      </cdk-virtual-scroll-viewport>
-    </ng-container>
-  </ng-container>
-}

apps/web/src/app/admin-console/organizations/members/deprecated_members.component.ts

@@ -1,624 +0,0 @@
-import { Component, computed, Signal } from "@angular/core";
-import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop";
-import { ActivatedRoute } from "@angular/router";
-import {
-  combineLatest,
-  concatMap,
-  filter,
-  firstValueFrom,
-  from,
-  map,
-  merge,
-  Observable,
-  shareReplay,
-  switchMap,
-  take,
-} from "rxjs";
-
-import { OrganizationUserUserDetailsResponse } from "@bitwarden/admin-console/common";
-import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service";
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
-import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import {
-  OrganizationUserStatusType,
-  OrganizationUserType,
-  PolicyType,
-} from "@bitwarden/common/admin-console/enums";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction";
-import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { getById } from "@bitwarden/common/platform/misc";
-import { DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
-import { UserId } from "@bitwarden/user-core";
-import { BillingConstraintService } from "@bitwarden/web-vault/app/billing/members/billing-constraint/billing-constraint.service";
-import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
-
-import { BaseMembersComponent } from "../../common/base-members.component";
-import {
-  CloudBulkReinviteLimit,
-  MaxCheckedCount,
-  PeopleTableDataSource,
-} from "../../common/people-table-data-source";
-import { OrganizationUserView } from "../core/views/organization-user.view";
-
-import { AccountRecoveryDialogResultType } from "./components/account-recovery/account-recovery-dialog.component";
-import { MemberDialogResult, MemberDialogTab } from "./components/member-dialog";
-import {
-  MemberDialogManagerService,
-  MemberExportService,
-  OrganizationMembersService,
-} from "./services";
-import { DeleteManagedMemberWarningService } from "./services/delete-managed-member/delete-managed-member-warning.service";
-import {
-  MemberActionsService,
-  MemberActionResult,
-} from "./services/member-actions/member-actions.service";
-
-class MembersTableDataSource extends PeopleTableDataSource<OrganizationUserView> {
-  protected statusType = OrganizationUserStatusType;
-}
-
-// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
-// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
-@Component({
-  templateUrl: "deprecated_members.component.html",
-  standalone: false,
-})
-export class MembersComponent extends BaseMembersComponent<OrganizationUserView> {
-  userType = OrganizationUserType;
-  userStatusType = OrganizationUserStatusType;
-  memberTab = MemberDialogTab;
-  protected dataSource: MembersTableDataSource;
-
-  readonly organization: Signal<Organization | undefined>;
-  status: OrganizationUserStatusType | undefined;
-
-  private userId$: Observable<UserId> = this.accountService.activeAccount$.pipe(getUserId);
-
-  resetPasswordPolicyEnabled$: Observable<boolean>;
-
-  protected readonly canUseSecretsManager: Signal<boolean> = computed(
-    () => this.organization()?.useSecretsManager ?? false,
-  );
-  protected readonly showUserManagementControls: Signal<boolean> = computed(
-    () => this.organization()?.canManageUsers ?? false,
-  );
-  protected billingMetadata$: Observable<OrganizationBillingMetadataResponse>;
-
-  // Fixed sizes used for cdkVirtualScroll
-  protected rowHeight = 66;
-  protected rowHeightClass = `tw-h-[66px]`;
-
-  constructor(
-    apiService: ApiService,
-    i18nService: I18nService,
-    organizationManagementPreferencesService: OrganizationManagementPreferencesService,
-    keyService: KeyService,
-    validationService: ValidationService,
-    logService: LogService,
-    userNamePipe: UserNamePipe,
-    dialogService: DialogService,
-    toastService: ToastService,
-    private route: ActivatedRoute,
-    protected deleteManagedMemberWarningService: DeleteManagedMemberWarningService,
-    private organizationWarningsService: OrganizationWarningsService,
-    private memberActionsService: MemberActionsService,
-    private memberDialogManager: MemberDialogManagerService,
-    protected billingConstraint: BillingConstraintService,
-    protected memberService: OrganizationMembersService,
-    private organizationService: OrganizationService,
-    private accountService: AccountService,
-    private policyService: PolicyService,
-    private policyApiService: PolicyApiServiceAbstraction,
-    private organizationMetadataService: OrganizationMetadataServiceAbstraction,
-    private memberExportService: MemberExportService,
-    private environmentService: EnvironmentService,
-  ) {
-    super(
-      apiService,
-      i18nService,
-      keyService,
-      validationService,
-      logService,
-      userNamePipe,
-      dialogService,
-      organizationManagementPreferencesService,
-      toastService,
-    );
-
-    this.dataSource = new MembersTableDataSource(this.environmentService);
-
-    const organization$ = this.route.params.pipe(
-      concatMap((params) =>
-        this.userId$.pipe(
-          switchMap((userId) =>
-            this.organizationService.organizations$(userId).pipe(getById(params.organizationId)),
-          ),
-          filter((organization): organization is Organization => organization != null),
-          shareReplay({ refCount: true, bufferSize: 1 }),
-        ),
-      ),
-    );
-
-    this.organization = toSignal(organization$);
-
-    const policies$ = combineLatest([this.userId$, organization$]).pipe(
-      switchMap(([userId, organization]) =>
-        organization.isProviderUser
-          ? from(this.policyApiService.getPolicies(organization.id)).pipe(
-              map((response) => Policy.fromListResponse(response)),
-            )
-          : this.policyService.policies$(userId),
-      ),
-    );
-
-    this.resetPasswordPolicyEnabled$ = combineLatest([organization$, policies$]).pipe(
-      map(
-        ([organization, policies]) =>
-          policies
-            .filter((policy) => policy.type === PolicyType.ResetPassword)
-            .find((p) => p.organizationId === organization.id)?.enabled ?? false,
-      ),
-    );
-
-    combineLatest([this.route.queryParams, organization$])
-      .pipe(
-        concatMap(async ([qParams, organization]) => {
-          await this.load(organization!);
-
-          this.searchControl.setValue(qParams.search);
-
-          if (qParams.viewEvents != null) {
-            const user = this.dataSource.data.filter((u) => u.id === qParams.viewEvents);
-            if (user.length > 0 && user[0].status === OrganizationUserStatusType.Confirmed) {
-              this.openEventsDialog(user[0], organization!);
-            }
-          }
-        }),
-        takeUntilDestroyed(),
-      )
-      .subscribe();
-
-    organization$
-      .pipe(
-        switchMap((organization) =>
-          merge(
-            this.organizationWarningsService.showInactiveSubscriptionDialog$(organization),
-            this.organizationWarningsService.showSubscribeBeforeFreeTrialEndsDialog$(organization),
-          ),
-        ),
-        takeUntilDestroyed(),
-      )
-      .subscribe();
-
-    this.billingMetadata$ = organization$.pipe(
-      switchMap((organization) =>
-        this.organizationMetadataService.getOrganizationMetadata$(organization.id),
-      ),
-      shareReplay({ bufferSize: 1, refCount: false }),
-    );
-
-    // Stripe is slow, so kick this off in the background but without blocking page load.
-    // Anyone who needs it will still await the first emission.
-    this.billingMetadata$.pipe(take(1), takeUntilDestroyed()).subscribe();
-  }
-
-  override async load(organization: Organization) {
-    await super.load(organization);
-  }
-
-  async getUsers(organization: Organization): Promise<OrganizationUserView[]> {
-    return await this.memberService.loadUsers(organization);
-  }
-
-  async removeUser(id: string, organization: Organization): Promise<MemberActionResult> {
-    return await this.memberActionsService.removeUser(organization, id);
-  }
-
-  async revokeUser(id: string, organization: Organization): Promise<MemberActionResult> {
-    return await this.memberActionsService.revokeUser(organization, id);
-  }
-
-  async restoreUser(id: string, organization: Organization): Promise<MemberActionResult> {
-    return await this.memberActionsService.restoreUser(organization, id);
-  }
-
-  async reinviteUser(id: string, organization: Organization): Promise<MemberActionResult> {
-    return await this.memberActionsService.reinviteUser(organization, id);
-  }
-
-  async confirmUser(
-    user: OrganizationUserView,
-    publicKey: Uint8Array,
-    organization: Organization,
-  ): Promise<MemberActionResult> {
-    return await this.memberActionsService.confirmUser(user, publicKey, organization);
-  }
-
-  async revoke(user: OrganizationUserView, organization: Organization) {
-    const confirmed = await this.revokeUserConfirmationDialog(user);
-
-    if (!confirmed) {
-      return false;
-    }
-
-    this.actionPromise = this.revokeUser(user.id, organization);
-    try {
-      const result = await this.actionPromise;
-      if (result.success) {
-        this.toastService.showToast({
-          variant: "success",
-          message: this.i18nService.t("revokedUserId", this.userNamePipe.transform(user)),
-        });
-        await this.load(organization);
-      } else {
-        throw new Error(result.error);
-      }
-    } catch (e) {
-      this.validationService.showError(e);
-    }
-    this.actionPromise = undefined;
-  }
-
-  async restore(user: OrganizationUserView, organization: Organization) {
-    this.actionPromise = this.restoreUser(user.id, organization);
-    try {
-      const result = await this.actionPromise;
-      if (result.success) {
-        this.toastService.showToast({
-          variant: "success",
-          message: this.i18nService.t("restoredUserId", this.userNamePipe.transform(user)),
-        });
-        await this.load(organization);
-      } else {
-        throw new Error(result.error);
-      }
-    } catch (e) {
-      this.validationService.showError(e);
-    }
-    this.actionPromise = undefined;
-  }
-
-  allowResetPassword(
-    orgUser: OrganizationUserView,
-    organization: Organization,
-    orgResetPasswordPolicyEnabled: boolean,
-  ): boolean {
-    return this.memberActionsService.allowResetPassword(
-      orgUser,
-      organization,
-      orgResetPasswordPolicyEnabled,
-    );
-  }
-
-  showEnrolledStatus(
-    orgUser: OrganizationUserUserDetailsResponse,
-    organization: Organization,
-    orgResetPasswordPolicyEnabled: boolean,
-  ): boolean {
-    return (
-      organization.useResetPassword &&
-      orgUser.resetPasswordEnrolled &&
-      orgResetPasswordPolicyEnabled
-    );
-  }
-
-  private async handleInviteDialog(organization: Organization) {
-    const billingMetadata = await firstValueFrom(this.billingMetadata$);
-    const allUserEmails = this.dataSource.data?.map((user) => user.email) ?? [];
-
-    const result = await this.memberDialogManager.openInviteDialog(
-      organization,
-      billingMetadata,
-      allUserEmails,
-    );
-
-    if (result === MemberDialogResult.Saved) {
-      await this.load(organization);
-    }
-  }
-
-  async invite(organization: Organization) {
-    const billingMetadata = await firstValueFrom(this.billingMetadata$);
-    const seatLimitResult = this.billingConstraint.checkSeatLimit(organization, billingMetadata);
-    if (!(await this.billingConstraint.seatLimitReached(seatLimitResult, organization))) {
-      await this.handleInviteDialog(organization);
-      this.organizationMetadataService.refreshMetadataCache();
-    }
-  }
-
-  async edit(
-    user: OrganizationUserView,
-    organization: Organization,
-    initialTab: MemberDialogTab = MemberDialogTab.Role,
-  ) {
-    const billingMetadata = await firstValueFrom(this.billingMetadata$);
-
-    const result = await this.memberDialogManager.openEditDialog(
-      user,
-      organization,
-      billingMetadata,
-      initialTab,
-    );
-
-    switch (result) {
-      case MemberDialogResult.Deleted:
-        this.dataSource.removeUser(user);
-        break;
-      case MemberDialogResult.Saved:
-      case MemberDialogResult.Revoked:
-      case MemberDialogResult.Restored:
-        await this.load(organization);
-        break;
-    }
-  }
-
-  async bulkRemove(organization: Organization) {
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    const users = this.dataSource.getCheckedUsersWithLimit(MaxCheckedCount);
-
-    await this.memberDialogManager.openBulkRemoveDialog(organization, users);
-    this.organizationMetadataService.refreshMetadataCache();
-    await this.load(organization);
-  }
-
-  async bulkDelete(organization: Organization) {
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    const users = this.dataSource.getCheckedUsersWithLimit(MaxCheckedCount);
-
-    await this.memberDialogManager.openBulkDeleteDialog(organization, users);
-    await this.load(organization);
-  }
-
-  async bulkRevoke(organization: Organization) {
-    await this.bulkRevokeOrRestore(true, organization);
-  }
-
-  async bulkRestore(organization: Organization) {
-    await this.bulkRevokeOrRestore(false, organization);
-  }
-
-  async bulkRevokeOrRestore(isRevoking: boolean, organization: Organization) {
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    const users = this.dataSource.getCheckedUsersWithLimit(MaxCheckedCount);
-
-    await this.memberDialogManager.openBulkRestoreRevokeDialog(organization, users, isRevoking);
-    await this.load(organization);
-  }
-
-  async bulkReinvite(organization: Organization) {
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    let users: OrganizationUserView[];
-    if (this.dataSource.isIncreasedBulkLimitEnabled()) {
-      users = this.dataSource.getCheckedUsersInVisibleOrder();
-    } else {
-      users = this.dataSource.getCheckedUsers();
-    }
-
-    const allInvitedUsers = users.filter((u) => u.status === OrganizationUserStatusType.Invited);
-
-    // Capture the original count BEFORE enforcing the limit
-    const originalInvitedCount = allInvitedUsers.length;
-
-    // When feature flag is enabled, limit invited users and uncheck the excess
-    let filteredUsers: OrganizationUserView[];
-    if (this.dataSource.isIncreasedBulkLimitEnabled()) {
-      filteredUsers = this.dataSource.limitAndUncheckExcess(
-        allInvitedUsers,
-        CloudBulkReinviteLimit,
-      );
-    } else {
-      filteredUsers = allInvitedUsers;
-    }
-
-    if (filteredUsers.length <= 0) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("noSelectedUsersApplicable"),
-      });
-      return;
-    }
-
-    try {
-      const result = await this.memberActionsService.bulkReinvite(organization, filteredUsers);
-
-      if (result.successful.length === 0) {
-        throw new Error();
-      }
-
-      // When feature flag is enabled, show toast instead of dialog
-      if (this.dataSource.isIncreasedBulkLimitEnabled()) {
-        const selectedCount = originalInvitedCount;
-        const invitedCount = filteredUsers.length;
-
-        if (selectedCount > CloudBulkReinviteLimit) {
-          const excludedCount = selectedCount - CloudBulkReinviteLimit;
-          this.toastService.showToast({
-            variant: "success",
-            message: this.i18nService.t(
-              "bulkReinviteLimitedSuccessToast",
-              CloudBulkReinviteLimit.toLocaleString(),
-              selectedCount.toLocaleString(),
-              excludedCount.toLocaleString(),
-            ),
-          });
-        } else {
-          this.toastService.showToast({
-            variant: "success",
-            message:
-              invitedCount === 1
-                ? this.i18nService.t("reinviteSuccessToast")
-                : this.i18nService.t("bulkReinviteSentToast", invitedCount.toString()),
-          });
-        }
-      } else {
-        // Feature flag disabled - show legacy dialog
-        await this.memberDialogManager.openBulkStatusDialog(
-          users,
-          filteredUsers,
-          Promise.resolve(result.successful),
-          this.i18nService.t("bulkReinviteMessage"),
-        );
-      }
-    } catch (e) {
-      this.validationService.showError(e);
-    }
-    this.actionPromise = undefined;
-  }
-
-  async bulkConfirm(organization: Organization) {
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    const users = this.dataSource.getCheckedUsersWithLimit(MaxCheckedCount);
-
-    await this.memberDialogManager.openBulkConfirmDialog(organization, users);
-    await this.load(organization);
-  }
-
-  async bulkEnableSM(organization: Organization) {
-    const users = this.dataSource.getCheckedUsersWithLimit(MaxCheckedCount);
-
-    await this.memberDialogManager.openBulkEnableSecretsManagerDialog(organization, users);
-
-    this.dataSource.uncheckAllUsers();
-    await this.load(organization);
-  }
-
-  openEventsDialog(user: OrganizationUserView, organization: Organization) {
-    this.memberDialogManager.openEventsDialog(user, organization);
-  }
-
-  async resetPassword(user: OrganizationUserView, organization: Organization) {
-    if (!user || !user.email || !user.id) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("orgUserDetailsNotFound"),
-      });
-      this.logService.error("Org user details not found when attempting account recovery");
-
-      return;
-    }
-
-    const result = await this.memberDialogManager.openAccountRecoveryDialog(user, organization);
-    if (result === AccountRecoveryDialogResultType.Ok) {
-      await this.load(organization);
-    }
-
-    return;
-  }
-
-  protected async removeUserConfirmationDialog(user: OrganizationUserView) {
-    return await this.memberDialogManager.openRemoveUserConfirmationDialog(user);
-  }
-
-  protected async revokeUserConfirmationDialog(user: OrganizationUserView) {
-    return await this.memberDialogManager.openRevokeUserConfirmationDialog(user);
-  }
-
-  async deleteUser(user: OrganizationUserView, organization: Organization) {
-    const confirmed = await this.memberDialogManager.openDeleteUserConfirmationDialog(
-      user,
-      organization,
-    );
-
-    if (!confirmed) {
-      return false;
-    }
-
-    this.actionPromise = this.memberActionsService.deleteUser(organization, user.id);
-    try {
-      const result = await this.actionPromise;
-      if (!result.success) {
-        throw new Error(result.error);
-      }
-      this.toastService.showToast({
-        variant: "success",
-        message: this.i18nService.t("organizationUserDeleted", this.userNamePipe.transform(user)),
-      });
-      this.dataSource.removeUser(user);
-    } catch (e) {
-      this.validationService.showError(e);
-    }
-    this.actionPromise = undefined;
-  }
-
-  get showBulkRestoreUsers(): boolean {
-    return this.dataSource
-      .getCheckedUsers()
-      .every((member) => member.status == this.userStatusType.Revoked);
-  }
-
-  get showBulkRevokeUsers(): boolean {
-    return this.dataSource
-      .getCheckedUsers()
-      .every((member) => member.status != this.userStatusType.Revoked);
-  }
-
-  get showBulkRemoveUsers(): boolean {
-    return this.dataSource.getCheckedUsers().every((member) => !member.managedByOrganization);
-  }
-
-  get showBulkDeleteUsers(): boolean {
-    const validStatuses = [
-      this.userStatusType.Accepted,
-      this.userStatusType.Confirmed,
-      this.userStatusType.Revoked,
-    ];
-
-    return this.dataSource
-      .getCheckedUsers()
-      .every((member) => member.managedByOrganization && validStatuses.includes(member.status));
-  }
-
-  get selectedInvitedCount(): number {
-    return this.dataSource
-      .getCheckedUsers()
-      .filter((member) => member.status === this.userStatusType.Invited).length;
-  }
-
-  get isSingleInvite(): boolean {
-    return this.selectedInvitedCount === 1;
-  }
-
-  exportMembers = () => {
-    const result = this.memberExportService.getMemberExport(this.dataSource.data);
-    if (result.success) {
-      this.toastService.showToast({
-        variant: "success",
-        title: undefined,
-        message: this.i18nService.t("dataExportSuccess"),
-      });
-    }
-
-    if (result.error != null) {
-      this.validationService.showError(result.error.message);
-    }
-  };
-}

apps/web/src/app/admin-console/organizations/members/members-routing.module.ts

@@ -1,30 +1,23 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { featureFlaggedRoute } from "@bitwarden/angular/platform/utils/feature-flagged-route";
 import { canAccessMembersTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
 import { FreeBitwardenFamiliesComponent } from "../../../billing/members/free-bitwarden-families.component";
 import { organizationPermissionsGuard } from "../guards/org-permissions.guard";
 
 import { canAccessSponsoredFamilies } from "./../../../billing/guards/can-access-sponsored-families.guard";
-import { MembersComponent } from "./deprecated_members.component";
-import { vNextMembersComponent } from "./members.component";
+import { MembersComponent } from "./members.component";
 
 const routes: Routes = [
-  ...featureFlaggedRoute({
-    defaultComponent: MembersComponent,
-    flaggedComponent: vNextMembersComponent,
-    featureFlag: FeatureFlag.MembersComponentRefactor,
-    routeOptions: {
-      path: "",
-      canActivate: [organizationPermissionsGuard(canAccessMembersTab)],
-      data: {
-        titleId: "members",
-      },
+  {
+    path: "",
+    component: MembersComponent,
+    canActivate: [organizationPermissionsGuard(canAccessMembersTab)],
+    data: {
+      titleId: "members",
     },
-  }),
+  },
   {
     path: "sponsored-families",
     component: FreeBitwardenFamiliesComponent,

apps/web/src/app/admin-console/organizations/members/members.component.spec.ts

@@ -36,7 +36,7 @@ import { OrganizationUserView } from "../core/views/organization-user.view";
 
 import { AccountRecoveryDialogResultType } from "./components/account-recovery/account-recovery-dialog.component";
 import { MemberDialogResult } from "./components/member-dialog";
-import { vNextMembersComponent } from "./members.component";
+import { MembersComponent } from "./members.component";
 import {
   MemberDialogManagerService,
   MemberExportService,
@@ -48,9 +48,9 @@ import {
   MemberActionResult,
 } from "./services/member-actions/member-actions.service";
 
-describe("vNextMembersComponent", () => {
-  let component: vNextMembersComponent;
-  let fixture: ComponentFixture<vNextMembersComponent>;
+describe("MembersComponent", () => {
+  let component: MembersComponent;
+  let fixture: ComponentFixture<MembersComponent>;
 
   let mockApiService: MockProxy<ApiService>;
   let mockI18nService: MockProxy<I18nService>;
@@ -172,7 +172,7 @@ describe("vNextMembersComponent", () => {
     mockFileDownloadService = mock<FileDownloadService>();
 
     await TestBed.configureTestingModule({
-      declarations: [vNextMembersComponent],
+      declarations: [MembersComponent],
       providers: [
         { provide: ApiService, useValue: mockApiService },
         { provide: I18nService, useValue: mockI18nService },
@@ -211,13 +211,13 @@ describe("vNextMembersComponent", () => {
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
-      .overrideComponent(vNextMembersComponent, {
+      .overrideComponent(MembersComponent, {
         remove: { imports: [] },
         add: { template: "<div></div>" },
       })
       .compileComponents();
 
-    fixture = TestBed.createComponent(vNextMembersComponent);
+    fixture = TestBed.createComponent(MembersComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

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

@@ -82,7 +82,7 @@ interface BulkMemberFlags {
   templateUrl: "members.component.html",
   standalone: false,
 })
-export class vNextMembersComponent {
+export class MembersComponent {
   protected i18nService = inject(I18nService);
   protected validationService = inject(ValidationService);
   protected logService = inject(LogService);

apps/web/src/app/admin-console/organizations/members/members.module.ts

@@ -19,9 +19,8 @@ import { BulkRemoveDialogComponent } from "./components/bulk/bulk-remove-dialog.
 import { BulkRestoreRevokeComponent } from "./components/bulk/bulk-restore-revoke.component";
 import { BulkStatusComponent } from "./components/bulk/bulk-status.component";
 import { UserDialogModule } from "./components/member-dialog";
-import { MembersComponent } from "./deprecated_members.component";
 import { MembersRoutingModule } from "./members-routing.module";
-import { vNextMembersComponent } from "./members.component";
+import { MembersComponent } from "./members.component";
 import { UserStatusPipe } from "./pipes";
 import {
   OrganizationMembersService,
@@ -52,7 +51,6 @@ import {
     BulkProgressDialogComponent,
     BulkReinviteFailureDialogComponent,
     MembersComponent,
-    vNextMembersComponent,
     BulkDeleteDialogComponent,
     UserStatusPipe,
   ],

bitwarden_license/bit-web/src/app/admin-console/providers/manage/deprecated_members.component.html

@@ -1,225 +0,0 @@
-<app-header>
-  <bit-search class="tw-grow" [formControl]="searchControl" [placeholder]="'searchMembers' | i18n">
-  </bit-search>
-  <button type="button" bitButton buttonType="primary" (click)="invite()">
-    <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-    {{ "inviteMember" | i18n }}
-  </button>
-</app-header>
-
-<div class="tw-mb-4 tw-flex tw-flex-col tw-space-y-4">
-  <bit-toggle-group
-    [selected]="status"
-    (selectedChange)="statusToggle.next($event)"
-    [attr.aria-label]="'memberStatusFilter' | i18n"
-  >
-    <bit-toggle [value]="null">
-      {{ "all" | i18n }}
-      <span bitBadge variant="info" *ngIf="dataSource.activeUserCount as allCount">
-        {{ allCount }}
-      </span>
-    </bit-toggle>
-    <bit-toggle [value]="userStatusType.Invited">
-      {{ "invited" | i18n }}
-      <span bitBadge variant="info" *ngIf="dataSource.invitedUserCount as invitedCount">
-        {{ invitedCount }}
-      </span>
-    </bit-toggle>
-    <bit-toggle [value]="userStatusType.Accepted">
-      {{ "needsConfirmation" | i18n }}
-      <span bitBadge variant="info" *ngIf="dataSource.acceptedUserCount as acceptedCount">
-        {{ acceptedCount }}
-      </span>
-    </bit-toggle>
-  </bit-toggle-group>
-</div>
-
-<ng-container *ngIf="!firstLoaded">
-  <i
-    class="bwi bwi-spinner bwi-spin tw-text-muted"
-    title="{{ 'loading' | i18n }}"
-    aria-hidden="true"
-  >
-  </i>
-  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-</ng-container>
-
-<ng-container *ngIf="firstLoaded">
-  <p *ngIf="!dataSource.filteredData.length">{{ "noMembersInList" | i18n }}</p>
-  <ng-container *ngIf="dataSource.filteredData.length">
-    <bit-callout
-      type="info"
-      title="{{ 'confirmUsers' | i18n }}"
-      icon="bwi-check-circle"
-      *ngIf="showConfirmUsers"
-    >
-      {{ "providerUsersNeedConfirmed" | i18n }}
-    </bit-callout>
-    <cdk-virtual-scroll-viewport bitScrollLayout [itemSize]="rowHeight" class="tw-pb-8">
-      <bit-table [dataSource]="dataSource">
-        <ng-container header>
-          <tr>
-            <th bitCell class="tw-w-20">
-              <input
-                type="checkbox"
-                bitCheckbox
-                class="tw-mr-1"
-                (change)="dataSource.checkAllFilteredUsers($any($event.target).checked)"
-                id="selectAll"
-              />
-              <label class="tw-mb-0 !tw-font-medium !tw-text-muted" for="selectAll">
-                {{ "all" | i18n }}
-              </label>
-            </th>
-            <th bitCell bitSortable="email" default>{{ "name" | i18n }}</th>
-            <th bitCell bitSortable="type">{{ "role" | i18n }}</th>
-            <th bitCell class="tw-w-10">
-              <button
-                [bitMenuTriggerFor]="headerMenu"
-                type="button"
-                bitIconButton="bwi-ellipsis-v"
-                size="small"
-                label="{{ 'options' | i18n }}"
-              ></button>
-              <bit-menu #headerMenu>
-                <button
-                  type="button"
-                  bitMenuItem
-                  (click)="bulkReinvite()"
-                  *ngIf="showBulkReinviteUsers"
-                >
-                  <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
-                  {{ (isSingleInvite ? "resendInvitation" : "reinviteSelected") | i18n }}
-                </button>
-                <button
-                  type="button"
-                  bitMenuItem
-                  (click)="bulkConfirm()"
-                  *ngIf="showBulkConfirmUsers"
-                >
-                  <span class="tw-text-success">
-                    <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
-                    {{ "confirmSelected" | i18n }}
-                  </span>
-                </button>
-                <button type="button" bitMenuItem (click)="bulkRemove()">
-                  <span class="tw-text-danger">
-                    <i aria-hidden="true" class="bwi bwi-close"></i>
-                    {{ "remove" | i18n }}
-                  </span>
-                </button>
-              </bit-menu>
-            </th>
-          </tr>
-        </ng-container>
-        <ng-template body let-rows$>
-          <tr
-            bitRow
-            *cdkVirtualFor="let user of rows$"
-            alignContent="middle"
-            [ngClass]="rowHeightClass"
-          >
-            <td bitCell (click)="dataSource.checkUser(user)">
-              <input type="checkbox" bitCheckbox [(ngModel)]="$any(user).checked" />
-            </td>
-            <td bitCell (click)="edit(user)" class="tw-cursor-pointer">
-              <div class="tw-flex tw-items-center">
-                <bit-avatar
-                  size="small"
-                  [text]="user | userName"
-                  [id]="user.userId"
-                  [color]="user.avatarColor"
-                  class="tw-mr-3"
-                ></bit-avatar>
-                <div class="tw-flex tw-flex-col">
-                  <div>
-                    <button type="button" bitLink>
-                      {{ user.name ?? user.email }}
-                    </button>
-                    <span
-                      bitBadge
-                      class="tw-text-xs"
-                      variant="secondary"
-                      *ngIf="user.status === userStatusType.Invited"
-                    >
-                      {{ "invited" | i18n }}
-                    </span>
-                    <span
-                      bitBadge
-                      class="tw-text-xs"
-                      variant="warning"
-                      *ngIf="user.status === userStatusType.Accepted"
-                    >
-                      {{ "needsConfirmation" | i18n }}
-                    </span>
-                    <span
-                      bitBadge
-                      class="tw-text-xs"
-                      variant="secondary"
-                      *ngIf="user.status === userStatusType.Revoked"
-                    >
-                      {{ "revoked" | i18n }}
-                    </span>
-                  </div>
-                  <div class="tw-text-sm tw-text-muted" *ngIf="user.name">
-                    {{ user.email }}
-                  </div>
-                </div>
-              </div>
-            </td>
-            <td bitCell class="tw-text-muted">
-              <span *ngIf="user.type === userType.ProviderAdmin">{{ "providerAdmin" | i18n }}</span>
-              <span *ngIf="user.type === userType.ServiceUser">{{ "serviceUser" | i18n }}</span>
-            </td>
-            <td bitCell>
-              <button
-                [bitMenuTriggerFor]="rowMenu"
-                type="button"
-                bitIconButton="bwi-ellipsis-v"
-                size="small"
-                label="{{ 'options' | i18n }}"
-              ></button>
-              <bit-menu #rowMenu>
-                <button
-                  type="button"
-                  bitMenuItem
-                  (click)="reinvite(user)"
-                  *ngIf="user.status === userStatusType.Invited"
-                >
-                  <i aria-hidden="true" class="bwi bwi-envelope"></i>
-                  {{ "resendInvitation" | i18n }}
-                </button>
-                <button
-                  type="button"
-                  bitMenuItem
-                  (click)="confirm(user)"
-                  *ngIf="user.status === userStatusType.Accepted"
-                >
-                  <span class="tw-text-success">
-                    <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
-                    {{ "confirm" | i18n }}
-                  </span>
-                </button>
-                <button
-                  type="button"
-                  bitMenuItem
-                  (click)="openEventsDialog(user)"
-                  *ngIf="user.status === userStatusType.Confirmed"
-                >
-                  <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
-                  {{ "eventLogs" | i18n }}
-                </button>
-                <button type="button" bitMenuItem (click)="remove(user)">
-                  <span class="tw-text-danger">
-                    <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
-                    {{ "remove" | i18n }}
-                  </span>
-                </button>
-              </bit-menu>
-            </td>
-          </tr>
-        </ng-template>
-      </bit-table>
-    </cdk-virtual-scroll-viewport>
-  </ng-container>
-</ng-container>

bitwarden_license/bit-web/src/app/admin-console/providers/manage/deprecated_members.component.ts

@@ -1,351 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { ActivatedRoute, Router } from "@angular/router";
-import { combineLatest, firstValueFrom, lastValueFrom, switchMap } from "rxjs";
-import { first, map } from "rxjs/operators";
-
-import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service";
-import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { ProviderUserStatusType, ProviderUserType } from "@bitwarden/common/admin-console/enums";
-import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request";
-import { ProviderUserConfirmRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-confirm.request";
-import { ProviderUserUserDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user.response";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { assertNonNullish } from "@bitwarden/common/auth/utils";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { ProviderId } from "@bitwarden/common/types/guid";
-import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
-import { BaseMembersComponent } from "@bitwarden/web-vault/app/admin-console/common/base-members.component";
-import {
-  CloudBulkReinviteLimit,
-  MaxCheckedCount,
-  peopleFilter,
-  PeopleTableDataSource,
-} from "@bitwarden/web-vault/app/admin-console/common/people-table-data-source";
-import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
-import { BulkStatusComponent } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-status.component";
-import { MemberActionResult } from "@bitwarden/web-vault/app/admin-console/organizations/members/services/member-actions/member-actions.service";
-
-import {
-  AddEditMemberDialogComponent,
-  AddEditMemberDialogParams,
-  AddEditMemberDialogResultType,
-} from "./dialogs/add-edit-member-dialog.component";
-import { BulkConfirmDialogComponent } from "./dialogs/bulk-confirm-dialog.component";
-import { BulkRemoveDialogComponent } from "./dialogs/bulk-remove-dialog.component";
-
-type ProviderUser = ProviderUserUserDetailsResponse;
-
-class MembersTableDataSource extends PeopleTableDataSource<ProviderUser> {
-  protected statusType = ProviderUserStatusType;
-}
-
-// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
-// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
-@Component({
-  templateUrl: "deprecated_members.component.html",
-  standalone: false,
-})
-export class MembersComponent extends BaseMembersComponent<ProviderUser> {
-  accessEvents = false;
-  dataSource: MembersTableDataSource;
-  loading = true;
-  providerId: string;
-  rowHeight = 70;
-  rowHeightClass = `tw-h-[70px]`;
-  status: ProviderUserStatusType = null;
-
-  userStatusType = ProviderUserStatusType;
-  userType = ProviderUserType;
-
-  constructor(
-    apiService: ApiService,
-    keyService: KeyService,
-    dialogService: DialogService,
-    i18nService: I18nService,
-    logService: LogService,
-    organizationManagementPreferencesService: OrganizationManagementPreferencesService,
-    toastService: ToastService,
-    userNamePipe: UserNamePipe,
-    validationService: ValidationService,
-    private encryptService: EncryptService,
-    private activatedRoute: ActivatedRoute,
-    private providerService: ProviderService,
-    private router: Router,
-    private accountService: AccountService,
-    private environmentService: EnvironmentService,
-  ) {
-    super(
-      apiService,
-      i18nService,
-      keyService,
-      validationService,
-      logService,
-      userNamePipe,
-      dialogService,
-      organizationManagementPreferencesService,
-      toastService,
-    );
-
-    this.dataSource = new MembersTableDataSource(this.environmentService);
-
-    combineLatest([
-      this.activatedRoute.parent.params,
-      this.activatedRoute.queryParams.pipe(first()),
-    ])
-      .pipe(
-        switchMap(async ([urlParams, queryParams]) => {
-          this.searchControl.setValue(queryParams.search);
-          this.dataSource.filter = peopleFilter(queryParams.search, null);
-
-          this.providerId = urlParams.providerId;
-          const provider = await firstValueFrom(
-            this.accountService.activeAccount$.pipe(
-              getUserId,
-              switchMap((userId) => this.providerService.get$(this.providerId, userId)),
-            ),
-          );
-
-          if (!provider || !provider.canManageUsers) {
-            return await this.router.navigate(["../"], { relativeTo: this.activatedRoute });
-          }
-          this.accessEvents = provider.useEvents;
-          await this.load();
-
-          if (queryParams.viewEvents != null) {
-            const user = this.dataSource.data.find((user) => user.id === queryParams.viewEvents);
-            if (user && user.status === ProviderUserStatusType.Confirmed) {
-              this.openEventsDialog(user);
-            }
-          }
-        }),
-        takeUntilDestroyed(),
-      )
-      .subscribe();
-  }
-
-  async bulkConfirm(): Promise<void> {
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    const users = this.dataSource.getCheckedUsersWithLimit(MaxCheckedCount);
-
-    const dialogRef = BulkConfirmDialogComponent.open(this.dialogService, {
-      data: {
-        providerId: this.providerId,
-        users: users,
-      },
-    });
-
-    await lastValueFrom(dialogRef.closed);
-    await this.load();
-  }
-
-  async bulkReinvite(): Promise<void> {
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    let users: ProviderUser[];
-    if (this.dataSource.isIncreasedBulkLimitEnabled()) {
-      users = this.dataSource.getCheckedUsersInVisibleOrder();
-    } else {
-      users = this.dataSource.getCheckedUsers();
-    }
-
-    const allInvitedUsers = users.filter((user) => user.status === ProviderUserStatusType.Invited);
-
-    // Capture the original count BEFORE enforcing the limit
-    const originalInvitedCount = allInvitedUsers.length;
-
-    // When feature flag is enabled, limit invited users and uncheck the excess
-    let checkedInvitedUsers: ProviderUser[];
-    if (this.dataSource.isIncreasedBulkLimitEnabled()) {
-      checkedInvitedUsers = this.dataSource.limitAndUncheckExcess(
-        allInvitedUsers,
-        CloudBulkReinviteLimit,
-      );
-    } else {
-      checkedInvitedUsers = allInvitedUsers;
-    }
-
-    if (checkedInvitedUsers.length <= 0) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("noSelectedUsersApplicable"),
-      });
-      return;
-    }
-
-    try {
-      // When feature flag is enabled, show toast instead of dialog
-      if (this.dataSource.isIncreasedBulkLimitEnabled()) {
-        await this.apiService.postManyProviderUserReinvite(
-          this.providerId,
-          new ProviderUserBulkRequest(checkedInvitedUsers.map((user) => user.id)),
-        );
-
-        const selectedCount = originalInvitedCount;
-        const invitedCount = checkedInvitedUsers.length;
-
-        if (selectedCount > CloudBulkReinviteLimit) {
-          const excludedCount = selectedCount - CloudBulkReinviteLimit;
-          this.toastService.showToast({
-            variant: "success",
-            message: this.i18nService.t(
-              "bulkReinviteLimitedSuccessToast",
-              CloudBulkReinviteLimit.toLocaleString(),
-              selectedCount.toLocaleString(),
-              excludedCount.toLocaleString(),
-            ),
-          });
-        } else {
-          this.toastService.showToast({
-            variant: "success",
-            message:
-              invitedCount === 1
-                ? this.i18nService.t("reinviteSuccessToast")
-                : this.i18nService.t("bulkReinviteSentToast", invitedCount.toString()),
-          });
-        }
-      } else {
-        // Feature flag disabled - show legacy dialog
-        const request = this.apiService
-          .postManyProviderUserReinvite(
-            this.providerId,
-            new ProviderUserBulkRequest(checkedInvitedUsers.map((user) => user.id)),
-          )
-          .then((response) => response.data);
-
-        const dialogRef = BulkStatusComponent.open(this.dialogService, {
-          data: {
-            users: users,
-            filteredUsers: checkedInvitedUsers,
-            request,
-            successfulMessage: this.i18nService.t("bulkReinviteMessage"),
-          },
-        });
-        await lastValueFrom(dialogRef.closed);
-      }
-    } catch (error) {
-      this.validationService.showError(error);
-    }
-  }
-
-  async invite() {
-    await this.edit(null);
-  }
-
-  async bulkRemove(): Promise<void> {
-    if (this.actionPromise != null) {
-      return;
-    }
-
-    const users = this.dataSource.getCheckedUsersWithLimit(MaxCheckedCount);
-
-    const dialogRef = BulkRemoveDialogComponent.open(this.dialogService, {
-      data: {
-        providerId: this.providerId,
-        users: users,
-      },
-    });
-
-    await lastValueFrom(dialogRef.closed);
-    await this.load();
-  }
-
-  async confirmUser(user: ProviderUser, publicKey: Uint8Array): Promise<MemberActionResult> {
-    try {
-      const providerKey = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(
-          getUserId,
-          switchMap((userId) => this.keyService.providerKeys$(userId)),
-          map((providerKeys) => providerKeys?.[this.providerId as ProviderId] ?? null),
-        ),
-      );
-      assertNonNullish(providerKey, "Provider key not found");
-
-      const key = await this.encryptService.encapsulateKeyUnsigned(providerKey, publicKey);
-      const request = new ProviderUserConfirmRequest(key.encryptedString);
-      await this.apiService.postProviderUserConfirm(this.providerId, user.id, request);
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: error.message };
-    }
-  }
-
-  removeUser = async (id: string): Promise<MemberActionResult> => {
-    try {
-      await this.apiService.deleteProviderUser(this.providerId, id);
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: error.message };
-    }
-  };
-
-  edit = async (user: ProviderUser | null): Promise<void> => {
-    const data: AddEditMemberDialogParams = {
-      providerId: this.providerId,
-      user,
-    };
-
-    const dialogRef = AddEditMemberDialogComponent.open(this.dialogService, {
-      data,
-    });
-
-    const result = await lastValueFrom(dialogRef.closed);
-
-    switch (result) {
-      case AddEditMemberDialogResultType.Saved:
-      case AddEditMemberDialogResultType.Deleted:
-        await this.load();
-        break;
-    }
-  };
-
-  openEventsDialog = (user: ProviderUser): DialogRef<void> =>
-    openEntityEventsDialog(this.dialogService, {
-      data: {
-        name: this.userNamePipe.transform(user),
-        providerId: this.providerId,
-        entityId: user.id,
-        showUser: false,
-        entity: "user",
-      },
-    });
-
-  getUsers = (): Promise<ListResponse<ProviderUser>> =>
-    this.apiService.getProviderUsers(this.providerId);
-
-  reinviteUser = async (id: string): Promise<MemberActionResult> => {
-    try {
-      await this.apiService.postProviderUserReinvite(this.providerId, id);
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: error.message };
-    }
-  };
-
-  get selectedInvitedCount(): number {
-    return this.dataSource
-      .getCheckedUsers()
-      .filter((member) => member.status === this.userStatusType.Invited).length;
-  }
-
-  get isSingleInvite(): boolean {
-    return this.selectedInvitedCount === 1;
-  }
-}

bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts

@@ -61,7 +61,7 @@ interface BulkProviderFlags {
   templateUrl: "members.component.html",
   standalone: false,
 })
-export class vNextMembersComponent {
+export class MembersComponent {
   protected apiService = inject(ApiService);
   protected dialogService = inject(DialogService);
   protected i18nService = inject(I18nService);

bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts

@@ -2,9 +2,7 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { authGuard } from "@bitwarden/angular/auth/guards";
-import { featureFlaggedRoute } from "@bitwarden/angular/platform/utils/feature-flagged-route";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { AnonLayoutWrapperComponent } from "@bitwarden/components";
 import { FrontendLayoutComponent } from "@bitwarden/web-vault/app/layouts/frontend-layout.component";
 import { UserLayoutComponent } from "@bitwarden/web-vault/app/layouts/user-layout.component";
@@ -17,9 +15,8 @@ import { ProviderSubscriptionComponent } from "../../billing/providers/subscript
 import { ManageClientsComponent } from "./clients/manage-clients.component";
 import { providerPermissionsGuard } from "./guards/provider-permissions.guard";
 import { AcceptProviderComponent } from "./manage/accept-provider.component";
-import { MembersComponent } from "./manage/deprecated_members.component";
 import { EventsComponent } from "./manage/events.component";
-import { vNextMembersComponent } from "./manage/members.component";
+import { MembersComponent } from "./manage/members.component";
 import { ProvidersLayoutComponent } from "./providers-layout.component";
 import { ProvidersComponent } from "./providers.component";
 import { AccountComponent } from "./settings/account.component";
@@ -95,20 +92,16 @@ const routes: Routes = [
                 pathMatch: "full",
                 redirectTo: "members",
               },
-              ...featureFlaggedRoute({
-                defaultComponent: MembersComponent,
-                flaggedComponent: vNextMembersComponent,
-                featureFlag: FeatureFlag.MembersComponentRefactor,
-                routeOptions: {
-                  path: "members",
-                  canActivate: [
-                    providerPermissionsGuard((provider: Provider) => provider.canManageUsers),
-                  ],
-                  data: {
-                    titleId: "members",
-                  },
+              {
+                path: "members",
+                component: MembersComponent,
+                canActivate: [
+                  providerPermissionsGuard((provider: Provider) => provider.canManageUsers),
+                ],
+                data: {
+                  titleId: "members",
                 },
-              }),
+              },
               {
                 path: "events",
                 component: EventsComponent,

bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts

@@ -27,12 +27,11 @@ import { CreateClientDialogComponent } from "./clients/create-client-dialog.comp
 import { ManageClientNameDialogComponent } from "./clients/manage-client-name-dialog.component";
 import { ManageClientSubscriptionDialogComponent } from "./clients/manage-client-subscription-dialog.component";
 import { AcceptProviderComponent } from "./manage/accept-provider.component";
-import { MembersComponent } from "./manage/deprecated_members.component";
 import { AddEditMemberDialogComponent } from "./manage/dialogs/add-edit-member-dialog.component";
 import { BulkConfirmDialogComponent } from "./manage/dialogs/bulk-confirm-dialog.component";
 import { BulkRemoveDialogComponent } from "./manage/dialogs/bulk-remove-dialog.component";
 import { EventsComponent } from "./manage/events.component";
-import { vNextMembersComponent } from "./manage/members.component";
+import { MembersComponent } from "./manage/members.component";
 import { ProviderActionsService } from "./manage/services/provider-actions/provider-actions.service";
 import { ProvidersLayoutComponent } from "./providers-layout.component";
 import { ProvidersRoutingModule } from "./providers-routing.module";
@@ -67,7 +66,6 @@ import { VerifyRecoverDeleteProviderComponent } from "./verify-recover-delete-pr
     BulkConfirmDialogComponent,
     BulkRemoveDialogComponent,
     EventsComponent,
-    vNextMembersComponent,
     MembersComponent,
     SetupComponent,
     SetupProviderComponent,

bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/security-tasks.service.ts

@@ -1,8 +1,10 @@
 import { BehaviorSubject, combineLatest, Observable } from "rxjs";
 import { map, shareReplay } from "rxjs/operators";
 
-import { RiskInsightsDataService } from "@bitwarden/bit-common/dirt/reports/risk-insights";
-import { SecurityTasksApiService } from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import {
+  RiskInsightsDataService,
+  SecurityTasksApiService,
+} from "@bitwarden/bit-common/dirt/reports/risk-insights";
 import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
 import { SecurityTask, SecurityTaskStatus, SecurityTaskType } from "@bitwarden/common/vault/tasks";
 

libs/common/src/enums/feature-flag.enum.ts

@@ -13,7 +13,6 @@ export enum FeatureFlag {
   /* Admin Console Team */
   AutoConfirm = "pm-19934-auto-confirm-organization-users",
   DefaultUserCollectionRestore = "pm-30883-my-items-restored-users",
-  MembersComponentRefactor = "pm-29503-refactor-members-inheritance",
   BulkReinviteUI = "pm-28416-bulk-reinvite-ux-improvements",
 
   /* Auth */
@@ -109,7 +108,6 @@ export const DefaultFeatureFlagValue = {
   /* Admin Console Team */
   [FeatureFlag.AutoConfirm]: FALSE,
   [FeatureFlag.DefaultUserCollectionRestore]: FALSE,
-  [FeatureFlag.MembersComponentRefactor]: FALSE,
   [FeatureFlag.BulkReinviteUI]: FALSE,
 
   /* Autofill */