[PM-4360] Move organization-domain and organization-user to admin console (#6630)

* Move organization-domain and organization-user to admin console

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

@@ -0,0 +1,186 @@
+import { Directive } from "@angular/core";
+
+import { EventResponse } from "@bitwarden/common/models/response/event.response";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+import { EventView } from "@bitwarden/common/models/view/event.view";
+import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+
+import { EventService } from "../../core";
+import { EventExportService } from "../../tools/event-export";
+
+@Directive()
+export abstract class BaseEventsComponent {
+  loading = true;
+  loaded = false;
+  events: EventView[];
+  start: string;
+  end: string;
+  dirtyDates = true;
+  continuationToken: string;
+  refreshPromise: Promise<any>;
+  exportPromise: Promise<any>;
+  morePromise: Promise<any>;
+
+  abstract readonly exportFileName: string;
+
+  constructor(
+    protected eventService: EventService,
+    protected i18nService: I18nService,
+    protected exportService: EventExportService,
+    protected platformUtilsService: PlatformUtilsService,
+    protected logService: LogService,
+    protected fileDownloadService: FileDownloadService
+  ) {
+    const defaultDates = this.eventService.getDefaultDateFilters();
+    this.start = defaultDates[0];
+    this.end = defaultDates[1];
+  }
+
+  async exportEvents() {
+    if (this.appApiPromiseUnfulfilled() || this.dirtyDates) {
+      return;
+    }
+
+    this.loading = true;
+
+    const dates = this.parseDates();
+    if (dates == null) {
+      return;
+    }
+
+    try {
+      this.exportPromise = this.export(dates[0], dates[1]);
+
+      await this.exportPromise;
+    } catch (e) {
+      this.logService.error(`Handled exception: ${e}`);
+    }
+
+    this.exportPromise = null;
+    this.loading = false;
+  }
+
+  async loadEvents(clearExisting: boolean) {
+    if (this.appApiPromiseUnfulfilled()) {
+      return;
+    }
+
+    const dates = this.parseDates();
+    if (dates == null) {
+      return;
+    }
+
+    this.loading = true;
+    let events: EventView[] = [];
+    try {
+      const promise = this.loadAndParseEvents(
+        dates[0],
+        dates[1],
+        clearExisting ? null : this.continuationToken
+      );
+      if (clearExisting) {
+        this.refreshPromise = promise;
+      } else {
+        this.morePromise = promise;
+      }
+      const result = await promise;
+      this.continuationToken = result.continuationToken;
+      events = result.events;
+    } catch (e) {
+      this.logService.error(`Handled exception: ${e}`);
+    }
+
+    if (!clearExisting && this.events != null && this.events.length > 0) {
+      this.events = this.events.concat(events);
+    } else {
+      this.events = events;
+    }
+
+    this.dirtyDates = false;
+    this.loading = false;
+    this.morePromise = null;
+    this.refreshPromise = null;
+  }
+
+  protected abstract requestEvents(
+    startDate: string,
+    endDate: string,
+    continuationToken: string
+  ): Promise<ListResponse<EventResponse>>;
+  protected abstract getUserName(r: EventResponse, userId: string): { name: string; email: string };
+
+  protected async loadAndParseEvents(
+    startDate: string,
+    endDate: string,
+    continuationToken: string
+  ) {
+    const response = await this.requestEvents(startDate, endDate, continuationToken);
+
+    const events = await Promise.all(
+      response.data.map(async (r) => {
+        const userId = r.actingUserId == null ? r.userId : r.actingUserId;
+        const eventInfo = await this.eventService.getEventInfo(r);
+        const user = this.getUserName(r, userId);
+        const userName = user != null ? user.name : this.i18nService.t("unknown");
+
+        return new EventView({
+          message: eventInfo.message,
+          humanReadableMessage: eventInfo.humanReadableMessage,
+          appIcon: eventInfo.appIcon,
+          appName: eventInfo.appName,
+          userId: userId,
+          userName: userName,
+          userEmail: user != null ? user.email : "",
+          date: r.date,
+          ip: r.ipAddress,
+          type: r.type,
+          installationId: r.installationId,
+          systemUser: r.systemUser,
+          serviceAccountId: r.serviceAccountId,
+        });
+      })
+    );
+    return { continuationToken: response.continuationToken, events: events };
+  }
+
+  protected parseDates() {
+    let dates: string[] = null;
+    try {
+      dates = this.eventService.formatDateFilters(this.start, this.end);
+    } catch (e) {
+      this.platformUtilsService.showToast(
+        "error",
+        this.i18nService.t("errorOccurred"),
+        this.i18nService.t("invalidDateRange")
+      );
+      return null;
+    }
+    return dates;
+  }
+
+  protected appApiPromiseUnfulfilled() {
+    return this.refreshPromise != null || this.morePromise != null || this.exportPromise != null;
+  }
+
+  private async export(start: string, end: string) {
+    let continuationToken = this.continuationToken;
+    let events = [].concat(this.events);
+
+    while (continuationToken != null) {
+      const result = await this.loadAndParseEvents(start, end, continuationToken);
+      continuationToken = result.continuationToken;
+      events = events.concat(result.events);
+    }
+
+    const data = await this.exportService.getEventExport(events);
+    const fileName = this.exportService.getFileName(this.exportFileName, "csv");
+    this.fileDownloadService.download({
+      fileName,
+      blobData: data,
+      blobOptions: { type: "text/plain" },
+    });
+  }
+}

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

@@ -0,0 +1,427 @@
+import { Directive, ViewChild, ViewContainerRef } from "@angular/core";
+
+import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
+import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
+import { ModalService } from "@bitwarden/angular/services/modal.service";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { SearchService } from "@bitwarden/common/abstractions/search.service";
+import {
+  OrganizationUserStatusType,
+  OrganizationUserType,
+  ProviderUserStatusType,
+  ProviderUserType,
+} from "@bitwarden/common/admin-console/enums";
+import { ProviderUserUserDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user.response";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { DialogService } from "@bitwarden/components";
+
+import { OrganizationUserView } from "../organizations/core/views/organization-user.view";
+import { UserConfirmComponent } from "../organizations/manage/user-confirm.component";
+
+type StatusType = OrganizationUserStatusType | ProviderUserStatusType;
+
+const MaxCheckedCount = 500;
+
+@Directive()
+export abstract class BasePeopleComponent<
+  UserType extends ProviderUserUserDetailsResponse | OrganizationUserView
+> {
+  @ViewChild("confirmTemplate", { read: ViewContainerRef, static: true })
+  confirmModalRef: ViewContainerRef;
+
+  get allCount() {
+    return this.activeUsers != null ? this.activeUsers.length : 0;
+  }
+
+  get invitedCount() {
+    return this.statusMap.has(this.userStatusType.Invited)
+      ? this.statusMap.get(this.userStatusType.Invited).length
+      : 0;
+  }
+
+  get acceptedCount() {
+    return this.statusMap.has(this.userStatusType.Accepted)
+      ? this.statusMap.get(this.userStatusType.Accepted).length
+      : 0;
+  }
+
+  get confirmedCount() {
+    return this.statusMap.has(this.userStatusType.Confirmed)
+      ? this.statusMap.get(this.userStatusType.Confirmed).length
+      : 0;
+  }
+
+  get revokedCount() {
+    return this.statusMap.has(this.userStatusType.Revoked)
+      ? this.statusMap.get(this.userStatusType.Revoked).length
+      : 0;
+  }
+
+  get showConfirmUsers(): boolean {
+    return (
+      this.activeUsers != null &&
+      this.statusMap != null &&
+      this.activeUsers.length > 1 &&
+      this.confirmedCount > 0 &&
+      this.confirmedCount < 3 &&
+      this.acceptedCount > 0
+    );
+  }
+
+  get showBulkConfirmUsers(): boolean {
+    return this.acceptedCount > 0;
+  }
+
+  abstract userType: typeof OrganizationUserType | typeof ProviderUserType;
+  abstract userStatusType: typeof OrganizationUserStatusType | typeof ProviderUserStatusType;
+
+  loading = true;
+  statusMap = new Map<StatusType, UserType[]>();
+  status: StatusType;
+  users: UserType[] = [];
+  pagedUsers: UserType[] = [];
+  searchText: string;
+  actionPromise: Promise<void>;
+
+  protected allUsers: UserType[] = [];
+  protected activeUsers: UserType[] = [];
+
+  protected didScroll = false;
+  protected pageSize = 100;
+
+  private pagedUsersCount = 0;
+
+  constructor(
+    protected apiService: ApiService,
+    private searchService: SearchService,
+    protected i18nService: I18nService,
+    protected platformUtilsService: PlatformUtilsService,
+    protected cryptoService: CryptoService,
+    protected validationService: ValidationService,
+    protected modalService: ModalService,
+    private logService: LogService,
+    private searchPipe: SearchPipe,
+    protected userNamePipe: UserNamePipe,
+    protected stateService: StateService,
+    protected dialogService: DialogService
+  ) {}
+
+  abstract edit(user: UserType): void;
+  abstract getUsers(): Promise<ListResponse<UserType> | UserType[]>;
+  abstract deleteUser(id: string): Promise<void>;
+  abstract revokeUser(id: string): Promise<void>;
+  abstract restoreUser(id: string): Promise<void>;
+  abstract reinviteUser(id: string): Promise<void>;
+  abstract confirmUser(user: UserType, publicKey: Uint8Array): Promise<void>;
+
+  async load() {
+    const response = await this.getUsers();
+    this.statusMap.clear();
+    this.activeUsers = [];
+    for (const status of Utils.iterateEnum(this.userStatusType)) {
+      this.statusMap.set(status, []);
+    }
+
+    if (response instanceof ListResponse) {
+      this.allUsers = response.data != null && response.data.length > 0 ? response.data : [];
+    } else if (Array.isArray(response)) {
+      this.allUsers = response;
+    }
+
+    this.allUsers.sort(
+      Utils.getSortFunction<ProviderUserUserDetailsResponse | OrganizationUserView>(
+        this.i18nService,
+        "email"
+      )
+    );
+    this.allUsers.forEach((u) => {
+      if (!this.statusMap.has(u.status)) {
+        this.statusMap.set(u.status, [u]);
+      } else {
+        this.statusMap.get(u.status).push(u);
+      }
+      if (u.status !== this.userStatusType.Revoked) {
+        this.activeUsers.push(u);
+      }
+    });
+    this.filter(this.status);
+    this.loading = false;
+  }
+
+  filter(status: StatusType) {
+    this.status = status;
+    if (this.status != null) {
+      this.users = this.statusMap.get(this.status);
+    } else {
+      this.users = this.activeUsers;
+    }
+    // Reset checkbox selecton
+    this.selectAll(false);
+    this.resetPaging();
+  }
+
+  loadMore() {
+    if (!this.users || this.users.length <= this.pageSize) {
+      return;
+    }
+    const pagedLength = this.pagedUsers.length;
+    let pagedSize = this.pageSize;
+    if (pagedLength === 0 && this.pagedUsersCount > this.pageSize) {
+      pagedSize = this.pagedUsersCount;
+    }
+    if (this.users.length > pagedLength) {
+      this.pagedUsers = this.pagedUsers.concat(
+        this.users.slice(pagedLength, pagedLength + pagedSize)
+      );
+    }
+    this.pagedUsersCount = this.pagedUsers.length;
+    this.didScroll = this.pagedUsers.length > this.pageSize;
+  }
+
+  checkUser(user: UserType, select?: boolean) {
+    (user as any).checked = select == null ? !(user as any).checked : select;
+  }
+
+  selectAll(select: boolean) {
+    if (select) {
+      this.selectAll(false);
+    }
+
+    const filteredUsers = this.searchPipe.transform(
+      this.users,
+      this.searchText,
+      "name",
+      "email",
+      "id"
+    );
+
+    const selectCount =
+      select && filteredUsers.length > MaxCheckedCount ? MaxCheckedCount : filteredUsers.length;
+    for (let i = 0; i < selectCount; i++) {
+      this.checkUser(filteredUsers[i], select);
+    }
+  }
+
+  async resetPaging() {
+    this.pagedUsers = [];
+    this.loadMore();
+  }
+
+  invite() {
+    this.edit(null);
+  }
+
+  protected async removeUserConfirmationDialog(user: UserType) {
+    return this.dialogService.openSimpleDialog({
+      title: this.userNamePipe.transform(user),
+      content: { key: "removeUserConfirmation" },
+      type: "warning",
+    });
+  }
+
+  async remove(user: UserType) {
+    const confirmed = await this.removeUserConfirmationDialog(user);
+    if (!confirmed) {
+      return false;
+    }
+
+    this.actionPromise = this.deleteUser(user.id);
+    try {
+      await this.actionPromise;
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("removedUserId", this.userNamePipe.transform(user))
+      );
+      this.removeUser(user);
+    } catch (e) {
+      this.validationService.showError(e);
+    }
+    this.actionPromise = null;
+  }
+
+  protected async revokeUserConfirmationDialog(user: UserType) {
+    return this.dialogService.openSimpleDialog({
+      title: { key: "revokeAccess", placeholders: [this.userNamePipe.transform(user)] },
+      content: this.revokeWarningMessage(),
+      acceptButtonText: { key: "revokeAccess" },
+      type: "warning",
+    });
+  }
+
+  async revoke(user: UserType) {
+    const confirmed = await this.revokeUserConfirmationDialog(user);
+
+    if (!confirmed) {
+      return false;
+    }
+
+    this.actionPromise = this.revokeUser(user.id);
+    try {
+      await this.actionPromise;
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("revokedUserId", this.userNamePipe.transform(user))
+      );
+      await this.load();
+    } catch (e) {
+      this.validationService.showError(e);
+    }
+    this.actionPromise = null;
+  }
+
+  async restore(user: UserType) {
+    this.actionPromise = this.restoreUser(user.id);
+    try {
+      await this.actionPromise;
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("restoredUserId", this.userNamePipe.transform(user))
+      );
+      await this.load();
+    } catch (e) {
+      this.validationService.showError(e);
+    }
+    this.actionPromise = null;
+  }
+
+  async reinvite(user: UserType) {
+    if (this.actionPromise != null) {
+      return;
+    }
+
+    this.actionPromise = this.reinviteUser(user.id);
+    try {
+      await this.actionPromise;
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("hasBeenReinvited", this.userNamePipe.transform(user))
+      );
+    } catch (e) {
+      this.validationService.showError(e);
+    }
+    this.actionPromise = null;
+  }
+
+  async confirm(user: UserType) {
+    function updateUser(self: BasePeopleComponent<UserType>) {
+      user.status = self.userStatusType.Confirmed;
+      const mapIndex = self.statusMap.get(self.userStatusType.Accepted).indexOf(user);
+      if (mapIndex > -1) {
+        self.statusMap.get(self.userStatusType.Accepted).splice(mapIndex, 1);
+        self.statusMap.get(self.userStatusType.Confirmed).push(user);
+      }
+    }
+
+    const confirmUser = async (publicKey: Uint8Array) => {
+      try {
+        this.actionPromise = this.confirmUser(user, publicKey);
+        await this.actionPromise;
+        updateUser(this);
+        this.platformUtilsService.showToast(
+          "success",
+          null,
+          this.i18nService.t("hasBeenConfirmed", this.userNamePipe.transform(user))
+        );
+      } catch (e) {
+        this.validationService.showError(e);
+        throw e;
+      } finally {
+        this.actionPromise = null;
+      }
+    };
+
+    if (this.actionPromise != null) {
+      return;
+    }
+
+    try {
+      const publicKeyResponse = await this.apiService.getUserPublicKey(user.userId);
+      const publicKey = Utils.fromB64ToArray(publicKeyResponse.publicKey);
+
+      const autoConfirm = await this.stateService.getAutoConfirmFingerPrints();
+      if (autoConfirm == null || !autoConfirm) {
+        const [modal] = await this.modalService.openViewRef(
+          UserConfirmComponent,
+          this.confirmModalRef,
+          (comp) => {
+            comp.name = this.userNamePipe.transform(user);
+            comp.userId = user != null ? user.userId : null;
+            comp.publicKey = publicKey;
+            // eslint-disable-next-line rxjs/no-async-subscribe
+            comp.onConfirmedUser.subscribe(async () => {
+              try {
+                comp.formPromise = confirmUser(publicKey);
+                await comp.formPromise;
+                modal.close();
+              } catch (e) {
+                this.logService.error(e);
+              }
+            });
+          }
+        );
+        return;
+      }
+
+      try {
+        const fingerprint = await this.cryptoService.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}`);
+    }
+  }
+
+  isSearching() {
+    return this.searchService.isSearchable(this.searchText);
+  }
+
+  isPaging() {
+    const searching = this.isSearching();
+    if (searching && this.didScroll) {
+      this.resetPaging();
+    }
+    return !searching && this.users && this.users.length > this.pageSize;
+  }
+
+  protected revokeWarningMessage(): string {
+    return this.i18nService.t("revokeUserConfirmation");
+  }
+
+  protected getCheckedUsers() {
+    return this.users.filter((u) => (u as any).checked);
+  }
+
+  protected removeUser(user: UserType) {
+    let index = this.users.indexOf(user);
+    if (index > -1) {
+      this.users.splice(index, 1);
+      this.resetPaging();
+    }
+
+    index = this.allUsers.indexOf(user);
+    if (index > -1) {
+      this.allUsers.splice(index, 1);
+    }
+
+    if (this.statusMap.has(user.status)) {
+      index = this.statusMap.get(user.status).indexOf(user);
+      if (index > -1) {
+        this.statusMap.get(user.status).splice(index, 1);
+      }
+    }
+  }
+}

apps/web/src/app/admin-console/organizations/core/services/user-admin.service.ts

@@ -1,11 +1,11 @@
 import { Injectable } from "@angular/core";
 
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import {
   OrganizationUserInviteRequest,
   OrganizationUserUpdateRequest,
-} from "@bitwarden/common/abstractions/organization-user/requests";
-import { OrganizationUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses";
+} from "@bitwarden/common/admin-console/abstractions/organization-user/requests";
+import { OrganizationUserDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-user/responses";
 
 import { CoreOrganizationModule } from "../core-organization.module";
 import { OrganizationUserAdminView } from "../views/organization-user-admin-view";

apps/web/src/app/admin-console/organizations/core/views/organization-user.view.ts

@@ -1,4 +1,4 @@
-import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses";
+import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-user/responses";
 import {
   OrganizationUserStatusType,
   OrganizationUserType,

apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts

@@ -4,7 +4,7 @@ import { FormBuilder } from "@angular/forms";
 
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import { EventResponse } from "@bitwarden/common/models/response/event.response";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { EventView } from "@bitwarden/common/models/view/event.view";

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

@@ -4,8 +4,8 @@ import { concatMap, Subject, takeUntil } from "rxjs";
 
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { EventSystemUser } from "@bitwarden/common/enums";
@@ -15,9 +15,9 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-import { BaseEventsComponent } from "../../../common/base.events.component";
 import { EventService } from "../../../core";
 import { EventExportService } from "../../../tools/event-export";
+import { BaseEventsComponent } from "../../common/base.events.component";
 
 const EVENT_SYSTEM_USER_TO_TRANSLATION: Record<EventSystemUser, string> = {
   [EventSystemUser.SCIM]: null, // SCIM acronym not able to be translated so just display SCIM

apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts

@@ -4,7 +4,7 @@ import { FormBuilder, Validators } from "@angular/forms";
 import { catchError, combineLatest, from, map, of, Subject, switchMap, takeUntil } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";

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

@@ -1,8 +1,8 @@
 import { Component, Input, OnInit } from "@angular/core";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
-import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
+import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests";
 import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";

apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts

@@ -1,7 +1,7 @@
 import { DialogRef, DIALOG_DATA } from "@angular/cdk/dialog";
 import { Component, Inject, OnInit } from "@angular/core";
 
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogService, TableDataSource } from "@bitwarden/components";

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

@@ -1,7 +1,7 @@
 import { Component, Input } from "@angular/core";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { BulkUserDetails } from "./bulk-status.component";

apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts

@@ -1,7 +1,7 @@
 import { DIALOG_DATA } from "@angular/cdk/dialog";
 import { Component, Inject } from "@angular/core";
 
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DialogService } from "@bitwarden/components";
 

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

@@ -3,8 +3,8 @@ import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { combineLatest, of, shareReplay, Subject, switchMap, takeUntil } from "rxjs";
 
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import {
   OrganizationUserStatusType,
   OrganizationUserType,

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

@@ -11,8 +11,8 @@ import { Subject, takeUntil } from "rxjs";
 import zxcvbn from "zxcvbn";
 
 import { PasswordStrengthComponent } from "@bitwarden/angular/shared/components/password-strength/password-strength.component";
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
-import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/abstractions/organization-user/requests";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
+import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";

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

@@ -18,15 +18,15 @@ import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
-import { OrganizationUserConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests";
-import {
-  OrganizationUserBulkResponse,
-  OrganizationUserUserDetailsResponse,
-} from "@bitwarden/common/abstractions/organization-user/responses";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
+import { OrganizationUserConfirmRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests";
+import {
+  OrganizationUserBulkResponse,
+  OrganizationUserUserDetailsResponse,
+} from "@bitwarden/common/admin-console/abstractions/organization-user/responses";
 import { PolicyApiServiceAbstraction as PolicyApiService } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import {
@@ -53,7 +53,7 @@ import { DialogService, SimpleDialogOptions } from "@bitwarden/components";
 
 import { flagEnabled } from "../../../../utils/flags";
 import { openEntityEventsDialog } from "../../../admin-console/organizations/manage/entity-events.component";
-import { BasePeopleComponent } from "../../../common/base.people.component";
+import { BasePeopleComponent } from "../../common/base.people.component";
 import { GroupService } from "../core";
 import { OrganizationUserView } from "../core/views/organization-user.view";
 

apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts

@@ -2,9 +2,9 @@ import { DIALOG_DATA, DialogRef } from "@angular/cdk/dialog";
 import { Component, Inject } from "@angular/core";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
-import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
+import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";