From 485be2182637fdda46684d1448457b2794850a21 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Mon, 30 Oct 2023 22:32:57 +0100 Subject: [PATCH] [PM-4360] Move organization-domain and organization-user to admin console (#6630) * Move organization-domain and organization-user to admin console --- .../src/auth/popup/set-password.component.ts | 2 +- .../admin-console/commands/confirm.command.ts | 4 ++-- apps/cli/src/bw.ts | 4 ++-- apps/cli/src/commands/list.command.ts | 2 +- .../desktop/src/auth/set-password.component.ts | 2 +- .../common/base.events.component.ts | 4 ++-- .../common/base.people.component.ts | 4 ++-- .../core/services/user-admin.service.ts | 6 +++--- .../core/views/organization-user.view.ts | 2 +- .../manage/entity-events.component.ts | 2 +- .../organizations/manage/events.component.ts | 4 ++-- .../manage/group-add-edit.component.ts | 2 +- .../components/bulk/bulk-confirm.component.ts | 4 ++-- .../bulk/bulk-enable-sm-dialog.component.ts | 2 +- .../components/bulk/bulk-remove.component.ts | 2 +- .../bulk/bulk-restore-revoke.component.ts | 2 +- .../member-dialog/member-dialog.component.ts | 2 +- .../components/reset-password.component.ts | 4 ++-- .../organizations/members/people.component.ts | 14 +++++++------- .../enroll-master-password-reset.component.ts | 4 ++-- .../app/auth/accept-organization.component.ts | 6 +++--- .../migrate-legacy-encryption.service.spec.ts | 4 ++-- .../migrate-legacy-encryption.service.ts | 4 ++-- .../web/src/app/auth/set-password.component.ts | 2 +- .../auth/settings/change-password.component.ts | 4 ++-- apps/web/src/app/auth/sso.component.ts | 4 ++-- .../collection-dialog.component.ts | 4 ++-- .../organization-options.component.ts | 4 ++-- .../device-approvals.component.ts | 4 ++-- .../domain-add-edit-dialog.component.ts | 8 ++++---- .../domain-verification.component.ts | 6 +++--- .../providers/manage/events.component.ts | 2 +- .../providers/manage/people.component.ts | 2 +- .../service-accounts-events.component.ts | 2 +- .../base-login-decryption-options.component.ts | 2 +- .../auth/components/set-password.component.ts | 4 ++-- .../src/services/jslib-services.module.ts | 18 +++++++++--------- .../organization-user-invite.request.ts | 13 ------------- .../organization-user-update.request.ts | 12 ------------ .../org-domain-api.service.abstraction.ts | 0 .../org-domain.service.abstraction.ts | 0 ...organization-domain-sso-details.response.ts | 2 +- .../responses/organization-domain.response.ts | 2 +- .../organization-user.service.ts | 2 +- .../organization-user/requests/index.ts | 0 .../organization-user-accept-init.request.ts | 2 +- .../organization-user-accept.request.ts | 0 .../organization-user-bulk-confirm.request.ts | 0 .../organization-user-confirm.request.ts | 0 .../organization-user-invite.request.ts | 13 +++++++++++++ ...n-user-reset-password-enrollment.request.ts | 2 +- ...organization-user-reset-password.request.ts | 0 .../organization-user-update-groups.request.ts | 0 .../organization-user-update.request.ts | 12 ++++++++++++ .../organization-user/responses/index.ts | 0 ...ganization-user-bulk-public-key.response.ts | 2 +- .../organization-user-bulk.response.ts | 2 +- .../responses/organization-user.response.ts | 10 +++++----- .../provider-user-bulk-public-key.response.ts | 2 +- .../org-domain-api.service.spec.ts | 6 +++--- .../org-domain-api.service.ts | 4 ++-- .../org-domain.service.spec.ts | 4 ++-- .../organization-domain/org-domain.service.ts | 4 ++-- .../organization-domain-sso-details.request.ts | 0 .../requests/organization-domain.request.ts | 0 ...organization-user.service.implementation.ts | 4 ++-- .../organization-user/requests/index.ts | 0 .../requests/organization-user-bulk.request.ts | 0 .../request/update-temp-password.request.ts | 2 +- ...t-enrollment.service.implementation.spec.ts | 2 +- ...-reset-enrollment.service.implementation.ts | 4 ++-- 71 files changed, 129 insertions(+), 129 deletions(-) rename apps/web/src/app/{ => admin-console}/common/base.events.component.ts (98%) rename apps/web/src/app/{ => admin-console}/common/base.people.component.ts (98%) delete mode 100644 libs/common/src/abstractions/organization-user/requests/organization-user-invite.request.ts delete mode 100644 libs/common/src/abstractions/organization-user/requests/organization-user-update.request.ts rename libs/common/src/{ => admin-console}/abstractions/organization-domain/org-domain-api.service.abstraction.ts (100%) rename libs/common/src/{ => admin-console}/abstractions/organization-domain/org-domain.service.abstraction.ts (100%) rename libs/common/src/{ => admin-console}/abstractions/organization-domain/responses/organization-domain-sso-details.response.ts (88%) rename libs/common/src/{ => admin-console}/abstractions/organization-domain/responses/organization-domain.response.ts (92%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/organization-user.service.ts (99%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/requests/index.ts (100%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/requests/organization-user-accept-init.request.ts (57%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/requests/organization-user-accept.request.ts (100%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/requests/organization-user-bulk-confirm.request.ts (100%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/requests/organization-user-confirm.request.ts (100%) create mode 100644 libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-invite.request.ts rename libs/common/src/{ => admin-console}/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts (54%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/requests/organization-user-reset-password.request.ts (100%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/requests/organization-user-update-groups.request.ts (100%) create mode 100644 libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-update.request.ts rename libs/common/src/{ => admin-console}/abstractions/organization-user/responses/index.ts (100%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/responses/organization-user-bulk-public-key.response.ts (81%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/responses/organization-user-bulk.response.ts (77%) rename libs/common/src/{ => admin-console}/abstractions/organization-user/responses/organization-user.response.ts (89%) rename libs/common/src/{ => admin-console}/services/organization-domain/org-domain-api.service.spec.ts (96%) rename libs/common/src/{ => admin-console}/services/organization-domain/org-domain-api.service.ts (96%) rename libs/common/src/{ => admin-console}/services/organization-domain/org-domain.service.spec.ts (97%) rename libs/common/src/{ => admin-console}/services/organization-domain/org-domain.service.ts (93%) rename libs/common/src/{ => admin-console}/services/organization-domain/requests/organization-domain-sso-details.request.ts (100%) rename libs/common/src/{ => admin-console}/services/organization-domain/requests/organization-domain.request.ts (100%) rename libs/common/src/{ => admin-console}/services/organization-user/organization-user.service.implementation.ts (98%) rename libs/common/src/{ => admin-console}/services/organization-user/requests/index.ts (100%) rename libs/common/src/{ => admin-console}/services/organization-user/requests/organization-user-bulk.request.ts (100%) diff --git a/apps/browser/src/auth/popup/set-password.component.ts b/apps/browser/src/auth/popup/set-password.component.ts index 565727f76e..7aae39da58 100644 --- a/apps/browser/src/auth/popup/set-password.component.ts +++ b/apps/browser/src/auth/popup/set-password.component.ts @@ -3,8 +3,8 @@ import { ActivatedRoute, Router } from "@angular/router"; import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/auth/components/set-password.component"; 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 { 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 { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; diff --git a/apps/cli/src/admin-console/commands/confirm.command.ts b/apps/cli/src/admin-console/commands/confirm.command.ts index be1264c399..3ae9b51516 100644 --- a/apps/cli/src/admin-console/commands/confirm.command.ts +++ b/apps/cli/src/admin-console/commands/confirm.command.ts @@ -1,6 +1,6 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationUserConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; +import { OrganizationUserConfirmRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index b63dda690f..9b0f2ed9ed 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -4,11 +4,12 @@ import * as path from "path"; import * as program from "commander"; import * as jsdom from "jsdom"; -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 { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service"; import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.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"; @@ -43,7 +44,6 @@ import { MemoryStorageService } from "@bitwarden/common/platform/services/memory import { NoopMessagingService } from "@bitwarden/common/platform/services/noop-messaging.service"; import { StateService } from "@bitwarden/common/platform/services/state.service"; import { AuditService } from "@bitwarden/common/services/audit.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"; diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index 8b94eb5982..f69926ad99 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -1,7 +1,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; import { ListResponse as ApiListResponse } from "@bitwarden/common/models/response/list.response"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/apps/desktop/src/auth/set-password.component.ts b/apps/desktop/src/auth/set-password.component.ts index c2c838c8e7..989dcc19ce 100644 --- a/apps/desktop/src/auth/set-password.component.ts +++ b/apps/desktop/src/auth/set-password.component.ts @@ -3,8 +3,8 @@ import { ActivatedRoute, Router } from "@angular/router"; import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/auth/components/set-password.component"; 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 { 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 { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; diff --git a/apps/web/src/app/common/base.events.component.ts b/apps/web/src/app/admin-console/common/base.events.component.ts similarity index 98% rename from apps/web/src/app/common/base.events.component.ts rename to apps/web/src/app/admin-console/common/base.events.component.ts index 35a53228f2..6f7c5d68ca 100644 --- a/apps/web/src/app/common/base.events.component.ts +++ b/apps/web/src/app/admin-console/common/base.events.component.ts @@ -8,8 +8,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { EventService } from "../core"; -import { EventExportService } from "../tools/event-export"; +import { EventService } from "../../core"; +import { EventExportService } from "../../tools/event-export"; @Directive() export abstract class BaseEventsComponent { diff --git a/apps/web/src/app/common/base.people.component.ts b/apps/web/src/app/admin-console/common/base.people.component.ts similarity index 98% rename from apps/web/src/app/common/base.people.component.ts rename to apps/web/src/app/admin-console/common/base.people.component.ts index d4093ad28b..19f1a7a737 100644 --- a/apps/web/src/app/common/base.people.component.ts +++ b/apps/web/src/app/admin-console/common/base.people.component.ts @@ -22,8 +22,8 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid import { Utils } from "@bitwarden/common/platform/misc/utils"; import { DialogService } from "@bitwarden/components"; -import { OrganizationUserView } from "../admin-console/organizations/core/views/organization-user.view"; -import { UserConfirmComponent } from "../admin-console/organizations/manage/user-confirm.component"; +import { OrganizationUserView } from "../organizations/core/views/organization-user.view"; +import { UserConfirmComponent } from "../organizations/manage/user-confirm.component"; type StatusType = OrganizationUserStatusType | ProviderUserStatusType; diff --git a/apps/web/src/app/admin-console/organizations/core/services/user-admin.service.ts b/apps/web/src/app/admin-console/organizations/core/services/user-admin.service.ts index 4e83d76f7d..4b1cb6467d 100644 --- a/apps/web/src/app/admin-console/organizations/core/services/user-admin.service.ts +++ b/apps/web/src/app/admin-console/organizations/core/services/user-admin.service.ts @@ -1,11 +1,11 @@ import { Injectable } from "@angular/core"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; import { OrganizationUserInviteRequest, OrganizationUserUpdateRequest, -} from "@bitwarden/common/abstractions/organization-user/requests"; -import { OrganizationUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses"; +} from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; +import { OrganizationUserDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-user/responses"; import { CoreOrganizationModule } from "../core-organization.module"; import { OrganizationUserAdminView } from "../views/organization-user-admin-view"; diff --git a/apps/web/src/app/admin-console/organizations/core/views/organization-user.view.ts b/apps/web/src/app/admin-console/organizations/core/views/organization-user.view.ts index f723fcc32e..8207102d8c 100644 --- a/apps/web/src/app/admin-console/organizations/core/views/organization-user.view.ts +++ b/apps/web/src/app/admin-console/organizations/core/views/organization-user.view.ts @@ -1,4 +1,4 @@ -import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses"; +import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-user/responses"; import { OrganizationUserStatusType, OrganizationUserType, diff --git a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts index afcb315e5a..91b0b4fdf2 100644 --- a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts @@ -4,7 +4,7 @@ import { FormBuilder } from "@angular/forms"; import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; import { EventResponse } from "@bitwarden/common/models/response/event.response"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { EventView } from "@bitwarden/common/models/view/event.view"; diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts index 0d6e1c0f07..c469d2c78f 100644 --- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts @@ -4,8 +4,8 @@ import { concatMap, Subject, takeUntil } from "rxjs"; import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { EventSystemUser } from "@bitwarden/common/enums"; @@ -15,9 +15,9 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { BaseEventsComponent } from "../../../common/base.events.component"; import { EventService } from "../../../core"; import { EventExportService } from "../../../tools/event-export"; +import { BaseEventsComponent } from "../../common/base.events.component"; const EVENT_SYSTEM_USER_TO_TRANSLATION: Record = { [EventSystemUser.SCIM]: null, // SCIM acronym not able to be translated so just display SCIM diff --git a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts index d2f4fb1d20..86fc5dcee3 100644 --- a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts @@ -4,7 +4,7 @@ import { FormBuilder, Validators } from "@angular/forms"; import { catchError, combineLatest, from, map, of, Subject, switchMap, takeUntil } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts index ae754faabe..700ec7b766 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts @@ -1,8 +1,8 @@ import { Component, Input, OnInit } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; +import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts index b76b640513..b9bfcc3142 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts @@ -1,7 +1,7 @@ import { DialogRef, DIALOG_DATA } from "@angular/cdk/dialog"; import { Component, Inject, OnInit } from "@angular/core"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { DialogService, TableDataSource } from "@bitwarden/components"; diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.ts index 665d245e9f..30ccda5be8 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { BulkUserDetails } from "./bulk-status.component"; diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts index f26321c32a..fe0b4b18d3 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts @@ -1,7 +1,7 @@ import { DIALOG_DATA } from "@angular/cdk/dialog"; import { Component, Inject } from "@angular/core"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { DialogService } from "@bitwarden/components"; diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts index 1d1a156269..aa9a211eed 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts @@ -3,8 +3,8 @@ import { Component, Inject, OnDestroy, OnInit } from "@angular/core"; import { FormBuilder, Validators } from "@angular/forms"; import { combineLatest, of, shareReplay, Subject, switchMap, takeUntil } from "rxjs"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; import { OrganizationUserStatusType, OrganizationUserType, diff --git a/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts index 7d0fae37e0..083c676d0e 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts @@ -11,8 +11,8 @@ import { Subject, takeUntil } from "rxjs"; import zxcvbn from "zxcvbn"; import { PasswordStrengthComponent } from "@bitwarden/angular/shared/components/password-strength/password-strength.component"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/abstractions/organization-user/requests"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; +import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; diff --git a/apps/web/src/app/admin-console/organizations/members/people.component.ts b/apps/web/src/app/admin-console/organizations/members/people.component.ts index 01c22862a0..a7d4c00d2b 100644 --- a/apps/web/src/app/admin-console/organizations/members/people.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/people.component.ts @@ -18,15 +18,15 @@ import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationUserConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests"; -import { - OrganizationUserBulkResponse, - OrganizationUserUserDetailsResponse, -} from "@bitwarden/common/abstractions/organization-user/responses"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; +import { OrganizationUserConfirmRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; +import { + OrganizationUserBulkResponse, + OrganizationUserUserDetailsResponse, +} from "@bitwarden/common/admin-console/abstractions/organization-user/responses"; import { PolicyApiServiceAbstraction as PolicyApiService } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { @@ -53,7 +53,7 @@ import { DialogService, SimpleDialogOptions } from "@bitwarden/components"; import { flagEnabled } from "../../../../utils/flags"; import { openEntityEventsDialog } from "../../../admin-console/organizations/manage/entity-events.component"; -import { BasePeopleComponent } from "../../../common/base.people.component"; +import { BasePeopleComponent } from "../../common/base.people.component"; import { GroupService } from "../core"; import { OrganizationUserView } from "../core/views/organization-user.view"; diff --git a/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts index 8e2b5c7052..fd09078e78 100644 --- a/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts +++ b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts @@ -2,9 +2,9 @@ import { DIALOG_DATA, DialogRef } from "@angular/cdk/dialog"; import { Component, Inject } from "@angular/core"; import { FormControl, FormGroup, Validators } from "@angular/forms"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; diff --git a/apps/web/src/app/auth/accept-organization.component.ts b/apps/web/src/app/auth/accept-organization.component.ts index 5e4a5448ef..d7907b9432 100644 --- a/apps/web/src/app/auth/accept-organization.component.ts +++ b/apps/web/src/app/auth/accept-organization.component.ts @@ -2,12 +2,12 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Params, Router } from "@angular/router"; 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 { OrganizationUserAcceptInitRequest, OrganizationUserAcceptRequest, -} from "@bitwarden/common/abstractions/organization-user/requests"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +} 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 { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; diff --git a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts index 88bbdc4e5b..f4b1409b0a 100644 --- a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts +++ b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts @@ -2,9 +2,9 @@ import { BehaviorSubject } from "rxjs"; 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 { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { OrganizationKeysResponse } from "@bitwarden/common/admin-console/models/response/organization-keys.response"; import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service"; diff --git a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.ts b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.ts index 35005fdce4..06f1f157f3 100644 --- a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.ts +++ b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.ts @@ -2,10 +2,10 @@ import { firstValueFrom } from "rxjs"; 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 { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; import { EmergencyAccessStatusType } from "@bitwarden/common/auth/enums/emergency-access-status-type"; import { EmergencyAccessUpdateRequest } from "@bitwarden/common/auth/models/request/emergency-access-update.request"; import { UpdateKeyRequest } from "@bitwarden/common/models/request/update-key.request"; diff --git a/apps/web/src/app/auth/set-password.component.ts b/apps/web/src/app/auth/set-password.component.ts index 1e799737e2..c85e0ab9b9 100644 --- a/apps/web/src/app/auth/set-password.component.ts +++ b/apps/web/src/app/auth/set-password.component.ts @@ -3,8 +3,8 @@ import { ActivatedRoute, Router } from "@angular/router"; import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/auth/components/set-password.component"; 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 { 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 { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; diff --git a/apps/web/src/app/auth/settings/change-password.component.ts b/apps/web/src/app/auth/settings/change-password.component.ts index 958582eb0a..00cbffa1fe 100644 --- a/apps/web/src/app/auth/settings/change-password.component.ts +++ b/apps/web/src/app/auth/settings/change-password.component.ts @@ -5,10 +5,10 @@ import { firstValueFrom, Observable } from "rxjs"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "@bitwarden/angular/auth/components/change-password.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.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 { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; diff --git a/apps/web/src/app/auth/sso.component.ts b/apps/web/src/app/auth/sso.component.ts index fbd626db7f..cb78d156bf 100644 --- a/apps/web/src/app/auth/sso.component.ts +++ b/apps/web/src/app/auth/sso.component.ts @@ -4,8 +4,8 @@ import { first } from "rxjs/operators"; import { SsoComponent as BaseSsoComponent } from "@bitwarden/angular/auth/components/sso.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/abstractions/organization-domain/org-domain-api.service.abstraction"; -import { OrganizationDomainSsoDetailsResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain-sso-details.response"; +import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction"; +import { OrganizationDomainSsoDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/organization-domain-sso-details.response"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; import { HttpStatusCode } from "@bitwarden/common/enums"; diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts index 0e14d88ef8..7a0240ab62 100644 --- a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts +++ b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts @@ -12,9 +12,9 @@ import { takeUntil, } from "rxjs"; -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/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; +import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-user/responses"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts index fe3aa8d885..35c5164388 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts @@ -3,9 +3,9 @@ import { map, Subject, takeUntil } from "rxjs"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { 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 { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts index 965132d637..32dfa777bb 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts @@ -2,8 +2,8 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { BehaviorSubject, Subject, switchMap, takeUntil, tap } from "rxjs"; -import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationUserResetPasswordDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses"; +import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; +import { OrganizationUserResetPasswordDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-user/responses"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts index 68df7e5183..65bd7ba24f 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts @@ -3,9 +3,10 @@ import { Component, Inject, OnDestroy, OnInit } from "@angular/core"; import { FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from "@angular/forms"; import { Subject, takeUntil } from "rxjs"; -import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/abstractions/organization-domain/org-domain-api.service.abstraction"; -import { OrgDomainServiceAbstraction } from "@bitwarden/common/abstractions/organization-domain/org-domain.service.abstraction"; -import { OrganizationDomainResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain.response"; +import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction"; +import { OrgDomainServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain.service.abstraction"; +import { OrganizationDomainResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/organization-domain.response"; +import { OrganizationDomainRequest } from "@bitwarden/common/admin-console/services/organization-domain/requests/organization-domain.request"; import { HttpStatusCode } from "@bitwarden/common/enums"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service"; @@ -13,7 +14,6 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { OrganizationDomainRequest } from "@bitwarden/common/services/organization-domain/requests/organization-domain.request"; import { DialogService } from "@bitwarden/components"; import { domainNameValidator } from "./validators/domain-name.validator"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts index aa7316f96b..204e9fc7f9 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts @@ -2,9 +2,9 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute, Params } from "@angular/router"; import { concatMap, Observable, Subject, take, takeUntil } from "rxjs"; -import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/abstractions/organization-domain/org-domain-api.service.abstraction"; -import { OrgDomainServiceAbstraction } from "@bitwarden/common/abstractions/organization-domain/org-domain.service.abstraction"; -import { OrganizationDomainResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain.response"; +import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction"; +import { OrgDomainServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain.service.abstraction"; +import { OrganizationDomainResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/organization-domain.response"; import { HttpStatusCode } from "@bitwarden/common/enums"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts index 0ed91a1f63..b4b5451d44 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts @@ -9,7 +9,7 @@ import { FileDownloadService } from "@bitwarden/common/platform/abstractions/fil import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { BaseEventsComponent } from "@bitwarden/web-vault/app/common/base.events.component"; +import { BaseEventsComponent } from "@bitwarden/web-vault/app/admin-console/common/base.events.component"; import { EventService } from "@bitwarden/web-vault/app/core"; import { EventExportService } from "@bitwarden/web-vault/app/tools/event-export"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.ts index 6afa4ac9ff..ab2e587b26 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.ts @@ -21,9 +21,9 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; import { DialogService } from "@bitwarden/components"; +import { BasePeopleComponent } from "@bitwarden/web-vault/app/admin-console/common/base.people.component"; import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component"; import { BulkStatusComponent } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-status.component"; -import { BasePeopleComponent } from "@bitwarden/web-vault/app/common/base.people.component"; import { BulkConfirmComponent } from "./bulk/bulk-confirm.component"; import { BulkRemoveComponent } from "./bulk/bulk-remove.component"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts index 652272ecd1..f094ab2ed5 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts @@ -6,7 +6,7 @@ import { FileDownloadService } from "@bitwarden/common/platform/abstractions/fil import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { BaseEventsComponent } from "@bitwarden/web-vault/app/common/base.events.component"; +import { BaseEventsComponent } from "@bitwarden/web-vault/app/admin-console/common/base.events.component"; import { EventService } from "@bitwarden/web-vault/app/core"; import { EventExportService } from "@bitwarden/web-vault/app/tools/event-export"; diff --git a/libs/angular/src/auth/components/base-login-decryption-options.component.ts b/libs/angular/src/auth/components/base-login-decryption-options.component.ts index 0203e27919..732699dfec 100644 --- a/libs/angular/src/auth/components/base-login-decryption-options.component.ts +++ b/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"; diff --git a/libs/angular/src/auth/components/set-password.component.ts b/libs/angular/src/auth/components/set-password.component.ts index 7723b9f2e4..29bd162132 100644 --- a/libs/angular/src/auth/components/set-password.component.ts +++ b/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"; diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index 959db09eb8..4c847001bf 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/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"; diff --git a/libs/common/src/abstractions/organization-user/requests/organization-user-invite.request.ts b/libs/common/src/abstractions/organization-user/requests/organization-user-invite.request.ts deleted file mode 100644 index cfb73bc3dc..0000000000 --- a/libs/common/src/abstractions/organization-user/requests/organization-user-invite.request.ts +++ /dev/null @@ -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; -} diff --git a/libs/common/src/abstractions/organization-user/requests/organization-user-update.request.ts b/libs/common/src/abstractions/organization-user/requests/organization-user-update.request.ts deleted file mode 100644 index 0a1ad79a9f..0000000000 --- a/libs/common/src/abstractions/organization-user/requests/organization-user-update.request.ts +++ /dev/null @@ -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; -} diff --git a/libs/common/src/abstractions/organization-domain/org-domain-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction.ts similarity index 100% rename from libs/common/src/abstractions/organization-domain/org-domain-api.service.abstraction.ts rename to libs/common/src/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction.ts diff --git a/libs/common/src/abstractions/organization-domain/org-domain.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization-domain/org-domain.service.abstraction.ts similarity index 100% rename from libs/common/src/abstractions/organization-domain/org-domain.service.abstraction.ts rename to libs/common/src/admin-console/abstractions/organization-domain/org-domain.service.abstraction.ts diff --git a/libs/common/src/abstractions/organization-domain/responses/organization-domain-sso-details.response.ts b/libs/common/src/admin-console/abstractions/organization-domain/responses/organization-domain-sso-details.response.ts similarity index 88% rename from libs/common/src/abstractions/organization-domain/responses/organization-domain-sso-details.response.ts rename to libs/common/src/admin-console/abstractions/organization-domain/responses/organization-domain-sso-details.response.ts index f2a7001522..b9783c55b7 100644 --- a/libs/common/src/abstractions/organization-domain/responses/organization-domain-sso-details.response.ts +++ b/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; diff --git a/libs/common/src/abstractions/organization-domain/responses/organization-domain.response.ts b/libs/common/src/admin-console/abstractions/organization-domain/responses/organization-domain.response.ts similarity index 92% rename from libs/common/src/abstractions/organization-domain/responses/organization-domain.response.ts rename to libs/common/src/admin-console/abstractions/organization-domain/responses/organization-domain.response.ts index 0ab7538e4e..a7e45831ea 100644 --- a/libs/common/src/abstractions/organization-domain/responses/organization-domain.response.ts +++ b/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; diff --git a/libs/common/src/abstractions/organization-user/organization-user.service.ts b/libs/common/src/admin-console/abstractions/organization-user/organization-user.service.ts similarity index 99% rename from libs/common/src/abstractions/organization-user/organization-user.service.ts rename to libs/common/src/admin-console/abstractions/organization-user/organization-user.service.ts index 3e0167ba5c..6cbb6da908 100644 --- a/libs/common/src/abstractions/organization-user/organization-user.service.ts +++ b/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, diff --git a/libs/common/src/abstractions/organization-user/requests/index.ts b/libs/common/src/admin-console/abstractions/organization-user/requests/index.ts similarity index 100% rename from libs/common/src/abstractions/organization-user/requests/index.ts rename to libs/common/src/admin-console/abstractions/organization-user/requests/index.ts diff --git a/libs/common/src/abstractions/organization-user/requests/organization-user-accept-init.request.ts b/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-accept-init.request.ts similarity index 57% rename from libs/common/src/abstractions/organization-user/requests/organization-user-accept-init.request.ts rename to libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-accept-init.request.ts index d47cb711d2..cff51451ed 100644 --- a/libs/common/src/abstractions/organization-user/requests/organization-user-accept-init.request.ts +++ b/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; diff --git a/libs/common/src/abstractions/organization-user/requests/organization-user-accept.request.ts b/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-accept.request.ts similarity index 100% rename from libs/common/src/abstractions/organization-user/requests/organization-user-accept.request.ts rename to libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-accept.request.ts diff --git a/libs/common/src/abstractions/organization-user/requests/organization-user-bulk-confirm.request.ts b/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-bulk-confirm.request.ts similarity index 100% rename from libs/common/src/abstractions/organization-user/requests/organization-user-bulk-confirm.request.ts rename to libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-bulk-confirm.request.ts diff --git a/libs/common/src/abstractions/organization-user/requests/organization-user-confirm.request.ts b/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-confirm.request.ts similarity index 100% rename from libs/common/src/abstractions/organization-user/requests/organization-user-confirm.request.ts rename to libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-confirm.request.ts diff --git a/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-invite.request.ts b/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-invite.request.ts new file mode 100644 index 0000000000..7f52e3fcce --- /dev/null +++ b/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; +} diff --git a/libs/common/src/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts b/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts similarity index 54% rename from libs/common/src/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts rename to libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts index c1fdc252f1..1078c59c4c 100644 --- a/libs/common/src/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts +++ b/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; diff --git a/libs/common/src/abstractions/organization-user/requests/organization-user-reset-password.request.ts b/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-reset-password.request.ts similarity index 100% rename from libs/common/src/abstractions/organization-user/requests/organization-user-reset-password.request.ts rename to libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-reset-password.request.ts diff --git a/libs/common/src/abstractions/organization-user/requests/organization-user-update-groups.request.ts b/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-update-groups.request.ts similarity index 100% rename from libs/common/src/abstractions/organization-user/requests/organization-user-update-groups.request.ts rename to libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-update-groups.request.ts diff --git a/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-update.request.ts b/libs/common/src/admin-console/abstractions/organization-user/requests/organization-user-update.request.ts new file mode 100644 index 0000000000..87c8dde8dd --- /dev/null +++ b/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; +} diff --git a/libs/common/src/abstractions/organization-user/responses/index.ts b/libs/common/src/admin-console/abstractions/organization-user/responses/index.ts similarity index 100% rename from libs/common/src/abstractions/organization-user/responses/index.ts rename to libs/common/src/admin-console/abstractions/organization-user/responses/index.ts diff --git a/libs/common/src/abstractions/organization-user/responses/organization-user-bulk-public-key.response.ts b/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user-bulk-public-key.response.ts similarity index 81% rename from libs/common/src/abstractions/organization-user/responses/organization-user-bulk-public-key.response.ts rename to libs/common/src/admin-console/abstractions/organization-user/responses/organization-user-bulk-public-key.response.ts index a0fffe9ea1..7edb2f1436 100644 --- a/libs/common/src/abstractions/organization-user/responses/organization-user-bulk-public-key.response.ts +++ b/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; diff --git a/libs/common/src/abstractions/organization-user/responses/organization-user-bulk.response.ts b/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user-bulk.response.ts similarity index 77% rename from libs/common/src/abstractions/organization-user/responses/organization-user-bulk.response.ts rename to libs/common/src/admin-console/abstractions/organization-user/responses/organization-user-bulk.response.ts index 77a844f198..40b2877275 100644 --- a/libs/common/src/abstractions/organization-user/responses/organization-user-bulk.response.ts +++ b/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; diff --git a/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts b/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user.response.ts similarity index 89% rename from libs/common/src/abstractions/organization-user/responses/organization-user.response.ts rename to libs/common/src/admin-console/abstractions/organization-user/responses/organization-user.response.ts index 973049968a..b526fa1fcf 100644 --- a/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts +++ b/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; diff --git a/libs/common/src/admin-console/models/response/provider/provider-user-bulk-public-key.response.ts b/libs/common/src/admin-console/models/response/provider/provider-user-bulk-public-key.response.ts index 8d0e5c7365..39e5747ade 100644 --- a/libs/common/src/admin-console/models/response/provider/provider-user-bulk-public-key.response.ts +++ b/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 {} diff --git a/libs/common/src/services/organization-domain/org-domain-api.service.spec.ts b/libs/common/src/admin-console/services/organization-domain/org-domain-api.service.spec.ts similarity index 96% rename from libs/common/src/services/organization-domain/org-domain-api.service.spec.ts rename to libs/common/src/admin-console/services/organization-domain/org-domain-api.service.spec.ts index 69cca7206f..58d7760bcf 100644 --- a/libs/common/src/services/organization-domain/org-domain-api.service.spec.ts +++ b/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"; diff --git a/libs/common/src/services/organization-domain/org-domain-api.service.ts b/libs/common/src/admin-console/services/organization-domain/org-domain-api.service.ts similarity index 96% rename from libs/common/src/services/organization-domain/org-domain-api.service.ts rename to libs/common/src/admin-console/services/organization-domain/org-domain-api.service.ts index 62b379ac2d..d92d723044 100644 --- a/libs/common/src/services/organization-domain/org-domain-api.service.ts +++ b/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"; diff --git a/libs/common/src/services/organization-domain/org-domain.service.spec.ts b/libs/common/src/admin-console/services/organization-domain/org-domain.service.spec.ts similarity index 97% rename from libs/common/src/services/organization-domain/org-domain.service.spec.ts rename to libs/common/src/admin-console/services/organization-domain/org-domain.service.spec.ts index 89e7526735..66a9d981a4 100644 --- a/libs/common/src/services/organization-domain/org-domain.service.spec.ts +++ b/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"; diff --git a/libs/common/src/services/organization-domain/org-domain.service.ts b/libs/common/src/admin-console/services/organization-domain/org-domain.service.ts similarity index 93% rename from libs/common/src/services/organization-domain/org-domain.service.ts rename to libs/common/src/admin-console/services/organization-domain/org-domain.service.ts index 1e2112eec5..d26b72ddfd 100644 --- a/libs/common/src/services/organization-domain/org-domain.service.ts +++ b/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 = new BehaviorSubject([]); diff --git a/libs/common/src/services/organization-domain/requests/organization-domain-sso-details.request.ts b/libs/common/src/admin-console/services/organization-domain/requests/organization-domain-sso-details.request.ts similarity index 100% rename from libs/common/src/services/organization-domain/requests/organization-domain-sso-details.request.ts rename to libs/common/src/admin-console/services/organization-domain/requests/organization-domain-sso-details.request.ts diff --git a/libs/common/src/services/organization-domain/requests/organization-domain.request.ts b/libs/common/src/admin-console/services/organization-domain/requests/organization-domain.request.ts similarity index 100% rename from libs/common/src/services/organization-domain/requests/organization-domain.request.ts rename to libs/common/src/admin-console/services/organization-domain/requests/organization-domain.request.ts diff --git a/libs/common/src/services/organization-user/organization-user.service.implementation.ts b/libs/common/src/admin-console/services/organization-user/organization-user.service.implementation.ts similarity index 98% rename from libs/common/src/services/organization-user/organization-user.service.implementation.ts rename to libs/common/src/admin-console/services/organization-user/organization-user.service.implementation.ts index 624295d828..86b4b5aa4c 100644 --- a/libs/common/src/services/organization-user/organization-user.service.implementation.ts +++ b/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"; diff --git a/libs/common/src/services/organization-user/requests/index.ts b/libs/common/src/admin-console/services/organization-user/requests/index.ts similarity index 100% rename from libs/common/src/services/organization-user/requests/index.ts rename to libs/common/src/admin-console/services/organization-user/requests/index.ts diff --git a/libs/common/src/services/organization-user/requests/organization-user-bulk.request.ts b/libs/common/src/admin-console/services/organization-user/requests/organization-user-bulk.request.ts similarity index 100% rename from libs/common/src/services/organization-user/requests/organization-user-bulk.request.ts rename to libs/common/src/admin-console/services/organization-user/requests/organization-user-bulk.request.ts diff --git a/libs/common/src/auth/models/request/update-temp-password.request.ts b/libs/common/src/auth/models/request/update-temp-password.request.ts index 88fd8a5d2b..84bcc597f4 100644 --- a/libs/common/src/auth/models/request/update-temp-password.request.ts +++ b/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; diff --git a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts index 7d1ade8332..ca953bca16 100644 --- a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts +++ b/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"; diff --git a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts index c6e19635c8..36be6fda12 100644 --- a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts +++ b/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";