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

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

libs/angular/src/auth/components/base-login-decryption-options.component.ts

@@ -15,8 +15,8 @@ import {
 } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction";
 import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
 import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";

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

@@ -3,9 +3,9 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.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/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
+import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request";

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

@@ -7,12 +7,6 @@ import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstr
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
-import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/abstractions/organization-domain/org-domain-api.service.abstraction";
-import {
-  OrgDomainInternalServiceAbstraction,
-  OrgDomainServiceAbstraction,
-} from "@bitwarden/common/abstractions/organization-domain/org-domain.service.abstraction";
-import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
 import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service";
 import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service";
@@ -23,6 +17,12 @@ import {
   InternalOrganizationServiceAbstraction,
   OrganizationService as OrganizationServiceAbstraction,
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction";
+import {
+  OrgDomainInternalServiceAbstraction,
+  OrgDomainServiceAbstraction,
+} from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain.service.abstraction";
+import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import {
   InternalPolicyService,
@@ -31,6 +31,9 @@ import {
 import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service";
+import { OrgDomainApiService } from "@bitwarden/common/admin-console/services/organization-domain/org-domain-api.service";
+import { OrgDomainService } from "@bitwarden/common/admin-console/services/organization-domain/org-domain.service";
+import { OrganizationUserServiceImplementation } from "@bitwarden/common/admin-console/services/organization-user/organization-user.service.implementation";
 import { PolicyApiService } from "@bitwarden/common/admin-console/services/policy/policy-api.service";
 import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service";
 import { ProviderService } from "@bitwarden/common/admin-console/services/provider.service";
@@ -105,9 +108,6 @@ import { AuditService } from "@bitwarden/common/services/audit.service";
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { NotificationsService } from "@bitwarden/common/services/notifications.service";
-import { OrgDomainApiService } from "@bitwarden/common/services/organization-domain/org-domain-api.service";
-import { OrgDomainService } from "@bitwarden/common/services/organization-domain/org-domain.service";
-import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation";
 import { SearchService } from "@bitwarden/common/services/search.service";
 import { SettingsService } from "@bitwarden/common/services/settings.service";
 import { TotpService } from "@bitwarden/common/services/totp.service";

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

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

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

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

libs/common/src/admin-console/abstractions/organization-domain/responses/organization-domain-sso-details.response.ts

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

libs/common/src/admin-console/abstractions/organization-domain/responses/organization-domain.response.ts

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

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

@@ -1,4 +1,4 @@
-import { ListResponse } from "../../models/response/list.response";
+import { ListResponse } from "../../../models/response/list.response";
 
 import {
   OrganizationUserAcceptInitRequest,

libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-accept-init.request.ts

@@ -1,4 +1,4 @@
-import { OrganizationKeysRequest } from "../../../admin-console/models/request/organization-keys.request";
+import { OrganizationKeysRequest } from "../../../models/request/organization-keys.request";
 
 export class OrganizationUserAcceptInitRequest {
   token: string;

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

@@ -0,0 +1,13 @@
+import { OrganizationUserType } from "../../../enums";
+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;
+  accessSecretsManager: boolean;
+  collections: SelectionReadOnlyRequest[] = [];
+  groups: string[];
+  permissions: PermissionsApi;
+}

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

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

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

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

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

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

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

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

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

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

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

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

libs/common/src/admin-console/services/organization-domain/org-domain-api.service.spec.ts

@@ -1,11 +1,11 @@
 import { mock } from "jest-mock-extended";
 import { lastValueFrom } from "rxjs";
 
-import { ApiService } from "../../abstractions/api.service";
+import { ApiService } from "../../../abstractions/api.service";
+import { I18nService } from "../../../platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
 import { OrganizationDomainSsoDetailsResponse } from "../../abstractions/organization-domain/responses/organization-domain-sso-details.response";
 import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response";
-import { I18nService } from "../../platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 
 import { OrgDomainApiService } from "./org-domain-api.service";
 import { OrgDomainService } from "./org-domain.service";

libs/common/src/admin-console/services/organization-domain/org-domain-api.service.ts

@@ -1,9 +1,9 @@
-import { ApiService } from "../../abstractions/api.service";
+import { ApiService } from "../../../abstractions/api.service";
+import { ListResponse } from "../../../models/response/list.response";
 import { OrgDomainApiServiceAbstraction } from "../../abstractions/organization-domain/org-domain-api.service.abstraction";
 import { OrgDomainInternalServiceAbstraction } from "../../abstractions/organization-domain/org-domain.service.abstraction";
 import { OrganizationDomainSsoDetailsResponse } from "../../abstractions/organization-domain/responses/organization-domain-sso-details.response";
 import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response";
-import { ListResponse } from "../../models/response/list.response";
 
 import { OrganizationDomainSsoDetailsRequest } from "./requests/organization-domain-sso-details.request";
 import { OrganizationDomainRequest } from "./requests/organization-domain.request";

libs/common/src/admin-console/services/organization-domain/org-domain.service.spec.ts

@@ -1,9 +1,9 @@
 import { mock, mockReset } from "jest-mock-extended";
 import { lastValueFrom } from "rxjs";
 
+import { I18nService } from "../../../platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
 import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response";
-import { I18nService } from "../../platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 
 import { OrgDomainService } from "./org-domain.service";
 

libs/common/src/admin-console/services/organization-domain/org-domain.service.ts

@@ -1,9 +1,9 @@
 import { BehaviorSubject } from "rxjs";
 
+import { I18nService } from "../../../platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
 import { OrgDomainInternalServiceAbstraction } from "../../abstractions/organization-domain/org-domain.service.abstraction";
 import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response";
-import { I18nService } from "../../platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 
 export class OrgDomainService implements OrgDomainInternalServiceAbstraction {
   protected _orgDomains$: BehaviorSubject<OrganizationDomainResponse[]> = new BehaviorSubject([]);

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

@@ -1,4 +1,5 @@
-import { ApiService } from "../../abstractions/api.service";
+import { ApiService } from "../../../abstractions/api.service";
+import { ListResponse } from "../../../models/response/list.response";
 import { OrganizationUserService } from "../../abstractions/organization-user/organization-user.service";
 import {
   OrganizationUserAcceptInitRequest,
@@ -18,7 +19,6 @@ import {
   OrganizationUserResetPasswordDetailsResponse,
   OrganizationUserUserDetailsResponse,
 } from "../../abstractions/organization-user/responses";
-import { ListResponse } from "../../models/response/list.response";
 
 import { OrganizationUserBulkRequest } from "./requests";
 

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

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

libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts

@@ -1,7 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
-import { OrganizationUserService } from "../../abstractions/organization-user/organization-user.service";
 import { OrganizationApiServiceAbstraction } from "../../admin-console/abstractions/organization/organization-api.service.abstraction";
+import { OrganizationUserService } from "../../admin-console/abstractions/organization-user/organization-user.service";
 import { OrganizationAutoEnrollStatusResponse } from "../../admin-console/models/response/organization-auto-enroll-status.response";
 import { CryptoService } from "../../platform/abstractions/crypto.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";

libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts

@@ -1,6 +1,6 @@
-import { OrganizationUserService } from "../../abstractions/organization-user/organization-user.service";
-import { OrganizationUserResetPasswordEnrollmentRequest } from "../../abstractions/organization-user/requests";
 import { OrganizationApiServiceAbstraction } from "../../admin-console/abstractions/organization/organization-api.service.abstraction";
+import { OrganizationUserService } from "../../admin-console/abstractions/organization-user/organization-user.service";
+import { OrganizationUserResetPasswordEnrollmentRequest } from "../../admin-console/abstractions/organization-user/requests";
 import { CryptoService } from "../../platform/abstractions/crypto.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
 import { StateService } from "../../platform/abstractions/state.service";