[EC 784] Refactor organization user service (#4163)

* [EC-784] Introduce OrganizationUserService and abstraction * [EC-784] Move API response models into abstraction folder * [EC-784] Register OrganizationUserService in JsLib * [EC-784] Add OrganizationUserService to CLI Main * [EC-784] Move getOrganizationUser() - Move getOrganizationUser() implementation to OrganizationUserService - Update any references to the API service in the CLI and Web projects * [EC-784] Move getOrganizationUserGroups() * [EC-784] Move and rename getOrganizationUsers() * [EC-784] Move getOrganizationUserResetPasswordDetails() * [EC-784] Move OrganizationUser API request models into abstraction folder * [EC-784] Move postOrganizationUserInvite() * [EC-784] Move postOrganizationUserReinvite() * [EC-784] Move postManyOrganizationUserReinvite() Also tweak the signature to avoid exposing the API request model * [EC-784] Move postOrganizationUserAccept() * [EC-784] Move postOrganizationUserConfirm() * [EC-784] Move postOrganizationUsersPublicKey() Also modify signature to avoid exposing API request model * [EC-784] Move postOrganizationUserBulkConfirm() * [EC-784] Move putOrganizationUser() * [EC-784] Move putOrganizationUserGroups() * [EC-784] Update abstraction method definitions to use abstract keyword * [EC-784] Move putOrganizationUserResetPasswordEnrollment() * [EC-784] Move putOrganizationUserResetPassword() * [EC-784] Move deleteOrganizationUser() * [EC-784] Move deleteManyOrganizationUsers() * [EC-784] Move revokeOrganizationUser() * [EC-784] Move revokeManyOrganizationUsers() * [EC-784] Move restoreOrganizationUser() * [EC-784] Move restoreManyOrganizationUsers() * [EC-784] Move internal OrganizationUserBulkRequest model out of service abstraction * [EC-784] Rename organizationUser folder to organization-user
2025-12-15 15:53:27 +00:00 · 2022-12-19 10:56:16 -08:00
parent d18c32ab32
commit f67fffcc08
48 changed files with 764 additions and 511 deletions
--- a/apps/web/src/app/accounts/accept-organization.component.ts
+++ b/apps/web/src/app/accounts/accept-organization.component.ts
@@ -5,6 +5,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserAcceptRequest } from "@bitwarden/common/abstractions/organization-user/requests";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
@@ -12,7 +14,6 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { Policy } from "@bitwarden/common/models/domain/policy";
-import { OrganizationUserAcceptRequest } from "@bitwarden/common/models/request/organization-user-accept.request";

 import { BaseAcceptComponent } from "../common/base.accept.component";

@@ -36,14 +37,15 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
    private policyApiService: PolicyApiServiceAbstraction,
    private policyService: PolicyService,
    private logService: LogService,
