[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

libs/angular/src/components/set-password.component.ts

@@ -6,6 +6,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 { 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 { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -19,7 +21,6 @@ import { Utils } from "@bitwarden/common/misc/utils";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
 import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
-import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organization-user-reset-password-enrollment.request";
 import { SetPasswordRequest } from "@bitwarden/common/models/request/set-password.request";
 
 import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component";
@@ -49,7 +50,8 @@ export class SetPasswordComponent extends BaseChangePasswordComponent {
     private syncService: SyncService,
     private route: ActivatedRoute,
     stateService: StateService,
-    private organizationApiService: OrganizationApiServiceAbstraction
+    private organizationApiService: OrganizationApiServiceAbstraction,
+    private organizationUserService: OrganizationUserService
   ) {
     super(
       i18nService,
@@ -136,7 +138,7 @@ export class SetPasswordComponent extends BaseChangePasswordComponent {
             resetRequest.masterPasswordHash = masterPasswordHash;
             resetRequest.resetPasswordKey = encryptedKey.encryptedString;
 
-            return this.apiService.putOrganizationUserResetPasswordEnrollment(
+            return this.organizationUserService.putOrganizationUserResetPasswordEnrollment(
               this.orgId,
               userId,
               resetRequest

libs/angular/src/services/jslib-services.module.ts

@@ -2,8 +2,8 @@ import { Injector, LOCALE_ID, NgModule } from "@angular/core";
 
 import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/abstractions/account/account-api.service";
 import {
-  InternalAccountService,
   AccountService as AccountServiceAbstraction,
+  InternalAccountService,
 } from "@bitwarden/common/abstractions/account/account.service";
 import { AnonymousHubService as AnonymousHubServiceAbstraction } from "@bitwarden/common/abstractions/anonymousHub.service";
 import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service";
@@ -35,6 +35,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/abstractions/login.service";
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import {
   InternalOrganizationService,
@@ -45,8 +46,8 @@ import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
 import {
-  PolicyService as PolicyServiceAbstraction,
   InternalPolicyService,
+  PolicyService as PolicyServiceAbstraction,
 } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/abstractions/provider.service";
 import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
@@ -96,6 +97,7 @@ import { FormValidationErrorsService } from "@bitwarden/common/services/formVali
 import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
 import { LoginService } from "@bitwarden/common/services/login.service";
 import { NotificationsService } from "@bitwarden/common/services/notifications.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";
@@ -126,16 +128,16 @@ import { UnauthGuard } from "../guards/unauth.guard";
 
 import { BroadcasterService } from "./broadcaster.service";
 import {
-  WINDOW,
+  LOCALES_DIRECTORY,
+  LOCKED_CALLBACK,
+  LOG_MAC_FAILURES,
+  LOGOUT_CALLBACK,
   MEMORY_STORAGE,
   SECURE_STORAGE,
   STATE_FACTORY,
   STATE_SERVICE_USE_CACHE,
-  LOGOUT_CALLBACK,
-  LOCKED_CALLBACK,
-  LOCALES_DIRECTORY,
   SYSTEM_LANGUAGE,
-  LOG_MAC_FAILURES,
+  WINDOW,
 } from "./injection-tokens";
 import { ModalService } from "./modal.service";
 import { PasswordRepromptService } from "./passwordReprompt.service";
@@ -539,6 +541,11 @@ import { AbstractThemingService } from "./theming/theming.service.abstraction";
       provide: InternalOrganizationService,
       useExisting: OrganizationServiceAbstraction,
     },
+    {
+      provide: OrganizationUserService,
+      useClass: OrganizationUserServiceImplementation,
+      deps: [ApiServiceAbstraction],
+    },
     {
       provide: ProviderServiceAbstraction,
       useClass: ProviderService,

libs/common/src/abstractions/api.service.ts

@@ -34,15 +34,6 @@ import { KeyConnectorUserKeyRequest } from "../models/request/key-connector-user
 import { KeysRequest } from "../models/request/keys.request";
 import { OrganizationConnectionRequest } from "../models/request/organization-connection.request";
 import { OrganizationImportRequest } from "../models/request/organization-import.request";
-import { OrganizationUserAcceptRequest } from "../models/request/organization-user-accept.request";
-import { OrganizationUserBulkConfirmRequest } from "../models/request/organization-user-bulk-confirm.request";
-import { OrganizationUserBulkRequest } from "../models/request/organization-user-bulk.request";
-import { OrganizationUserConfirmRequest } from "../models/request/organization-user-confirm.request";
-import { OrganizationUserInviteRequest } from "../models/request/organization-user-invite.request";
-import { OrganizationUserResetPasswordEnrollmentRequest } from "../models/request/organization-user-reset-password-enrollment.request";
-import { OrganizationUserResetPasswordRequest } from "../models/request/organization-user-reset-password.request";
-import { OrganizationUserUpdateGroupsRequest } from "../models/request/organization-user-update-groups.request";
-import { OrganizationUserUpdateRequest } from "../models/request/organization-user-update.request";
 import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organization-sponsorship-create.request";
 import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organization-sponsorship-redeem.request";
 import { PasswordHintRequest } from "../models/request/password-hint.request";
@@ -117,13 +108,6 @@ import {
 } from "../models/response/organization-connection.response";
 import { OrganizationExportResponse } from "../models/response/organization-export.response";
 import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/organization-sponsorship-sync-status.response";
-import { OrganizationUserBulkPublicKeyResponse } from "../models/response/organization-user-bulk-public-key.response";
-import { OrganizationUserBulkResponse } from "../models/response/organization-user-bulk.response";
-import {
-  OrganizationUserDetailsResponse,
-  OrganizationUserUserDetailsResponse,
-  OrganizationUserResetPasswordDetailsReponse,
-} from "../models/response/organization-user.response";
 import { PaymentResponse } from "../models/response/payment.response";
 import { PlanResponse } from "../models/response/plan.response";
 import { PolicyResponse } from "../models/response/policy.response";
@@ -136,8 +120,8 @@ import {
 import { ProviderUserBulkPublicKeyResponse } from "../models/response/provider/provider-user-bulk-public-key.response";
 import { ProviderUserBulkResponse } from "../models/response/provider/provider-user-bulk.response";
 import {
-  ProviderUserUserDetailsResponse,
   ProviderUserResponse,
+  ProviderUserUserDetailsResponse,
 } from "../models/response/provider/provider-user.response";
 import { ProviderResponse } from "../models/response/provider/provider.response";
 import { SelectionReadOnlyResponse } from "../models/response/selection-read-only.response";
@@ -156,8 +140,8 @@ import { TwoFactorEmailResponse } from "../models/response/two-factor-email.resp
 import { TwoFactorProviderResponse } from "../models/response/two-factor-provider.response";
 import { TwoFactorRecoverResponse } from "../models/response/two-factor-recover.response";
 import {
-  TwoFactorWebAuthnResponse,
   ChallengeResponse,
+  TwoFactorWebAuthnResponse,
 } from "../models/response/two-factor-web-authn.response";
 import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.response";
 import { UserKeyResponse } from "../models/response/user-key.response";
@@ -355,82 +339,6 @@ export abstract class ApiService {
   deleteGroup: (organizationId: string, id: string) => Promise<any>;
   deleteGroupUser: (organizationId: string, id: string, organizationUserId: string) => Promise<any>;
 
-  getOrganizationUser: (
-    organizationId: string,
-    id: string
-  ) => Promise<OrganizationUserDetailsResponse>;
-  getOrganizationUserGroups: (organizationId: string, id: string) => Promise<string[]>;
-  getOrganizationUsers: (
-    organizationId: string
-  ) => Promise<ListResponse<OrganizationUserUserDetailsResponse>>;
-  getOrganizationUserResetPasswordDetails: (
-    organizationId: string,
-    id: string
-  ) => Promise<OrganizationUserResetPasswordDetailsReponse>;
-  postOrganizationUserInvite: (
-    organizationId: string,
-    request: OrganizationUserInviteRequest
-  ) => Promise<any>;
-  postOrganizationUserReinvite: (organizationId: string, id: string) => Promise<any>;
-  postManyOrganizationUserReinvite: (
-    organizationId: string,
-    request: OrganizationUserBulkRequest
-  ) => Promise<ListResponse<OrganizationUserBulkResponse>>;
-  postOrganizationUserAccept: (
-    organizationId: string,
-    id: string,
-    request: OrganizationUserAcceptRequest
-  ) => Promise<any>;
-  postOrganizationUserConfirm: (
-    organizationId: string,
-    id: string,
-    request: OrganizationUserConfirmRequest
-  ) => Promise<any>;
-  postOrganizationUsersPublicKey: (
-    organizationId: string,
-    request: OrganizationUserBulkRequest
-  ) => Promise<ListResponse<OrganizationUserBulkPublicKeyResponse>>;
-  postOrganizationUserBulkConfirm: (
-    organizationId: string,
-    request: OrganizationUserBulkConfirmRequest
-  ) => Promise<ListResponse<OrganizationUserBulkResponse>>;
-
-  putOrganizationUser: (
-    organizationId: string,
-    id: string,
-    request: OrganizationUserUpdateRequest
-  ) => Promise<any>;
-  putOrganizationUserGroups: (
-    organizationId: string,
-    id: string,
-    request: OrganizationUserUpdateGroupsRequest
-  ) => Promise<any>;
-  putOrganizationUserResetPasswordEnrollment: (
-    organizationId: string,
-    userId: string,
-    request: OrganizationUserResetPasswordEnrollmentRequest
-  ) => Promise<void>;
-  putOrganizationUserResetPassword: (
-    organizationId: string,
-    id: string,
-    request: OrganizationUserResetPasswordRequest
-  ) => Promise<any>;
-  deleteOrganizationUser: (organizationId: string, id: string) => Promise<any>;
-  deleteManyOrganizationUsers: (
-    organizationId: string,
-    request: OrganizationUserBulkRequest
-  ) => Promise<ListResponse<OrganizationUserBulkResponse>>;
-  revokeOrganizationUser: (organizationId: string, id: string) => Promise<any>;
-  revokeManyOrganizationUsers: (
-    organizationId: string,
-    request: OrganizationUserBulkRequest
-  ) => Promise<ListResponse<OrganizationUserBulkResponse>>;
-  restoreOrganizationUser: (organizationId: string, id: string) => Promise<any>;
-  restoreManyOrganizationUsers: (
-    organizationId: string,
-    request: OrganizationUserBulkRequest
-  ) => Promise<ListResponse<OrganizationUserBulkResponse>>;
-
   getSync: () => Promise<SyncResponse>;
   postPublicImportDirectory: (request: OrganizationImportRequest) => Promise<any>;
 

libs/common/src/abstractions/organization-user/organization-user.service.ts

@@ -0,0 +1,233 @@
+import { ListResponse } from "../../models/response/list.response";
+
+import {
+  OrganizationUserAcceptRequest,
+  OrganizationUserBulkConfirmRequest,
+  OrganizationUserConfirmRequest,
+  OrganizationUserInviteRequest,
+  OrganizationUserResetPasswordEnrollmentRequest,
+  OrganizationUserResetPasswordRequest,
+  OrganizationUserUpdateGroupsRequest,
+  OrganizationUserUpdateRequest,
+} from "./requests";
+import {
+  OrganizationUserBulkPublicKeyResponse,
+  OrganizationUserBulkResponse,
+  OrganizationUserDetailsResponse,
+  OrganizationUserResetPasswordDetailsReponse,
+  OrganizationUserUserDetailsResponse,
+} from "./responses";
+
+/**
+ * Service for interacting with Organization Users via the API
+ */
+export abstract class OrganizationUserService {
+  /**
+   * Retrieve a single organization user by Id
+   * @param organizationId - Identifier for the user's organization
+   * @param id - Organization user identifier
+   */
+  abstract getOrganizationUser(
+    organizationId: string,
+    id: string
+  ): Promise<OrganizationUserDetailsResponse>;
+
+  /**
+   * Retrieve a list of groups Ids the specified organization user belongs to
+   * @param organizationId - Identifier for the user's organization
+   * @param id - Organization user identifier
+   */
+  abstract getOrganizationUserGroups(organizationId: string, id: string): Promise<string[]>;
+
+  /**
+   * Retrieve a list of all users that belong to the specified organization
+   * @param organizationId - Identifier for the organization
+   */
+  abstract getAllUsers(
+    organizationId: string
+  ): Promise<ListResponse<OrganizationUserUserDetailsResponse>>;
+
+  /**
+   * Retrieve reset password details for the specified organization user
+   * @param organizationId - Identifier for the user's organization
+   * @param id - Organization user identifier
+   */
+  abstract getOrganizationUserResetPasswordDetails(
+    organizationId: string,
+    id: string
+  ): Promise<OrganizationUserResetPasswordDetailsReponse>;
+
+  /**
+   * Create new organization user invite(s) for the specified organization
+   * @param organizationId - Identifier for the organization
+   * @param request - New user invitation request details
+   */
+  abstract postOrganizationUserInvite(
+    organizationId: string,
+    request: OrganizationUserInviteRequest
+  ): Promise<void>;
+
+  /**
+   * Re-invite the specified organization user
+   * @param organizationId - Identifier for the user's organization
+   * @param id - Organization user identifier
+   */
+  abstract postOrganizationUserReinvite(organizationId: string, id: string): Promise<any>;
+
+  /**
+   * Re-invite many organization users for the specified organization
+   * @param organizationId - Identifier for the organization
+   * @param ids - A list of organization user identifiers
+   * @return List of user ids, including both those that were successfully re-invited and those that had an error
+   */
+  abstract postManyOrganizationUserReinvite(
+    organizationId: string,
+    ids: string[]
+  ): Promise<ListResponse<OrganizationUserBulkResponse>>;
+
+  /**
+   * Accept an organization user invitation
+   * @param organizationId - Identifier for the organization to accept
+   * @param id - Organization user identifier
+   * @param request - Request details for accepting the invitation
+   */
+  abstract postOrganizationUserAccept(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserAcceptRequest
+  ): Promise<void>;
+
+  /**
+   * Confirm an organization user that has accepted their invitation
+   * @param organizationId - Identifier for the organization to confirm
+   * @param id - Organization user identifier
+   * @param request - Request details for confirming the user
+   */
+  abstract postOrganizationUserConfirm(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserConfirmRequest
+  ): Promise<void>;
+
+  /**
+   * Retrieve a list of the specified users' public keys
+   * @param organizationId - Identifier for the organization to accept
+   * @param ids - A list of organization user identifiers to retrieve public keys for
+   */
+  abstract postOrganizationUsersPublicKey(
+    organizationId: string,
+    ids: string[]
+  ): Promise<ListResponse<OrganizationUserBulkPublicKeyResponse>>;
+
+  /**
+   * Confirm many organization users that have accepted their invitations
+   * @param organizationId - Identifier for the organization to confirm users
+   * @param request - Bulk request details for confirming the user
+   */
+  abstract postOrganizationUserBulkConfirm(
+    organizationId: string,
+    request: OrganizationUserBulkConfirmRequest
+  ): Promise<ListResponse<OrganizationUserBulkResponse>>;
+
+  /**
+   * Update an organization users
+   * @param organizationId - Identifier for the organization the user belongs to
+   * @param id - Organization user identifier
+   * @param request - Request details for updating the user
+   */
+  abstract putOrganizationUser(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserUpdateRequest
+  ): Promise<void>;
+
+  /**
+   * Update an organization user's groups
+   * @param organizationId - Identifier for the organization the user belongs to
+   * @param id - Organization user identifier
+   * @param groupIds - List of group ids to associate the user with
+   */
+  abstract putOrganizationUserGroups(
+    organizationId: string,
+    id: string,
+    groupIds: OrganizationUserUpdateGroupsRequest
+  ): Promise<void>;
+
+  /**
+   * Update an organization user's reset password enrollment
+   * @param organizationId - Identifier for the organization the user belongs to
+   * @param userId - Organization user identifier
+   * @param request - Reset password enrollment details
+   */
+  abstract putOrganizationUserResetPasswordEnrollment(
+    organizationId: string,
+    userId: string,
+    request: OrganizationUserResetPasswordEnrollmentRequest
+  ): Promise<void>;
+
+  /**
+   * Reset an organization user's password
+   * @param organizationId - Identifier for the organization the user belongs to
+   * @param id - Organization user identifier
+   * @param request - Reset password details
+   */
+  abstract putOrganizationUserResetPassword(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserResetPasswordRequest
+  ): Promise<void>;
+
+  /**
+   * Delete an organization user
+   * @param organizationId - Identifier for the organization the user belongs to
+   * @param id - Organization user identifier
+   */
+  abstract deleteOrganizationUser(organizationId: string, id: string): Promise<void>;
+
+  /**
+   * Delete many organization users
+   * @param organizationId - Identifier for the organization the users belongs to
+   * @param ids - List of organization user identifiers to delete
+   * @return List of user ids, including both those that were successfully deleted and those that had an error
+   */
+  abstract deleteManyOrganizationUsers(
+    organizationId: string,
+    ids: string[]
+  ): Promise<ListResponse<OrganizationUserBulkResponse>>;
+
+  /**
+   * Revoke an organization user's access to the organization
+   * @param organizationId - Identifier for the organization the user belongs to
+   * @param id - Organization user identifier
+   */
+  abstract revokeOrganizationUser(organizationId: string, id: string): Promise<void>;
+
+  /**
+   * Revoke many organization users' access to the organization
+   * @param organizationId - Identifier for the organization the users belongs to
+   * @param ids - List of organization user identifiers to revoke
+   * @return List of user ids, including both those that were successfully revoked and those that had an error
+   */
+  abstract revokeManyOrganizationUsers(
+    organizationId: string,
+    ids: string[]
+  ): Promise<ListResponse<OrganizationUserBulkResponse>>;
+
+  /**
+   * Restore an organization user's access to the organization
+   * @param organizationId - Identifier for the organization the user belongs to
+   * @param id - Organization user identifier
+   */
+  abstract restoreOrganizationUser(organizationId: string, id: string): Promise<void>;
+
+  /**
+   * Restore many organization users' access to the organization
+   * @param organizationId - Identifier for the organization the users belongs to
+   * @param ids - List of organization user identifiers to restore
+   * @return List of user ids, including both those that were successfully restored and those that had an error
+   */
+  abstract restoreManyOrganizationUsers(
+    organizationId: string,
+    ids: string[]
+  ): Promise<ListResponse<OrganizationUserBulkResponse>>;
+}

libs/common/src/abstractions/organization-user/requests/index.ts

@@ -0,0 +1,8 @@
+export * from "./organization-user-accept.request";
+export * from "./organization-user-bulk-confirm.request";
+export * from "./organization-user-confirm.request";
+export * from "./organization-user-invite.request";
+export * from "./organization-user-reset-password.request";
+export * from "./organization-user-reset-password-enrollment.request";
+export * from "./organization-user-update.request";
+export * from "./organization-user-update-groups.request";

libs/common/src/abstractions/organization-user/requests/organization-user-invite.request.ts

@@ -0,0 +1,11 @@
+import { OrganizationUserType } from "../../../enums/organizationUserType";
+import { PermissionsApi } from "../../../models/api/permissions.api";
+import { SelectionReadOnlyRequest } from "../../../models/request/selection-read-only.request";
+
+export class OrganizationUserInviteRequest {
+  emails: string[] = [];
+  type: OrganizationUserType;
+  accessAll: boolean;
+  collections: SelectionReadOnlyRequest[] = [];
+  permissions: PermissionsApi;
+}

libs/common/src/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts

@@ -1,4 +1,4 @@
-import { SecretVerificationRequest } from "./secret-verification.request";
+import { SecretVerificationRequest } from "../../../models/request/secret-verification.request";
 
 export class OrganizationUserResetPasswordEnrollmentRequest extends SecretVerificationRequest {
   resetPasswordKey: string;

libs/common/src/abstractions/organization-user/requests/organization-user-update.request.ts

@@ -0,0 +1,10 @@
+import { OrganizationUserType } from "../../../enums/organizationUserType";
+import { PermissionsApi } from "../../../models/api/permissions.api";
+import { SelectionReadOnlyRequest } from "../../../models/request/selection-read-only.request";
+
+export class OrganizationUserUpdateRequest {
+  type: OrganizationUserType;
+  accessAll: boolean;
+  collections: SelectionReadOnlyRequest[] = [];
+  permissions: PermissionsApi;
+}

libs/common/src/abstractions/organization-user/responses/index.ts

@@ -0,0 +1,3 @@
+export * from "./organization-user.response";
+export * from "./organization-user-bulk.response";
+export * from "./organization-user-bulk-public-key.response";

libs/common/src/abstractions/organization-user/responses/organization-user-bulk-public-key.response.ts

@@ -1,4 +1,4 @@
-import { BaseResponse } from "./base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class OrganizationUserBulkPublicKeyResponse extends BaseResponse {
   id: string;

libs/common/src/abstractions/organization-user/responses/organization-user-bulk.response.ts

@@ -1,4 +1,4 @@
-import { BaseResponse } from "./base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class OrganizationUserBulkResponse extends BaseResponse {
   id: string;

libs/common/src/abstractions/organization-user/responses/organization-user.response.ts

@@ -1,10 +1,9 @@
-import { KdfType } from "../../enums/kdfType";
-import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType";
-import { OrganizationUserType } from "../../enums/organizationUserType";
-import { PermissionsApi } from "../api/permissions.api";
-
-import { BaseResponse } from "./base.response";
-import { SelectionReadOnlyResponse } from "./selection-read-only.response";
+import { KdfType } from "../../../enums/kdfType";
+import { OrganizationUserStatusType } from "../../../enums/organizationUserStatusType";
+import { OrganizationUserType } from "../../../enums/organizationUserType";
+import { PermissionsApi } from "../../../models/api/permissions.api";
+import { BaseResponse } from "../../../models/response/base.response";
+import { SelectionReadOnlyResponse } from "../../../models/response/selection-read-only.response";
 
 export class OrganizationUserResponse extends BaseResponse {
   id: string;

libs/common/src/models/request/organization-user-invite.request.ts

@@ -1,12 +0,0 @@
-import { OrganizationUserType } from "../../enums/organizationUserType";
-import { PermissionsApi } from "../api/permissions.api";
-
-import { SelectionReadOnlyRequest } from "./selection-read-only.request";
-
-export class OrganizationUserInviteRequest {
-  emails: string[] = [];
-  type: OrganizationUserType;
-  accessAll: boolean;
-  collections: SelectionReadOnlyRequest[] = [];
-  permissions: PermissionsApi;
-}

libs/common/src/models/request/organization-user-update.request.ts

@@ -1,11 +0,0 @@
-import { OrganizationUserType } from "../../enums/organizationUserType";
-import { PermissionsApi } from "../api/permissions.api";
-
-import { SelectionReadOnlyRequest } from "./selection-read-only.request";
-
-export class OrganizationUserUpdateRequest {
-  type: OrganizationUserType;
-  accessAll: boolean;
-  collections: SelectionReadOnlyRequest[] = [];
-  permissions: PermissionsApi;
-}

libs/common/src/models/request/update-temp-password.request.ts

@@ -1,4 +1,4 @@
-import { OrganizationUserResetPasswordRequest } from "./organization-user-reset-password.request";
+import { OrganizationUserResetPasswordRequest } from "../../abstractions/organization-user/requests";
 
 export class UpdateTempPasswordRequest extends OrganizationUserResetPasswordRequest {
   masterPasswordHint: string;

libs/common/src/models/response/provider/provider-user-bulk-public-key.response.ts

@@ -1,3 +1,3 @@
-import { OrganizationUserBulkPublicKeyResponse } from "../organization-user-bulk-public-key.response";
+import { OrganizationUserBulkPublicKeyResponse } from "../../../abstractions/organization-user/responses";
 
 export class ProviderUserBulkPublicKeyResponse extends OrganizationUserBulkPublicKeyResponse {}

libs/common/src/services/api.service.ts

@@ -42,15 +42,6 @@ import { KeyConnectorUserKeyRequest } from "../models/request/key-connector-user
 import { KeysRequest } from "../models/request/keys.request";
 import { OrganizationConnectionRequest } from "../models/request/organization-connection.request";
 import { OrganizationImportRequest } from "../models/request/organization-import.request";
-import { OrganizationUserAcceptRequest } from "../models/request/organization-user-accept.request";
-import { OrganizationUserBulkConfirmRequest } from "../models/request/organization-user-bulk-confirm.request";
-import { OrganizationUserBulkRequest } from "../models/request/organization-user-bulk.request";
-import { OrganizationUserConfirmRequest } from "../models/request/organization-user-confirm.request";
-import { OrganizationUserInviteRequest } from "../models/request/organization-user-invite.request";
-import { OrganizationUserResetPasswordEnrollmentRequest } from "../models/request/organization-user-reset-password-enrollment.request";
-import { OrganizationUserResetPasswordRequest } from "../models/request/organization-user-reset-password.request";
-import { OrganizationUserUpdateGroupsRequest } from "../models/request/organization-user-update-groups.request";
-import { OrganizationUserUpdateRequest } from "../models/request/organization-user-update.request";
 import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organization-sponsorship-create.request";
 import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organization-sponsorship-redeem.request";
 import { PasswordHintRequest } from "../models/request/password-hint.request";
@@ -126,13 +117,6 @@ import {
 } from "../models/response/organization-connection.response";
 import { OrganizationExportResponse } from "../models/response/organization-export.response";
 import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/organization-sponsorship-sync-status.response";
-import { OrganizationUserBulkPublicKeyResponse } from "../models/response/organization-user-bulk-public-key.response";
-import { OrganizationUserBulkResponse } from "../models/response/organization-user-bulk.response";
-import {
-  OrganizationUserDetailsResponse,
-  OrganizationUserUserDetailsResponse,
-  OrganizationUserResetPasswordDetailsReponse,
-} from "../models/response/organization-user.response";
 import { PaymentResponse } from "../models/response/payment.response";
 import { PlanResponse } from "../models/response/plan.response";
 import { PolicyResponse } from "../models/response/policy.response";
@@ -165,8 +149,8 @@ import { TwoFactorEmailResponse } from "../models/response/two-factor-email.resp
 import { TwoFactorProviderResponse } from "../models/response/two-factor-provider.response";
 import { TwoFactorRecoverResponse } from "../models/response/two-factor-recover.response";
 import {
-  TwoFactorWebAuthnResponse,
   ChallengeResponse,
+  TwoFactorWebAuthnResponse,
 } from "../models/response/two-factor-web-authn.response";
 import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.response";
 import { UserKeyResponse } from "../models/response/user-key.response";
@@ -1016,281 +1000,6 @@ export class ApiService implements ApiServiceAbstraction {
     );
   }
 
-  // Organization User APIs
-
-  async getOrganizationUser(
-    organizationId: string,
-    id: string
-  ): Promise<OrganizationUserDetailsResponse> {
-    const r = await this.send(
-      "GET",
-      "/organizations/" + organizationId + "/users/" + id,
-      null,
-      true,
-      true
-    );
-    return new OrganizationUserDetailsResponse(r);
-  }
-
-  async getOrganizationUserGroups(organizationId: string, id: string): Promise<string[]> {
-    const r = await this.send(
-      "GET",
-      "/organizations/" + organizationId + "/users/" + id + "/groups",
-      null,
-      true,
-      true
-    );
-    return r;
-  }
-
-  async getOrganizationUsers(
-    organizationId: string
-  ): Promise<ListResponse<OrganizationUserUserDetailsResponse>> {
-    const r = await this.send(
-      "GET",
-      "/organizations/" + organizationId + "/users",
-      null,
-      true,
-      true
-    );
-    return new ListResponse(r, OrganizationUserUserDetailsResponse);
-  }
-
-  async getOrganizationUserResetPasswordDetails(
-    organizationId: string,
-    id: string
-  ): Promise<OrganizationUserResetPasswordDetailsReponse> {
-    const r = await this.send(
-      "GET",
-      "/organizations/" + organizationId + "/users/" + id + "/reset-password-details",
-      null,
-      true,
-      true
-    );
-    return new OrganizationUserResetPasswordDetailsReponse(r);
-  }
-
-  postOrganizationUserInvite(
-    organizationId: string,
-    request: OrganizationUserInviteRequest
-  ): Promise<any> {
-    return this.send(
-      "POST",
-      "/organizations/" + organizationId + "/users/invite",
-      request,
-      true,
-      false
-    );
-  }
-
-  postOrganizationUserReinvite(organizationId: string, id: string): Promise<any> {
-    return this.send(
-      "POST",
-      "/organizations/" + organizationId + "/users/" + id + "/reinvite",
-      null,
-      true,
-      false
-    );
-  }
-
-  async postManyOrganizationUserReinvite(
-    organizationId: string,
-    request: OrganizationUserBulkRequest
-  ): Promise<ListResponse<OrganizationUserBulkResponse>> {
-    const r = await this.send(
-      "POST",
-      "/organizations/" + organizationId + "/users/reinvite",
-      request,
-      true,
-      true
-    );
-    return new ListResponse(r, OrganizationUserBulkResponse);
-  }
-
-  postOrganizationUserAccept(
-    organizationId: string,
-    id: string,
-    request: OrganizationUserAcceptRequest
-  ): Promise<any> {
-    return this.send(
-      "POST",
-      "/organizations/" + organizationId + "/users/" + id + "/accept",
-      request,
-      true,
-      false
-    );
-  }
-
-  postOrganizationUserConfirm(
-    organizationId: string,
-    id: string,
-    request: OrganizationUserConfirmRequest
-  ): Promise<any> {
-    return this.send(
-      "POST",
-      "/organizations/" + organizationId + "/users/" + id + "/confirm",
-      request,
-      true,
-      false
-    );
-  }
-
-  async postOrganizationUsersPublicKey(
-    organizationId: string,
-    request: OrganizationUserBulkRequest
-  ): Promise<ListResponse<OrganizationUserBulkPublicKeyResponse>> {
-    const r = await this.send(
-      "POST",
-      "/organizations/" + organizationId + "/users/public-keys",
-      request,
-      true,
-      true
-    );
-    return new ListResponse(r, OrganizationUserBulkPublicKeyResponse);
-  }
-
-  async postOrganizationUserBulkConfirm(
-    organizationId: string,
-    request: OrganizationUserBulkConfirmRequest
-  ): Promise<ListResponse<OrganizationUserBulkResponse>> {
-    const r = await this.send(
-      "POST",
-      "/organizations/" + organizationId + "/users/confirm",
-      request,
-      true,
-      true
-    );
-    return new ListResponse(r, OrganizationUserBulkResponse);
-  }
-
-  putOrganizationUser(
-    organizationId: string,
-    id: string,
-    request: OrganizationUserUpdateRequest
-  ): Promise<any> {
-    return this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/users/" + id,
-      request,
-      true,
-      false
-    );
-  }
-
-  putOrganizationUserGroups(
-    organizationId: string,
-    id: string,
-    request: OrganizationUserUpdateGroupsRequest
-  ): Promise<any> {
-    return this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/users/" + id + "/groups",
-      request,
-      true,
-      false
-    );
-  }
-
-  putOrganizationUserResetPasswordEnrollment(
-    organizationId: string,
-    userId: string,
-    request: OrganizationUserResetPasswordEnrollmentRequest
-  ): Promise<void> {
-    return this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/users/" + userId + "/reset-password-enrollment",
-      request,
-      true,
-      false
-    );
-  }
-
-  putOrganizationUserResetPassword(
-    organizationId: string,
-    id: string,
-    request: OrganizationUserResetPasswordRequest
-  ): Promise<any> {
-    return this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/users/" + id + "/reset-password",
-      request,
-      true,
-      false
-    );
-  }
-
-  deleteOrganizationUser(organizationId: string, id: string): Promise<any> {
-    return this.send(
-      "DELETE",
-      "/organizations/" + organizationId + "/users/" + id,
-      null,
-      true,
-      false
-    );
-  }
-
-  async deleteManyOrganizationUsers(
-    organizationId: string,
-    request: OrganizationUserBulkRequest
-  ): Promise<ListResponse<OrganizationUserBulkResponse>> {
-    const r = await this.send(
-      "DELETE",
-      "/organizations/" + organizationId + "/users",
-      request,
-      true,
-      true
-    );
-    return new ListResponse(r, OrganizationUserBulkResponse);
-  }
-
-  revokeOrganizationUser(organizationId: string, id: string): Promise<any> {
-    return this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/users/" + id + "/revoke",
-      null,
-      true,
-      false
-    );
-  }
-
-  async revokeManyOrganizationUsers(
-    organizationId: string,
-    request: OrganizationUserBulkRequest
-  ): Promise<ListResponse<OrganizationUserBulkResponse>> {
-    const r = await this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/users/revoke",
-      request,
-      true,
-      true
-    );
-    return new ListResponse(r, OrganizationUserBulkResponse);
-  }
-
-  restoreOrganizationUser(organizationId: string, id: string): Promise<any> {
-    return this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/users/" + id + "/restore",
-      null,
-      true,
-      false
-    );
-  }
-
-  async restoreManyOrganizationUsers(
-    organizationId: string,
-    request: OrganizationUserBulkRequest
-  ): Promise<ListResponse<OrganizationUserBulkResponse>> {
-    const r = await this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/users/restore",
-      request,
-      true,
-      true
-    );
-    return new ListResponse(r, OrganizationUserBulkResponse);
-  }
-
   // Plan APIs
 
   async getPlans(): Promise<ListResponse<PlanResponse>> {

libs/common/src/services/organization-user/organization-user.service.implementation.ts

@@ -0,0 +1,299 @@
+import { ApiService } from "../../abstractions/api.service";
+import { OrganizationUserService } from "../../abstractions/organization-user/organization-user.service";
+import {
+  OrganizationUserAcceptRequest,
+  OrganizationUserBulkConfirmRequest,
+  OrganizationUserConfirmRequest,
+  OrganizationUserInviteRequest,
+  OrganizationUserResetPasswordEnrollmentRequest,
+  OrganizationUserResetPasswordRequest,
+  OrganizationUserUpdateGroupsRequest,
+  OrganizationUserUpdateRequest,
+} from "../../abstractions/organization-user/requests";
+import {
+  OrganizationUserBulkPublicKeyResponse,
+  OrganizationUserBulkResponse,
+  OrganizationUserDetailsResponse,
+  OrganizationUserResetPasswordDetailsReponse,
+  OrganizationUserUserDetailsResponse,
+} from "../../abstractions/organization-user/responses";
+import { ListResponse } from "../../models/response/list.response";
+
+import { OrganizationUserBulkRequest } from "./requests";
+
+export class OrganizationUserServiceImplementation implements OrganizationUserService {
+  constructor(private apiService: ApiService) {}
+
+  async getOrganizationUser(
+    organizationId: string,
+    id: string
+  ): Promise<OrganizationUserDetailsResponse> {
+    const r = await this.apiService.send(
+      "GET",
+      "/organizations/" + organizationId + "/users/" + id,
+      null,
+      true,
+      true
+    );
+    return new OrganizationUserDetailsResponse(r);
+  }
+
+  async getOrganizationUserGroups(organizationId: string, id: string): Promise<string[]> {
+    const r = await this.apiService.send(
+      "GET",
+      "/organizations/" + organizationId + "/users/" + id + "/groups",
+      null,
+      true,
+      true
+    );
+    return r;
+  }
+
+  async getAllUsers(
+    organizationId: string
+  ): Promise<ListResponse<OrganizationUserUserDetailsResponse>> {
+    const r = await this.apiService.send(
+      "GET",
+      "/organizations/" + organizationId + "/users",
+      null,
+      true,
+      true
+    );
+    return new ListResponse(r, OrganizationUserUserDetailsResponse);
+  }
+
+  async getOrganizationUserResetPasswordDetails(
+    organizationId: string,
+    id: string
+  ): Promise<OrganizationUserResetPasswordDetailsReponse> {
+    const r = await this.apiService.send(
+      "GET",
+      "/organizations/" + organizationId + "/users/" + id + "/reset-password-details",
+      null,
+      true,
+      true
+    );
+    return new OrganizationUserResetPasswordDetailsReponse(r);
+  }
+
+  postOrganizationUserInvite(
+    organizationId: string,
+    request: OrganizationUserInviteRequest
+  ): Promise<void> {
+    return this.apiService.send(
+      "POST",
+      "/organizations/" + organizationId + "/users/invite",
+      request,
+      true,
+      false
+    );
+  }
+
+  postOrganizationUserReinvite(organizationId: string, id: string): Promise<any> {
+    return this.apiService.send(
+      "POST",
+      "/organizations/" + organizationId + "/users/" + id + "/reinvite",
+      null,
+      true,
+      false
+    );
+  }
+
+  async postManyOrganizationUserReinvite(
+    organizationId: string,
+    ids: string[]
+  ): Promise<ListResponse<OrganizationUserBulkResponse>> {
+    const r = await this.apiService.send(
+      "POST",
+      "/organizations/" + organizationId + "/users/reinvite",
+      new OrganizationUserBulkRequest(ids),
+      true,
+      true
+    );
+    return new ListResponse(r, OrganizationUserBulkResponse);
+  }
+
+  postOrganizationUserAccept(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserAcceptRequest
+  ): Promise<void> {
+    return this.apiService.send(
+      "POST",
+      "/organizations/" + organizationId + "/users/" + id + "/accept",
+      request,
+      true,
+      false
+    );
+  }
+
+  postOrganizationUserConfirm(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserConfirmRequest
+  ): Promise<void> {
+    return this.apiService.send(
+      "POST",
+      "/organizations/" + organizationId + "/users/" + id + "/confirm",
+      request,
+      true,
+      false
+    );
+  }
+
+  async postOrganizationUsersPublicKey(
+    organizationId: string,
+    ids: string[]
+  ): Promise<ListResponse<OrganizationUserBulkPublicKeyResponse>> {
+    const r = await this.apiService.send(
+      "POST",
+      "/organizations/" + organizationId + "/users/public-keys",
+      new OrganizationUserBulkRequest(ids),
+      true,
+      true
+    );
+    return new ListResponse(r, OrganizationUserBulkPublicKeyResponse);
+  }
+
+  async postOrganizationUserBulkConfirm(
+    organizationId: string,
+    request: OrganizationUserBulkConfirmRequest
+  ): Promise<ListResponse<OrganizationUserBulkResponse>> {
+    const r = await this.apiService.send(
+      "POST",
+      "/organizations/" + organizationId + "/users/confirm",
+      request,
+      true,
+      true
+    );
+    return new ListResponse(r, OrganizationUserBulkResponse);
+  }
+
+  putOrganizationUser(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserUpdateRequest
+  ): Promise<void> {
+    return this.apiService.send(
+      "PUT",
+      "/organizations/" + organizationId + "/users/" + id,
+      request,
+      true,
+      false
+    );
+  }
+
+  putOrganizationUserGroups(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserUpdateGroupsRequest
+  ): Promise<void> {
+    return this.apiService.send(
+      "PUT",
+      "/organizations/" + organizationId + "/users/" + id + "/groups",
+      request,
+      true,
+      false
+    );
+  }
+
+  putOrganizationUserResetPasswordEnrollment(
+    organizationId: string,
+    userId: string,
+    request: OrganizationUserResetPasswordEnrollmentRequest
+  ): Promise<void> {
+    return this.apiService.send(
+      "PUT",
+      "/organizations/" + organizationId + "/users/" + userId + "/reset-password-enrollment",
+      request,
+      true,
+      false
+    );
+  }
+
+  putOrganizationUserResetPassword(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserResetPasswordRequest
+  ): Promise<void> {
+    return this.apiService.send(
+      "PUT",
+      "/organizations/" + organizationId + "/users/" + id + "/reset-password",
+      request,
+      true,
+      false
+    );
+  }
+
+  deleteOrganizationUser(organizationId: string, id: string): Promise<any> {
+    return this.apiService.send(
+      "DELETE",
+      "/organizations/" + organizationId + "/users/" + id,
+      null,
+      true,
+      false
+    );
+  }
+
+  async deleteManyOrganizationUsers(
+    organizationId: string,
+    ids: string[]
+  ): Promise<ListResponse<OrganizationUserBulkResponse>> {
+    const r = await this.apiService.send(
+      "DELETE",
+      "/organizations/" + organizationId + "/users",
+      new OrganizationUserBulkRequest(ids),
+      true,
+      true
+    );
+    return new ListResponse(r, OrganizationUserBulkResponse);
+  }
+
+  revokeOrganizationUser(organizationId: string, id: string): Promise<void> {
+    return this.apiService.send(
+      "PUT",
+      "/organizations/" + organizationId + "/users/" + id + "/revoke",
+      null,
+      true,
+      false
+    );
+  }
+
+  async revokeManyOrganizationUsers(
+    organizationId: string,
+    ids: string[]
+  ): Promise<ListResponse<OrganizationUserBulkResponse>> {
+    const r = await this.apiService.send(
+      "PUT",
+      "/organizations/" + organizationId + "/users/revoke",
+      new OrganizationUserBulkRequest(ids),
+      true,
+      true
+    );
+    return new ListResponse(r, OrganizationUserBulkResponse);
+  }
+
+  restoreOrganizationUser(organizationId: string, id: string): Promise<void> {
+    return this.apiService.send(
+      "PUT",
+      "/organizations/" + organizationId + "/users/" + id + "/restore",
+      null,
+      true,
+      false
+    );
+  }
+
+  async restoreManyOrganizationUsers(
+    organizationId: string,
+    ids: string[]
+  ): Promise<ListResponse<OrganizationUserBulkResponse>> {
+    const r = await this.apiService.send(
+      "PUT",
+      "/organizations/" + organizationId + "/users/restore",
+      new OrganizationUserBulkRequest(ids),
+      true,
+      true
+    );
+    return new ListResponse(r, OrganizationUserBulkResponse);
+  }
+}

libs/common/src/services/organization-user/requests/index.ts

@@ -0,0 +1 @@
+export * from "./organization-user-bulk.request";