Merge branch 'master' into feature/org-admin-refresh

apps/browser/src/popup/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 {
     router: Router,
     syncService: SyncService,
     route: ActivatedRoute,
-    organizationApiService: OrganizationApiServiceAbstraction
+    organizationApiService: OrganizationApiServiceAbstraction,
+    organizationUserService: OrganizationUserService
   ) {
     super(
       i18nService,
@@ -47,7 +49,8 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
       syncService,
       route,
       stateService,
-      organizationApiService
+      organizationApiService,
+      organizationUserService
     );
   }
 }

apps/browser/src/popup/scss/base.scss

@@ -327,7 +327,7 @@ header {
 }
 
 .content {
-  padding: 15px;
+  padding: 15px 5px;
 }
 
 .tabs {

apps/browser/src/popup/scss/box.scss

@@ -19,11 +19,11 @@
   }
 
   .box-header-expandable {
-    padding: 10px;
-    margin: 0 10px;
+    padding: 10px 5px;
+    margin: 0 5px;
     text-transform: uppercase;
     display: flex;
-    width: calc(100% - 20px);
+    width: calc(100% - 10px);
     box-sizing: border-box;
     align-items: center;
     border-radius: $border-radius;
@@ -76,11 +76,18 @@
         }
       }
     }
+
+    &.single-line .box-content-row,
+    .box-content-row.single-line {
+      padding-top: 10px;
+      padding-bottom: 10px;
+      margin: 5px;
+    }
   }
 
   .box-footer {
-    margin: 0 10px 10px 10px;
-    padding: 0 15px 10px 15px;
+    margin: 0 5px 5px 5px;
+    padding: 0 10px 5px 10px;
     font-size: $font-size-small;
 
     button.btn {
@@ -109,10 +116,10 @@
     margin: 10px 0 20px 0;
     .box-content {
       .box-content-row {
-        padding: 10px;
+        padding: 5px 10px;
         text-decoration: none;
         border-radius: $border-radius;
-        margin: 10px;
+        margin: 5px;
         // background-color: $background-color;
 
         @include themify($themes) {
@@ -180,7 +187,7 @@
           display: flex;
           padding-top: 10px;
           padding-bottom: 10px;
-          margin: 10px;
+          margin: 5px;
           border-radius: $border-radius;
         }
       }
@@ -219,11 +226,11 @@
 
 .box-content-row {
   display: block;
-  padding: 10px 15px;
+  padding: 5px 10px;
   position: relative;
   z-index: 1;
   border-radius: $border-radius;
-  margin: 10px;
+  margin: 8px 5px;
 
   @include themify($themes) {
     background-color: themed("boxBackgroundColor");
@@ -353,8 +360,6 @@
   }
 
   &.box-content-row-multi {
-    width: calc(100% - 20px);
-
     input:not([type="checkbox"]) {
       width: 100%;
     }
@@ -388,6 +393,10 @@
   &.box-content-row-checkbox,
   &.box-content-row-input,
   &.box-content-row-slider {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    margin: 5px;
+
     label,
     .row-label {
       font-size: $font-size-base;

apps/browser/src/popup/scss/buttons.scss

@@ -65,7 +65,7 @@
 
   &.block {
     display: block;
-    width: calc(100% - 20px);
+    width: calc(100% - 10px);
     margin: 0 auto;
   }
 
@@ -90,7 +90,7 @@
 
 button.box-content-row {
   display: block;
-  width: calc(100% - 20px);
+  width: calc(100% - 10px);
   text-align: left;
   border-color: none;
 

apps/browser/src/popup/scss/pages.scss

@@ -11,8 +11,8 @@ app-sync {
 app-generator .generated-block {
   font-size: $font-size-large;
   font-family: $font-family-monospace;
-  margin: 10px;
-  padding: 10px 10px 10px 0;
+  margin: 8px;
+  padding: 8px 10px 8px 0;
   display: flex;
   border-radius: $border-radius;
   border: 1px solid;
@@ -165,7 +165,8 @@ app-options {
 
 app-vault-view,
 app-vault-add-edit,
-app-generator {
+app-generator,
+app-vault-attachments {
   .box {
     margin: 15px 0 25px 0;
 

apps/browser/src/popup/settings/excluded-domains.component.html

@@ -74,7 +74,7 @@
           type="button"
           appStopClick
           (click)="addUri()"
-          class="box-content-row box-content-row-newmulti"
+          class="box-content-row box-content-row-newmulti single-line"
         >
           <i class="bwi bwi-plus-circle bwi-fw bwi-lg" aria-hidden="true"></i> {{ "newUri" | i18n }}
         </button>

apps/browser/src/popup/vault/add-edit.component.html

@@ -549,7 +549,7 @@
           type="button"
           appStopClick
           (click)="addUri()"
-          class="box-content-row box-content-row-newmulti"
+          class="box-content-row box-content-row-newmulti single-line"
           *ngIf="!(!cipher.edit && editMode)"
         >
           <i class="bwi bwi-plus-circle bwi-fw bwi-lg" aria-hidden="true"></i> {{ "newUri" | i18n }}
@@ -607,7 +607,7 @@
         </div>
         <button
           type="button"
-          class="box-content-row box-content-row-flex text-default"
+          class="box-content-row box-content-row-flex text-default single-line"
           appStopClick
           (click)="attachments()"
           *ngIf="editMode && showAttachments && !cloneMode"

apps/browser/src/popup/vault/attachments.component.html

@@ -21,7 +21,7 @@
   </header>
   <main tabindex="-1">
     <div class="box" *ngIf="cipher && cipher.hasAttachments">
-      <div class="box-content no-hover">
+      <div class="box-content no-hover single-line">
         <div class="box-content-row box-content-row-flex" *ngFor="let a of cipher.attachments">
           <div class="row-main">
             {{ a.fileName }}

apps/browser/src/popup/vault/view.component.html

@@ -525,7 +525,7 @@
     <h2 class="box-header">
       {{ "attachments" | i18n }}
     </h2>
-    <div class="box-content">
+    <div class="box-content single-line">
       <button
         type="button"
         class="box-content-row box-content-row-flex text-default"

apps/cli/src/bw.ts

@@ -5,6 +5,7 @@ import * as program from "commander";
 import * as jsdom from "jsdom";
 
 import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { ClientType } from "@bitwarden/common/enums/clientType";
 import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions";
@@ -30,6 +31,7 @@ import { ImportService } from "@bitwarden/common/services/import.service";
 import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service";
+import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation";
 import { OrganizationApiService } from "@bitwarden/common/services/organization/organization-api.service";
 import { OrganizationService } from "@bitwarden/common/services/organization/organization.service";
 import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service";
@@ -82,6 +84,7 @@ export class Main {
   settingsService: SettingsService;
   cipherService: CipherService;
   folderService: InternalFolderService;
+  organizationUserService: OrganizationUserService;
   collectionService: CollectionService;
   vaultTimeoutService: VaultTimeoutService;
   vaultTimeoutSettingsService: VaultTimeoutSettingsService;
@@ -242,6 +245,8 @@ export class Main {
 
     this.organizationService = new OrganizationService(this.stateService);
 
+    this.organizationUserService = new OrganizationUserServiceImplementation(this.apiService);
+
     this.policyService = new PolicyService(this.stateService, this.organizationService);
 
     this.sendService = new SendService(

apps/cli/src/commands/confirm.command.ts

@@ -1,12 +1,17 @@
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { OrganizationUserConfirmRequest } from "@bitwarden/common/models/request/organization-user-confirm.request";
 
 import { Response } from "../models/response";
 
 export class ConfirmCommand {
-  constructor(private apiService: ApiService, private cryptoService: CryptoService) {}
+  constructor(
+    private apiService: ApiService,
+    private cryptoService: CryptoService,
+    private organizationUserService: OrganizationUserService
+  ) {}
 
   async run(object: string, id: string, cmdOptions: Record<string, any>): Promise<Response> {
     if (id != null) {
@@ -37,7 +42,10 @@ export class ConfirmCommand {
       if (orgKey == null) {
         throw new Error("No encryption key for this organization.");
       }
-      const orgUser = await this.apiService.getOrganizationUser(options.organizationId, id);
+      const orgUser = await this.organizationUserService.getOrganizationUser(
+        options.organizationId,
+        id
+      );
       if (orgUser == null) {
         throw new Error("Member id does not exist for this organization.");
       }
@@ -46,7 +54,11 @@ export class ConfirmCommand {
       const key = await this.cryptoService.rsaEncrypt(orgKey.key, publicKey.buffer);
       const req = new OrganizationUserConfirmRequest();
       req.key = key.encryptedString;
-      await this.apiService.postOrganizationUserConfirm(options.organizationId, id, req);
+      await this.organizationUserService.postOrganizationUserConfirm(
+        options.organizationId,
+        id,
+        req
+      );
       return Response.success();
     } catch (e) {
       return Response.error(e);

apps/cli/src/commands/list.command.ts

@@ -2,6 +2,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { Utils } from "@bitwarden/common/misc/utils";
@@ -30,6 +31,7 @@ export class ListCommand {
     private collectionService: CollectionService,
     private organizationService: OrganizationService,
     private searchService: SearchService,
+    private organizationUserService: OrganizationUserService,
     private apiService: ApiService
   ) {}
 
@@ -202,7 +204,7 @@ export class ListCommand {
     }
 
     try {
-      const response = await this.apiService.getOrganizationUsers(options.organizationId);
+      const response = await this.organizationUserService.getAllUsers(options.organizationId);
       const res = new ListResponse(
         response.data.map((r) => {
           const u = new OrganizationUserResponse();

apps/cli/src/commands/serve.command.ts

@@ -73,6 +73,7 @@ export class ServeCommand {
       this.main.collectionService,
       this.main.organizationService,
       this.main.searchService,
+      this.main.organizationUserService,
       this.main.apiService
     );
     this.createCommand = new CreateCommand(
@@ -108,7 +109,11 @@ export class ServeCommand {
       this.main.apiService,
       this.main.folderApiService
     );
-    this.confirmCommand = new ConfirmCommand(this.main.apiService, this.main.cryptoService);
+    this.confirmCommand = new ConfirmCommand(
+      this.main.apiService,
+      this.main.cryptoService,
+      this.main.organizationUserService
+    );
     this.restoreCommand = new RestoreCommand(this.main.cipherService);
     this.shareCommand = new ShareCommand(this.main.cipherService);
     this.lockCommand = new LockCommand(this.main.vaultTimeoutService);

apps/cli/src/vault.program.ts

@@ -115,6 +115,7 @@ export class VaultProgram extends Program {
           this.main.collectionService,
           this.main.organizationService,
           this.main.searchService,
+          this.main.organizationUserService,
           this.main.apiService
         );
         const response = await command.run(object, cmd);
@@ -410,7 +411,11 @@ export class VaultProgram extends Program {
         }
 
         await this.exitIfLocked();
-        const command = new ConfirmCommand(this.main.apiService, this.main.cryptoService);
+        const command = new ConfirmCommand(
+          this.main.apiService,
+          this.main.cryptoService,
+          this.main.organizationUserService
+        );
         const response = await command.run(object, id, cmd);
         this.processResponse(response);
       });

apps/desktop/src/app/accounts/set-password.component.ts

@@ -7,6 +7,7 @@ import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.s
 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";
@@ -37,7 +38,8 @@ export class SetPasswordComponent extends BaseSetPasswordComponent implements On
     private broadcasterService: BroadcasterService,
     private ngZone: NgZone,
     stateService: StateService,
-    organizationApiService: OrganizationApiServiceAbstraction
+    organizationApiService: OrganizationApiServiceAbstraction,
+    organizationUserService: OrganizationUserService
   ) {
     super(
       i18nService,
@@ -52,7 +54,8 @@ export class SetPasswordComponent extends BaseSetPasswordComponent implements On
       syncService,
       route,
       stateService,
-      organizationApiService
+      organizationApiService,
+      organizationUserService
     );
   }
 

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

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
     );
   }
 }

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

@@ -1,7 +1,7 @@
+import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses";
 import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
 import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
 import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api";
-import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organization-user.response";
 
 import { CollectionAccessSelectionView } from "./collection-access-selection.view";
 

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 });

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);

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 });

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

@@ -7,6 +7,7 @@ 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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { CollectionData } from "@bitwarden/common/models/data/collection.data";
 import { Collection } from "@bitwarden/common/models/domain/collection";
@@ -129,7 +130,7 @@ export class GroupAddEditComponent implements OnInit, OnDestroy {
   }
 
   private get orgMembers$() {
-    return from(this.apiService.getOrganizationUsers(this.organizationId)).pipe(
+    return from(this.organizationUserService.getAllUsers(this.organizationId)).pipe(
       map((response) =>
         response.data.map((m) => ({
           id: m.id,
@@ -172,6 +173,7 @@ export class GroupAddEditComponent implements OnInit, OnDestroy {
     @Inject(DIALOG_DATA) private params: GroupAddEditDialogParams,
     private dialogRef: DialogRef<GroupAddEditDialogResultType>,
     private apiService: ApiService,
+    private organizationUserService: OrganizationUserService,
     private groupService: GroupService,
     private i18nService: I18nService,
     private collectionService: CollectionService,

apps/web/src/app/organizations/members/components/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
+    );
   }
 }

apps/web/src/app/organizations/members/components/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() {

apps/web/src/app/organizations/members/components/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
+      );
     }
   }
 }

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

@@ -6,6 +6,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";
@@ -13,8 +18,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";
@@ -108,6 +111,7 @@ export class MemberDialogComponent implements OnInit {
     private platformUtilsService: PlatformUtilsService,
     private organizationService: OrganizationService,
     private logService: LogService,
+    private organizationUserService: OrganizationUserService,
     private formBuilder: FormBuilder
   ) {}
 
@@ -123,7 +127,7 @@ export class MemberDialogComponent implements OnInit {
       this.editMode = true;
       this.title = this.i18nService.t("editMember");
       try {
-        const user = await this.apiService.getOrganizationUser(
+        const user = await this.organizationUserService.getOrganizationUser(
           this.params.organizationId,
           this.params.organizationUserId
         );
@@ -246,7 +250,7 @@ export class MemberDialogComponent implements OnInit {
     }
 
     try {
-      await this.apiService.deleteOrganizationUser(
+      await this.organizationUserService.deleteOrganizationUser(
         this.params.organizationId,
         this.params.organizationUserId
       );
@@ -281,7 +285,7 @@ export class MemberDialogComponent implements OnInit {
     }
 
     try {
-      await this.apiService.revokeOrganizationUser(
+      await this.organizationUserService.revokeOrganizationUser(
         this.params.organizationId,
         this.params.organizationUserId
       );
@@ -304,7 +308,7 @@ export class MemberDialogComponent implements OnInit {
     }
 
     try {
-      await this.apiService.restoreOrganizationUser(
+      await this.organizationUserService.restoreOrganizationUser(
         this.params.organizationId,
         this.params.organizationUserId
       );
@@ -338,7 +342,7 @@ export class MemberDialogComponent implements OnInit {
       request.permissions ?? new PermissionsApi(),
       request.type !== OrganizationUserType.Custom
     );
-    await this.apiService.putOrganizationUser(
+    await this.organizationUserService.putOrganizationUser(
       this.params.organizationId,
       this.params.organizationUserId,
       request
@@ -355,7 +359,10 @@ export class MemberDialogComponent implements OnInit {
       request.type !== OrganizationUserType.Custom
     );
     request.collections = collections;
-    await this.apiService.postOrganizationUserInvite(this.params.organizationId, request);
+    await this.organizationUserService.postOrganizationUserInvite(
+      this.params.organizationId,
+      request
+    );
   }
 }
 

apps/web/src/app/organizations/members/components/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

apps/web/src/app/organizations/members/components/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 { GroupService, GroupView } from "../../core";
 
@@ -28,7 +29,8 @@ export class UserGroupsComponent implements OnInit {
     private groupApiService: GroupService,
     private i18nService: I18nService,
     private platformUtilsService: PlatformUtilsService,
-    private logService: LogService
+    private logService: LogService,
+    private organizationUserService: OrganizationUserService
   ) {}
 
   async ngOnInit() {
@@ -37,7 +39,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
       );
@@ -72,7 +74,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

apps/web/src/app/organizations/members/people.component.ts

@@ -10,6 +10,12 @@ import { CollectionService } from "@bitwarden/common/abstractions/collection.ser
 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";
@@ -26,12 +32,8 @@ import { CollectionData } from "@bitwarden/common/models/data/collection.data";
 import { Collection } from "@bitwarden/common/models/domain/collection";
 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 { CollectionDetailsResponse } from "@bitwarden/common/models/response/collection.response";
 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";
@@ -97,6 +99,7 @@ export class PeopleComponent
     stateService: StateService,
     private organizationService: OrganizationService,
     private organizationApiService: OrganizationApiServiceAbstraction,
+    private organizationUserService: OrganizationUserService,
     private dialogService: DialogService,
     private groupService: GroupService,
     private collectionService: CollectionService
@@ -177,7 +180,7 @@ export class PeopleComponent
     let collectionsPromise: Promise<Map<string, string>>;
 
     // We don't need both groups and collections for the table, so only load one
-    const userPromise = this.apiService.getOrganizationUsers(this.organization.id, {
+    const userPromise = this.organizationUserService.getAllUsers(this.organization.id, {
       includeGroups: this.organization.useGroups,
       includeCollections: !this.organization.useGroups,
     });
@@ -234,19 +237,19 @@ export class PeopleComponent
   }
 
   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(user: OrganizationUserView, publicKey: Uint8Array): Promise<void> {
@@ -254,7 +257,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: OrganizationUserView): boolean {
@@ -428,10 +435,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,

apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.component.ts

@@ -3,12 +3,12 @@ import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 import { combineLatest, of, shareReplay, Subject, switchMap, takeUntil } from "rxjs";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { Organization } from "@bitwarden/common/models/domain/organization";
-import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/src/models/response/organization-user.response";
 import { CollectionView } from "@bitwarden/common/src/models/view/collection.view";
 import { BitValidators, DialogService } from "@bitwarden/components";
 
@@ -70,12 +70,12 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
     @Inject(DIALOG_DATA) private params: CollectionDialogParams,
     private formBuilder: FormBuilder,
     private dialogRef: DialogRef<CollectionDialogResult>,
-    private apiService: ApiService,
     private organizationService: OrganizationService,
     private groupService: GroupService,
     private collectionService: CollectionAdminService,
     private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService
+    private platformUtilsService: PlatformUtilsService,
+    private organizationUserService: OrganizationUserService
   ) {
     this.tabIndex = params.initialTab ?? CollectionDialogTabType.Info;
   }
@@ -101,7 +101,7 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
         ? this.collectionService.get(this.params.organizationId, this.params.collectionId)
         : of(null),
       groups: groups$,
-      users: this.apiService.getOrganizationUsers(this.params.organizationId),
+      users: this.organizationUserService.getAllUsers(this.params.organizationId),
     })
       .pipe(takeUntil(this.destroy$))
       .subscribe(({ organization, collections, collectionDetails, groups, users }) => {

apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.stories.ts

@@ -6,10 +6,10 @@ import { Meta, moduleMetadata, Story } from "@storybook/angular";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organization-user.response";
 import { PlatformUtilsService } from "@bitwarden/common/src/abstractions/platformUtils.service";
 
 import { SharedModule } from "../../../../shared/shared.module";

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

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
+      );
     }
   }
 }

apps/web/src/app/vault/vault-filter/components/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";
 import { OptionsInput } from "../shared/components/vault-filter-section.component";
@@ -38,7 +39,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() {
@@ -134,7 +136,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