-    private organizationApiService: OrganizationApiServiceAbstraction
+    private organizationApiService: OrganizationApiServiceAbstraction,
+    private organizationUserService: OrganizationUserService
  ) {
    super(router, platformUtilsService, i18nService, route, stateService);
  }

  async authedHandler(qParams: Params): Promise<void> {
    this.actionPromise = this.prepareAcceptRequest(qParams).then(async (request) => {
-      await this.apiService.postOrganizationUserAccept(
+      await this.organizationUserService.postOrganizationUserAccept(
        qParams.organizationId,
        qParams.organizationUserId,
        request
--- a/apps/web/src/app/accounts/set-password.component.ts
+++ b/apps/web/src/app/accounts/set-password.component.ts
@@ -6,6 +6,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -32,7 +33,8 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
    syncService: SyncService,
    route: ActivatedRoute,
    stateService: StateService,
-    organizationApiService: OrganizationApiServiceAbstraction
+    organizationApiService: OrganizationApiServiceAbstraction,
+    organizationUserService: OrganizationUserService
  ) {
    super(
      i18nService,
@@ -47,7 +49,8 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
      syncService,
      route,
      stateService,
-      organizationApiService
+      organizationApiService,
+      organizationUserService
    );
  }
 }
--- a/apps/web/src/app/common/base.people.component.ts
+++ b/apps/web/src/app/common/base.people.component.ts
@@ -7,6 +7,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
@@ -17,7 +18,6 @@ import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStat
 import { ProviderUserType } from "@bitwarden/common/enums/providerUserType";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organization-user.response";
 import { ProviderUserUserDetailsResponse } from "@bitwarden/common/models/response/provider/provider-user.response";

 import { UserConfirmComponent } from "../organizations/manage/user-confirm.component";
--- a/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts
+++ b/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts
@@ -3,10 +3,10 @@ import { Component, Input, OnInit } from "@angular/core";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests";
 import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/models/request/organization-user-bulk-confirm.request";
-import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organization-user-bulk.request";

 import { BulkUserDetails } from "./bulk-status.component";

@@ -31,6 +31,7 @@ export class BulkConfirmComponent implements OnInit {
  constructor(
    protected cryptoService: CryptoService,
    protected apiService: ApiService,
+    private organizationUserService: OrganizationUserService,
    private i18nService: I18nService
  ) {}

@@ -91,8 +92,10 @@ export class BulkConfirmComponent implements OnInit {
  }

  protected async getPublicKeys() {
-    const request = new OrganizationUserBulkRequest(this.filteredUsers.map((user) => user.id));
-    return await this.apiService.postOrganizationUsersPublicKey(this.organizationId, request);
+    return await this.organizationUserService.postOrganizationUsersPublicKey(
+      this.organizationId,
+      this.filteredUsers.map((user) => user.id)
+    );
  }

  protected getCryptoKey() {
@@ -101,6 +104,9 @@ export class BulkConfirmComponent implements OnInit {

  protected async postConfirmRequest(userIdsWithKeys: any[]) {
    const request = new OrganizationUserBulkConfirmRequest(userIdsWithKeys);
-    return await this.apiService.postOrganizationUserBulkConfirm(this.organizationId, request);
+    return await this.organizationUserService.postOrganizationUserBulkConfirm(
+      this.organizationId,
+      request
+    );
  }
 }
--- a/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts
+++ b/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts
@@ -2,7 +2,7 @@ import { Component, Input } from "@angular/core";

 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organization-user-bulk.request";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";

 import { BulkUserDetails } from "./bulk-status.component";

@@ -20,7 +20,11 @@ export class BulkRemoveComponent {
  done = false;
  error: string;

-  constructor(protected apiService: ApiService, protected i18nService: I18nService) {}
+  constructor(
+    protected apiService: ApiService,
+    protected i18nService: I18nService,
+    private organizationUserService: OrganizationUserService
+  ) {}

  async submit() {
    this.loading = true;
@@ -40,8 +44,10 @@ export class BulkRemoveComponent {
  }

  protected async deleteUsers() {
-    const request = new OrganizationUserBulkRequest(this.users.map((user) => user.id));
-    return await this.apiService.deleteManyOrganizationUsers(this.organizationId, request);
+    return await this.organizationUserService.deleteManyOrganizationUsers(
+      this.organizationId,
+      this.users.map((user) => user.id)
+    );
  }

  protected get removeUsersWarning() {
--- a/apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.ts
+++ b/apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.ts
@@ -1,9 +1,8 @@
 import { Component } from "@angular/core";

 import { ModalConfig } from "@bitwarden/angular/services/modal.service";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organization-user-bulk.request";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";

 import { BulkUserDetails } from "./bulk-status.component";

@@ -23,8 +22,8 @@ export class BulkRestoreRevokeComponent {
  error: string;

  constructor(
-    protected apiService: ApiService,
    protected i18nService: I18nService,
+    private organizationUserService: OrganizationUserService,
    config: ModalConfig
  ) {
    this.isRevoking = config.data.isRevoking;
@@ -56,11 +55,17 @@ export class BulkRestoreRevokeComponent {
  }

  protected async performBulkUserAction() {
-    const request = new OrganizationUserBulkRequest(this.users.map((user) => user.id));
+    const userIds = this.users.map((user) => user.id);
    if (this.isRevoking) {
-      return await this.apiService.revokeManyOrganizationUsers(this.organizationId, request);
+      return await this.organizationUserService.revokeManyOrganizationUsers(
+        this.organizationId,
+        userIds
+      );
    } else {
-      return await this.apiService.restoreManyOrganizationUsers(this.organizationId, request);
+      return await this.organizationUserService.restoreManyOrganizationUsers(
+        this.organizationId,
+        userIds
+      );
    }
  }
 }
--- a/apps/web/src/app/organizations/manage/entity-events.component.ts
+++ b/apps/web/src/app/organizations/manage/entity-events.component.ts
@@ -4,6 +4,7 @@ import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { EventResponse } from "@bitwarden/common/models/response/event.response";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
@@ -40,7 +41,8 @@ export class EntityEventsComponent implements OnInit {
    private eventService: EventService,
    private platformUtilsService: PlatformUtilsService,
    private userNamePipe: UserNamePipe,
-    private logService: LogService
+    private logService: LogService,
+    private organizationUserService: OrganizationUserService
  ) {}

  async ngOnInit() {
@@ -52,7 +54,7 @@ export class EntityEventsComponent implements OnInit {

  async load() {
    if (this.showUser) {
-      const response = await this.apiService.getOrganizationUsers(this.organizationId);
+      const response = await this.organizationUserService.getAllUsers(this.organizationId);
      response.data.forEach((u) => {
        const name = this.userNamePipe.transform(u);
        this.orgUsersIdMap.set(u.id, { name: name, email: u.email });
--- a/apps/web/src/app/organizations/manage/entity-users.component.ts
+++ b/apps/web/src/app/organizations/manage/entity-users.component.ts
@@ -4,12 +4,13 @@ import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
 import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request";
-import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organization-user.response";

@Component({
  selector: "app-entity-users",
@@ -39,6 +40,7 @@ export class EntityUsersComponent implements OnInit {
    private apiService: ApiService,
    private i18nService: I18nService,
    private platformUtilsService: PlatformUtilsService,
+    private organizationUserService: OrganizationUserService,
    private logService: LogService
  ) {}

@@ -64,7 +66,7 @@ export class EntityUsersComponent implements OnInit {
  }

  async loadUsers() {
-    const users = await this.apiService.getOrganizationUsers(this.organizationId);
+    const users = await this.organizationUserService.getAllUsers(this.organizationId);
    this.allUsers = users.data.map((r) => r).sort(Utils.getSortFunction(this.i18nService, "email"));
    if (this.entity === "group") {
      const response = await this.apiService.getGroupUsers(this.organizationId, this.entityId);
--- a/apps/web/src/app/organizations/manage/events.component.ts
+++ b/apps/web/src/app/organizations/manage/events.component.ts
@@ -8,6 +8,7 @@ import { ExportService } from "@bitwarden/common/abstractions/export.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { ProviderService } from "@bitwarden/common/abstractions/provider.service";
@@ -41,6 +42,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
    logService: LogService,
    private userNamePipe: UserNamePipe,
    private organizationService: OrganizationService,
+    private organizationUserService: OrganizationUserService,
    private providerService: ProviderService,
    fileDownloadService: FileDownloadService
  ) {
@@ -72,7 +74,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
  }

  async load() {
-    const response = await this.apiService.getOrganizationUsers(this.organizationId);
+    const response = await this.organizationUserService.getAllUsers(this.organizationId);
    response.data.forEach((u) => {
      const name = this.userNamePipe.transform(u);
      this.orgUsersUserIdMap.set(u.userId, { name: name, email: u.email });
--- a/apps/web/src/app/organizations/manage/people.component.ts
+++ b/apps/web/src/app/organizations/manage/people.component.ts
@@ -9,6 +9,12 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.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 { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -23,11 +29,7 @@ import { PolicyType } from "@bitwarden/common/enums/policyType";
 import { ProductType } from "@bitwarden/common/enums/productType";
 import { Organization } from "@bitwarden/common/models/domain/organization";
 import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organization-keys.request";
-import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organization-user-bulk.request";
-import { OrganizationUserConfirmRequest } from "@bitwarden/common/models/request/organization-user-confirm.request";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { OrganizationUserBulkResponse } from "@bitwarden/common/models/response/organization-user-bulk.response";
-import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organization-user.response";
 import { DialogService } from "@bitwarden/components";

 import { BasePeopleComponent } from "../../common/base.people.component";
@@ -92,6 +94,7 @@ export class PeopleComponent
    stateService: StateService,
    private organizationService: OrganizationService,
    private organizationApiService: OrganizationApiServiceAbstraction,
+    private organizationUserService: OrganizationUserService,
    private dialogService: DialogService
  ) {
    super(
@@ -167,23 +170,23 @@ export class PeopleComponent
  }

  getUsers(): Promise<ListResponse<OrganizationUserUserDetailsResponse>> {
-    return this.apiService.getOrganizationUsers(this.organization.id);
+    return this.organizationUserService.getAllUsers(this.organization.id);
  }

  deleteUser(id: string): Promise<void> {
-    return this.apiService.deleteOrganizationUser(this.organization.id, id);
+    return this.organizationUserService.deleteOrganizationUser(this.organization.id, id);
  }

  revokeUser(id: string): Promise<void> {
-    return this.apiService.revokeOrganizationUser(this.organization.id, id);
+    return this.organizationUserService.revokeOrganizationUser(this.organization.id, id);
  }

  restoreUser(id: string): Promise<void> {
-    return this.apiService.restoreOrganizationUser(this.organization.id, id);
+    return this.organizationUserService.restoreOrganizationUser(this.organization.id, id);
  }

  reinviteUser(id: string): Promise<void> {
-    return this.apiService.postOrganizationUserReinvite(this.organization.id, id);
+    return this.organizationUserService.postOrganizationUserReinvite(this.organization.id, id);
  }

  async confirmUser(
@@ -194,7 +197,11 @@ export class PeopleComponent
    const key = await this.cryptoService.rsaEncrypt(orgKey.key, publicKey.buffer);
    const request = new OrganizationUserConfirmRequest();
    request.key = key.encryptedString;
-    await this.apiService.postOrganizationUserConfirm(this.organization.id, user.id, request);
+    await this.organizationUserService.postOrganizationUserConfirm(
+      this.organization.id,
+      user.id,
+      request
+    );
  }

  allowResetPassword(orgUser: OrganizationUserUserDetailsResponse): boolean {
@@ -377,10 +384,9 @@ export class PeopleComponent
    }

    try {
-      const request = new OrganizationUserBulkRequest(filteredUsers.map((user) => user.id));
-      const response = this.apiService.postManyOrganizationUserReinvite(
+      const response = this.organizationUserService.postManyOrganizationUserReinvite(
        this.organization.id,
-        request
+        filteredUsers.map((user) => user.id)
      );
      this.showBulkStatus(
        users,
--- a/apps/web/src/app/organizations/manage/reset-password.component.ts
+++ b/apps/web/src/app/organizations/manage/reset-password.component.ts
@@ -11,17 +11,17 @@ import { Subject, takeUntil } from "rxjs";
 import zxcvbn from "zxcvbn";

 import { PasswordStrengthComponent } from "@bitwarden/angular/shared/components/password-strength/password-strength.component";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/abstractions/organization-user/requests";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
-import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/models/request/organization-user-reset-password.request";

@Component({
  selector: "app-reset-password",
@@ -44,13 +44,13 @@ export class ResetPasswordComponent implements OnInit, OnDestroy {
  private destroy$ = new Subject<void>();

  constructor(
-    private apiService: ApiService,
    private i18nService: I18nService,
    private platformUtilsService: PlatformUtilsService,
    private passwordGenerationService: PasswordGenerationService,
    private policyService: PolicyService,
    private cryptoService: CryptoService,
-    private logService: LogService
+    private logService: LogService,
+    private organizationUserService: OrganizationUserService
  ) {}

  async ngOnInit() {
@@ -147,7 +147,7 @@ export class ResetPasswordComponent implements OnInit, OnDestroy {

    // Get user Information (kdf type, kdf iterations, resetPasswordKey, private key) and change password
    try {
-      this.formPromise = this.apiService
+      this.formPromise = this.organizationUserService
        .getOrganizationUserResetPasswordDetails(this.organizationId, this.id)
        .then(async (response) => {
          if (response == null) {
@@ -188,7 +188,7 @@ export class ResetPasswordComponent implements OnInit, OnDestroy {
          request.newMasterPasswordHash = newPasswordHash;

          // Change user's password
-          return this.apiService.putOrganizationUserResetPassword(
+          return this.organizationUserService.putOrganizationUserResetPassword(
            this.organizationId,
            this.id,
            request
--- a/apps/web/src/app/organizations/manage/user-add-edit.component.ts
+++ b/apps/web/src/app/organizations/manage/user-add-edit.component.ts
@@ -4,6 +4,11 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import {
+  OrganizationUserInviteRequest,
+  OrganizationUserUpdateRequest,
+} from "@bitwarden/common/abstractions/organization-user/requests";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
@@ -11,8 +16,6 @@ import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserTy
 import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api";
 import { CollectionData } from "@bitwarden/common/models/data/collection.data";
 import { Collection } from "@bitwarden/common/models/domain/collection";
-import { OrganizationUserInviteRequest } from "@bitwarden/common/models/request/organization-user-invite.request";
-import { OrganizationUserUpdateRequest } from "@bitwarden/common/models/request/organization-user-update.request";
 import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request";
 import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collection.response";
 import { CollectionView } from "@bitwarden/common/models/view/collection.view";
@@ -87,7 +90,8 @@ export class UserAddEditComponent implements OnInit {
    private collectionService: CollectionService,
    private platformUtilsService: PlatformUtilsService,
    private organizationService: OrganizationService,
-    private logService: LogService
+    private logService: LogService,
+    private organizationUserService: OrganizationUserService
  ) {}

  async ngOnInit() {
@@ -100,7 +104,7 @@ export class UserAddEditComponent implements OnInit {
      this.editMode = true;
      this.title = this.i18nService.t("editUser");
      try {
-        const user = await this.apiService.getOrganizationUser(
+        const user = await this.organizationUserService.getOrganizationUser(
          this.organizationId,
          this.organizationUserId
        );
@@ -224,7 +228,7 @@ export class UserAddEditComponent implements OnInit {
    }

    try {
-      this.deletePromise = this.apiService.deleteOrganizationUser(
+      this.deletePromise = this.organizationUserService.deleteOrganizationUser(
        this.organizationId,
        this.organizationUserId
      );
@@ -259,7 +263,7 @@ export class UserAddEditComponent implements OnInit {
    }

    try {
-      this.formPromise = this.apiService.revokeOrganizationUser(
+      this.formPromise = this.organizationUserService.revokeOrganizationUser(
        this.organizationId,
        this.organizationUserId
      );
@@ -282,7 +286,7 @@ export class UserAddEditComponent implements OnInit {
    }

    try {
-      this.formPromise = this.apiService.restoreOrganizationUser(
+      this.formPromise = this.organizationUserService.restoreOrganizationUser(
        this.organizationId,
        this.organizationUserId
      );
@@ -308,7 +312,7 @@ export class UserAddEditComponent implements OnInit {
      request.permissions ?? new PermissionsApi(),
      request.type !== OrganizationUserType.Custom
    );
-    this.formPromise = this.apiService.putOrganizationUser(
+    this.formPromise = this.organizationUserService.putOrganizationUser(
      this.organizationId,
      this.organizationUserId,
      request
@@ -325,6 +329,9 @@ export class UserAddEditComponent implements OnInit {
      request.type !== OrganizationUserType.Custom
    );
    request.collections = collections;
-    this.formPromise = this.apiService.postOrganizationUserInvite(this.organizationId, request);
+    this.formPromise = this.organizationUserService.postOrganizationUserInvite(
+      this.organizationId,
+      request
+    );
  }
 }
--- a/apps/web/src/app/organizations/manage/user-groups.component.ts
+++ b/apps/web/src/app/organizations/manage/user-groups.component.ts
@@ -3,9 +3,10 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserUpdateGroupsRequest } from "@bitwarden/common/abstractions/organization-user/requests";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { OrganizationUserUpdateGroupsRequest } from "@bitwarden/common/models/request/organization-user-update-groups.request";
 import { GroupResponse } from "@bitwarden/common/models/response/group.response";

@Component({
@@ -26,7 +27,8 @@ export class UserGroupsComponent implements OnInit {
    private apiService: ApiService,
    private i18nService: I18nService,
    private platformUtilsService: PlatformUtilsService,
-    private logService: LogService
+    private logService: LogService,
+    private organizationUserService: OrganizationUserService
  ) {}

  async ngOnInit() {
@@ -36,7 +38,7 @@ export class UserGroupsComponent implements OnInit {
    this.groups = groups;

    try {
-      const userGroups = await this.apiService.getOrganizationUserGroups(
+      const userGroups = await this.organizationUserService.getOrganizationUserGroups(
        this.organizationId,
        this.organizationUserId
      );
@@ -71,7 +73,7 @@ export class UserGroupsComponent implements OnInit {
    request.groupIds = this.groups.filter((g) => (g as any).checked).map((g) => g.id);

    try {
-      this.formPromise = this.apiService.putOrganizationUserGroups(
+      this.formPromise = this.organizationUserService.putOrganizationUserGroups(
        this.organizationId,
        this.organizationUserId,
        request
--- a/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts
+++ b/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts
@@ -2,17 +2,17 @@ import { Component } from "@angular/core";

 import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
 import { ModalConfig } from "@bitwarden/angular/services/modal.service";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+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/abstractions/organization/organization-api.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
 import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { Organization } from "@bitwarden/common/models/domain/organization";
-import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organization-user-reset-password-enrollment.request";
 import { Verification } from "@bitwarden/common/types/verification";

@Component({
@@ -27,7 +27,6 @@ export class EnrollMasterPasswordReset {

  constructor(
    private userVerificationService: UserVerificationService,
-    private apiService: ApiService,
    private platformUtilsService: PlatformUtilsService,
    private i18nService: I18nService,
    private cryptoService: CryptoService,
@@ -35,7 +34,8 @@ export class EnrollMasterPasswordReset {
    private logService: LogService,
    private modalRef: ModalRef,
    config: ModalConfig,
-    private organizationApiService: OrganizationApiServiceAbstraction
+    private organizationApiService: OrganizationApiServiceAbstraction,
+    private organizationUserService: OrganizationUserService
  ) {
    this.organization = config.data.organization;
  }
@@ -65,7 +65,7 @@ export class EnrollMasterPasswordReset {

        // Create request and execute enrollment
        request.resetPasswordKey = keyString;
-        await this.apiService.putOrganizationUserResetPasswordEnrollment(
+        await this.organizationUserService.putOrganizationUserResetPasswordEnrollment(
          this.organization.id,
          this.organization.userId,
          request
--- a/apps/web/src/app/settings/change-password.component.ts
+++ b/apps/web/src/app/settings/change-password.component.ts
@@ -10,6 +10,8 @@ import { FolderService } from "@bitwarden/common/abstractions/folder/folder.serv
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
+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/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
@@ -25,7 +27,6 @@ import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-cr
 import { CipherWithIdRequest } from "@bitwarden/common/models/request/cipher-with-id.request";
 import { EmergencyAccessUpdateRequest } from "@bitwarden/common/models/request/emergency-access-update.request";
 import { FolderWithIdRequest } from "@bitwarden/common/models/request/folder-with-id.request";
-import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organization-user-reset-password-enrollment.request";
 import { PasswordRequest } from "@bitwarden/common/models/request/password.request";
 import { SendWithIdRequest } from "@bitwarden/common/models/request/send-with-id.request";
 import { UpdateKeyRequest } from "@bitwarden/common/models/request/update-key.request";
@@ -55,7 +56,8 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
    private organizationService: OrganizationService,
    private keyConnectorService: KeyConnectorService,
    private router: Router,
-    private organizationApiService: OrganizationApiServiceAbstraction
+    private organizationApiService: OrganizationApiServiceAbstraction,
+    private organizationUserService: OrganizationUserService
  ) {
    super(
      i18nService,
@@ -280,7 +282,11 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
      request.masterPasswordHash = masterPasswordHash;
      request.resetPasswordKey = encryptedKey.encryptedString;

-      await this.apiService.putOrganizationUserResetPasswordEnrollment(org.id, org.userId, request);
+      await this.organizationUserService.putOrganizationUserResetPasswordEnrollment(
+        org.id,
+        org.userId,
+        request
+      );
    }
  }
 }
--- a/apps/web/src/app/vault/vault-filter/organization-filter/organization-options.component.ts
+++ b/apps/web/src/app/vault/vault-filter/organization-filter/organization-options.component.ts
@@ -5,6 +5,8 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+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/abstractions/organization/organization-api.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
@@ -12,7 +14,6 @@ import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.ab
 import { PolicyType } from "@bitwarden/common/enums/policyType";
 import { Organization } from "@bitwarden/common/models/domain/organization";
 import { Policy } from "@bitwarden/common/models/domain/policy";
-import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organization-user-reset-password-enrollment.request";

 import { EnrollMasterPasswordReset } from "../../../organizations/users/enroll-master-password-reset.component";

@@ -37,7 +38,8 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
    private policyService: PolicyService,
    private modalService: ModalService,
    private logService: LogService,
-    private organizationApiService: OrganizationApiServiceAbstraction
+    private organizationApiService: OrganizationApiServiceAbstraction,
+    private organizationUserService: OrganizationUserService
  ) {}

  async ngOnInit() {
@@ -133,7 +135,7 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
      const request = new OrganizationUserResetPasswordEnrollmentRequest();
      request.masterPasswordHash = "ignored";
      request.resetPasswordKey = null;
-      this.actionPromise = this.apiService.putOrganizationUserResetPasswordEnrollment(
+      this.actionPromise = this.organizationUserService.putOrganizationUserResetPasswordEnrollment(
        this.organization.id,
        this.organization.userId,
        request