diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index 28d55d0deb..221efe5438 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -9,7 +9,6 @@ ./libs/common/src/abstractions/vaultTimeout ./libs/common/src/services/vaultTimeout ./bitwarden_license/README.md -./bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts ./libs/angular/src/directives/cipherListVirtualScroll.directive.ts ./libs/angular/src/scss/webfonts/Open_Sans-italic-700.woff ./libs/angular/src/scss/webfonts/Open_Sans-normal-300.woff @@ -49,33 +48,22 @@ ./libs/common/src/enums/linkedIdType.ts ./libs/common/src/enums/sendType.ts ./libs/common/src/enums/importOptions.ts -./libs/common/src/enums/policyType.ts -./libs/common/src/enums/planSponsorshipType.ts ./libs/common/src/enums/encryptionType.ts ./libs/common/src/enums/htmlStorageLocation.ts -./libs/common/src/enums/providerUserType.ts -./libs/common/src/enums/organizationUserStatusType.ts ./libs/common/src/enums/notificationType.ts ./libs/common/src/enums/keySuffixOptions.ts ./libs/common/src/enums/productType.ts -./libs/common/src/enums/scimProviderType.ts ./libs/common/src/enums/eventType.ts ./libs/common/src/enums/hashPurpose.ts ./libs/common/src/enums/uriMatchType.ts ./libs/common/src/enums/deviceType.ts -./libs/common/src/enums/organizationConnectionType.ts ./libs/common/src/enums/secureNoteType.ts -./libs/common/src/enums/transactionType.ts -./libs/common/src/enums/providerUserStatusType.ts ./libs/common/src/enums/storageLocation.ts ./libs/common/src/enums/themeType.ts ./libs/common/src/enums/logLevelType.ts -./libs/common/src/enums/planType.ts ./libs/common/src/enums/stateVersion.ts ./libs/common/src/enums/fieldType.ts -./libs/common/src/enums/paymentMethodType.ts ./libs/common/src/enums/nativeMessagingVersion.ts -./libs/common/src/enums/organizationUserType.ts ./libs/common/src/factories/accountFactory.ts ./libs/common/src/factories/globalStateFactory.ts ./libs/common/src/factories/stateFactory.ts diff --git a/apps/browser/src/background/service_factories/collection-service.factory.ts b/apps/browser/src/admin-console/background/service-factories/collection-service.factory.ts similarity index 57% rename from apps/browser/src/background/service_factories/collection-service.factory.ts rename to apps/browser/src/admin-console/background/service-factories/collection-service.factory.ts index d85e6dd8dc..0035eee8c4 100644 --- a/apps/browser/src/background/service_factories/collection-service.factory.ts +++ b/apps/browser/src/admin-console/background/service-factories/collection-service.factory.ts @@ -1,13 +1,23 @@ -import { CollectionService as AbstractCollectionService } from "@bitwarden/common/abstractions/collection.service"; -import { CollectionService } from "@bitwarden/common/services/collection.service"; +import { CollectionService as AbstractCollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { CollectionService } from "@bitwarden/common/admin-console/services/collection.service"; -import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory"; +import { + cryptoServiceFactory, + CryptoServiceInitOptions, +} from "../../../background/service_factories/crypto-service.factory"; +import { + CachedServices, + factory, + FactoryOptions, +} from "../../../background/service_factories/factory-options"; +import { + i18nServiceFactory, + I18nServiceInitOptions, +} from "../../../background/service_factories/i18n-service.factory"; import { stateServiceFactory as stateServiceFactory, StateServiceInitOptions, -} from "./state-service.factory"; +} from "../../../background/service_factories/state-service.factory"; type CollectionServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/organization-service.factory.ts b/apps/browser/src/admin-console/background/service-factories/organization-service.factory.ts similarity index 57% rename from apps/browser/src/background/service_factories/organization-service.factory.ts rename to apps/browser/src/admin-console/background/service-factories/organization-service.factory.ts index 4f2eaee805..95204e8d5a 100644 --- a/apps/browser/src/background/service_factories/organization-service.factory.ts +++ b/apps/browser/src/admin-console/background/service-factories/organization-service.factory.ts @@ -1,9 +1,15 @@ -import { OrganizationService as AbstractOrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { OrganizationService as AbstractOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { BrowserOrganizationService } from "../../services/browser-organization.service"; - -import { FactoryOptions, CachedServices, factory } from "./factory-options"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; +import { + FactoryOptions, + CachedServices, + factory, +} from "../../../background/service_factories/factory-options"; +import { + stateServiceFactory, + StateServiceInitOptions, +} from "../../../background/service_factories/state-service.factory"; +import { BrowserOrganizationService } from "../../../services/browser-organization.service"; type OrganizationServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/policy-service.factory.ts b/apps/browser/src/admin-console/background/service-factories/policy-service.factory.ts similarity index 77% rename from apps/browser/src/background/service_factories/policy-service.factory.ts rename to apps/browser/src/admin-console/background/service-factories/policy-service.factory.ts index d20bca3c62..4bb19639c8 100644 --- a/apps/browser/src/background/service_factories/policy-service.factory.ts +++ b/apps/browser/src/admin-console/background/service-factories/policy-service.factory.ts @@ -1,16 +1,20 @@ -import { PolicyService as AbstractPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +import { PolicyService as AbstractPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { + CachedServices, + factory, + FactoryOptions, +} from "../../../background/service_factories/factory-options"; +import { + stateServiceFactory as stateServiceFactory, + StateServiceInitOptions, +} from "../../../background/service_factories/state-service.factory"; import { BrowserPolicyService } from "../../services/browser-policy.service"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; import { organizationServiceFactory, OrganizationServiceInitOptions, } from "./organization-service.factory"; -import { - stateServiceFactory as stateServiceFactory, - StateServiceInitOptions, -} from "./state-service.factory"; type PolicyServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/services/browser-policy.service.ts b/apps/browser/src/admin-console/services/browser-policy.service.ts similarity index 74% rename from apps/browser/src/services/browser-policy.service.ts rename to apps/browser/src/admin-console/services/browser-policy.service.ts index 6bdf3f6f35..89aa35a51e 100644 --- a/apps/browser/src/services/browser-policy.service.ts +++ b/apps/browser/src/admin-console/services/browser-policy.service.ts @@ -1,13 +1,13 @@ import { BehaviorSubject, filter, map, Observable, switchMap, tap } from "rxjs"; import { Jsonify } from "type-fest"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { Policy } from "@bitwarden/common/models/domain/policy"; -import { PolicyService } from "@bitwarden/common/services/policy/policy.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; +import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service"; -import { browserSession, sessionSync } from "../decorators/session-sync-observable"; +import { browserSession, sessionSync } from "../../decorators/session-sync-observable"; @browserSession export class BrowserPolicyService extends PolicyService { diff --git a/apps/browser/src/types/group-policy-environment.ts b/apps/browser/src/admin-console/types/group-policy-environment.ts similarity index 100% rename from apps/browser/src/types/group-policy-environment.ts rename to apps/browser/src/admin-console/types/group-policy-environment.ts diff --git a/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts b/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts index c9e154da1b..0689398f9c 100644 --- a/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts @@ -1,6 +1,10 @@ import { KeyConnectorService as AbstractKeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { KeyConnectorService } from "@bitwarden/common/auth/services/key-connector.service"; +import { + OrganizationServiceInitOptions, + organizationServiceFactory, +} from "../../../admin-console/background/service-factories/organization-service.factory"; import { apiServiceFactory, ApiServiceInitOptions, @@ -22,10 +26,6 @@ import { logServiceFactory, LogServiceInitOptions, } from "../../../background/service_factories/log-service.factory"; -import { - OrganizationServiceInitOptions, - organizationServiceFactory, -} from "../../../background/service_factories/organization-service.factory"; import { stateServiceFactory, StateServiceInitOptions, diff --git a/apps/browser/src/auth/popup/set-password.component.ts b/apps/browser/src/auth/popup/set-password.component.ts index d8e36015fc..2f50db7c2b 100644 --- a/apps/browser/src/auth/popup/set-password.component.ts +++ b/apps/browser/src/auth/popup/set-password.component.ts @@ -7,11 +7,11 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/browser/src/auth/popup/update-temp-password.component.ts b/apps/browser/src/auth/popup/update-temp-password.component.ts index 438479bf74..c20d5fb422 100644 --- a/apps/browser/src/auth/popup/update-temp-password.component.ts +++ b/apps/browser/src/auth/popup/update-temp-password.component.ts @@ -7,8 +7,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts index 85e8633b2b..71284dbbe5 100644 --- a/apps/browser/src/autofill/background/notification.background.ts +++ b/apps/browser/src/autofill/background/notification.background.ts @@ -1,9 +1,9 @@ import { firstValueFrom } from "rxjs"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; import { ThemeType } from "@bitwarden/common/enums/themeType"; import { Utils } from "@bitwarden/common/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index b096ea5003..52bd993725 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -2,7 +2,6 @@ import { AvatarUpdateService as AvatarUpdateServiceAbstraction } from "@bitwarde import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service"; import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/abstractions/appId.service"; import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service"; -import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service"; import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; @@ -14,11 +13,7 @@ import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstrac import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service"; import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; -import { InternalOrganizationService as InternalOrganizationServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { InternalPolicyService as InternalPolicyServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/abstractions/provider.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; import { SendService as SendServiceAbstraction } from "@bitwarden/common/abstractions/send.service"; import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service"; @@ -32,6 +27,14 @@ import { UserVerificationApiServiceAbstraction } from "@bitwarden/common/abstrac import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; +import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { InternalOrganizationService as InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; +import { InternalPolicyService as InternalPolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider.service"; +import { CollectionService } from "@bitwarden/common/admin-console/services/collection.service"; +import { PolicyApiService } from "@bitwarden/common/admin-console/services/policy/policy-api.service"; +import { ProviderService } from "@bitwarden/common/admin-console/services/provider.service"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { TokenService as TokenServiceAbstraction } from "@bitwarden/common/auth/abstractions/token.service"; @@ -48,7 +51,6 @@ import { AvatarUpdateService } from "@bitwarden/common/services/account/avatar-u import { ApiService } from "@bitwarden/common/services/api.service"; import { AppIdService } from "@bitwarden/common/services/appId.service"; import { AuditService } from "@bitwarden/common/services/audit.service"; -import { CollectionService } from "@bitwarden/common/services/collection.service"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { ContainerService } from "@bitwarden/common/services/container.service"; import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation"; @@ -59,8 +61,6 @@ import { ExportService } from "@bitwarden/common/services/export.service"; import { FileUploadService } from "@bitwarden/common/services/fileUpload.service"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { NotificationsService } from "@bitwarden/common/services/notifications.service"; -import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service"; -import { ProviderService } from "@bitwarden/common/services/provider.service"; import { SearchService } from "@bitwarden/common/services/search.service"; import { SendService } from "@bitwarden/common/services/send.service"; import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; @@ -87,6 +87,7 @@ import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service"; import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service"; +import { BrowserPolicyService } from "../admin-console/services/browser-policy.service"; import ContextMenusBackground from "../autofill/background/context-menus.background"; import NotificationBackground from "../autofill/background/notification.background"; import TabsBackground from "../autofill/background/tabs.background"; @@ -104,7 +105,6 @@ import { BrowserStateService as StateServiceAbstraction } from "../services/abst import { BrowserEnvironmentService } from "../services/browser-environment.service"; import { BrowserI18nService } from "../services/browser-i18n.service"; import { BrowserOrganizationService } from "../services/browser-organization.service"; -import { BrowserPolicyService } from "../services/browser-policy.service"; import { BrowserSettingsService } from "../services/browser-settings.service"; import { BrowserStateService } from "../services/browser-state.service"; import { BrowserCryptoService } from "../services/browserCrypto.service"; diff --git a/apps/browser/src/background/service_factories/event-collection-service.factory.ts b/apps/browser/src/background/service_factories/event-collection-service.factory.ts index 4266db43ec..4008091c22 100644 --- a/apps/browser/src/background/service_factories/event-collection-service.factory.ts +++ b/apps/browser/src/background/service_factories/event-collection-service.factory.ts @@ -1,6 +1,10 @@ import { EventCollectionService as AbstractEventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service"; +import { + organizationServiceFactory, + OrganizationServiceInitOptions, +} from "../../admin-console/background/service-factories/organization-service.factory"; import { cipherServiceFactory, CipherServiceInitOptions, @@ -11,10 +15,6 @@ import { EventUploadServiceInitOptions, } from "./event-upload-service.factory"; import { FactoryOptions, CachedServices, factory } from "./factory-options"; -import { - organizationServiceFactory, - OrganizationServiceInitOptions, -} from "./organization-service.factory"; import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; type EventCollectionServiceOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/password-generation-service.factory.ts b/apps/browser/src/background/service_factories/password-generation-service.factory.ts index e8c9596f65..cffbf376d4 100644 --- a/apps/browser/src/background/service_factories/password-generation-service.factory.ts +++ b/apps/browser/src/background/service_factories/password-generation-service.factory.ts @@ -3,9 +3,13 @@ import { PasswordGenerationServiceAbstraction, } from "@bitwarden/common/tools/generator/password"; +import { + policyServiceFactory, + PolicyServiceInitOptions, +} from "../../admin-console/background/service-factories/policy-service.factory"; + import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { policyServiceFactory, PolicyServiceInitOptions } from "./policy-service.factory"; import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; type PasswordGenerationServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts b/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts index a1529d9e94..b69d8d1d65 100644 --- a/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts +++ b/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts @@ -1,5 +1,9 @@ import { VaultTimeoutService as AbstractVaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; +import { + collectionServiceFactory, + CollectionServiceInitOptions, +} from "../../admin-console/background/service-factories/collection-service.factory"; import { authServiceFactory, AuthServiceInitOptions, @@ -18,10 +22,6 @@ import { FolderServiceInitOptions, } from "../../vault/background/service_factories/folder-service.factory"; -import { - collectionServiceFactory, - CollectionServiceInitOptions, -} from "./collection-service.factory"; import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; import { messagingServiceFactory, MessagingServiceInitOptions } from "./messaging-service.factory"; diff --git a/apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts b/apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts index aa9f526f79..d349771f42 100644 --- a/apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts +++ b/apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts @@ -1,6 +1,10 @@ import { VaultTimeoutSettingsService as AbstractVaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service"; +import { + policyServiceFactory, + PolicyServiceInitOptions, +} from "../../admin-console/background/service-factories/policy-service.factory"; import { tokenServiceFactory, TokenServiceInitOptions, @@ -8,7 +12,6 @@ import { import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { policyServiceFactory, PolicyServiceInitOptions } from "./policy-service.factory"; import { stateServiceFactory as stateServiceFactory, StateServiceInitOptions, diff --git a/apps/browser/src/flags.ts b/apps/browser/src/flags.ts index 39aad1809c..5159cac968 100644 --- a/apps/browser/src/flags.ts +++ b/apps/browser/src/flags.ts @@ -6,7 +6,7 @@ import { SharedDevFlags, } from "@bitwarden/common/misc/flags"; -import { GroupPolicyEnvironment } from "./types/group-policy-environment"; +import { GroupPolicyEnvironment } from "./admin-console/types/group-policy-environment"; // required to avoid linting errors when there are no flags /* eslint-disable-next-line @typescript-eslint/ban-types */ diff --git a/apps/browser/src/models/browserGroupingsComponentState.ts b/apps/browser/src/models/browserGroupingsComponentState.ts index a09c336f96..3237546370 100644 --- a/apps/browser/src/models/browserGroupingsComponentState.ts +++ b/apps/browser/src/models/browserGroupingsComponentState.ts @@ -1,5 +1,5 @@ +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 902f6300f2..1b409fb0f4 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -22,6 +22,7 @@ import { GeneratorComponent } from "../tools/popup/generator/generator.component import { PasswordGeneratorHistoryComponent } from "../tools/popup/generator/password-generator-history.component"; import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component"; import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.component"; +import { CollectionsComponent } from "../vault/popup/components/vault/collections.component"; import { CurrentTabComponent } from "../vault/popup/components/vault/current-tab.component"; import { PasswordHistoryComponent } from "../vault/popup/components/vault/password-history.component"; import { ShareComponent } from "../vault/popup/components/vault/share.component"; @@ -44,7 +45,6 @@ import { PremiumComponent } from "./settings/premium.component"; import { SettingsComponent } from "./settings/settings.component"; import { SyncComponent } from "./settings/sync.component"; import { TabsComponent } from "./tabs.component"; -import { CollectionsComponent } from "./vault/collections.component"; const routes: Routes = [ { diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts index b4073f0214..9805e7f095 100644 --- a/apps/browser/src/popup/app.module.ts +++ b/apps/browser/src/popup/app.module.ts @@ -32,7 +32,6 @@ import { SsoComponent } from "../auth/popup/sso.component"; import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.component"; import { TwoFactorComponent } from "../auth/popup/two-factor.component"; import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component"; -import { CollectionsComponent } from "../popup/vault/collections.component"; import { GeneratorComponent } from "../tools/popup/generator/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/popup/generator/password-generator-history.component"; import { ActionButtonsComponent } from "../vault/popup/components/action-buttons.component"; @@ -41,6 +40,7 @@ import { PasswordRepromptComponent } from "../vault/popup/components/password-re import { AddEditCustomFieldsComponent } from "../vault/popup/components/vault/add-edit-custom-fields.component"; import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component"; import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.component"; +import { CollectionsComponent } from "../vault/popup/components/vault/collections.component"; import { CurrentTabComponent } from "../vault/popup/components/vault/current-tab.component"; import { PasswordHistoryComponent } from "../vault/popup/components/vault/password-history.component"; import { ShareComponent } from "../vault/popup/components/vault/share.component"; diff --git a/apps/browser/src/popup/send/send-add-edit.component.ts b/apps/browser/src/popup/send/send-add-edit.component.ts index 0355b764c3..c620de643d 100644 --- a/apps/browser/src/popup/send/send-add-edit.component.ts +++ b/apps/browser/src/popup/send/send-add-edit.component.ts @@ -9,8 +9,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { BrowserStateService } from "../../services/abstractions/browser-state.service"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/popup/send/send-groupings.component.ts b/apps/browser/src/popup/send/send-groupings.component.ts index 5e442f7112..7ac3f1cb8e 100644 --- a/apps/browser/src/popup/send/send-groupings.component.ts +++ b/apps/browser/src/popup/send/send-groupings.component.ts @@ -7,9 +7,9 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { SendType } from "@bitwarden/common/enums/sendType"; import { SendView } from "@bitwarden/common/models/view/send.view"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/browser/src/popup/send/send-type.component.ts b/apps/browser/src/popup/send/send-type.component.ts index e899ab9f00..e4bed31f4d 100644 --- a/apps/browser/src/popup/send/send-type.component.ts +++ b/apps/browser/src/popup/send/send-type.component.ts @@ -9,9 +9,9 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { SendType } from "@bitwarden/common/enums/sendType"; import { SendView } from "@bitwarden/common/models/view/send.view"; diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index baf9878e87..81d7644777 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -9,7 +9,6 @@ import { AbstractThemingService } from "@bitwarden/angular/services/theming/them import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction"; import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; @@ -25,14 +24,7 @@ import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstrac import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { - InternalPolicyService, - PolicyService, -} from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; @@ -49,6 +41,15 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; +import { + InternalPolicyService, + PolicyService, +} from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; +import { PolicyApiService } from "@bitwarden/common/admin-console/services/policy/policy-api.service"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/login.service"; @@ -60,7 +61,6 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { ContainerService } from "@bitwarden/common/services/container.service"; -import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service"; import { SearchService } from "@bitwarden/common/services/search.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username"; @@ -74,6 +74,7 @@ import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service"; +import { BrowserPolicyService } from "../../admin-console/services/browser-policy.service"; import { LockGuardService, UnauthGuardService } from "../../auth/popup/services"; import { AutofillService } from "../../autofill/services/abstractions/autofill.service"; import MainBackground from "../../background/main.background"; @@ -84,7 +85,6 @@ import { BrowserConfigService } from "../../services/browser-config.service"; import { BrowserEnvironmentService } from "../../services/browser-environment.service"; import { BrowserI18nService } from "../../services/browser-i18n.service"; import { BrowserOrganizationService } from "../../services/browser-organization.service"; -import { BrowserPolicyService } from "../../services/browser-policy.service"; import { BrowserSettingsService } from "../../services/browser-settings.service"; import { BrowserStateService } from "../../services/browser-state.service"; import { BrowserFileDownloadService } from "../../services/browserFileDownloadService"; diff --git a/apps/browser/src/popup/settings/export.component.ts b/apps/browser/src/popup/settings/export.component.ts index c13a495bc5..eb87917263 100644 --- a/apps/browser/src/popup/settings/export.component.ts +++ b/apps/browser/src/popup/settings/export.component.ts @@ -10,8 +10,8 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; @Component({ selector: "app-export", diff --git a/apps/browser/src/services/browser-environment.service.ts b/apps/browser/src/services/browser-environment.service.ts index b3aab9a7a1..bad4b4b832 100644 --- a/apps/browser/src/services/browser-environment.service.ts +++ b/apps/browser/src/services/browser-environment.service.ts @@ -2,8 +2,8 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { EnvironmentService } from "@bitwarden/common/services/environment.service"; +import { GroupPolicyEnvironment } from "../admin-console/types/group-policy-environment"; import { devFlagEnabled, devFlagValue } from "../flags"; -import { GroupPolicyEnvironment } from "../types/group-policy-environment"; export class BrowserEnvironmentService extends EnvironmentService { constructor(stateService: StateService, private logService: LogService) { diff --git a/apps/browser/src/services/browser-organization.service.ts b/apps/browser/src/services/browser-organization.service.ts index 63f2848e2e..bff4e18b10 100644 --- a/apps/browser/src/services/browser-organization.service.ts +++ b/apps/browser/src/services/browser-organization.service.ts @@ -1,7 +1,7 @@ import { BehaviorSubject } from "rxjs"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationService } from "@bitwarden/common/services/organization/organization.service"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service"; import { browserSession, sessionSync } from "../decorators/session-sync-observable"; diff --git a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts index 522e0004ae..362f6d46ed 100644 --- a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts +++ b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts @@ -5,15 +5,15 @@ import { first } from "rxjs/operators"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/browser/src/popup/vault/collections.component.html b/apps/browser/src/vault/popup/components/vault/collections.component.html similarity index 100% rename from apps/browser/src/popup/vault/collections.component.html rename to apps/browser/src/vault/popup/components/vault/collections.component.html diff --git a/apps/browser/src/popup/vault/collections.component.ts b/apps/browser/src/vault/popup/components/vault/collections.component.ts similarity index 90% rename from apps/browser/src/popup/vault/collections.component.ts rename to apps/browser/src/vault/popup/components/vault/collections.component.ts index 766b51e2ec..3f61c1f23f 100644 --- a/apps/browser/src/popup/vault/collections.component.ts +++ b/apps/browser/src/vault/popup/components/vault/collections.component.ts @@ -3,11 +3,11 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/components/collections.component"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts index 125e2f97fa..1a83142cf1 100644 --- a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts +++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts @@ -5,10 +5,10 @@ import { debounceTime, takeUntil } from "rxjs/operators"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Utils } from "@bitwarden/common/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/browser/src/vault/popup/components/vault/share.component.ts b/apps/browser/src/vault/popup/components/vault/share.component.ts index 23f5e91ca2..c7dde9ab78 100644 --- a/apps/browser/src/vault/popup/components/vault/share.component.ts +++ b/apps/browser/src/vault/popup/components/vault/share.component.ts @@ -3,11 +3,11 @@ import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts index 0068ae6164..a5eaa8bc38 100644 --- a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts @@ -9,8 +9,8 @@ import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.s import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; diff --git a/apps/browser/src/vault/popup/components/vault/vault-items.component.ts b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts index b4141abbf3..2bc40d0d57 100644 --- a/apps/browser/src/vault/popup/components/vault/vault-items.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts @@ -6,13 +6,13 @@ import { first } from "rxjs/operators"; import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/vault/components/vault-items.component"; import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; diff --git a/apps/browser/src/vault/popup/components/vault/vault-select.component.ts b/apps/browser/src/vault/popup/components/vault/vault-select.component.ts index 2a0cd1b23e..eb058913c7 100644 --- a/apps/browser/src/vault/popup/components/vault/vault-select.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-select.component.ts @@ -16,12 +16,12 @@ import { import { BehaviorSubject, concatMap, map, merge, Observable, Subject, takeUntil } from "rxjs"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { isNotProviderUser, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { VaultFilterService } from "../../../services/vault-filter.service"; diff --git a/apps/browser/src/vault/services/vault-filter.service.ts b/apps/browser/src/vault/services/vault-filter.service.ts index bc7b7a6861..4b7c497fd4 100644 --- a/apps/browser/src/vault/services/vault-filter.service.ts +++ b/apps/browser/src/vault/services/vault-filter.service.ts @@ -1,9 +1,9 @@ import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/cli/src/commands/confirm.command.ts b/apps/cli/src/admin-console/commands/confirm.command.ts similarity index 98% rename from apps/cli/src/commands/confirm.command.ts rename to apps/cli/src/admin-console/commands/confirm.command.ts index 6249fb4c2d..c91af4d668 100644 --- a/apps/cli/src/commands/confirm.command.ts +++ b/apps/cli/src/admin-console/commands/confirm.command.ts @@ -4,7 +4,7 @@ import { OrganizationUserService } from "@bitwarden/common/abstractions/organiza import { OrganizationUserConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests"; import { Utils } from "@bitwarden/common/misc/utils"; -import { Response } from "../models/response"; +import { Response } from "../../models/response"; export class ConfirmCommand { constructor( diff --git a/apps/cli/src/commands/share.command.ts b/apps/cli/src/admin-console/commands/share.command.ts similarity index 92% rename from apps/cli/src/commands/share.command.ts rename to apps/cli/src/admin-console/commands/share.command.ts index cf76c353ef..68bd8a1805 100644 --- a/apps/cli/src/commands/share.command.ts +++ b/apps/cli/src/admin-console/commands/share.command.ts @@ -1,8 +1,8 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { Response } from "../models/response"; -import { CliUtils } from "../utils"; -import { CipherResponse } from "../vault/models/cipher.response"; +import { Response } from "../../models/response"; +import { CliUtils } from "../../utils"; +import { CipherResponse } from "../../vault/models/cipher.response"; export class ShareCommand { constructor(private cipherService: CipherService) {} diff --git a/apps/cli/src/models/request/organization-collection.request.ts b/apps/cli/src/admin-console/models/request/organization-collection.request.ts similarity index 100% rename from apps/cli/src/models/request/organization-collection.request.ts rename to apps/cli/src/admin-console/models/request/organization-collection.request.ts diff --git a/apps/cli/src/models/response/collection.response.ts b/apps/cli/src/admin-console/models/response/collection.response.ts similarity index 65% rename from apps/cli/src/models/response/collection.response.ts rename to apps/cli/src/admin-console/models/response/collection.response.ts index 4275415233..317249829f 100644 --- a/apps/cli/src/models/response/collection.response.ts +++ b/apps/cli/src/admin-console/models/response/collection.response.ts @@ -1,7 +1,7 @@ +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { CollectionWithIdExport } from "@bitwarden/common/models/export/collection-with-id.export"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class CollectionResponse extends CollectionWithIdExport implements BaseResponse { object: string; diff --git a/apps/cli/src/models/response/organization-collection.response.ts b/apps/cli/src/admin-console/models/response/organization-collection.response.ts similarity index 79% rename from apps/cli/src/models/response/organization-collection.response.ts rename to apps/cli/src/admin-console/models/response/organization-collection.response.ts index 98b5b09c58..d58676ad4e 100644 --- a/apps/cli/src/models/response/organization-collection.response.ts +++ b/apps/cli/src/admin-console/models/response/organization-collection.response.ts @@ -1,4 +1,4 @@ -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { SelectionReadOnly } from "../selection-read-only"; diff --git a/apps/cli/src/models/response/organization.response.ts b/apps/cli/src/admin-console/models/response/organization.response.ts similarity index 51% rename from apps/cli/src/models/response/organization.response.ts rename to apps/cli/src/admin-console/models/response/organization.response.ts index 1b100687f2..995ed8af7c 100644 --- a/apps/cli/src/models/response/organization.response.ts +++ b/apps/cli/src/admin-console/models/response/organization.response.ts @@ -1,8 +1,8 @@ -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class OrganizationResponse implements BaseResponse { object: string; diff --git a/apps/cli/src/models/selection-read-only.ts b/apps/cli/src/admin-console/models/selection-read-only.ts similarity index 100% rename from apps/cli/src/models/selection-read-only.ts rename to apps/cli/src/admin-console/models/selection-read-only.ts diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts index 675c94c149..6270e59e51 100644 --- a/apps/cli/src/auth/commands/login.command.ts +++ b/apps/cli/src/auth/commands/login.command.ts @@ -10,8 +10,8 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service"; diff --git a/apps/cli/src/auth/commands/unlock.command.ts b/apps/cli/src/auth/commands/unlock.command.ts index 5fbf4219a8..3208f8faf7 100644 --- a/apps/cli/src/auth/commands/unlock.command.ts +++ b/apps/cli/src/auth/commands/unlock.command.ts @@ -2,8 +2,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index d563cd14da..efc6686014 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -6,7 +6,12 @@ import * as jsdom from "jsdom"; import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { CollectionService } from "@bitwarden/common/admin-console/services/collection.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 { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service"; +import { ProviderService } from "@bitwarden/common/admin-console/services/provider.service"; import { AuthService } from "@bitwarden/common/auth/services/auth.service"; import { KeyConnectorService } from "@bitwarden/common/auth/services/key-connector.service"; import { TokenService } from "@bitwarden/common/auth/services/token.service"; @@ -22,7 +27,6 @@ import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { AppIdService } from "@bitwarden/common/services/appId.service"; import { AuditService } from "@bitwarden/common/services/audit.service"; import { BroadcasterService } from "@bitwarden/common/services/broadcaster.service"; -import { CollectionService } from "@bitwarden/common/services/collection.service"; import { ContainerService } from "@bitwarden/common/services/container.service"; import { CryptoService } from "@bitwarden/common/services/crypto.service"; import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation"; @@ -34,10 +38,6 @@ import { ImportService } from "@bitwarden/common/services/import/import.service" import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service"; import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation"; -import { OrganizationApiService } from "@bitwarden/common/services/organization/organization-api.service"; -import { OrganizationService } from "@bitwarden/common/services/organization/organization.service"; -import { PolicyService } from "@bitwarden/common/services/policy/policy.service"; -import { ProviderService } from "@bitwarden/common/services/provider.service"; import { SearchService } from "@bitwarden/common/services/search.service"; import { SendService } from "@bitwarden/common/services/send.service"; import { SettingsService } from "@bitwarden/common/services/settings.service"; diff --git a/apps/cli/src/commands/convert-to-key-connector.command.ts b/apps/cli/src/commands/convert-to-key-connector.command.ts index 16ac2b7818..d124fbfc67 100644 --- a/apps/cli/src/commands/convert-to-key-connector.command.ts +++ b/apps/cli/src/commands/convert-to-key-connector.command.ts @@ -1,7 +1,7 @@ import * as inquirer from "inquirer"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts index 2a10065ace..29cccc6b43 100644 --- a/apps/cli/src/commands/edit.command.ts +++ b/apps/cli/src/commands/edit.command.ts @@ -1,18 +1,18 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { CollectionRequest } from "@bitwarden/common/admin-console/models/request/collection.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; import { Utils } from "@bitwarden/common/misc/utils"; import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; import { CollectionExport } from "@bitwarden/common/models/export/collection.export"; import { FolderExport } from "@bitwarden/common/models/export/folder.export"; -import { CollectionRequest } from "@bitwarden/common/models/request/collection.request"; -import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { OrganizationCollectionRequest } from "../models/request/organization-collection.request"; +import { OrganizationCollectionRequest } from "../admin-console/models/request/organization-collection.request"; +import { OrganizationCollectionResponse } from "../admin-console/models/response/organization-collection.response"; import { Response } from "../models/response"; -import { OrganizationCollectionResponse } from "../models/response/organization-collection.response"; import { CliUtils } from "../utils"; import { CipherResponse } from "../vault/models/cipher.response"; import { FolderResponse } from "../vault/models/folder.response"; diff --git a/apps/cli/src/commands/export.command.ts b/apps/cli/src/commands/export.command.ts index 9e9594c6ca..71246f0119 100644 --- a/apps/cli/src/commands/export.command.ts +++ b/apps/cli/src/commands/export.command.ts @@ -2,8 +2,8 @@ import * as program from "commander"; import * as inquirer from "inquirer"; import { ExportFormat, ExportService } from "@bitwarden/common/abstractions/export.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { Utils } from "@bitwarden/common/misc/utils"; import { Response } from "../models/response"; diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index 78c80b9211..4c1d203314 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -1,15 +1,16 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { SendType } from "@bitwarden/common/enums/sendType"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { CardExport } from "@bitwarden/common/models/export/card.export"; import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; import { CollectionExport } from "@bitwarden/common/models/export/collection.export"; @@ -20,22 +21,21 @@ import { LoginUriExport } from "@bitwarden/common/models/export/login-uri.export import { LoginExport } from "@bitwarden/common/models/export/login.export"; import { SecureNoteExport } from "@bitwarden/common/models/export/secure-note.export"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { OrganizationCollectionRequest } from "../models/request/organization-collection.request"; +import { OrganizationCollectionRequest } from "../admin-console/models/request/organization-collection.request"; +import { CollectionResponse } from "../admin-console/models/response/collection.response"; +import { OrganizationCollectionResponse } from "../admin-console/models/response/organization-collection.response"; +import { OrganizationResponse } from "../admin-console/models/response/organization.response"; +import { SelectionReadOnly } from "../admin-console/models/selection-read-only"; import { Response } from "../models/response"; -import { CollectionResponse } from "../models/response/collection.response"; -import { OrganizationCollectionResponse } from "../models/response/organization-collection.response"; -import { OrganizationResponse } from "../models/response/organization.response"; import { SendResponse } from "../models/response/send.response"; import { StringResponse } from "../models/response/string.response"; import { TemplateResponse } from "../models/response/template.response"; -import { SelectionReadOnly } from "../models/selection-read-only"; import { CliUtils } from "../utils"; import { CipherResponse } from "../vault/models/cipher.response"; import { FolderResponse } from "../vault/models/folder.response"; diff --git a/apps/cli/src/commands/import.command.ts b/apps/cli/src/commands/import.command.ts index bc753ffc7a..6792086143 100644 --- a/apps/cli/src/commands/import.command.ts +++ b/apps/cli/src/commands/import.command.ts @@ -2,7 +2,7 @@ import * as program from "commander"; import * as inquirer from "inquirer"; import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ImportType } from "@bitwarden/common/enums/importOptions"; import { Importer } from "@bitwarden/common/importers/importer"; diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index 13292e1b64..005cac721d 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -1,25 +1,25 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { CollectionData } from "@bitwarden/common/models/data/collection.data"; -import { Collection } from "@bitwarden/common/models/domain/collection"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; +import { Collection } from "@bitwarden/common/admin-console/models/domain/collection"; import { CollectionDetailsResponse as ApiCollectionDetailsResponse, CollectionResponse as ApiCollectionResponse, -} from "@bitwarden/common/models/response/collection.response"; +} from "@bitwarden/common/admin-console/models/response/collection.response"; +import { Utils } from "@bitwarden/common/misc/utils"; import { ListResponse as ApiListResponse } from "@bitwarden/common/models/response/list.response"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { CollectionResponse } from "../admin-console/models/response/collection.response"; +import { OrganizationResponse } from "../admin-console/models/response/organization.response"; import { Response } from "../models/response"; -import { CollectionResponse } from "../models/response/collection.response"; import { ListResponse } from "../models/response/list.response"; import { OrganizationUserResponse } from "../models/response/organization-user.response"; -import { OrganizationResponse } from "../models/response/organization.response"; import { CliUtils } from "../utils"; import { CipherResponse } from "../vault/models/cipher.response"; import { FolderResponse } from "../vault/models/folder.response"; diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts index c0a6032a1f..370981370c 100644 --- a/apps/cli/src/commands/serve.command.ts +++ b/apps/cli/src/commands/serve.command.ts @@ -8,6 +8,8 @@ import * as koaJson from "koa-json"; import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; import { Utils } from "@bitwarden/common/misc/utils"; +import { ConfirmCommand } from "../admin-console/commands/confirm.command"; +import { ShareCommand } from "../admin-console/commands/share.command"; import { LockCommand } from "../auth/commands/lock.command"; import { UnlockCommand } from "../auth/commands/unlock.command"; import { Main } from "../bw"; @@ -18,7 +20,6 @@ import { CreateCommand } from "../vault/create.command"; import { DeleteCommand } from "../vault/delete.command"; import { SyncCommand } from "../vault/sync.command"; -import { ConfirmCommand } from "./confirm.command"; import { EditCommand } from "./edit.command"; import { GetCommand } from "./get.command"; import { ListCommand } from "./list.command"; @@ -29,7 +30,6 @@ import { SendEditCommand } from "./send/edit.command"; import { SendGetCommand } from "./send/get.command"; import { SendListCommand } from "./send/list.command"; import { SendRemovePasswordCommand } from "./send/remove-password.command"; -import { ShareCommand } from "./share.command"; import { StatusCommand } from "./status.command"; export class ServeCommand { diff --git a/apps/cli/src/models/response/organization-user.response.ts b/apps/cli/src/models/response/organization-user.response.ts index 92a8e63821..1a45deca24 100644 --- a/apps/cli/src/models/response/organization-user.response.ts +++ b/apps/cli/src/models/response/organization-user.response.ts @@ -1,5 +1,5 @@ -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; import { BaseResponse } from "./base.response"; diff --git a/apps/cli/src/utils.ts b/apps/cli/src/utils.ts index cb6f8695bf..a2e9008239 100644 --- a/apps/cli/src/utils.ts +++ b/apps/cli/src/utils.ts @@ -5,10 +5,10 @@ import * as inquirer from "inquirer"; import * as JSZip from "jszip"; import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { Utils } from "@bitwarden/common/misc/utils"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { Response } from "./models/response"; diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts index c02812fb17..cf1b112112 100644 --- a/apps/cli/src/vault.program.ts +++ b/apps/cli/src/vault.program.ts @@ -1,14 +1,14 @@ import * as program from "commander"; +import { ConfirmCommand } from "./admin-console/commands/confirm.command"; +import { ShareCommand } from "./admin-console/commands/share.command"; import { Main } from "./bw"; -import { ConfirmCommand } from "./commands/confirm.command"; import { EditCommand } from "./commands/edit.command"; import { ExportCommand } from "./commands/export.command"; import { GetCommand } from "./commands/get.command"; import { ImportCommand } from "./commands/import.command"; import { ListCommand } from "./commands/list.command"; import { RestoreCommand } from "./commands/restore.command"; -import { ShareCommand } from "./commands/share.command"; import { Response } from "./models/response"; import { Program } from "./program"; import { CliUtils } from "./utils"; diff --git a/apps/cli/src/vault/create.command.ts b/apps/cli/src/vault/create.command.ts index 82ce29f643..f6ee54a32f 100644 --- a/apps/cli/src/vault/create.command.ts +++ b/apps/cli/src/vault/create.command.ts @@ -4,19 +4,19 @@ import * as path from "path"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CollectionRequest } from "@bitwarden/common/admin-console/models/request/collection.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; import { Utils } from "@bitwarden/common/misc/utils"; import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; import { CollectionExport } from "@bitwarden/common/models/export/collection.export"; import { FolderExport } from "@bitwarden/common/models/export/folder.export"; -import { CollectionRequest } from "@bitwarden/common/models/request/collection.request"; -import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { OrganizationCollectionRequest } from "../models/request/organization-collection.request"; +import { OrganizationCollectionRequest } from "../admin-console/models/request/organization-collection.request"; +import { OrganizationCollectionResponse } from "../admin-console/models/response/organization-collection.response"; import { Response } from "../models/response"; -import { OrganizationCollectionResponse } from "../models/response/organization-collection.response"; import { CliUtils } from "../utils"; import { CipherResponse } from "./models/cipher.response"; diff --git a/apps/desktop/src/app/vault/vault-filter/filters/collection-filter.component.html b/apps/desktop/src/admin-console/vault-filters/collection-filter.component.html similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/filters/collection-filter.component.html rename to apps/desktop/src/admin-console/vault-filters/collection-filter.component.html diff --git a/apps/desktop/src/app/vault/vault-filter/filters/collection-filter.component.ts b/apps/desktop/src/admin-console/vault-filters/collection-filter.component.ts similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/filters/collection-filter.component.ts rename to apps/desktop/src/admin-console/vault-filters/collection-filter.component.ts diff --git a/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html b/apps/desktop/src/admin-console/vault-filters/organization-filter.component.html similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html rename to apps/desktop/src/admin-console/vault-filters/organization-filter.component.html diff --git a/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.ts b/apps/desktop/src/admin-console/vault-filters/organization-filter.component.ts similarity index 93% rename from apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.ts rename to apps/desktop/src/admin-console/vault-filters/organization-filter.component.ts index ec40f8b436..03f858243b 100644 --- a/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.ts +++ b/apps/desktop/src/admin-console/vault-filters/organization-filter.component.ts @@ -4,7 +4,7 @@ import { OrganizationFilterComponent as BaseOrganizationFilterComponent } from " import { DisplayMode } from "@bitwarden/angular/vault/vault-filter/models/display-mode"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @Component({ selector: "app-organization-filter", diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts index 1a4562b8da..3db6209b2c 100644 --- a/apps/desktop/src/app/app.component.ts +++ b/apps/desktop/src/app/app.component.ts @@ -16,7 +16,6 @@ import { firstValueFrom, Subject, takeUntil } from "rxjs"; import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; @@ -24,13 +23,14 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SystemService } from "@bitwarden/common/abstractions/system.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index 1b81a49d2e..4cf6637c1c 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/apps/desktop/src/app/app.module.ts @@ -27,6 +27,7 @@ import { PasswordRepromptComponent } from "../vault/app/components/password-repr import { AddEditCustomFieldsComponent } from "../vault/app/vault/add-edit-custom-fields.component"; import { AddEditComponent } from "../vault/app/vault/add-edit.component"; import { AttachmentsComponent } from "../vault/app/vault/attachments.component"; +import { CollectionsComponent } from "../vault/app/vault/collections.component"; import { FolderAddEditComponent } from "../vault/app/vault/folder-add-edit.component"; import { PasswordHistoryComponent } from "../vault/app/vault/password-history.component"; import { ShareComponent } from "../vault/app/vault/share.component"; @@ -52,7 +53,6 @@ import { SendComponent } from "./send/send.component"; import { SharedModule } from "./shared/shared.module"; import { GeneratorComponent } from "./tools/generator.component"; import { PasswordGeneratorHistoryComponent } from "./tools/password-generator-history.component"; -import { CollectionsComponent } from "./vault/collections.component"; import { ExportComponent } from "./vault/export.component"; @NgModule({ diff --git a/apps/desktop/src/app/send/add-edit.component.ts b/apps/desktop/src/app/send/add-edit.component.ts index b6f63254a8..5596165c4f 100644 --- a/apps/desktop/src/app/send/add-edit.component.ts +++ b/apps/desktop/src/app/send/add-edit.component.ts @@ -7,9 +7,9 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SendService } from "@bitwarden/common/abstractions/send.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; @Component({ selector: "app-send-add-edit", diff --git a/apps/desktop/src/app/send/send.component.ts b/apps/desktop/src/app/send/send.component.ts index 2ba29cc4ad..3d40120356 100644 --- a/apps/desktop/src/app/send/send.component.ts +++ b/apps/desktop/src/app/send/send.component.ts @@ -6,9 +6,9 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { SendView } from "@bitwarden/common/models/view/send.view"; import { invokeMenu, RendererMenuItem } from "../../utils"; diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index b7e1c8ac10..2bf87a4a30 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -23,11 +23,11 @@ import { } from "@bitwarden/common/abstractions/log.service"; import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service"; import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abstractions/system.service"; +import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/login.service"; import { LoginService } from "@bitwarden/common/auth/services/login.service"; diff --git a/apps/desktop/src/app/vault/export.component.ts b/apps/desktop/src/app/vault/export.component.ts index 01859f4c4e..ed712f4c06 100644 --- a/apps/desktop/src/app/vault/export.component.ts +++ b/apps/desktop/src/app/vault/export.component.ts @@ -12,8 +12,8 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; const BroadcasterSubscriptionId = "ExportComponent"; diff --git a/apps/desktop/src/auth/set-password.component.ts b/apps/desktop/src/auth/set-password.component.ts index 26782432b7..d4f904d83c 100644 --- a/apps/desktop/src/auth/set-password.component.ts +++ b/apps/desktop/src/auth/set-password.component.ts @@ -8,11 +8,11 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/desktop/src/auth/update-temp-password.component.ts b/apps/desktop/src/auth/update-temp-password.component.ts index 65ccf9ea5b..8d087dd55f 100644 --- a/apps/desktop/src/auth/update-temp-password.component.ts +++ b/apps/desktop/src/auth/update-temp-password.component.ts @@ -7,8 +7,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/desktop/src/services/encrypted-message-handler.service.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts index 77c8598e68..f4888e6453 100644 --- a/apps/desktop/src/services/encrypted-message-handler.service.ts +++ b/apps/desktop/src/services/encrypted-message-handler.service.ts @@ -1,10 +1,10 @@ import { firstValueFrom } from "rxjs"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; diff --git a/apps/desktop/src/vault/app/vault/add-edit.component.ts b/apps/desktop/src/vault/app/vault/add-edit.component.ts index ab53f91ca4..e1b147ca60 100644 --- a/apps/desktop/src/vault/app/vault/add-edit.component.ts +++ b/apps/desktop/src/vault/app/vault/add-edit.component.ts @@ -4,15 +4,15 @@ import { NgForm } from "@angular/forms"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/desktop/src/app/vault/collections.component.html b/apps/desktop/src/vault/app/vault/collections.component.html similarity index 100% rename from apps/desktop/src/app/vault/collections.component.html rename to apps/desktop/src/vault/app/vault/collections.component.html diff --git a/apps/desktop/src/app/vault/collections.component.ts b/apps/desktop/src/vault/app/vault/collections.component.ts similarity index 84% rename from apps/desktop/src/app/vault/collections.component.ts rename to apps/desktop/src/vault/app/vault/collections.component.ts index 56beb83cfe..ae64f67b0f 100644 --- a/apps/desktop/src/app/vault/collections.component.ts +++ b/apps/desktop/src/vault/app/vault/collections.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; -import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/components/collections.component"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/desktop/src/vault/app/vault/share.component.ts b/apps/desktop/src/vault/app/vault/share.component.ts index f11a7537d9..683bd7d523 100644 --- a/apps/desktop/src/vault/app/vault/share.component.ts +++ b/apps/desktop/src/vault/app/vault/share.component.ts @@ -2,11 +2,11 @@ import { Component } from "@angular/core"; import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts index 9b9f0ab342..ca7fab0f9c 100644 --- a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts +++ b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts @@ -5,8 +5,8 @@ import { JslibModule } from "@bitwarden/angular/jslib.module"; import { DeprecatedVaultFilterService as DeprecatedVaultFilterServiceAbstraction } from "@bitwarden/angular/vault/abstractions/deprecated-vault-filter.service"; import { VaultFilterService } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service"; -import { CollectionFilterComponent } from "../../../../app/vault/vault-filter/filters/collection-filter.component"; -import { OrganizationFilterComponent } from "../../../../app/vault/vault-filter/filters/organization-filter.component"; +import { CollectionFilterComponent } from "../../../../admin-console/vault-filters/collection-filter.component"; +import { OrganizationFilterComponent } from "../../../../admin-console/vault-filters/organization-filter.component"; import { FolderFilterComponent } from "./filters/folder-filter.component"; import { StatusFilterComponent } from "./filters/status-filter.component"; diff --git a/apps/desktop/src/vault/app/vault/vault.component.ts b/apps/desktop/src/vault/app/vault/vault.component.ts index 04a942f7cc..cd81a496a6 100644 --- a/apps/desktop/src/vault/app/vault/vault.component.ts +++ b/apps/desktop/src/vault/app/vault/vault.component.ts @@ -31,8 +31,8 @@ import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { SearchBarService } from "../../../app/layout/search/search-bar.service"; import { GeneratorComponent } from "../../../app/tools/generator.component"; -import { CollectionsComponent } from "../../../app/vault/collections.component"; import { invokeMenu, RendererMenuItem } from "../../../utils"; +import { CollectionsComponent } from "../../../vault/app/vault/collections.component"; import { AddEditComponent } from "./add-edit.component"; import { AttachmentsComponent } from "./attachments.component"; diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts index c89a2ff3a1..fdbc72b365 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts +++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts @@ -11,13 +11,13 @@ import { BehaviorSubject, of } from "rxjs"; import { I18nPipe } from "@bitwarden/angular/pipes/i18n.pipe"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PlanType } from "@bitwarden/common/enums/planType"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; +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 { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; +import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response"; +import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; -import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; import { RouterService } from "../../core"; diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts index 2ed89b8bb5..384d12c008 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts +++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts @@ -7,14 +7,14 @@ import { first, Subject, takeUntil } from "rxjs"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PlanType } from "@bitwarden/common/enums/planType"; +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 { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; +import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; +import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; import { ProductType } from "@bitwarden/common/enums/productType"; -import { PolicyData } from "@bitwarden/common/models/data/policy.data"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; -import { Policy } from "@bitwarden/common/models/domain/policy"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; import { RouterService } from "./../../core/router.service"; diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts index 4aaee20001..218dbb9c9d 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts +++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts @@ -5,10 +5,10 @@ import { NgModule } from "@angular/core"; import { FormFieldModule } from "@bitwarden/components"; import { RegisterFormModule } from "../../../auth/register-form/register-form.module"; -import { OrganizationCreateModule } from "../../organizations/create/organization-create.module"; +import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module"; +import { BillingComponent } from "../../billing/accounts/trial-initiation/billing.component"; import { LooseComponentsModule, SharedModule } from "../../shared"; -import { BillingComponent } from "./billing.component"; import { ConfirmationDetailsComponent } from "./confirmation-details.component"; import { AbmEnterpriseContentComponent } from "./content/abm-enterprise-content.component"; import { AbmTeamsContentComponent } from "./content/abm-teams-content.component"; diff --git a/apps/web/src/app/components/organization-switcher.component.html b/apps/web/src/app/admin-console/components/organization-switcher.component.html similarity index 100% rename from apps/web/src/app/components/organization-switcher.component.html rename to apps/web/src/app/admin-console/components/organization-switcher.component.html diff --git a/apps/web/src/app/components/organization-switcher.component.ts b/apps/web/src/app/admin-console/components/organization-switcher.component.ts similarity index 83% rename from apps/web/src/app/components/organization-switcher.component.ts rename to apps/web/src/app/admin-console/components/organization-switcher.component.ts index a7aafa15da..b3fd8ef8b6 100644 --- a/apps/web/src/app/components/organization-switcher.component.ts +++ b/apps/web/src/app/admin-console/components/organization-switcher.component.ts @@ -6,9 +6,9 @@ import { canAccessAdmin, isNotProviderUser, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { Utils } from "@bitwarden/common/misc/utils"; -import { Organization } from "@bitwarden/common/models/domain/organization"; @Component({ selector: "app-organization-switcher", diff --git a/apps/web/src/app/core/policy-list.service.ts b/apps/web/src/app/admin-console/core/policy-list.service.ts similarity index 100% rename from apps/web/src/app/core/policy-list.service.ts rename to apps/web/src/app/admin-console/core/policy-list.service.ts diff --git a/apps/web/src/app/organizations/create/organization-create.module.ts b/apps/web/src/app/admin-console/organizations/create/organization-create.module.ts similarity index 86% rename from apps/web/src/app/organizations/create/organization-create.module.ts rename to apps/web/src/app/admin-console/organizations/create/organization-create.module.ts index 12b2b759e1..cfc9ffdaff 100644 --- a/apps/web/src/app/organizations/create/organization-create.module.ts +++ b/apps/web/src/app/admin-console/organizations/create/organization-create.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../shared"; +import { SharedModule } from "../../../shared"; import { OrganizationInformationComponent } from "./organization-information.component"; diff --git a/apps/web/src/app/organizations/create/organization-information.component.html b/apps/web/src/app/admin-console/organizations/create/organization-information.component.html similarity index 100% rename from apps/web/src/app/organizations/create/organization-information.component.html rename to apps/web/src/app/admin-console/organizations/create/organization-information.component.html diff --git a/apps/web/src/app/organizations/create/organization-information.component.ts b/apps/web/src/app/admin-console/organizations/create/organization-information.component.ts similarity index 100% rename from apps/web/src/app/organizations/create/organization-information.component.ts rename to apps/web/src/app/admin-console/organizations/create/organization-information.component.ts diff --git a/apps/web/src/app/organizations/guards/org-permissions.guard.spec.ts b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts similarity index 93% rename from apps/web/src/app/organizations/guards/org-permissions.guard.spec.ts rename to apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts index 64295fdebb..5e2510f1eb 100644 --- a/apps/web/src/app/organizations/guards/org-permissions.guard.spec.ts +++ b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts @@ -7,10 +7,10 @@ import { import { mock, MockProxy } from "jest-mock-extended"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { OrganizationPermissionsGuard } from "./org-permissions.guard"; diff --git a/apps/web/src/app/organizations/guards/org-permissions.guard.ts b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts similarity index 92% rename from apps/web/src/app/organizations/guards/org-permissions.guard.ts rename to apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts index 8cad346acc..26263eb816 100644 --- a/apps/web/src/app/organizations/guards/org-permissions.guard.ts +++ b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts @@ -2,12 +2,12 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { canAccessOrgAdmin, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Injectable({ diff --git a/apps/web/src/app/organizations/guards/org-redirect.guard.ts b/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.ts similarity index 90% rename from apps/web/src/app/organizations/guards/org-redirect.guard.ts rename to apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.ts index 3f3213f6a3..bd496e79ec 100644 --- a/apps/web/src/app/organizations/guards/org-redirect.guard.ts +++ b/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.ts @@ -4,7 +4,7 @@ import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from import { canAccessOrgAdmin, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; @Injectable({ providedIn: "root", diff --git a/apps/web/src/app/organizations/layouts/organization-layout.component.html b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html similarity index 100% rename from apps/web/src/app/organizations/layouts/organization-layout.component.html rename to apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html diff --git a/apps/web/src/app/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts similarity index 91% rename from apps/web/src/app/organizations/layouts/organization-layout.component.ts rename to apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts index 69a04b68a5..a0a7df5a92 100644 --- a/apps/web/src/app/organizations/layouts/organization-layout.component.ts +++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts @@ -11,8 +11,8 @@ import { canAccessVaultTab, getOrganizationById, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @Component({ selector: "app-organization-layout", diff --git a/apps/web/src/app/organizations/manage/collections.component.html b/apps/web/src/app/admin-console/organizations/manage/collections.component.html similarity index 100% rename from apps/web/src/app/organizations/manage/collections.component.html rename to apps/web/src/app/admin-console/organizations/manage/collections.component.html diff --git a/apps/web/src/app/organizations/manage/collections.component.ts b/apps/web/src/app/admin-console/organizations/manage/collections.component.ts similarity index 91% rename from apps/web/src/app/organizations/manage/collections.component.ts rename to apps/web/src/app/admin-console/organizations/manage/collections.component.ts index 94407cc64b..fc8dd4d447 100644 --- a/apps/web/src/app/organizations/manage/collections.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/collections.component.ts @@ -5,22 +5,22 @@ import { first } from "rxjs/operators"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { ProductType } from "@bitwarden/common/enums/productType"; -import { CollectionData } from "@bitwarden/common/models/data/collection.data"; -import { Collection } from "@bitwarden/common/models/domain/collection"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; +import { Collection } from "@bitwarden/common/admin-console/models/domain/collection"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CollectionDetailsResponse, CollectionResponse, -} from "@bitwarden/common/models/response/collection.response"; +} from "@bitwarden/common/admin-console/models/response/collection.response"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; +import { ProductType } from "@bitwarden/common/enums/productType"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { DialogService, SimpleDialogCloseType, @@ -28,9 +28,11 @@ import { SimpleDialogType, } from "@bitwarden/components"; -import { CollectionDialogResult, openCollectionDialog } from "../shared"; - -import { EntityUsersComponent } from "./entity-users.component"; +import { EntityUsersComponent } from "../manage/entity-users.component"; +import { + CollectionDialogResult, + openCollectionDialog, +} from "../shared/components/collection-dialog"; @Component({ selector: "app-org-manage-collections", diff --git a/apps/web/src/app/organizations/manage/entity-events.component.html b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.html similarity index 100% rename from apps/web/src/app/organizations/manage/entity-events.component.html rename to apps/web/src/app/admin-console/organizations/manage/entity-events.component.html diff --git a/apps/web/src/app/organizations/manage/entity-events.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts similarity index 99% rename from apps/web/src/app/organizations/manage/entity-events.component.ts rename to apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts index 31e92d336e..26f2bccd3c 100644 --- a/apps/web/src/app/organizations/manage/entity-events.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts @@ -9,7 +9,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { EventResponse } from "@bitwarden/common/models/response/event.response"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; -import { EventService } from "../../core"; +import { EventService } from "../../../core"; @Component({ selector: "app-entity-events", diff --git a/apps/web/src/app/organizations/manage/entity-users.component.html b/apps/web/src/app/admin-console/organizations/manage/entity-users.component.html similarity index 100% rename from apps/web/src/app/organizations/manage/entity-users.component.html rename to apps/web/src/app/admin-console/organizations/manage/entity-users.component.html diff --git a/apps/web/src/app/organizations/manage/entity-users.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-users.component.ts similarity index 93% rename from apps/web/src/app/organizations/manage/entity-users.component.ts rename to apps/web/src/app/admin-console/organizations/manage/entity-users.component.ts index 28e38e266b..28a161c731 100644 --- a/apps/web/src/app/organizations/manage/entity-users.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/entity-users.component.ts @@ -7,10 +7,10 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; @Component({ selector: "app-entity-users", diff --git a/apps/web/src/app/organizations/manage/events.component.html b/apps/web/src/app/admin-console/organizations/manage/events.component.html similarity index 100% rename from apps/web/src/app/organizations/manage/events.component.html rename to apps/web/src/app/admin-console/organizations/manage/events.component.html diff --git a/apps/web/src/app/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts similarity index 92% rename from apps/web/src/app/organizations/manage/events.component.ts rename to apps/web/src/app/admin-console/organizations/manage/events.component.ts index 69fbf0965a..36c7893a43 100644 --- a/apps/web/src/app/organizations/manage/events.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts @@ -9,15 +9,15 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +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/event-system-user"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { EventResponse } from "@bitwarden/common/models/response/event.response"; -import { BaseEventsComponent } from "../../common/base.events.component"; -import { EventService } from "../../core"; +import { BaseEventsComponent } from "../../../common/base.events.component"; +import { EventService } from "../../../core"; 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/organizations/manage/group-add-edit.component.html b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html similarity index 100% rename from apps/web/src/app/organizations/manage/group-add-edit.component.html rename to apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html diff --git a/apps/web/src/app/organizations/manage/group-add-edit.component.ts b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts similarity index 94% rename from apps/web/src/app/organizations/manage/group-add-edit.component.ts rename to apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts index 9edeb8ddc4..25239318e7 100644 --- a/apps/web/src/app/organizations/manage/group-add-edit.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts @@ -4,18 +4,18 @@ 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 { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CollectionData } from "@bitwarden/common/models/data/collection.data"; -import { Collection } from "@bitwarden/common/models/domain/collection"; -import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collection.response"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; +import { Collection } from "@bitwarden/common/admin-console/models/domain/collection"; +import { CollectionDetailsResponse } from "@bitwarden/common/admin-console/models/response/collection.response"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { DialogService } from "@bitwarden/components"; -import { GroupService, GroupView } from "../core"; +import { GroupService, GroupView } from "../../../organizations/core"; import { AccessItemType, AccessItemValue, diff --git a/apps/web/src/app/organizations/manage/groups.component.html b/apps/web/src/app/admin-console/organizations/manage/groups.component.html similarity index 100% rename from apps/web/src/app/organizations/manage/groups.component.html rename to apps/web/src/app/admin-console/organizations/manage/groups.component.html diff --git a/apps/web/src/app/organizations/manage/groups.component.ts b/apps/web/src/app/admin-console/organizations/manage/groups.component.ts similarity index 94% rename from apps/web/src/app/organizations/manage/groups.component.ts rename to apps/web/src/app/admin-console/organizations/manage/groups.component.ts index b450eaef1c..d333c01e71 100644 --- a/apps/web/src/app/organizations/manage/groups.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/groups.component.ts @@ -17,23 +17,23 @@ import { first } from "rxjs/operators"; import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { CollectionData } from "@bitwarden/common/models/data/collection.data"; -import { Collection } from "@bitwarden/common/models/domain/collection"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; +import { Collection } from "@bitwarden/common/admin-console/models/domain/collection"; import { CollectionDetailsResponse, CollectionResponse, -} from "@bitwarden/common/models/response/collection.response"; +} from "@bitwarden/common/admin-console/models/response/collection.response"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; +import { Utils } from "@bitwarden/common/misc/utils"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { DialogService } from "@bitwarden/components"; -import { GroupService, GroupView } from "../core"; +import { GroupService, GroupView } from "../../../organizations/core"; import { GroupAddEditDialogResultType, diff --git a/apps/web/src/app/organizations/manage/manage.component.html b/apps/web/src/app/admin-console/organizations/manage/manage.component.html similarity index 100% rename from apps/web/src/app/organizations/manage/manage.component.html rename to apps/web/src/app/admin-console/organizations/manage/manage.component.html diff --git a/apps/web/src/app/organizations/manage/manage.component.ts b/apps/web/src/app/admin-console/organizations/manage/manage.component.ts similarity index 75% rename from apps/web/src/app/organizations/manage/manage.component.ts rename to apps/web/src/app/admin-console/organizations/manage/manage.component.ts index 5e42e3bfe3..8f07c27e47 100644 --- a/apps/web/src/app/organizations/manage/manage.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/manage.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @Component({ selector: "app-org-manage", diff --git a/apps/web/src/app/organizations/manage/organization-manage.module.ts b/apps/web/src/app/admin-console/organizations/manage/organization-manage.module.ts similarity index 64% rename from apps/web/src/app/organizations/manage/organization-manage.module.ts rename to apps/web/src/app/admin-console/organizations/manage/organization-manage.module.ts index 58c0ad161a..9a7b166962 100644 --- a/apps/web/src/app/organizations/manage/organization-manage.module.ts +++ b/apps/web/src/app/admin-console/organizations/manage/organization-manage.module.ts @@ -1,9 +1,8 @@ import { ScrollingModule } from "@angular/cdk/scrolling"; import { NgModule } from "@angular/core"; -import { SharedModule } from "../../shared"; - -import { EntityUsersComponent } from "./entity-users.component"; +import { EntityUsersComponent } from "../../../admin-console/organizations/manage/entity-users.component"; +import { SharedModule } from "../../../shared"; @NgModule({ imports: [SharedModule, ScrollingModule], diff --git a/apps/web/src/app/organizations/manage/user-confirm.component.html b/apps/web/src/app/admin-console/organizations/manage/user-confirm.component.html similarity index 100% rename from apps/web/src/app/organizations/manage/user-confirm.component.html rename to apps/web/src/app/admin-console/organizations/manage/user-confirm.component.html diff --git a/apps/web/src/app/organizations/manage/user-confirm.component.ts b/apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts similarity index 100% rename from apps/web/src/app/organizations/manage/user-confirm.component.ts rename to apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts diff --git a/apps/web/src/app/organizations/members/components/member-dialog/index.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/index.ts similarity index 100% rename from apps/web/src/app/organizations/members/components/member-dialog/index.ts rename to apps/web/src/app/admin-console/organizations/members/components/member-dialog/index.ts diff --git a/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html similarity index 100% rename from apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.html rename to apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html diff --git a/apps/web/src/app/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 similarity index 95% rename from apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.ts rename to apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts index c35364fdcf..5ccd8d1f4b 100644 --- a/apps/web/src/app/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 @@ -5,16 +5,16 @@ import { combineLatest, of, shareReplay, Subject, switchMap, takeUntil } from "r import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; -import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; +import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { DialogService } from "@bitwarden/components"; -import { flagEnabled } from "../../../../../utils/flags"; +import { flagEnabled } from "../../../../../../utils/flags"; import { CollectionAccessSelectionView, CollectionAdminService, @@ -22,7 +22,7 @@ import { GroupView, OrganizationUserAdminView, UserAdminService, -} from "../../../core"; +} from "../../../../../organizations/core"; import { AccessItemType, AccessItemValue, diff --git a/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.module.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.module.ts similarity index 84% rename from apps/web/src/app/organizations/members/components/member-dialog/member-dialog.module.ts rename to apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.module.ts index 8e803d134c..2ab2081ae5 100644 --- a/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.module.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.module.ts @@ -2,7 +2,7 @@ import { NgModule } from "@angular/core"; import { RadioButtonModule } from "@bitwarden/components"; -import { SharedOrganizationModule } from "../../../shared"; +import { SharedOrganizationModule } from "../../../../../organizations/shared"; import { MemberDialogComponent } from "./member-dialog.component"; import { NestedCheckboxComponent } from "./nested-checkbox.component"; diff --git a/apps/web/src/app/organizations/members/components/member-dialog/nested-checkbox.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.html similarity index 100% rename from apps/web/src/app/organizations/members/components/member-dialog/nested-checkbox.component.html rename to apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.html diff --git a/apps/web/src/app/organizations/members/components/member-dialog/nested-checkbox.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.ts similarity index 100% rename from apps/web/src/app/organizations/members/components/member-dialog/nested-checkbox.component.ts rename to apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.ts diff --git a/apps/web/src/app/organizations/members/components/member-dialog/validators/comma-separated-emails.validator.spec.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/validators/comma-separated-emails.validator.spec.ts similarity index 100% rename from apps/web/src/app/organizations/members/components/member-dialog/validators/comma-separated-emails.validator.spec.ts rename to apps/web/src/app/admin-console/organizations/members/components/member-dialog/validators/comma-separated-emails.validator.spec.ts diff --git a/apps/web/src/app/organizations/members/components/member-dialog/validators/comma-separated-emails.validator.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/validators/comma-separated-emails.validator.ts similarity index 100% rename from apps/web/src/app/organizations/members/components/member-dialog/validators/comma-separated-emails.validator.ts rename to apps/web/src/app/admin-console/organizations/members/components/member-dialog/validators/comma-separated-emails.validator.ts diff --git a/apps/web/src/app/organizations/members/components/reset-password.component.html b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html similarity index 100% rename from apps/web/src/app/organizations/members/components/reset-password.component.html rename to apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html diff --git a/apps/web/src/app/organizations/members/components/reset-password.component.ts b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts similarity index 96% rename from apps/web/src/app/organizations/members/components/reset-password.component.ts rename to apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts index 8969524939..dfd85d353f 100644 --- a/apps/web/src/app/organizations/members/components/reset-password.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts @@ -17,11 +17,11 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/abstractions/organization-user/requests"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +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"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; diff --git a/apps/web/src/app/organizations/members/people.component.html b/apps/web/src/app/admin-console/organizations/members/people.component.html similarity index 100% rename from apps/web/src/app/organizations/members/people.component.html rename to apps/web/src/app/admin-console/organizations/members/people.component.html diff --git a/apps/web/src/app/organizations/members/people.component.ts b/apps/web/src/app/admin-console/organizations/members/people.component.ts similarity index 90% rename from apps/web/src/app/organizations/members/people.component.ts rename to apps/web/src/app/admin-console/organizations/members/people.component.ts index c060bccc21..19a07ac1a5 100644 --- a/apps/web/src/app/organizations/members/people.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/people.component.ts @@ -17,7 +17,6 @@ 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 { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; @@ -27,23 +26,24 @@ import { OrganizationUserBulkResponse, OrganizationUserUserDetailsResponse, } from "@bitwarden/common/abstractions/organization-user/responses"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction as PolicyApiService } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.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 { 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 { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; +import { Collection } from "@bitwarden/common/admin-console/models/domain/collection"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request"; +import { CollectionDetailsResponse } from "@bitwarden/common/admin-console/models/response/collection.response"; import { ProductType } from "@bitwarden/common/enums/productType"; -import { CollectionData } from "@bitwarden/common/models/data/collection.data"; -import { Collection } from "@bitwarden/common/models/domain/collection"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organization-keys.request"; -import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collection.response"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { @@ -53,15 +53,15 @@ import { SimpleDialogType, } from "@bitwarden/components"; -import { BasePeopleComponent } from "../../common/base.people.component"; -import { GroupService } from "../core"; -import { OrganizationUserView } from "../core/views/organization-user.view"; -import { EntityEventsComponent } from "../manage/entity-events.component"; +import { EntityEventsComponent } from "../../../admin-console/organizations/manage/entity-events.component"; +import { BasePeopleComponent } from "../../../common/base.people.component"; +import { GroupService } from "../../../organizations/core"; +import { OrganizationUserView } from "../../../organizations/core/views/organization-user.view"; +import { BulkConfirmComponent } from "../../../organizations/members/components/bulk/bulk-confirm.component"; +import { BulkRemoveComponent } from "../../../organizations/members/components/bulk/bulk-remove.component"; +import { BulkRestoreRevokeComponent } from "../../../organizations/members/components/bulk/bulk-restore-revoke.component"; +import { BulkStatusComponent } from "../../../organizations/members/components/bulk/bulk-status.component"; -import { BulkConfirmComponent } from "./components/bulk/bulk-confirm.component"; -import { BulkRemoveComponent } from "./components/bulk/bulk-remove.component"; -import { BulkRestoreRevokeComponent } from "./components/bulk/bulk-restore-revoke.component"; -import { BulkStatusComponent } from "./components/bulk/bulk-status.component"; import { MemberDialogResult, MemberDialogTab, diff --git a/apps/web/src/app/organizations/organization-routing.module.ts b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts similarity index 62% rename from apps/web/src/app/organizations/organization-routing.module.ts rename to apps/web/src/app/admin-console/organizations/organization-routing.module.ts index 0f54d6150c..350847e7a3 100644 --- a/apps/web/src/app/organizations/organization-routing.module.ts +++ b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts @@ -9,17 +9,16 @@ import { canAccessVaultTab, canAccessReportingTab, canAccessSettingsTab, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { VaultModule } from "../vault/org-vault/vault.module"; - -import { OrganizationPermissionsGuard } from "./guards/org-permissions.guard"; -import { OrganizationRedirectGuard } from "./guards/org-redirect.guard"; -import { OrganizationLayoutComponent } from "./layouts/organization-layout.component"; -import { CollectionsComponent } from "./manage/collections.component"; -import { GroupsComponent } from "./manage/groups.component"; -import { ManageComponent } from "./manage/manage.component"; +import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard"; +import { OrganizationRedirectGuard } from "../../admin-console/organizations/guards/org-redirect.guard"; +import { OrganizationLayoutComponent } from "../../admin-console/organizations/layouts/organization-layout.component"; +import { CollectionsComponent } from "../../admin-console/organizations/manage/collections.component"; +import { GroupsComponent } from "../../admin-console/organizations/manage/groups.component"; +import { ManageComponent } from "../../admin-console/organizations/manage/manage.component"; +import { VaultModule } from "../../vault/org-vault/vault.module"; const routes: Routes = [ { @@ -45,11 +44,14 @@ const routes: Routes = [ }, { path: "settings", - loadChildren: () => import("./settings").then((m) => m.OrganizationSettingsModule), + loadChildren: () => + import("./settings/organization-settings.module").then( + (m) => m.OrganizationSettingsModule + ), }, { path: "members", - loadChildren: () => import("./members").then((m) => m.MembersModule), + loadChildren: () => import("../../organizations/members").then((m) => m.MembersModule), }, { path: "groups", @@ -76,14 +78,16 @@ const routes: Routes = [ { path: "reporting", loadChildren: () => - import("./reporting/organization-reporting.module").then( + import("../organizations/reporting/organization-reporting.module").then( (m) => m.OrganizationReportingModule ), }, { path: "billing", loadChildren: () => - import("./billing/organization-billing.module").then((m) => m.OrganizationBillingModule), + import("../../billing/organizations/organization-billing.module").then( + (m) => m.OrganizationBillingModule + ), }, ], }, diff --git a/apps/web/src/app/organizations/policies/base-policy.component.ts b/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts similarity index 76% rename from apps/web/src/app/organizations/policies/base-policy.component.ts rename to apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts index ef9635acb6..2387a58de6 100644 --- a/apps/web/src/app/organizations/policies/base-policy.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts @@ -1,10 +1,10 @@ import { Directive, Input, OnInit } from "@angular/core"; import { UntypedFormControl, UntypedFormGroup } from "@angular/forms"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { PolicyRequest } from "@bitwarden/common/models/request/policy.request"; -import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request"; +import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response"; export abstract class BasePolicy { abstract name: string; diff --git a/apps/web/src/app/organizations/policies/disable-send.component.html b/apps/web/src/app/admin-console/organizations/policies/disable-send.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/disable-send.component.html rename to apps/web/src/app/admin-console/organizations/policies/disable-send.component.html diff --git a/apps/web/src/app/organizations/policies/disable-send.component.ts b/apps/web/src/app/admin-console/organizations/policies/disable-send.component.ts similarity index 85% rename from apps/web/src/app/organizations/policies/disable-send.component.ts rename to apps/web/src/app/admin-console/organizations/policies/disable-send.component.ts index 346627e703..4b65f52a87 100644 --- a/apps/web/src/app/organizations/policies/disable-send.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/disable-send.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/index.ts b/apps/web/src/app/admin-console/organizations/policies/index.ts similarity index 100% rename from apps/web/src/app/organizations/policies/index.ts rename to apps/web/src/app/admin-console/organizations/policies/index.ts diff --git a/apps/web/src/app/organizations/policies/master-password.component.html b/apps/web/src/app/admin-console/organizations/policies/master-password.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/master-password.component.html rename to apps/web/src/app/admin-console/organizations/policies/master-password.component.html diff --git a/apps/web/src/app/organizations/policies/master-password.component.ts b/apps/web/src/app/admin-console/organizations/policies/master-password.component.ts similarity index 89% rename from apps/web/src/app/organizations/policies/master-password.component.ts rename to apps/web/src/app/admin-console/organizations/policies/master-password.component.ts index a28a08ce9f..ae0abf8857 100644 --- a/apps/web/src/app/organizations/policies/master-password.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/master-password.component.ts @@ -2,8 +2,8 @@ import { Component } from "@angular/core"; import { UntypedFormBuilder } from "@angular/forms"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/password-generator.component.html b/apps/web/src/app/admin-console/organizations/policies/password-generator.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/password-generator.component.html rename to apps/web/src/app/admin-console/organizations/policies/password-generator.component.html diff --git a/apps/web/src/app/organizations/policies/password-generator.component.ts b/apps/web/src/app/admin-console/organizations/policies/password-generator.component.ts similarity index 94% rename from apps/web/src/app/organizations/policies/password-generator.component.ts rename to apps/web/src/app/admin-console/organizations/policies/password-generator.component.ts index f975aae3ef..2ce3109f2e 100644 --- a/apps/web/src/app/organizations/policies/password-generator.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/password-generator.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { UntypedFormBuilder } from "@angular/forms"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/personal-ownership.component.html b/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/personal-ownership.component.html rename to apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.html diff --git a/apps/web/src/app/organizations/policies/personal-ownership.component.ts b/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.ts similarity index 86% rename from apps/web/src/app/organizations/policies/personal-ownership.component.ts rename to apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.ts index 2caeaf168d..97726c8fc6 100644 --- a/apps/web/src/app/organizations/policies/personal-ownership.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/policies.component.html b/apps/web/src/app/admin-console/organizations/policies/policies.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/policies.component.html rename to apps/web/src/app/admin-console/organizations/policies/policies.component.html diff --git a/apps/web/src/app/organizations/policies/policies.component.ts b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts similarity index 86% rename from apps/web/src/app/organizations/policies/policies.component.ts rename to apps/web/src/app/admin-console/organizations/policies/policies.component.ts index 717e35ac96..4300763f36 100644 --- a/apps/web/src/app/organizations/policies/policies.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts @@ -3,13 +3,13 @@ import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response"; -import { PolicyListService } from "../../core"; +import { PolicyListService } from "../../../core"; import { BasePolicy } from "../policies"; import { PolicyEditComponent } from "./policy-edit.component"; diff --git a/apps/web/src/app/organizations/policies/policies.module.ts b/apps/web/src/app/admin-console/organizations/policies/policies.module.ts similarity index 96% rename from apps/web/src/app/organizations/policies/policies.module.ts rename to apps/web/src/app/admin-console/organizations/policies/policies.module.ts index 37b4d63c33..c6b1fbe4bf 100644 --- a/apps/web/src/app/organizations/policies/policies.module.ts +++ b/apps/web/src/app/admin-console/organizations/policies/policies.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { LooseComponentsModule, SharedModule } from "../../shared"; +import { LooseComponentsModule, SharedModule } from "../../../shared"; import { DisableSendPolicyComponent } from "./disable-send.component"; import { MasterPasswordPolicyComponent } from "./master-password.component"; diff --git a/apps/web/src/app/organizations/policies/policy-edit.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/policy-edit.component.html rename to apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html diff --git a/apps/web/src/app/organizations/policies/policy-edit.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts similarity index 89% rename from apps/web/src/app/organizations/policies/policy-edit.component.ts rename to apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts index 908c6ff6f7..456ae1b33c 100644 --- a/apps/web/src/app/organizations/policies/policy-edit.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts @@ -12,10 +12,10 @@ import { import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { PolicyRequest } from "@bitwarden/common/models/request/policy.request"; -import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; +import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request"; +import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response"; import { BasePolicy, BasePolicyComponent } from "../policies"; diff --git a/apps/web/src/app/organizations/policies/require-sso.component.html b/apps/web/src/app/admin-console/organizations/policies/require-sso.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/require-sso.component.html rename to apps/web/src/app/admin-console/organizations/policies/require-sso.component.html diff --git a/apps/web/src/app/organizations/policies/require-sso.component.ts b/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts similarity index 79% rename from apps/web/src/app/organizations/policies/require-sso.component.ts rename to apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts index a56f36c7f7..15ee6625a9 100644 --- a/apps/web/src/app/organizations/policies/require-sso.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { PolicyRequest } from "@bitwarden/common/models/request/policy.request"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/reset-password.component.html b/apps/web/src/app/admin-console/organizations/policies/reset-password.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/reset-password.component.html rename to apps/web/src/app/admin-console/organizations/policies/reset-password.component.html diff --git a/apps/web/src/app/organizations/policies/reset-password.component.ts b/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts similarity index 79% rename from apps/web/src/app/organizations/policies/reset-password.component.ts rename to apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts index 6f7fb26551..b993a193f2 100644 --- a/apps/web/src/app/organizations/policies/reset-password.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; import { UntypedFormBuilder } from "@angular/forms"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/send-options.component.html b/apps/web/src/app/admin-console/organizations/policies/send-options.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/send-options.component.html rename to apps/web/src/app/admin-console/organizations/policies/send-options.component.html diff --git a/apps/web/src/app/organizations/policies/send-options.component.ts b/apps/web/src/app/admin-console/organizations/policies/send-options.component.ts similarity index 89% rename from apps/web/src/app/organizations/policies/send-options.component.ts rename to apps/web/src/app/admin-console/organizations/policies/send-options.component.ts index 21e07e478c..381db785cd 100644 --- a/apps/web/src/app/organizations/policies/send-options.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/send-options.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { UntypedFormBuilder } from "@angular/forms"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/single-org.component.html b/apps/web/src/app/admin-console/organizations/policies/single-org.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/single-org.component.html rename to apps/web/src/app/admin-console/organizations/policies/single-org.component.html diff --git a/apps/web/src/app/organizations/policies/single-org.component.ts b/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts similarity index 87% rename from apps/web/src/app/organizations/policies/single-org.component.ts rename to apps/web/src/app/admin-console/organizations/policies/single-org.component.ts index 8b34d132df..0b2aeeb2b9 100644 --- a/apps/web/src/app/organizations/policies/single-org.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { PolicyRequest } from "@bitwarden/common/models/request/policy.request"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/two-factor-authentication.component.html b/apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.html similarity index 100% rename from apps/web/src/app/organizations/policies/two-factor-authentication.component.html rename to apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.html diff --git a/apps/web/src/app/organizations/policies/two-factor-authentication.component.ts b/apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.ts similarity index 87% rename from apps/web/src/app/organizations/policies/two-factor-authentication.component.ts rename to apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.ts index d1c4df60d4..9965e1a3e6 100644 --- a/apps/web/src/app/organizations/policies/two-factor-authentication.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/reporting/organization-reporting-routing.module.ts b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts similarity index 76% rename from apps/web/src/app/organizations/reporting/organization-reporting-routing.module.ts rename to apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts index dae0e6d7de..72a72857ca 100644 --- a/apps/web/src/app/organizations/reporting/organization-reporting-routing.module.ts +++ b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts @@ -1,17 +1,17 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { canAccessReportingTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { canAccessReportingTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { ExposedPasswordsReportComponent } from "../../../admin-console/organizations/tools/exposed-passwords-report.component"; +import { InactiveTwoFactorReportComponent } from "../../../admin-console/organizations/tools/inactive-two-factor-report.component"; +import { ReusedPasswordsReportComponent } from "../../../admin-console/organizations/tools/reused-passwords-report.component"; +import { UnsecuredWebsitesReportComponent } from "../../../admin-console/organizations/tools/unsecured-websites-report.component"; +import { WeakPasswordsReportComponent } from "../../../admin-console/organizations/tools/weak-passwords-report.component"; import { OrganizationPermissionsGuard } from "../guards/org-permissions.guard"; import { OrganizationRedirectGuard } from "../guards/org-redirect.guard"; import { EventsComponent } from "../manage/events.component"; -import { ExposedPasswordsReportComponent } from "../tools/exposed-passwords-report.component"; -import { InactiveTwoFactorReportComponent } from "../tools/inactive-two-factor-report.component"; -import { ReusedPasswordsReportComponent } from "../tools/reused-passwords-report.component"; -import { UnsecuredWebsitesReportComponent } from "../tools/unsecured-websites-report.component"; -import { WeakPasswordsReportComponent } from "../tools/weak-passwords-report.component"; import { ReportingComponent } from "./reporting.component"; import { ReportsHomeComponent } from "./reports-home.component"; diff --git a/apps/web/src/app/organizations/reporting/organization-reporting.module.ts b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts similarity index 79% rename from apps/web/src/app/organizations/reporting/organization-reporting.module.ts rename to apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts index 846798ae01..03bcd28a51 100644 --- a/apps/web/src/app/organizations/reporting/organization-reporting.module.ts +++ b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; -import { ReportsSharedModule } from "../../reports"; -import { SharedModule } from "../../shared/shared.module"; +import { ReportsSharedModule } from "../../../reports"; +import { SharedModule } from "../../../shared/shared.module"; import { OrganizationReportingRoutingModule } from "./organization-reporting-routing.module"; import { ReportingComponent } from "./reporting.component"; diff --git a/apps/web/src/app/organizations/reporting/reporting.component.html b/apps/web/src/app/admin-console/organizations/reporting/reporting.component.html similarity index 100% rename from apps/web/src/app/organizations/reporting/reporting.component.html rename to apps/web/src/app/admin-console/organizations/reporting/reporting.component.html diff --git a/apps/web/src/app/organizations/reporting/reporting.component.ts b/apps/web/src/app/admin-console/organizations/reporting/reporting.component.ts similarity index 79% rename from apps/web/src/app/organizations/reporting/reporting.component.ts rename to apps/web/src/app/admin-console/organizations/reporting/reporting.component.ts index 6b6f88b342..e7998c1de5 100644 --- a/apps/web/src/app/organizations/reporting/reporting.component.ts +++ b/apps/web/src/app/admin-console/organizations/reporting/reporting.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { map, Observable, shareReplay, startWith, switchMap } from "rxjs"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @Component({ selector: "app-org-reporting", diff --git a/apps/web/src/app/organizations/reporting/reports-home.component.html b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.html similarity index 100% rename from apps/web/src/app/organizations/reporting/reports-home.component.html rename to apps/web/src/app/admin-console/organizations/reporting/reports-home.component.html diff --git a/apps/web/src/app/organizations/reporting/reports-home.component.ts b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts similarity index 98% rename from apps/web/src/app/organizations/reporting/reports-home.component.ts rename to apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts index 3789909364..dba7c86984 100644 --- a/apps/web/src/app/organizations/reporting/reports-home.component.ts +++ b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts @@ -4,7 +4,7 @@ import { filter, Subject, takeUntil } from "rxjs"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { ReportVariant, reports, ReportType, ReportEntry } from "../../reports"; +import { ReportVariant, reports, ReportType, ReportEntry } from "../../../reports"; @Component({ selector: "app-org-reports-home", diff --git a/apps/web/src/app/organizations/settings/account.component.html b/apps/web/src/app/admin-console/organizations/settings/account.component.html similarity index 100% rename from apps/web/src/app/organizations/settings/account.component.html rename to apps/web/src/app/admin-console/organizations/settings/account.component.html diff --git a/apps/web/src/app/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts similarity index 87% rename from apps/web/src/app/organizations/settings/account.component.ts rename to apps/web/src/app/admin-console/organizations/settings/account.component.ts index 1f37993d7d..75dae9015a 100644 --- a/apps/web/src/app/organizations/settings/account.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts @@ -5,15 +5,15 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organization-keys.request"; -import { OrganizationUpdateRequest } from "@bitwarden/common/models/request/organization-update.request"; -import { OrganizationResponse } from "@bitwarden/common/models/response/organization.response"; +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 { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request"; +import { OrganizationUpdateRequest } from "@bitwarden/common/admin-console/models/request/organization-update.request"; +import { OrganizationResponse } from "@bitwarden/common/admin-console/models/response/organization.response"; -import { ApiKeyComponent } from "../../settings/api-key.component"; -import { PurgeVaultComponent } from "../../settings/purge-vault.component"; +import { ApiKeyComponent } from "../../../settings/api-key.component"; +import { PurgeVaultComponent } from "../../../settings/purge-vault.component"; import { DeleteOrganizationComponent } from "./delete-organization.component"; diff --git a/apps/web/src/app/organizations/settings/delete-organization.component.html b/apps/web/src/app/admin-console/organizations/settings/delete-organization.component.html similarity index 100% rename from apps/web/src/app/organizations/settings/delete-organization.component.html rename to apps/web/src/app/admin-console/organizations/settings/delete-organization.component.html diff --git a/apps/web/src/app/organizations/settings/delete-organization.component.ts b/apps/web/src/app/admin-console/organizations/settings/delete-organization.component.ts similarity index 95% rename from apps/web/src/app/organizations/settings/delete-organization.component.ts rename to apps/web/src/app/admin-console/organizations/settings/delete-organization.component.ts index 279d2f3289..cec096955a 100644 --- a/apps/web/src/app/organizations/settings/delete-organization.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/delete-organization.component.ts @@ -2,10 +2,10 @@ import { Component, EventEmitter, OnInit, Output } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; +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 { Utils } from "@bitwarden/common/misc/utils"; import { Verification } from "@bitwarden/common/types/verification"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/apps/web/src/app/organizations/settings/index.ts b/apps/web/src/app/admin-console/organizations/settings/index.ts similarity index 100% rename from apps/web/src/app/organizations/settings/index.ts rename to apps/web/src/app/admin-console/organizations/settings/index.ts diff --git a/apps/web/src/app/organizations/settings/organization-settings-routing.module.ts b/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts similarity index 80% rename from apps/web/src/app/organizations/settings/organization-settings-routing.module.ts rename to apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts index b36e82b152..c75a697140 100644 --- a/apps/web/src/app/organizations/settings/organization-settings-routing.module.ts +++ b/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { canAccessSettingsTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { OrganizationPermissionsGuard } from "../guards/org-permissions.guard"; -import { OrganizationRedirectGuard } from "../guards/org-redirect.guard"; -import { PoliciesComponent } from "../policies"; +import { OrganizationPermissionsGuard } from "../../organizations/guards/org-permissions.guard"; +import { OrganizationRedirectGuard } from "../../organizations/guards/org-redirect.guard"; +import { PoliciesComponent } from "../../organizations/policies"; import { AccountComponent } from "./account.component"; import { SettingsComponent } from "./settings.component"; diff --git a/apps/web/src/app/organizations/settings/organization-settings.module.ts b/apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts similarity index 83% rename from apps/web/src/app/organizations/settings/organization-settings.module.ts rename to apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts index 1c5b72552c..0b22c66d1e 100644 --- a/apps/web/src/app/organizations/settings/organization-settings.module.ts +++ b/apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; -import { LooseComponentsModule, SharedModule } from "../../shared"; -import { PoliciesModule } from "../policies"; +import { LooseComponentsModule, SharedModule } from "../../../shared"; +import { PoliciesModule } from "../../organizations/policies"; import { AccountComponent } from "./account.component"; import { DeleteOrganizationComponent } from "./delete-organization.component"; diff --git a/apps/web/src/app/organizations/settings/settings.component.html b/apps/web/src/app/admin-console/organizations/settings/settings.component.html similarity index 100% rename from apps/web/src/app/organizations/settings/settings.component.html rename to apps/web/src/app/admin-console/organizations/settings/settings.component.html diff --git a/apps/web/src/app/organizations/settings/settings.component.ts b/apps/web/src/app/admin-console/organizations/settings/settings.component.ts similarity index 72% rename from apps/web/src/app/organizations/settings/settings.component.ts rename to apps/web/src/app/admin-console/organizations/settings/settings.component.ts index b6ab227490..4590432736 100644 --- a/apps/web/src/app/organizations/settings/settings.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/settings.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { Observable, switchMap } from "rxjs"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @Component({ selector: "app-org-settings", diff --git a/apps/web/src/app/organizations/settings/two-factor-setup.component.ts b/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts similarity index 86% rename from apps/web/src/app/organizations/settings/two-factor-setup.component.ts rename to apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts index 97179ab7aa..a89a68298a 100644 --- a/apps/web/src/app/organizations/settings/two-factor-setup.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts @@ -4,16 +4,16 @@ import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; -import { TwoFactorDuoComponent } from "../../../auth/settings/two-factor-duo.component"; -import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../../auth/settings/two-factor-setup.component"; +import { TwoFactorDuoComponent } from "../../../../auth/settings/two-factor-duo.component"; +import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../../../auth/settings/two-factor-setup.component"; @Component({ selector: "app-two-factor-setup", - templateUrl: "../../../auth/settings/two-factor-setup.component.html", + templateUrl: "../../../../auth/settings/two-factor-setup.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent { diff --git a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.html b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html similarity index 100% rename from apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.html rename to apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html diff --git a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.spec.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.spec.ts similarity index 96% rename from apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.spec.ts rename to apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.spec.ts index 145f1ad11e..172d32b494 100644 --- a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.spec.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; import { AvatarModule, BadgeModule, @@ -15,7 +15,7 @@ import { } from "@bitwarden/components"; import { SelectItemView } from "@bitwarden/components/src/multi-select/models/select-item-view"; -import { PreloadedEnglishI18nModule } from "../../../../tests/preloaded-english-i18n.module"; +import { PreloadedEnglishI18nModule } from "../../../../../tests/preloaded-english-i18n.module"; import { AccessSelectorComponent, PermissionMode } from "./access-selector.component"; import { AccessItemType, CollectionPermission } from "./access-selector.models"; diff --git a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.ts similarity index 100% rename from apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.ts rename to apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.ts diff --git a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.models.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts similarity index 91% rename from apps/web/src/app/organizations/shared/components/access-selector/access-selector.models.ts rename to apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts index 678c3bc873..d0a181e5bd 100644 --- a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.models.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts @@ -1,8 +1,8 @@ -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; import { SelectItemView } from "@bitwarden/components"; -import { CollectionAccessSelectionView } from "../../../core"; +import { CollectionAccessSelectionView } from "../../../../../organizations/core"; /** * Permission options that replace/correspond with readOnly and hidePassword server fields. diff --git a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.module.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.module.ts similarity index 83% rename from apps/web/src/app/organizations/shared/components/access-selector/access-selector.module.ts rename to apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.module.ts index 9bd0139f32..f907b08aa8 100644 --- a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.module.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../../../shared/shared.module"; +import { SharedModule } from "../../../../../shared"; import { AccessSelectorComponent } from "./access-selector.component"; import { UserTypePipe } from "./user-type.pipe"; diff --git a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.stories.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.stories.ts similarity index 97% rename from apps/web/src/app/organizations/shared/components/access-selector/access-selector.stories.ts rename to apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.stories.ts index 16edca9a4c..a663e94981 100644 --- a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.stories.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.stories.ts @@ -3,8 +3,8 @@ import { action } from "@storybook/addon-actions"; import { Meta, moduleMetadata, Story } from "@storybook/angular"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; import { AvatarModule, BadgeModule, @@ -16,7 +16,7 @@ import { TabsModule, } from "@bitwarden/components"; -import { PreloadedEnglishI18nModule } from "../../../../tests/preloaded-english-i18n.module"; +import { PreloadedEnglishI18nModule } from "../../../../../tests/preloaded-english-i18n.module"; import { AccessSelectorComponent } from "./access-selector.component"; import { AccessItemType, AccessItemView, CollectionPermission } from "./access-selector.models"; diff --git a/apps/web/src/app/organizations/shared/components/access-selector/index.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/index.ts similarity index 100% rename from apps/web/src/app/organizations/shared/components/access-selector/index.ts rename to apps/web/src/app/admin-console/organizations/shared/components/access-selector/index.ts diff --git a/apps/web/src/app/organizations/shared/components/access-selector/user-type.pipe.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/user-type.pipe.ts similarity index 89% rename from apps/web/src/app/organizations/shared/components/access-selector/user-type.pipe.ts rename to apps/web/src/app/admin-console/organizations/shared/components/access-selector/user-type.pipe.ts index 6ef78cb65e..d6e478f7ea 100644 --- a/apps/web/src/app/organizations/shared/components/access-selector/user-type.pipe.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/user-type.pipe.ts @@ -1,7 +1,7 @@ import { Pipe, PipeTransform } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; @Pipe({ name: "userType", diff --git a/apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.component.html b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.html similarity index 100% rename from apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.component.html rename to apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.html diff --git a/apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts similarity index 96% rename from apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.component.ts rename to apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts index 236a3fd8ca..30d1767a61 100644 --- a/apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.component.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts @@ -6,10 +6,10 @@ import { combineLatest, of, shareReplay, Subject, switchMap, takeUntil } from "r import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CollectionView } from "@bitwarden/common/src/models/view/collection.view"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { BitValidators, DialogService } from "@bitwarden/components"; import { @@ -17,7 +17,7 @@ import { CollectionAdminView, GroupService, GroupView, -} from "../../../core"; +} from "../../../../../organizations/core"; import { AccessItemType, AccessItemValue, diff --git a/apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.module.ts b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.module.ts similarity index 66% rename from apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.module.ts rename to apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.module.ts index c5817eee63..4f9b19e62a 100644 --- a/apps/web/src/app/organizations/shared/components/collection-dialog/collection-dialog.module.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.module.ts @@ -2,8 +2,8 @@ import { NgModule } from "@angular/core"; import { SelectModule } from "@bitwarden/components"; -import { SharedModule } from "../../../../shared/shared.module"; -import { AccessSelectorModule } from "../access-selector"; +import { AccessSelectorModule } from "../../../../../admin-console/organizations/shared/components/access-selector/access-selector.module"; +import { SharedModule } from "../../../../../shared"; import { CollectionDialogComponent } from "./collection-dialog.component"; diff --git a/apps/web/src/app/organizations/shared/components/collection-dialog/index.ts b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/index.ts similarity index 100% rename from apps/web/src/app/organizations/shared/components/collection-dialog/index.ts rename to apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/index.ts diff --git a/apps/web/src/app/organizations/sponsorships/accept-family-sponsorship.component.html b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html similarity index 100% rename from apps/web/src/app/organizations/sponsorships/accept-family-sponsorship.component.html rename to apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html diff --git a/apps/web/src/app/organizations/sponsorships/accept-family-sponsorship.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts similarity index 91% rename from apps/web/src/app/organizations/sponsorships/accept-family-sponsorship.component.ts rename to apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts index ea92159dc1..0cd6a4c277 100644 --- a/apps/web/src/app/organizations/sponsorships/accept-family-sponsorship.component.ts +++ b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { Params } from "@angular/router"; -import { BaseAcceptComponent } from "../../common/base.accept.component"; +import { BaseAcceptComponent } from "../../../common/base.accept.component"; @Component({ selector: "app-accept-family-sponsorship", diff --git a/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.html b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.html similarity index 100% rename from apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.html rename to apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.html diff --git a/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts similarity index 90% rename from apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts rename to apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts index 0b7e291583..8c26c36e03 100644 --- a/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts +++ b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts @@ -6,18 +6,18 @@ import { first, map, takeUntil } from "rxjs/operators"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { PlanSponsorshipType } from "@bitwarden/common/enums/planSponsorshipType"; -import { PlanType } from "@bitwarden/common/enums/planType"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { OrganizationSponsorshipRedeemRequest } from "@bitwarden/common/admin-console/models/request/organization/organization-sponsorship-redeem.request"; +import { PlanSponsorshipType } from "@bitwarden/common/billing/enums/plan-sponsorship-type"; +import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; import { ProductType } from "@bitwarden/common/enums/productType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationSponsorshipRedeemRequest } from "@bitwarden/common/models/request/organization/organization-sponsorship-redeem.request"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { OrganizationPlansComponent } from "../../../billing/settings/organization-plans.component"; import { DeleteOrganizationComponent } from "../../organizations/settings"; -import { OrganizationPlansComponent } from "../../settings/organization-plans.component"; @Component({ selector: "families-for-enterprise-setup", diff --git a/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts similarity index 87% rename from apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts rename to apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts index ecc49e41fa..e61b02042f 100644 --- a/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts @@ -4,18 +4,18 @@ import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; // eslint-disable-next-line no-restricted-imports -import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent } from "../../reports/pages/exposed-passwords-report.component"; +import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent } from "../../../reports/pages/exposed-passwords-report.component"; @Component({ selector: "app-org-exposed-passwords-report", - templateUrl: "../../reports/pages/exposed-passwords-report.component.html", + templateUrl: "../../../reports/pages/exposed-passwords-report.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class ExposedPasswordsReportComponent extends BaseExposedPasswordsReportComponent { diff --git a/apps/web/src/app/organizations/tools/import-export/org-export.component.ts b/apps/web/src/app/admin-console/organizations/tools/import-export/org-export.component.ts similarity index 91% rename from apps/web/src/app/organizations/tools/import-export/org-export.component.ts rename to apps/web/src/app/admin-console/organizations/tools/import-export/org-export.component.ts index a7ab72edfa..b8dcec30b3 100644 --- a/apps/web/src/app/organizations/tools/import-export/org-export.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/import-export/org-export.component.ts @@ -10,15 +10,15 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { ExportComponent } from "../../../tools/import-export/export.component"; +import { ExportComponent } from "../../../../tools/import-export/export.component"; @Component({ selector: "app-org-export", - templateUrl: "../../../tools/import-export/export.component.html", + templateUrl: "../../../../tools/import-export/export.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class OrganizationExportComponent extends ExportComponent { diff --git a/apps/web/src/app/organizations/tools/import-export/org-import-export-routing.module.ts b/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export-routing.module.ts similarity index 81% rename from apps/web/src/app/organizations/tools/import-export/org-import-export-routing.module.ts rename to apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export-routing.module.ts index 145afc3cb7..c0430ab2e0 100644 --- a/apps/web/src/app/organizations/tools/import-export/org-import-export-routing.module.ts +++ b/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export-routing.module.ts @@ -1,9 +1,9 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { OrganizationPermissionsGuard } from "../../guards/org-permissions.guard"; +import { OrganizationPermissionsGuard } from "../../../../admin-console/organizations/guards/org-permissions.guard"; import { OrganizationExportComponent } from "./org-export.component"; import { OrganizationImportComponent } from "./org-import.component"; diff --git a/apps/web/src/app/organizations/tools/import-export/org-import-export.module.ts b/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts similarity index 90% rename from apps/web/src/app/organizations/tools/import-export/org-import-export.module.ts rename to apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts index 8429ea983a..c091294020 100644 --- a/apps/web/src/app/organizations/tools/import-export/org-import-export.module.ts +++ b/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts @@ -1,17 +1,17 @@ import { NgModule } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction"; import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import/import.service.abstraction"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { ImportApiService } from "@bitwarden/common/services/import/import-api.service"; import { ImportService } from "@bitwarden/common/services/import/import.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { LooseComponentsModule, SharedModule } from "../../../shared"; +import { LooseComponentsModule, SharedModule } from "../../../../shared"; import { OrganizationExportComponent } from "./org-export.component"; import { OrganizationImportExportRoutingModule } from "./org-import-export-routing.module"; diff --git a/apps/web/src/app/organizations/tools/import-export/org-import.component.ts b/apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts similarity index 84% rename from apps/web/src/app/organizations/tools/import-export/org-import.component.ts rename to apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts index d30e411b3a..7a73d1b613 100644 --- a/apps/web/src/app/organizations/tools/import-export/org-import.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts @@ -5,16 +5,16 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { ImportComponent } from "../../../tools/import-export/import.component"; +import { ImportComponent } from "../../../../tools/import-export/import.component"; @Component({ selector: "app-org-import", - templateUrl: "../../../tools/import-export/import.component.html", + templateUrl: "../../../../tools/import-export/import.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class OrganizationImportComponent extends ImportComponent { diff --git a/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts similarity index 85% rename from apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts rename to apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts index 69b3b9b6a6..4ba3c4ee4a 100644 --- a/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts @@ -4,17 +4,17 @@ import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; // eslint-disable-next-line no-restricted-imports -import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../../reports/pages/inactive-two-factor-report.component"; +import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../../../reports/pages/inactive-two-factor-report.component"; @Component({ selector: "app-inactive-two-factor-report", - templateUrl: "../../reports/pages/inactive-two-factor-report.component.html", + templateUrl: "../../../reports/pages/inactive-two-factor-report.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class InactiveTwoFactorReportComponent extends BaseInactiveTwoFactorReportComponent { diff --git a/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts similarity index 87% rename from apps/web/src/app/organizations/tools/reused-passwords-report.component.ts rename to apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts index 00526b5154..5cb2c7c20e 100644 --- a/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts @@ -3,19 +3,19 @@ import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; // eslint-disable-next-line no-restricted-imports -import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../../reports/pages/reused-passwords-report.component"; +import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../../../reports/pages/reused-passwords-report.component"; @Component({ selector: "app-reused-passwords-report", - templateUrl: "../../reports/pages/reused-passwords-report.component.html", + templateUrl: "../../../reports/pages/reused-passwords-report.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class ReusedPasswordsReportComponent extends BaseReusedPasswordsReportComponent { diff --git a/apps/web/src/app/organizations/tools/tools.component.html b/apps/web/src/app/admin-console/organizations/tools/tools.component.html similarity index 100% rename from apps/web/src/app/organizations/tools/tools.component.html rename to apps/web/src/app/admin-console/organizations/tools/tools.component.html diff --git a/apps/web/src/app/organizations/tools/tools.component.ts b/apps/web/src/app/admin-console/organizations/tools/tools.component.ts similarity index 84% rename from apps/web/src/app/organizations/tools/tools.component.ts rename to apps/web/src/app/admin-console/organizations/tools/tools.component.ts index e50320d7c8..1978dd194f 100644 --- a/apps/web/src/app/organizations/tools/tools.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/tools.component.ts @@ -2,8 +2,8 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @Component({ selector: "app-org-tools", diff --git a/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts similarity index 84% rename from apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts rename to apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts index 524947533a..f1db307a55 100644 --- a/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts @@ -3,17 +3,17 @@ import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; // eslint-disable-next-line no-restricted-imports -import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../../reports/pages/unsecured-websites-report.component"; +import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../../../reports/pages/unsecured-websites-report.component"; @Component({ selector: "app-unsecured-websites-report", - templateUrl: "../../reports/pages/unsecured-websites-report.component.html", + templateUrl: "../../../reports/pages/unsecured-websites-report.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class UnsecuredWebsitesReportComponent extends BaseUnsecuredWebsitesReportComponent { diff --git a/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts similarity index 88% rename from apps/web/src/app/organizations/tools/weak-passwords-report.component.ts rename to apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts index 19c58c4d54..d073cc0995 100644 --- a/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; @@ -11,11 +11,11 @@ import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; // eslint-disable-next-line no-restricted-imports -import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../../reports/pages/weak-passwords-report.component"; +import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../../../reports/pages/weak-passwords-report.component"; @Component({ selector: "app-weak-passwords-report", - templateUrl: "../../reports/pages/weak-passwords-report.component.html", + templateUrl: "../../../reports/pages/weak-passwords-report.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class WeakPasswordsReportComponent extends BaseWeakPasswordsReportComponent { diff --git a/apps/web/src/app/organizations/users/enroll-master-password-reset.component.html b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.html similarity index 100% rename from apps/web/src/app/organizations/users/enroll-master-password-reset.component.html rename to apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.html diff --git a/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts similarity index 95% rename from apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts rename to apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts index d47e73baac..eea6641de3 100644 --- a/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts +++ b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts @@ -7,11 +7,11 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { Utils } from "@bitwarden/common/misc/utils"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { Verification } from "@bitwarden/common/types/verification"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/web/src/app/organizations/users/organization-user.module.ts b/apps/web/src/app/admin-console/organizations/users/organization-user.module.ts similarity index 84% rename from apps/web/src/app/organizations/users/organization-user.module.ts rename to apps/web/src/app/admin-console/organizations/users/organization-user.module.ts index c9d14bc02b..6194cfbdff 100644 --- a/apps/web/src/app/organizations/users/organization-user.module.ts +++ b/apps/web/src/app/admin-console/organizations/users/organization-user.module.ts @@ -1,7 +1,7 @@ import { ScrollingModule } from "@angular/cdk/scrolling"; import { NgModule } from "@angular/core"; -import { LooseComponentsModule, SharedModule } from "../../shared"; +import { LooseComponentsModule, SharedModule } from "../../../shared"; import { EnrollMasterPasswordReset } from "./enroll-master-password-reset.component"; diff --git a/apps/web/src/app/providers/providers.component.html b/apps/web/src/app/admin-console/providers/providers.component.html similarity index 100% rename from apps/web/src/app/providers/providers.component.html rename to apps/web/src/app/admin-console/providers/providers.component.html diff --git a/apps/web/src/app/providers/providers.component.ts b/apps/web/src/app/admin-console/providers/providers.component.ts similarity index 89% rename from apps/web/src/app/providers/providers.component.ts rename to apps/web/src/app/admin-console/providers/providers.component.ts index 25fd211cb9..5d5f4737af 100644 --- a/apps/web/src/app/providers/providers.component.ts +++ b/apps/web/src/app/admin-console/providers/providers.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Utils } from "@bitwarden/common/misc/utils"; import { Provider } from "@bitwarden/common/models/domain/provider"; diff --git a/apps/web/src/app/settings/create-organization.component.html b/apps/web/src/app/admin-console/settings/create-organization.component.html similarity index 100% rename from apps/web/src/app/settings/create-organization.component.html rename to apps/web/src/app/admin-console/settings/create-organization.component.html diff --git a/apps/web/src/app/settings/create-organization.component.ts b/apps/web/src/app/admin-console/settings/create-organization.component.ts similarity index 88% rename from apps/web/src/app/settings/create-organization.component.ts rename to apps/web/src/app/admin-console/settings/create-organization.component.ts index 6cae85c940..c9ea819d0e 100644 --- a/apps/web/src/app/settings/create-organization.component.ts +++ b/apps/web/src/app/admin-console/settings/create-organization.component.ts @@ -2,10 +2,10 @@ import { Component, OnInit, ViewChild } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { PlanType } from "@bitwarden/common/enums/planType"; +import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; import { ProductType } from "@bitwarden/common/enums/productType"; -import { OrganizationPlansComponent } from "./organization-plans.component"; +import { OrganizationPlansComponent } from "../../billing/settings/organization-plans.component"; @Component({ selector: "app-create-organization", diff --git a/apps/web/src/app/settings/sponsored-families.component.html b/apps/web/src/app/admin-console/settings/sponsored-families.component.html similarity index 100% rename from apps/web/src/app/settings/sponsored-families.component.html rename to apps/web/src/app/admin-console/settings/sponsored-families.component.html diff --git a/apps/web/src/app/settings/sponsored-families.component.ts b/apps/web/src/app/admin-console/settings/sponsored-families.component.ts similarity index 92% rename from apps/web/src/app/settings/sponsored-families.component.ts rename to apps/web/src/app/admin-console/settings/sponsored-families.component.ts index aad04e2dd2..5c103e06c5 100644 --- a/apps/web/src/app/settings/sponsored-families.component.ts +++ b/apps/web/src/app/admin-console/settings/sponsored-families.component.ts @@ -5,11 +5,11 @@ import { map, Observable, Subject, takeUntil } from "rxjs"; import { notAllowedValueAsync } from "@bitwarden/angular/validators/notAllowedValueAsync.validator"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PlanSponsorshipType } from "@bitwarden/common/enums/planSponsorshipType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { PlanSponsorshipType } from "@bitwarden/common/billing/enums/plan-sponsorship-type"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; interface RequestSponsorshipForm { diff --git a/apps/web/src/app/settings/sponsoring-org-row.component.html b/apps/web/src/app/admin-console/settings/sponsoring-org-row.component.html similarity index 100% rename from apps/web/src/app/settings/sponsoring-org-row.component.html rename to apps/web/src/app/admin-console/settings/sponsoring-org-row.component.html diff --git a/apps/web/src/app/settings/sponsoring-org-row.component.ts b/apps/web/src/app/admin-console/settings/sponsoring-org-row.component.ts similarity index 98% rename from apps/web/src/app/settings/sponsoring-org-row.component.ts rename to apps/web/src/app/admin-console/settings/sponsoring-org-row.component.ts index db898e5cba..fd529ab1fb 100644 --- a/apps/web/src/app/settings/sponsoring-org-row.component.ts +++ b/apps/web/src/app/admin-console/settings/sponsoring-org-row.component.ts @@ -6,7 +6,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @Component({ selector: "[sponsoring-org-row]", diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts index d3b3e57e8d..1e5d72e988 100644 --- a/apps/web/src/app/app.component.ts +++ b/apps/web/src/app/app.component.ts @@ -8,17 +8,17 @@ import { Subject, takeUntil } from "rxjs"; import Swal from "sweetalert2"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @@ -26,7 +26,6 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { PolicyListService, RouterService } from "./core"; import { DisableSendPolicy, MasterPasswordPolicy, @@ -37,7 +36,8 @@ import { SendOptionsPolicy, SingleOrgPolicy, TwoFactorAuthenticationPolicy, -} from "./organizations/policies"; +} from "./admin-console/organizations/policies"; +import { PolicyListService, RouterService } from "./core"; const BroadcasterSubscriptionId = "AppComponent"; const IdleTimeout = 60000 * 10; // 10 minutes diff --git a/apps/web/src/app/accounts/trial-initiation/billing.component.html b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/billing.component.html rename to apps/web/src/app/billing/accounts/trial-initiation/billing.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/billing.component.ts b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts similarity index 87% rename from apps/web/src/app/accounts/trial-initiation/billing.component.ts rename to apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts index b75258e6c9..3be5e4a069 100644 --- a/apps/web/src/app/accounts/trial-initiation/billing.component.ts +++ b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts @@ -7,10 +7,10 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +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 { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { ProductType } from "@bitwarden/common/enums/productType"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/web/src/app/organizations/billing/adjust-subscription.component.html b/apps/web/src/app/billing/organizations/adjust-subscription.component.html similarity index 100% rename from apps/web/src/app/organizations/billing/adjust-subscription.component.html rename to apps/web/src/app/billing/organizations/adjust-subscription.component.html diff --git a/apps/web/src/app/organizations/billing/adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts similarity index 93% rename from apps/web/src/app/organizations/billing/adjust-subscription.component.ts rename to apps/web/src/app/billing/organizations/adjust-subscription.component.ts index 00dd0cce30..ae75b5c339 100644 --- a/apps/web/src/app/organizations/billing/adjust-subscription.component.ts +++ b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts @@ -2,9 +2,9 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationSubscriptionUpdateRequest } from "@bitwarden/common/models/request/organization-subscription-update.request"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { OrganizationSubscriptionUpdateRequest } from "@bitwarden/common/billing/models/request/organization-subscription-update.request"; @Component({ selector: "app-adjust-subscription", diff --git a/apps/web/src/app/organizations/billing/billing-sync-api-key.component.html b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html similarity index 100% rename from apps/web/src/app/organizations/billing/billing-sync-api-key.component.html rename to apps/web/src/app/billing/organizations/billing-sync-api-key.component.html diff --git a/apps/web/src/app/organizations/billing/billing-sync-api-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts similarity index 95% rename from apps/web/src/app/organizations/billing/billing-sync-api-key.component.ts rename to apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts index a23bf68977..ab3c45212b 100644 --- a/apps/web/src/app/organizations/billing/billing-sync-api-key.component.ts +++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts @@ -3,10 +3,10 @@ import { Component } from "@angular/core"; import { ModalConfig } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { OrganizationApiKeyType } from "@bitwarden/common/auth/enums/organization-api-key-type"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { OrganizationApiKeyType } from "@bitwarden/common/admin-console/enums/organization-api-key-type"; import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response"; import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organization-api-key.request"; import { Verification } from "@bitwarden/common/types/verification"; diff --git a/apps/web/src/app/organizations/billing/change-plan.component.html b/apps/web/src/app/billing/organizations/change-plan.component.html similarity index 100% rename from apps/web/src/app/organizations/billing/change-plan.component.html rename to apps/web/src/app/billing/organizations/change-plan.component.html diff --git a/apps/web/src/app/organizations/billing/change-plan.component.ts b/apps/web/src/app/billing/organizations/change-plan.component.ts similarity index 92% rename from apps/web/src/app/organizations/billing/change-plan.component.ts rename to apps/web/src/app/billing/organizations/change-plan.component.ts index fcdc56d444..b27de8b622 100644 --- a/apps/web/src/app/organizations/billing/change-plan.component.ts +++ b/apps/web/src/app/billing/organizations/change-plan.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlanType } from "@bitwarden/common/enums/planType"; +import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; import { ProductType } from "@bitwarden/common/enums/productType"; @Component({ diff --git a/apps/web/src/app/organizations/billing/download-license.component.html b/apps/web/src/app/billing/organizations/download-license.component.html similarity index 100% rename from apps/web/src/app/organizations/billing/download-license.component.html rename to apps/web/src/app/billing/organizations/download-license.component.html diff --git a/apps/web/src/app/organizations/billing/download-license.component.ts b/apps/web/src/app/billing/organizations/download-license.component.ts similarity index 94% rename from apps/web/src/app/organizations/billing/download-license.component.ts rename to apps/web/src/app/billing/organizations/download-license.component.ts index 5cad1c3b22..cecc704a43 100644 --- a/apps/web/src/app/organizations/billing/download-license.component.ts +++ b/apps/web/src/app/billing/organizations/download-license.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; @Component({ selector: "app-download-license", diff --git a/apps/web/src/app/organizations/billing/organization-billing-history-view.component.html b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.html similarity index 100% rename from apps/web/src/app/organizations/billing/organization-billing-history-view.component.html rename to apps/web/src/app/billing/organizations/organization-billing-history-view.component.html diff --git a/apps/web/src/app/organizations/billing/organization-billing-history-view.component.ts b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts similarity index 86% rename from apps/web/src/app/organizations/billing/organization-billing-history-view.component.ts rename to apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts index c352bb83f1..22cea10acb 100644 --- a/apps/web/src/app/organizations/billing/organization-billing-history-view.component.ts +++ b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts @@ -2,8 +2,8 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { concatMap, Subject, takeUntil } from "rxjs"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { BillingHistoryResponse } from "@bitwarden/common/models/response/billing-history.response"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response"; @Component({ selector: "app-org-billing-history-view", diff --git a/apps/web/src/app/organizations/billing/organization-billing-routing.module.ts b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts similarity index 81% rename from apps/web/src/app/organizations/billing/organization-billing-routing.module.ts rename to apps/web/src/app/billing/organizations/organization-billing-routing.module.ts index e296175eda..5ba8ab4415 100644 --- a/apps/web/src/app/organizations/billing/organization-billing-routing.module.ts +++ b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { canAccessBillingTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { canAccessBillingTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard"; +import { PaymentMethodComponent } from "../../billing/settings/payment-method.component"; import { WebPlatformUtilsService } from "../../core/web-platform-utils.service"; -import { PaymentMethodComponent } from "../../settings/payment-method.component"; -import { OrganizationPermissionsGuard } from "../guards/org-permissions.guard"; import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component"; import { OrganizationBillingTabComponent } from "./organization-billing-tab.component"; diff --git a/apps/web/src/app/organizations/billing/organization-billing-tab.component.html b/apps/web/src/app/billing/organizations/organization-billing-tab.component.html similarity index 100% rename from apps/web/src/app/organizations/billing/organization-billing-tab.component.html rename to apps/web/src/app/billing/organizations/organization-billing-tab.component.html diff --git a/apps/web/src/app/organizations/billing/organization-billing-tab.component.ts b/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts similarity index 87% rename from apps/web/src/app/organizations/billing/organization-billing-tab.component.ts rename to apps/web/src/app/billing/organizations/organization-billing-tab.component.ts index 3f041dca2f..8acf90254e 100644 --- a/apps/web/src/app/organizations/billing/organization-billing-tab.component.ts +++ b/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { map, Observable, switchMap } from "rxjs"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; @Component({ selector: "app-org-billing-tab", diff --git a/apps/web/src/app/organizations/billing/organization-billing.module.ts b/apps/web/src/app/billing/organizations/organization-billing.module.ts similarity index 93% rename from apps/web/src/app/organizations/billing/organization-billing.module.ts rename to apps/web/src/app/billing/organizations/organization-billing.module.ts index 17d825fbae..34d1d0722a 100644 --- a/apps/web/src/app/organizations/billing/organization-billing.module.ts +++ b/apps/web/src/app/billing/organizations/organization-billing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from "@angular/core"; +import { SecretsManagerEnrollComponent } from "../../organizations/billing/secrets-manager/enroll.component"; import { LooseComponentsModule, SharedModule } from "../../shared"; import { AdjustSubscription } from "./adjust-subscription.component"; @@ -11,7 +12,6 @@ import { OrganizationBillingRoutingModule } from "./organization-billing-routing import { OrganizationBillingTabComponent } from "./organization-billing-tab.component"; import { OrganizationSubscriptionCloudComponent } from "./organization-subscription-cloud.component"; import { OrganizationSubscriptionSelfhostComponent } from "./organization-subscription-selfhost.component"; -import { SecretsManagerEnrollComponent } from "./secrets-manager/enroll.component"; import { SubscriptionHiddenComponent } from "./subscription-hidden.component"; @NgModule({ diff --git a/apps/web/src/app/organizations/billing/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html similarity index 100% rename from apps/web/src/app/organizations/billing/organization-subscription-cloud.component.html rename to apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html diff --git a/apps/web/src/app/organizations/billing/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts similarity index 94% rename from apps/web/src/app/organizations/billing/organization-subscription-cloud.component.ts rename to apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts index d0884032a5..1a4fa29201 100644 --- a/apps/web/src/app/organizations/billing/organization-subscription-cloud.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts @@ -6,13 +6,13 @@ import { ModalConfig, ModalService } from "@bitwarden/angular/services/modal.ser import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationApiKeyType } from "@bitwarden/common/auth/enums/organization-api-key-type"; -import { PlanType } from "@bitwarden/common/enums/planType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationSubscriptionResponse } from "@bitwarden/common/models/response/organization-subscription.response"; +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 { OrganizationApiKeyType } from "@bitwarden/common/admin-console/enums/organization-api-key-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; +import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response"; import { BillingSyncApiKeyComponent, diff --git a/apps/web/src/app/organizations/billing/organization-subscription-selfhost.component.html b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html similarity index 100% rename from apps/web/src/app/organizations/billing/organization-subscription-selfhost.component.html rename to apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html diff --git a/apps/web/src/app/organizations/billing/organization-subscription-selfhost.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts similarity index 87% rename from apps/web/src/app/organizations/billing/organization-subscription-selfhost.component.ts rename to apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts index 774e07d65d..96482b441b 100644 --- a/apps/web/src/app/organizations/billing/organization-subscription-selfhost.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts @@ -7,19 +7,19 @@ import { ModalConfig, ModalService } from "@bitwarden/angular/services/modal.ser import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; -import { BillingSyncConfigApi } from "@bitwarden/common/models/api/billing-sync-config.api"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organization-connection.response"; -import { OrganizationSubscriptionResponse } from "@bitwarden/common/models/response/organization-subscription.response"; +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 { OrganizationConnectionType } from "@bitwarden/common/admin-console/enums/organization-connection-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { OrganizationConnectionResponse } from "@bitwarden/common/admin-console/models/response/organization-connection.response"; +import { BillingSyncConfigApi } from "@bitwarden/common/billing/models/api/billing-sync-config.api"; +import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response"; import { BillingSyncKeyComponent, BillingSyncKeyModalData, -} from "../../settings/billing-sync-key.component"; +} from "../../billing/settings/billing-sync-key.component"; enum LicenseOptions { SYNC = 0, diff --git a/apps/web/src/app/organizations/billing/subscription-hidden.component.ts b/apps/web/src/app/billing/organizations/subscription-hidden.component.ts similarity index 100% rename from apps/web/src/app/organizations/billing/subscription-hidden.component.ts rename to apps/web/src/app/billing/organizations/subscription-hidden.component.ts diff --git a/apps/web/src/app/settings/add-credit.component.html b/apps/web/src/app/billing/settings/add-credit.component.html similarity index 100% rename from apps/web/src/app/settings/add-credit.component.html rename to apps/web/src/app/billing/settings/add-credit.component.html diff --git a/apps/web/src/app/settings/add-credit.component.ts b/apps/web/src/app/billing/settings/add-credit.component.ts similarity index 92% rename from apps/web/src/app/settings/add-credit.component.ts rename to apps/web/src/app/billing/settings/add-credit.component.ts index ccaf7314f2..e3fd113cd1 100644 --- a/apps/web/src/app/settings/add-credit.component.ts +++ b/apps/web/src/app/billing/settings/add-credit.component.ts @@ -11,11 +11,11 @@ import { import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { PayPalConfig } from "@bitwarden/common/abstractions/environment.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; -import { BitPayInvoiceRequest } from "@bitwarden/common/models/request/bit-pay-invoice.request"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PaymentMethodType } from "@bitwarden/common/billing/enums/payment-method-type"; +import { BitPayInvoiceRequest } from "@bitwarden/common/billing/models/request/bit-pay-invoice.request"; @Component({ selector: "app-add-credit", diff --git a/apps/web/src/app/settings/adjust-payment.component.html b/apps/web/src/app/billing/settings/adjust-payment.component.html similarity index 100% rename from apps/web/src/app/settings/adjust-payment.component.html rename to apps/web/src/app/billing/settings/adjust-payment.component.html diff --git a/apps/web/src/app/settings/adjust-payment.component.ts b/apps/web/src/app/billing/settings/adjust-payment.component.ts similarity index 92% rename from apps/web/src/app/settings/adjust-payment.component.ts rename to apps/web/src/app/billing/settings/adjust-payment.component.ts index dc4bf17e0b..afd41ab0ed 100644 --- a/apps/web/src/app/settings/adjust-payment.component.ts +++ b/apps/web/src/app/billing/settings/adjust-payment.component.ts @@ -3,10 +3,10 @@ import { Component, EventEmitter, Input, Output, ViewChild } from "@angular/core import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; -import { PaymentRequest } from "@bitwarden/common/models/request/payment.request"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { PaymentMethodType } from "@bitwarden/common/billing/enums/payment-method-type"; +import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request"; import { PaymentComponent } from "./payment.component"; import { TaxInfoComponent } from "./tax-info.component"; diff --git a/apps/web/src/app/settings/billing-history-view.component.html b/apps/web/src/app/billing/settings/billing-history-view.component.html similarity index 100% rename from apps/web/src/app/settings/billing-history-view.component.html rename to apps/web/src/app/billing/settings/billing-history-view.component.html diff --git a/apps/web/src/app/settings/billing-history-view.component.ts b/apps/web/src/app/billing/settings/billing-history-view.component.ts similarity index 90% rename from apps/web/src/app/settings/billing-history-view.component.ts rename to apps/web/src/app/billing/settings/billing-history-view.component.ts index 4a2ff349a1..baa024c764 100644 --- a/apps/web/src/app/settings/billing-history-view.component.ts +++ b/apps/web/src/app/billing/settings/billing-history-view.component.ts @@ -3,7 +3,7 @@ import { Router } from "@angular/router"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { BillingHistoryResponse } from "@bitwarden/common/models/response/billing-history.response"; +import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response"; @Component({ selector: "app-billing-history-view", diff --git a/apps/web/src/app/settings/billing-history.component.html b/apps/web/src/app/billing/settings/billing-history.component.html similarity index 100% rename from apps/web/src/app/settings/billing-history.component.html rename to apps/web/src/app/billing/settings/billing-history.component.html diff --git a/apps/web/src/app/settings/billing-history.component.ts b/apps/web/src/app/billing/settings/billing-history.component.ts similarity index 77% rename from apps/web/src/app/settings/billing-history.component.ts rename to apps/web/src/app/billing/settings/billing-history.component.ts index acc90d969d..f1eca8cd6f 100644 --- a/apps/web/src/app/settings/billing-history.component.ts +++ b/apps/web/src/app/billing/settings/billing-history.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from "@angular/core"; -import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; -import { TransactionType } from "@bitwarden/common/enums/transactionType"; -import { BillingHistoryResponse } from "@bitwarden/common/models/response/billing-history.response"; +import { PaymentMethodType } from "@bitwarden/common/billing/enums/payment-method-type"; +import { TransactionType } from "@bitwarden/common/billing/enums/transaction-type"; +import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response"; @Component({ selector: "app-billing-history", diff --git a/apps/web/src/app/settings/billing-sync-key.component.html b/apps/web/src/app/billing/settings/billing-sync-key.component.html similarity index 100% rename from apps/web/src/app/settings/billing-sync-key.component.html rename to apps/web/src/app/billing/settings/billing-sync-key.component.html diff --git a/apps/web/src/app/settings/billing-sync-key.component.ts b/apps/web/src/app/billing/settings/billing-sync-key.component.ts similarity index 85% rename from apps/web/src/app/settings/billing-sync-key.component.ts rename to apps/web/src/app/billing/settings/billing-sync-key.component.ts index 45b3a06d69..f16e5b8d2b 100644 --- a/apps/web/src/app/settings/billing-sync-key.component.ts +++ b/apps/web/src/app/billing/settings/billing-sync-key.component.ts @@ -4,11 +4,11 @@ import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; import { ModalConfig } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; -import { BillingSyncConfigApi } from "@bitwarden/common/models/api/billing-sync-config.api"; -import { BillingSyncConfigRequest } from "@bitwarden/common/models/request/billing-sync-config.request"; -import { OrganizationConnectionRequest } from "@bitwarden/common/models/request/organization-connection.request"; -import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organization-connection.response"; +import { OrganizationConnectionType } from "@bitwarden/common/admin-console/enums/organization-connection-type"; +import { OrganizationConnectionRequest } from "@bitwarden/common/admin-console/models/request/organization-connection.request"; +import { OrganizationConnectionResponse } from "@bitwarden/common/admin-console/models/response/organization-connection.response"; +import { BillingSyncConfigApi } from "@bitwarden/common/billing/models/api/billing-sync-config.api"; +import { BillingSyncConfigRequest } from "@bitwarden/common/billing/models/request/billing-sync-config.request"; export interface BillingSyncKeyModalData { entityId: string; diff --git a/apps/web/src/app/settings/organization-plans.component.html b/apps/web/src/app/billing/settings/organization-plans.component.html similarity index 100% rename from apps/web/src/app/settings/organization-plans.component.html rename to apps/web/src/app/billing/settings/organization-plans.component.html diff --git a/apps/web/src/app/settings/organization-plans.component.ts b/apps/web/src/app/billing/settings/organization-plans.component.ts similarity index 94% rename from apps/web/src/app/settings/organization-plans.component.ts rename to apps/web/src/app/billing/settings/organization-plans.component.ts index 91db366bf4..2744446f06 100644 --- a/apps/web/src/app/settings/organization-plans.component.ts +++ b/apps/web/src/app/billing/settings/organization-plans.component.ts @@ -16,21 +16,21 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; -import { PlanType } from "@bitwarden/common/enums/planType"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +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 { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { OrganizationCreateRequest } from "@bitwarden/common/admin-console/models/request/organization-create.request"; +import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request"; +import { OrganizationUpgradeRequest } from "@bitwarden/common/admin-console/models/request/organization-upgrade.request"; +import { ProviderOrganizationCreateRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-organization-create.request"; +import { PaymentMethodType } from "@bitwarden/common/billing/enums/payment-method-type"; +import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; +import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response"; import { ProductType } from "@bitwarden/common/enums/productType"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { OrganizationCreateRequest } from "@bitwarden/common/models/request/organization-create.request"; -import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organization-keys.request"; -import { OrganizationUpgradeRequest } from "@bitwarden/common/models/request/organization-upgrade.request"; -import { ProviderOrganizationCreateRequest } from "@bitwarden/common/models/request/provider/provider-organization-create.request"; -import { PlanResponse } from "@bitwarden/common/models/response/plan.response"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { PaymentComponent } from "./payment.component"; diff --git a/apps/web/src/app/settings/payment-method.component.html b/apps/web/src/app/billing/settings/payment-method.component.html similarity index 100% rename from apps/web/src/app/settings/payment-method.component.html rename to apps/web/src/app/billing/settings/payment-method.component.html diff --git a/apps/web/src/app/settings/payment-method.component.ts b/apps/web/src/app/billing/settings/payment-method.component.ts similarity index 93% rename from apps/web/src/app/settings/payment-method.component.ts rename to apps/web/src/app/billing/settings/payment-method.component.ts index 1d17fb78ab..fe2c0f2303 100644 --- a/apps/web/src/app/settings/payment-method.component.ts +++ b/apps/web/src/app/billing/settings/payment-method.component.ts @@ -5,12 +5,12 @@ import { ActivatedRoute, Router } from "@angular/router"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { OrganizationResponse } from "@bitwarden/common/admin-console/models/response/organization.response"; +import { PaymentMethodType } from "@bitwarden/common/billing/enums/payment-method-type"; +import { BillingPaymentResponse } from "@bitwarden/common/billing/models/response/billing-payment.response"; import { VerifyBankRequest } from "@bitwarden/common/models/request/verify-bank.request"; -import { BillingPaymentResponse } from "@bitwarden/common/models/response/billing-payment.response"; -import { OrganizationResponse } from "@bitwarden/common/models/response/organization.response"; import { TaxInfoComponent } from "./tax-info.component"; diff --git a/apps/web/src/app/settings/payment.component.html b/apps/web/src/app/billing/settings/payment.component.html similarity index 100% rename from apps/web/src/app/settings/payment.component.html rename to apps/web/src/app/billing/settings/payment.component.html diff --git a/apps/web/src/app/settings/payment.component.ts b/apps/web/src/app/billing/settings/payment.component.ts similarity index 99% rename from apps/web/src/app/settings/payment.component.ts rename to apps/web/src/app/billing/settings/payment.component.ts index 73335dad0c..140cb4d870 100644 --- a/apps/web/src/app/settings/payment.component.ts +++ b/apps/web/src/app/billing/settings/payment.component.ts @@ -4,7 +4,7 @@ import { Subject, takeUntil } from "rxjs"; import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; +import { PaymentMethodType } from "@bitwarden/common/billing/enums/payment-method-type"; @Component({ selector: "app-payment", diff --git a/apps/web/src/app/settings/subscription-routing.module.ts b/apps/web/src/app/billing/settings/subscription-routing.module.ts similarity index 75% rename from apps/web/src/app/settings/subscription-routing.module.ts rename to apps/web/src/app/billing/settings/subscription-routing.module.ts index 7d83026d2d..35b98b75d6 100644 --- a/apps/web/src/app/settings/subscription-routing.module.ts +++ b/apps/web/src/app/billing/settings/subscription-routing.module.ts @@ -1,11 +1,12 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { BillingHistoryViewComponent } from "./billing-history-view.component"; -import { PaymentMethodComponent } from "./payment-method.component"; -import { PremiumComponent } from "./premium.component"; +import { BillingHistoryViewComponent } from "../../billing/settings/billing-history-view.component"; +import { PaymentMethodComponent } from "../../billing/settings/payment-method.component"; +import { UserSubscriptionComponent } from "../../billing/settings/user-subscription.component"; +import { PremiumComponent } from "../../settings/premium.component"; + import { SubscriptionComponent } from "./subscription.component"; -import { UserSubscriptionComponent } from "./user-subscription.component"; const routes: Routes = [ { diff --git a/apps/web/src/app/settings/subscription.component.html b/apps/web/src/app/billing/settings/subscription.component.html similarity index 100% rename from apps/web/src/app/settings/subscription.component.html rename to apps/web/src/app/billing/settings/subscription.component.html diff --git a/apps/web/src/app/settings/subscription.component.ts b/apps/web/src/app/billing/settings/subscription.component.ts similarity index 100% rename from apps/web/src/app/settings/subscription.component.ts rename to apps/web/src/app/billing/settings/subscription.component.ts diff --git a/apps/web/src/app/settings/tax-info.component.html b/apps/web/src/app/billing/settings/tax-info.component.html similarity index 100% rename from apps/web/src/app/settings/tax-info.component.html rename to apps/web/src/app/billing/settings/tax-info.component.html diff --git a/apps/web/src/app/settings/tax-info.component.ts b/apps/web/src/app/billing/settings/tax-info.component.ts similarity index 92% rename from apps/web/src/app/settings/tax-info.component.ts rename to apps/web/src/app/billing/settings/tax-info.component.ts index fdebdbd5a2..9ac57716aa 100644 --- a/apps/web/src/app/settings/tax-info.component.ts +++ b/apps/web/src/app/billing/settings/tax-info.component.ts @@ -3,11 +3,11 @@ import { ActivatedRoute } from "@angular/router"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationTaxInfoUpdateRequest } from "@bitwarden/common/models/request/organization-tax-info-update.request"; -import { TaxInfoUpdateRequest } from "@bitwarden/common/models/request/tax-info-update.request"; -import { TaxInfoResponse } from "@bitwarden/common/models/response/tax-info.response"; -import { TaxRateResponse } from "@bitwarden/common/models/response/tax-rate.response"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { OrganizationTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/organization-tax-info-update.request"; +import { TaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/tax-info-update.request"; +import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response"; +import { TaxRateResponse } from "@bitwarden/common/billing/models/response/tax-rate.response"; type TaxInfoView = Omit & { includeTaxId: boolean; diff --git a/apps/web/src/app/settings/user-subscription.component.html b/apps/web/src/app/billing/settings/user-subscription.component.html similarity index 100% rename from apps/web/src/app/settings/user-subscription.component.html rename to apps/web/src/app/billing/settings/user-subscription.component.html diff --git a/apps/web/src/app/settings/user-subscription.component.ts b/apps/web/src/app/billing/settings/user-subscription.component.ts similarity index 98% rename from apps/web/src/app/settings/user-subscription.component.ts rename to apps/web/src/app/billing/settings/user-subscription.component.ts index 88f3dd20f6..fcf210f658 100644 --- a/apps/web/src/app/settings/user-subscription.component.ts +++ b/apps/web/src/app/billing/settings/user-subscription.component.ts @@ -7,7 +7,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SubscriptionResponse } from "@bitwarden/common/models/response/subscription.response"; +import { SubscriptionResponse } from "@bitwarden/common/billing/models/response/subscription.response"; @Component({ selector: "app-user-subscription", diff --git a/apps/web/src/app/common/base.people.component.ts b/apps/web/src/app/common/base.people.component.ts index 7464a41877..35d8af0c07 100644 --- a/apps/web/src/app/common/base.people.component.ts +++ b/apps/web/src/app/common/base.people.component.ts @@ -11,16 +11,16 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; -import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; -import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; +import { ProviderUserStatusType } from "@bitwarden/common/admin-console/enums/provider-user-status-type"; +import { ProviderUserType } from "@bitwarden/common/admin-console/enums/provider-user-type"; +import { ProviderUserUserDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user.response"; import { Utils } from "@bitwarden/common/misc/utils"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; -import { ProviderUserUserDetailsResponse } from "@bitwarden/common/models/response/provider/provider-user.response"; +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/core/core.module.ts b/apps/web/src/app/core/core.module.ts index f01c0278f8..251bd9d51c 100644 --- a/apps/web/src/app/core/core.module.ts +++ b/apps/web/src/app/core/core.module.ts @@ -24,6 +24,7 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { PolicyListService } from "../admin-console/core/policy-list.service"; import { PasswordRepromptService } from "../vault/core/password-reprompt.service"; import { BroadcasterMessagingService } from "./broadcaster-messaging.service"; @@ -32,7 +33,6 @@ import { HtmlStorageService } from "./html-storage.service"; import { I18nService } from "./i18n.service"; import { InitService } from "./init.service"; import { ModalService } from "./modal.service"; -import { PolicyListService } from "./policy-list.service"; import { RouterService } from "./router.service"; import { Account, GlobalState, StateService } from "./state"; import { StateMigrationService } from "./state-migration.service"; diff --git a/apps/web/src/app/core/event.service.ts b/apps/web/src/app/core/event.service.ts index 6650d7dcc7..904326f830 100644 --- a/apps/web/src/app/core/event.service.ts +++ b/apps/web/src/app/core/event.service.ts @@ -1,11 +1,11 @@ import { Injectable } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; import { DeviceType } from "@bitwarden/common/enums/deviceType"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { Policy } from "@bitwarden/common/models/domain/policy"; import { EventResponse } from "@bitwarden/common/models/response/event.response"; @Injectable() diff --git a/apps/web/src/app/core/index.ts b/apps/web/src/app/core/index.ts index 80c1a44d50..4850fa2482 100644 --- a/apps/web/src/app/core/index.ts +++ b/apps/web/src/app/core/index.ts @@ -1,5 +1,5 @@ export * from "./core.module"; export * from "./event.service"; -export * from "./policy-list.service"; +export * from "../admin-console/core/policy-list.service"; export * from "./router.service"; export * from "./state/state.service"; diff --git a/apps/web/src/app/core/state/state.service.ts b/apps/web/src/app/core/state/state.service.ts index d2fcb55a10..1bf9fec7bb 100644 --- a/apps/web/src/app/core/state/state.service.ts +++ b/apps/web/src/app/core/state/state.service.ts @@ -12,8 +12,8 @@ import { AbstractMemoryStorageService, AbstractStorageService, } from "@bitwarden/common/abstractions/storage.service"; +import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { CollectionData } from "@bitwarden/common/models/data/collection.data"; import { SendData } from "@bitwarden/common/models/data/send.data"; import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; import { StateService as BaseStateService } from "@bitwarden/common/services/state.service"; diff --git a/apps/web/src/app/layouts/navbar.component.ts b/apps/web/src/app/layouts/navbar.component.ts index 3d67e75b32..2147024ef3 100644 --- a/apps/web/src/app/layouts/navbar.component.ts +++ b/apps/web/src/app/layouts/navbar.component.ts @@ -3,15 +3,15 @@ import { map, Observable } from "rxjs"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { canAccessAdmin, isNotProviderUser, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { Provider } from "@bitwarden/common/models/domain/provider"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts index c6f4a5536f..21f186aa6a 100644 --- a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts +++ b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts @@ -2,7 +2,7 @@ import { Component, ViewChild } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { combineLatest, map } from "rxjs"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { MenuComponent } from "@bitwarden/components"; type ProductSwitcherItem = { diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts index c86f9c4e39..d9494b5eb2 100644 --- a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts +++ b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts @@ -5,8 +5,8 @@ import { BehaviorSubject } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { IconButtonModule, LinkModule, MenuModule } from "@bitwarden/components"; import { I18nMockService } from "@bitwarden/components/src/utils/i18n-mock.service"; diff --git a/apps/web/src/app/organizations/billing/secrets-manager/enroll.component.ts b/apps/web/src/app/organizations/billing/secrets-manager/enroll.component.ts index e28e089a3a..bc6ed17ba7 100644 --- a/apps/web/src/app/organizations/billing/secrets-manager/enroll.component.ts +++ b/apps/web/src/app/organizations/billing/secrets-manager/enroll.component.ts @@ -2,9 +2,9 @@ import { Component, Input, OnInit } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationEnrollSecretsManagerRequest } from "@bitwarden/common/models/request/organization/organization-enroll-secrets-manager.request"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { OrganizationEnrollSecretsManagerRequest } from "@bitwarden/common/admin-console/models/request/organization/organization-enroll-secrets-manager.request"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { flagEnabled } from "../../../../utils/flags"; diff --git a/apps/web/src/app/organizations/core/services/collection-admin.service.ts b/apps/web/src/app/organizations/core/services/collection-admin.service.ts index d89343ffd4..45adb00842 100644 --- a/apps/web/src/app/organizations/core/services/collection-admin.service.ts +++ b/apps/web/src/app/organizations/core/services/collection-admin.service.ts @@ -2,13 +2,13 @@ import { Injectable } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { CollectionRequest } from "@bitwarden/common/models/request/collection.request"; -import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; +import { CollectionRequest } from "@bitwarden/common/admin-console/models/request/collection.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; import { CollectionAccessDetailsResponse, CollectionResponse, -} from "@bitwarden/common/models/response/collection.response"; +} from "@bitwarden/common/admin-console/models/response/collection.response"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { CoreOrganizationModule } from "../core-organization.module"; import { CollectionAdminView } from "../views/collection-admin.view"; diff --git a/apps/web/src/app/organizations/core/services/group/group.service.ts b/apps/web/src/app/organizations/core/services/group/group.service.ts index 2a60da16f5..772fbd3cf4 100644 --- a/apps/web/src/app/organizations/core/services/group/group.service.ts +++ b/apps/web/src/app/organizations/core/services/group/group.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { CoreOrganizationModule } from "../../core-organization.module"; diff --git a/apps/web/src/app/organizations/core/services/group/requests/group.request.ts b/apps/web/src/app/organizations/core/services/group/requests/group.request.ts index 26fa6f76dc..b59c869692 100644 --- a/apps/web/src/app/organizations/core/services/group/requests/group.request.ts +++ b/apps/web/src/app/organizations/core/services/group/requests/group.request.ts @@ -1,4 +1,4 @@ -import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; export class GroupRequest { name: string; diff --git a/apps/web/src/app/organizations/core/services/group/responses/group.response.ts b/apps/web/src/app/organizations/core/services/group/responses/group.response.ts index a825b40fe1..b2c015a26a 100644 --- a/apps/web/src/app/organizations/core/services/group/responses/group.response.ts +++ b/apps/web/src/app/organizations/core/services/group/responses/group.response.ts @@ -1,5 +1,5 @@ +import { SelectionReadOnlyResponse } from "@bitwarden/common/admin-console/models/response/selection-read-only.response"; import { BaseResponse } from "@bitwarden/common/models/response/base.response"; -import { SelectionReadOnlyResponse } from "@bitwarden/common/models/response/selection-read-only.response"; export class GroupResponse extends BaseResponse { id: string; diff --git a/apps/web/src/app/organizations/core/views/collection-admin.view.ts b/apps/web/src/app/organizations/core/views/collection-admin.view.ts index dd7be147a3..be38798379 100644 --- a/apps/web/src/app/organizations/core/views/collection-admin.view.ts +++ b/apps/web/src/app/organizations/core/views/collection-admin.view.ts @@ -1,5 +1,5 @@ -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { CollectionAccessDetailsResponse } from "@bitwarden/common/src/models/response/collection.response"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; +import { CollectionAccessDetailsResponse } from "@bitwarden/common/src/admin-console/models/response/collection.response"; import { CollectionAccessSelectionView } from "./collection-access-selection.view"; diff --git a/apps/web/src/app/organizations/core/views/organization-user-admin-view.ts b/apps/web/src/app/organizations/core/views/organization-user-admin-view.ts index ff76f1540f..0d88773592 100644 --- a/apps/web/src/app/organizations/core/views/organization-user-admin-view.ts +++ b/apps/web/src/app/organizations/core/views/organization-user-admin-view.ts @@ -1,6 +1,6 @@ -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; -import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; +import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api"; import { CollectionAccessSelectionView } from "./collection-access-selection.view"; diff --git a/apps/web/src/app/organizations/core/views/organization-user.view.ts b/apps/web/src/app/organizations/core/views/organization-user.view.ts index cc9b86f11a..4c81216dfc 100644 --- a/apps/web/src/app/organizations/core/views/organization-user.view.ts +++ b/apps/web/src/app/organizations/core/views/organization-user.view.ts @@ -1,7 +1,7 @@ import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; -import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; +import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api"; import { CollectionAccessSelectionView } from "./collection-access-selection.view"; diff --git a/apps/web/src/app/organizations/manage/collection-add-edit.component.ts b/apps/web/src/app/organizations/manage/collection-add-edit.component.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/apps/web/src/app/organizations/members/components/bulk/bulk-confirm.component.ts b/apps/web/src/app/organizations/members/components/bulk/bulk-confirm.component.ts index 30813be02d..f542ab6c1f 100644 --- a/apps/web/src/app/organizations/members/components/bulk/bulk-confirm.component.ts +++ b/apps/web/src/app/organizations/members/components/bulk/bulk-confirm.component.ts @@ -5,7 +5,7 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; import { Utils } from "@bitwarden/common/misc/utils"; import { BulkUserDetails } from "./bulk-status.component"; diff --git a/apps/web/src/app/organizations/members/components/bulk/bulk-status.component.ts b/apps/web/src/app/organizations/members/components/bulk/bulk-status.component.ts index d6020d00e4..5bcd3e67f9 100644 --- a/apps/web/src/app/organizations/members/components/bulk/bulk-status.component.ts +++ b/apps/web/src/app/organizations/members/components/bulk/bulk-status.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { ProviderUserStatusType } from "@bitwarden/common/admin-console/enums/provider-user-status-type"; export interface BulkUserDetails { id: string; diff --git a/apps/web/src/app/organizations/members/members-routing.module.ts b/apps/web/src/app/organizations/members/members-routing.module.ts index 5f669a0b02..07cd3421ba 100644 --- a/apps/web/src/app/organizations/members/members-routing.module.ts +++ b/apps/web/src/app/organizations/members/members-routing.module.ts @@ -1,11 +1,10 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { canAccessMembersTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { canAccessMembersTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { OrganizationPermissionsGuard } from "../guards/org-permissions.guard"; - -import { PeopleComponent } from "./people.component"; +import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard"; +import { PeopleComponent } from "../../admin-console/organizations/members/people.component"; const routes: Routes = [ { diff --git a/apps/web/src/app/organizations/members/members.module.ts b/apps/web/src/app/organizations/members/members.module.ts index c67a4dd0d6..fe161b8902 100644 --- a/apps/web/src/app/organizations/members/members.module.ts +++ b/apps/web/src/app/organizations/members/members.module.ts @@ -1,5 +1,8 @@ import { NgModule } from "@angular/core"; +import { UserDialogModule } from "../../admin-console/organizations/members/components/member-dialog"; +import { ResetPasswordComponent } from "../../admin-console/organizations/members/components/reset-password.component"; +import { PeopleComponent } from "../../admin-console/organizations/members/people.component"; import { LooseComponentsModule } from "../../shared"; import { SharedOrganizationModule } from "../shared"; @@ -7,10 +10,7 @@ import { BulkConfirmComponent } from "./components/bulk/bulk-confirm.component"; import { BulkRemoveComponent } from "./components/bulk/bulk-remove.component"; import { BulkRestoreRevokeComponent } from "./components/bulk/bulk-restore-revoke.component"; import { BulkStatusComponent } from "./components/bulk/bulk-status.component"; -import { UserDialogModule } from "./components/member-dialog"; -import { ResetPasswordComponent } from "./components/reset-password.component"; import { MembersRoutingModule } from "./members-routing.module"; -import { PeopleComponent } from "./people.component"; @NgModule({ imports: [ diff --git a/apps/web/src/app/organizations/navigation-permissions.ts b/apps/web/src/app/organizations/navigation-permissions.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/apps/web/src/app/organizations/organization.module.ts b/apps/web/src/app/organizations/organization.module.ts index 32b1df1660..63fe377ab9 100644 --- a/apps/web/src/app/organizations/organization.module.ts +++ b/apps/web/src/app/organizations/organization.module.ts @@ -1,11 +1,12 @@ import { NgModule } from "@angular/core"; +import { GroupAddEditComponent } from "../admin-console/organizations/manage/group-add-edit.component"; +import { GroupsComponent } from "../admin-console/organizations/manage/groups.component"; +import { OrganizationsRoutingModule } from "../admin-console/organizations/organization-routing.module"; +import { AccessSelectorModule } from "../admin-console/organizations/shared/components/access-selector"; + import { CoreOrganizationModule } from "./core"; -import { GroupAddEditComponent } from "./manage/group-add-edit.component"; -import { GroupsComponent } from "./manage/groups.component"; -import { OrganizationsRoutingModule } from "./organization-routing.module"; import { SharedOrganizationModule } from "./shared"; -import { AccessSelectorModule } from "./shared/components/access-selector"; @NgModule({ imports: [ diff --git a/apps/web/src/app/organizations/shared/index.ts b/apps/web/src/app/organizations/shared/index.ts index 24a7c9176b..a4966edba3 100644 --- a/apps/web/src/app/organizations/shared/index.ts +++ b/apps/web/src/app/organizations/shared/index.ts @@ -1,2 +1,2 @@ export * from "./shared-organization.module"; -export * from "./components/collection-dialog"; +export * from "../../admin-console/organizations/shared/components/collection-dialog"; diff --git a/apps/web/src/app/organizations/shared/shared-organization.module.ts b/apps/web/src/app/organizations/shared/shared-organization.module.ts index 96082de74f..8c31a19142 100644 --- a/apps/web/src/app/organizations/shared/shared-organization.module.ts +++ b/apps/web/src/app/organizations/shared/shared-organization.module.ts @@ -1,9 +1,9 @@ import { NgModule } from "@angular/core"; +import { AccessSelectorModule } from "../../admin-console/organizations/shared/components/access-selector/access-selector.module"; +import { CollectionDialogModule } from "../../admin-console/organizations/shared/components/collection-dialog"; import { SharedModule } from "../../shared/shared.module"; -import { AccessSelectorModule } from "./components/access-selector"; -import { CollectionDialogModule } from "./components/collection-dialog"; import { SearchInputComponent } from "./components/search-input/search-input.component"; @NgModule({ diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 7610aea164..cba24a86c6 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -5,6 +5,7 @@ import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard"; import { LockGuard } from "@bitwarden/angular/auth/guards/lock.guard"; import { UnauthGuard } from "@bitwarden/angular/auth/guards/unauth.guard"; +import { SubscriptionRoutingModule } from "../app/billing/settings/subscription-routing.module"; import { AcceptEmergencyComponent } from "../auth/accept-emergency.component"; import { AcceptOrganizationComponent } from "../auth/accept-organization.component"; import { HintComponent } from "../auth/hint.component"; @@ -26,23 +27,22 @@ import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.comp import { flagEnabled, Flags } from "../utils/flags"; import { TrialInitiationComponent } from "./accounts/trial-initiation/trial-initiation.component"; +import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/sponsorships/accept-family-sponsorship.component"; +import { FamiliesForEnterpriseSetupComponent } from "./admin-console/organizations/sponsorships/families-for-enterprise-setup.component"; +import { CreateOrganizationComponent } from "./admin-console/settings/create-organization.component"; +import { SponsoredFamiliesComponent } from "./admin-console/settings/sponsored-families.component"; import { HomeGuard } from "./guards/home.guard"; import { FrontendLayoutComponent } from "./layouts/frontend-layout.component"; import { UserLayoutComponent } from "./layouts/user-layout.component"; import { OrganizationModule } from "./organizations/organization.module"; -import { AcceptFamilySponsorshipComponent } from "./organizations/sponsorships/accept-family-sponsorship.component"; -import { FamiliesForEnterpriseSetupComponent } from "./organizations/sponsorships/families-for-enterprise-setup.component"; import { ReportsModule } from "./reports"; import { AccessComponent } from "./send/access.component"; import { SendComponent } from "./send/send.component"; import { AccountComponent } from "./settings/account.component"; -import { CreateOrganizationComponent } from "./settings/create-organization.component"; import { DomainRulesComponent } from "./settings/domain-rules.component"; import { PreferencesComponent } from "./settings/preferences.component"; import { SecurityRoutingModule } from "./settings/security-routing.module"; import { SettingsComponent } from "./settings/settings.component"; -import { SponsoredFamiliesComponent } from "./settings/sponsored-families.component"; -import { SubscriptionRoutingModule } from "./settings/subscription-routing.module"; import { GeneratorComponent } from "./tools/generator.component"; import { ToolsComponent } from "./tools/tools.component"; import { VaultModule } from "./vault/individual-vault/vault.module"; diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts index 0b05f02803..1f2cefa309 100644 --- a/apps/web/src/app/oss.module.ts +++ b/apps/web/src/app/oss.module.ts @@ -3,9 +3,9 @@ import { NgModule } from "@angular/core"; import { LoginModule } from "../auth/login/login.module"; import { TrialInitiationModule } from "./accounts/trial-initiation/trial-initiation.module"; -import { OrganizationCreateModule } from "./organizations/create/organization-create.module"; -import { OrganizationManageModule } from "./organizations/manage/organization-manage.module"; -import { OrganizationUserModule } from "./organizations/users/organization-user.module"; +import { OrganizationCreateModule } from "./admin-console/organizations/create/organization-create.module"; +import { OrganizationManageModule } from "./admin-console/organizations/manage/organization-manage.module"; +import { OrganizationUserModule } from "./admin-console/organizations/users/organization-user.module"; import { LooseComponentsModule, SharedModule } from "./shared"; import { OrganizationBadgeModule } from "./vault/individual-vault/organization-badge/organization-badge.module"; import { VaultFilterModule } from "./vault/individual-vault/vault-filter/vault-filter.module"; diff --git a/apps/web/src/app/reports/pages/cipher-report.component.ts b/apps/web/src/app/reports/pages/cipher-report.component.ts index 4c970e729a..425975ade3 100644 --- a/apps/web/src/app/reports/pages/cipher-report.component.ts +++ b/apps/web/src/app/reports/pages/cipher-report.component.ts @@ -2,7 +2,7 @@ import { Directive, ViewChild, ViewContainerRef } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/web/src/app/send/add-edit.component.ts b/apps/web/src/app/send/add-edit.component.ts index d8f8aa491f..b9aa49af09 100644 --- a/apps/web/src/app/send/add-edit.component.ts +++ b/apps/web/src/app/send/add-edit.component.ts @@ -7,9 +7,9 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SendService } from "@bitwarden/common/abstractions/send.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; @Component({ selector: "app-send-add-edit", diff --git a/apps/web/src/app/send/send.component.ts b/apps/web/src/app/send/send.component.ts index 615d058762..0b2bfe65bb 100644 --- a/apps/web/src/app/send/send.component.ts +++ b/apps/web/src/app/send/send.component.ts @@ -7,9 +7,9 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { SendView } from "@bitwarden/common/models/view/send.view"; import { Icons } from "@bitwarden/components"; diff --git a/apps/web/src/app/settings/adjust-storage.component.ts b/apps/web/src/app/settings/adjust-storage.component.ts index 20c93ced41..346b67c505 100644 --- a/apps/web/src/app/settings/adjust-storage.component.ts +++ b/apps/web/src/app/settings/adjust-storage.component.ts @@ -4,12 +4,12 @@ import { ActivatedRoute, Router } from "@angular/router"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { PaymentResponse } from "@bitwarden/common/billing/models/response/payment.response"; import { StorageRequest } from "@bitwarden/common/models/request/storage.request"; -import { PaymentResponse } from "@bitwarden/common/models/response/payment.response"; -import { PaymentComponent } from "./payment.component"; +import { PaymentComponent } from "../billing/settings/payment.component"; @Component({ selector: "app-adjust-storage", diff --git a/apps/web/src/app/settings/change-password.component.ts b/apps/web/src/app/settings/change-password.component.ts index 61cf92d2ab..946af00fcd 100644 --- a/apps/web/src/app/settings/change-password.component.ts +++ b/apps/web/src/app/settings/change-password.component.ts @@ -10,12 +10,12 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SendService } from "@bitwarden/common/abstractions/send.service"; import { StateService } from "@bitwarden/common/abstractions/state.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 { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { EmergencyAccessStatusType } from "@bitwarden/common/auth/enums/emergency-access-status-type"; import { EmergencyAccessUpdateRequest } from "@bitwarden/common/auth/models/request/emergency-access-update.request"; diff --git a/apps/web/src/app/settings/premium.component.ts b/apps/web/src/app/settings/premium.component.ts index 33c2c0c76e..2e78882fa5 100644 --- a/apps/web/src/app/settings/premium.component.ts +++ b/apps/web/src/app/settings/premium.component.ts @@ -10,8 +10,8 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { PaymentComponent } from "./payment.component"; -import { TaxInfoComponent } from "./tax-info.component"; +import { PaymentComponent } from "../billing/settings/payment.component"; +import { TaxInfoComponent } from "../billing/settings/tax-info.component"; @Component({ selector: "app-premium", diff --git a/apps/web/src/app/settings/settings.component.ts b/apps/web/src/app/settings/settings.component.ts index d85ef54d96..c65f22b00d 100644 --- a/apps/web/src/app/settings/settings.component.ts +++ b/apps/web/src/app/settings/settings.component.ts @@ -2,8 +2,8 @@ import { Component, NgZone, OnDestroy, OnInit } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { StateService } from "../core"; diff --git a/apps/web/src/app/settings/update-license.component.ts b/apps/web/src/app/settings/update-license.component.ts index 3554a930d6..d12ec0ebc4 100644 --- a/apps/web/src/app/settings/update-license.component.ts +++ b/apps/web/src/app/settings/update-license.component.ts @@ -3,8 +3,8 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; @Component({ selector: "app-update-license", diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 7b988acc51..aea965082b 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -33,8 +33,38 @@ import { UpdatePasswordComponent } from "../../auth/update-password.component"; import { UpdateTempPasswordComponent } from "../../auth/update-temp-password.component"; import { VerifyEmailTokenComponent } from "../../auth/verify-email-token.component"; import { VerifyRecoverDeleteComponent } from "../../auth/verify-recover-delete.component"; +import { OrganizationSwitcherComponent } from "../admin-console/components/organization-switcher.component"; +import { OrganizationCreateModule } from "../admin-console/organizations/create/organization-create.module"; +import { OrganizationLayoutComponent } from "../admin-console/organizations/layouts/organization-layout.component"; +import { CollectionsComponent as OrgManageCollectionsComponent } from "../admin-console/organizations/manage/collections.component"; +import { EntityEventsComponent as OrgEntityEventsComponent } from "../admin-console/organizations/manage/entity-events.component"; +import { EventsComponent as OrgEventsComponent } from "../admin-console/organizations/manage/events.component"; +import { ManageComponent as OrgManageComponent } from "../admin-console/organizations/manage/manage.component"; +import { UserConfirmComponent as OrgUserConfirmComponent } from "../admin-console/organizations/manage/user-confirm.component"; +import { AcceptFamilySponsorshipComponent } from "../admin-console/organizations/sponsorships/accept-family-sponsorship.component"; +import { FamiliesForEnterpriseSetupComponent } from "../admin-console/organizations/sponsorships/families-for-enterprise-setup.component"; +import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../admin-console/organizations/tools/exposed-passwords-report.component"; +import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../admin-console/organizations/tools/inactive-two-factor-report.component"; +import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../admin-console/organizations/tools/reused-passwords-report.component"; +import { ToolsComponent as OrgToolsComponent } from "../admin-console/organizations/tools/tools.component"; +import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../admin-console/organizations/tools/unsecured-websites-report.component"; +import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../admin-console/organizations/tools/weak-passwords-report.component"; +import { ProvidersComponent } from "../admin-console/providers/providers.component"; +import { CreateOrganizationComponent } from "../admin-console/settings/create-organization.component"; +import { SponsoredFamiliesComponent } from "../admin-console/settings/sponsored-families.component"; +import { SponsoringOrgRowComponent } from "../admin-console/settings/sponsoring-org-row.component"; +import { AddCreditComponent } from "../billing/settings/add-credit.component"; +import { AdjustPaymentComponent } from "../billing/settings/adjust-payment.component"; +import { BillingHistoryViewComponent } from "../billing/settings/billing-history-view.component"; +import { BillingHistoryComponent } from "../billing/settings/billing-history.component"; +import { BillingSyncKeyComponent } from "../billing/settings/billing-sync-key.component"; +import { OrganizationPlansComponent } from "../billing/settings/organization-plans.component"; +import { PaymentMethodComponent } from "../billing/settings/payment-method.component"; +import { PaymentComponent } from "../billing/settings/payment.component"; +import { SubscriptionComponent } from "../billing/settings/subscription.component"; +import { TaxInfoComponent } from "../billing/settings/tax-info.component"; +import { UserSubscriptionComponent } from "../billing/settings/user-subscription.component"; import { DynamicAvatarComponent } from "../components/dynamic-avatar.component"; -import { OrganizationSwitcherComponent } from "../components/organization-switcher.component"; import { SelectableAvatarComponent } from "../components/selectable-avatar.component"; import { UserVerificationPromptComponent } from "../components/user-verification-prompt.component"; import { UserVerificationComponent } from "../components/user-verification.component"; @@ -43,46 +73,20 @@ import { FrontendLayoutComponent } from "../layouts/frontend-layout.component"; import { NavbarComponent } from "../layouts/navbar.component"; import { ProductSwitcherModule } from "../layouts/product-switcher/product-switcher.module"; import { UserLayoutComponent } from "../layouts/user-layout.component"; -import { OrganizationCreateModule } from "../organizations/create/organization-create.module"; -import { OrganizationLayoutComponent } from "../organizations/layouts/organization-layout.component"; -import { CollectionsComponent as OrgManageCollectionsComponent } from "../organizations/manage/collections.component"; -import { EntityEventsComponent as OrgEntityEventsComponent } from "../organizations/manage/entity-events.component"; -import { EventsComponent as OrgEventsComponent } from "../organizations/manage/events.component"; -import { ManageComponent as OrgManageComponent } from "../organizations/manage/manage.component"; -import { UserConfirmComponent as OrgUserConfirmComponent } from "../organizations/manage/user-confirm.component"; -import { AcceptFamilySponsorshipComponent } from "../organizations/sponsorships/accept-family-sponsorship.component"; -import { FamiliesForEnterpriseSetupComponent } from "../organizations/sponsorships/families-for-enterprise-setup.component"; -import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../organizations/tools/exposed-passwords-report.component"; -import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../organizations/tools/inactive-two-factor-report.component"; -import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../organizations/tools/reused-passwords-report.component"; -import { ToolsComponent as OrgToolsComponent } from "../organizations/tools/tools.component"; -import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../organizations/tools/unsecured-websites-report.component"; -import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../organizations/tools/weak-passwords-report.component"; -import { CollectionsComponent as OrgCollectionsComponent } from "../organizations/vault/collections.component"; -import { ProvidersComponent } from "../providers/providers.component"; import { AccessComponent } from "../send/access.component"; import { AddEditComponent as SendAddEditComponent } from "../send/add-edit.component"; import { EffluxDatesComponent as SendEffluxDatesComponent } from "../send/efflux-dates.component"; import { SendComponent } from "../send/send.component"; import { AccountComponent } from "../settings/account.component"; -import { AddCreditComponent } from "../settings/add-credit.component"; -import { AdjustPaymentComponent } from "../settings/adjust-payment.component"; import { AdjustStorageComponent } from "../settings/adjust-storage.component"; import { ApiKeyComponent } from "../settings/api-key.component"; -import { BillingHistoryViewComponent } from "../settings/billing-history-view.component"; -import { BillingHistoryComponent } from "../settings/billing-history.component"; -import { BillingSyncKeyComponent } from "../settings/billing-sync-key.component"; import { ChangeAvatarComponent } from "../settings/change-avatar.component"; import { ChangeEmailComponent } from "../settings/change-email.component"; import { ChangeKdfModule } from "../settings/change-kdf/change-kdf.module"; import { ChangePasswordComponent } from "../settings/change-password.component"; -import { CreateOrganizationComponent } from "../settings/create-organization.component"; import { DeleteAccountComponent } from "../settings/delete-account.component"; import { DomainRulesComponent } from "../settings/domain-rules.component"; import { LowKdfComponent } from "../settings/low-kdf.component"; -import { OrganizationPlansComponent } from "../settings/organization-plans.component"; -import { PaymentMethodComponent } from "../settings/payment-method.component"; -import { PaymentComponent } from "../settings/payment.component"; import { PreferencesComponent } from "../settings/preferences.component"; import { PremiumComponent } from "../settings/premium.component"; import { ProfileComponent } from "../settings/profile.component"; @@ -90,13 +94,8 @@ import { PurgeVaultComponent } from "../settings/purge-vault.component"; import { SecurityKeysComponent } from "../settings/security-keys.component"; import { SecurityComponent } from "../settings/security.component"; import { SettingsComponent } from "../settings/settings.component"; -import { SponsoredFamiliesComponent } from "../settings/sponsored-families.component"; -import { SponsoringOrgRowComponent } from "../settings/sponsoring-org-row.component"; -import { SubscriptionComponent } from "../settings/subscription.component"; -import { TaxInfoComponent } from "../settings/tax-info.component"; import { UpdateKeyComponent } from "../settings/update-key.component"; import { UpdateLicenseComponent } from "../settings/update-license.component"; -import { UserSubscriptionComponent } from "../settings/user-subscription.component"; import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component"; import { GeneratorComponent } from "../tools/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component"; @@ -111,6 +110,7 @@ import { FolderAddEditComponent } from "../vault/individual-vault/folder-add-edi import { ShareComponent } from "../vault/individual-vault/share.component"; import { AddEditComponent as OrgAddEditComponent } from "../vault/org-vault/add-edit.component"; import { AttachmentsComponent as OrgAttachmentsComponent } from "../vault/org-vault/attachments.component"; +import { CollectionsComponent as OrgCollectionsComponent } from "../vault/org-vault/collections.component"; import { SharedModule } from "./shared.module"; diff --git a/apps/web/src/app/tools/import-export/export.component.ts b/apps/web/src/app/tools/import-export/export.component.ts index 135b3ace14..83324aab82 100644 --- a/apps/web/src/app/tools/import-export/export.component.ts +++ b/apps/web/src/app/tools/import-export/export.component.ts @@ -10,8 +10,8 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { EncryptedExportType } from "@bitwarden/common/enums/encryptedExportType"; import { UserVerificationPromptComponent } from "../../components/user-verification-prompt.component"; diff --git a/apps/web/src/app/tools/import-export/import-export.module.ts b/apps/web/src/app/tools/import-export/import-export.module.ts index 1f2647a29f..67d9dbecf2 100644 --- a/apps/web/src/app/tools/import-export/import-export.module.ts +++ b/apps/web/src/app/tools/import-export/import-export.module.ts @@ -1,11 +1,11 @@ import { NgModule } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction"; import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import/import.service.abstraction"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { ImportApiService } from "@bitwarden/common/services/import/import-api.service"; import { ImportService } from "@bitwarden/common/services/import/import.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/apps/web/src/app/tools/import-export/import.component.ts b/apps/web/src/app/tools/import-export/import.component.ts index 7d96109e8d..14690df2db 100644 --- a/apps/web/src/app/tools/import-export/import.component.ts +++ b/apps/web/src/app/tools/import-export/import.component.ts @@ -9,9 +9,9 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { ImportOption, ImportType } from "@bitwarden/common/enums/importOptions"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; import { ImportError } from "@bitwarden/common/importers/import-error"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts index e78b308d69..ef17c7ec2c 100644 --- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts @@ -2,16 +2,16 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { EventType } from "@bitwarden/common/enums/eventType"; import { ProductType } from "@bitwarden/common/enums/productType"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; diff --git a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts index 7b4bfb2e43..af8bfc142b 100644 --- a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts +++ b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts @@ -4,7 +4,7 @@ import { Component, Inject } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CollectionBulkDeleteRequest } from "@bitwarden/common/models/request/collection-bulk-delete.request"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherBulkDeleteRequest } from "@bitwarden/common/vault/models/request/cipher-bulk-delete.request"; diff --git a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts index ebb08babd6..32b26a05b1 100644 --- a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts +++ b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts @@ -1,13 +1,13 @@ import { DialogConfig, DialogRef, DIALOG_DATA } from "@angular/cdk/dialog"; import { Component, Inject, OnInit } from "@angular/core"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { Checkable, isChecked } from "@bitwarden/common/types/checkable"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/web/src/app/vault/individual-vault/collections.component.ts b/apps/web/src/app/vault/individual-vault/collections.component.ts index 739e88f1c1..1df9350bd5 100644 --- a/apps/web/src/app/vault/individual-vault/collections.component.ts +++ b/apps/web/src/app/vault/individual-vault/collections.component.ts @@ -1,11 +1,11 @@ import { Component, OnDestroy } from "@angular/core"; -import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/components/collections.component"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/web/src/app/vault/individual-vault/pipes/get-collection-name.pipe.ts b/apps/web/src/app/vault/individual-vault/pipes/get-collection-name.pipe.ts index edecf07cce..45cadb4b03 100644 --- a/apps/web/src/app/vault/individual-vault/pipes/get-collection-name.pipe.ts +++ b/apps/web/src/app/vault/individual-vault/pipes/get-collection-name.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { CollectionView } from "@bitwarden/common/src/models/view/collection.view"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; @Pipe({ name: "collectionNameFromId", diff --git a/apps/web/src/app/vault/individual-vault/pipes/get-organization-name.pipe.ts b/apps/web/src/app/vault/individual-vault/pipes/get-organization-name.pipe.ts index 1e597346a9..0ec8ae5afb 100644 --- a/apps/web/src/app/vault/individual-vault/pipes/get-organization-name.pipe.ts +++ b/apps/web/src/app/vault/individual-vault/pipes/get-organization-name.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @Pipe({ name: "orgNameFromId", diff --git a/apps/web/src/app/vault/individual-vault/share.component.ts b/apps/web/src/app/vault/individual-vault/share.component.ts index fb3e1cb873..6e962c3b56 100644 --- a/apps/web/src/app/vault/individual-vault/share.component.ts +++ b/apps/web/src/app/vault/individual-vault/share.component.ts @@ -1,12 +1,12 @@ import { Component, OnDestroy } from "@angular/core"; import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.ts index 47b628b748..deeb4caf92 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.ts @@ -9,8 +9,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ 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 e4fdcbf4dd..ee9501d03f 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 @@ -7,15 +7,15 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { Policy } from "@bitwarden/common/models/domain/policy"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { EnrollMasterPasswordReset } from "../../../../organizations/users/enroll-master-password-reset.component"; +import { EnrollMasterPasswordReset } from "../../../../admin-console/organizations/users/enroll-master-password-reset.component"; import { OptionsInput } from "../shared/components/vault-filter-section.component"; import { OrganizationFilter } from "../shared/models/vault-filter.type"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts index a3e2cc8cdf..041d837c72 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts @@ -3,8 +3,8 @@ import { firstValueFrom, Subject } from "rxjs"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts index 3a454d08d5..23b7541c67 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts @@ -1,8 +1,8 @@ import { Observable } from "rxjs"; -import { Organization } from "@bitwarden/common/src/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/src/admin-console/models/view/collection.view"; import { TreeNode } from "@bitwarden/common/src/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/src/models/view/collection.view"; import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view"; import { diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts index e627258234..c5a2736341 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts @@ -1,14 +1,14 @@ import { mock, MockProxy } from "jest-mock-extended"; import { firstValueFrom, ReplaySubject, take } from "rxjs"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts index 8866438b94..a55982b467 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts @@ -10,19 +10,19 @@ import { switchMap, } from "rxjs"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { isNotProviderUser, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts index 7a118de2b2..fec3be05ef 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts @@ -1,7 +1,7 @@ import { Component, InjectionToken, Injector, Input, OnDestroy, OnInit } from "@angular/core"; import { Subject, takeUntil } from "rxjs"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { ITreeNodeObject, TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { VaultFilterService } from "../../services/abstractions/vault-filter.service"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts index e47f6dfe30..332b197669 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts @@ -1,6 +1,6 @@ -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts index 60bc6af3e4..bb96336cf3 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts @@ -1,4 +1,4 @@ -import { Organization } from "@bitwarden/common/src/models/domain/organization"; +import { Organization } from "@bitwarden/common/src/admin-console/models/domain/organization"; import { ITreeNodeObject } from "@bitwarden/common/src/models/domain/tree-node"; import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts index cd6e480f5d..aecdf3e60a 100644 --- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { VaultFilter } from "../vault-filter/shared/models/vault-filter.model"; diff --git a/apps/web/src/app/vault/individual-vault/vault-items.component.ts b/apps/web/src/app/vault/individual-vault/vault-items.component.ts index 185b91e03b..06144841f2 100644 --- a/apps/web/src/app/vault/individual-vault/vault-items.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-items.component.ts @@ -6,16 +6,16 @@ import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angul import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts index 8286bbf460..2a806b50a8 100644 --- a/apps/web/src/app/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts @@ -16,9 +16,9 @@ import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.s import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums/kdfType"; import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; diff --git a/apps/web/src/app/vault/org-vault/add-edit.component.ts b/apps/web/src/app/vault/org-vault/add-edit.component.ts index 6c521b4961..5e3d62f923 100644 --- a/apps/web/src/app/vault/org-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/org-vault/add-edit.component.ts @@ -2,16 +2,16 @@ import { Component } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/web/src/app/vault/org-vault/attachments.component.ts b/apps/web/src/app/vault/org-vault/attachments.component.ts index f5f9d5b732..3b2f140b45 100644 --- a/apps/web/src/app/vault/org-vault/attachments.component.ts +++ b/apps/web/src/app/vault/org-vault/attachments.component.ts @@ -7,7 +7,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; diff --git a/apps/web/src/app/vault/org-vault/collection-badge/collection-name.badge.component.ts b/apps/web/src/app/vault/org-vault/collection-badge/collection-name.badge.component.ts index 625b308302..fa4056983a 100644 --- a/apps/web/src/app/vault/org-vault/collection-badge/collection-name.badge.component.ts +++ b/apps/web/src/app/vault/org-vault/collection-badge/collection-name.badge.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from "@angular/core"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; @Component({ selector: "app-collection-badge", diff --git a/apps/web/src/app/organizations/vault/collections.component.ts b/apps/web/src/app/vault/org-vault/collections.component.ts similarity index 90% rename from apps/web/src/app/organizations/vault/collections.component.ts rename to apps/web/src/app/vault/org-vault/collections.component.ts index 1766548ace..2d5995f0de 100644 --- a/apps/web/src/app/organizations/vault/collections.component.ts +++ b/apps/web/src/app/vault/org-vault/collections.component.ts @@ -1,17 +1,17 @@ import { Component } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherCollectionsRequest } from "@bitwarden/common/vault/models/request/cipher-collections.request"; -import { CollectionsComponent as BaseCollectionsComponent } from "../../vault/individual-vault/collections.component"; +import { CollectionsComponent as BaseCollectionsComponent } from "../individual-vault/collections.component"; @Component({ selector: "app-org-vault-collections", diff --git a/apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts b/apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts index 6a019b3a26..bdd69a7a84 100644 --- a/apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts +++ b/apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnChanges } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; import { GroupView } from "../../../organizations/core"; diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts index fa8b6cff5c..a5508491ca 100644 --- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts +++ b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnDestroy, OnInit } from "@angular/core"; import { firstValueFrom, Subject } from "rxjs"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { VaultFilterComponent as BaseVaultFilterComponent } from "../../individual-vault/vault-filter/components/vault-filter.component"; //../../vault/vault-filter/components/vault-filter.component"; diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts index 166fcdea64..9e6f06987d 100644 --- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts +++ b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts @@ -1,15 +1,15 @@ import { Injectable, OnDestroy } from "@angular/core"; import { filter, map, Observable, ReplaySubject, Subject, switchMap, takeUntil } from "rxjs"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { canAccessVaultTab, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts index e6e7537952..dd81bc8eca 100644 --- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts +++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts @@ -5,12 +5,12 @@ import { firstValueFrom, lastValueFrom } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { ProductType } from "@bitwarden/common/enums/productType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { DialogService, SimpleDialogCloseType, @@ -18,12 +18,12 @@ import { SimpleDialogType, } from "@bitwarden/components"; -import { CollectionAdminService, CollectionAdminView } from "../../../organizations/core"; import { CollectionDialogResult, CollectionDialogTabType, openCollectionDialog, -} from "../../../organizations/shared"; +} from "../../../admin-console/organizations/shared/components/collection-dialog"; +import { CollectionAdminService, CollectionAdminView } from "../../../organizations/core"; import { VaultFilterService } from "../../individual-vault/vault-filter/services/abstractions/vault-filter.service"; import { VaultFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.model"; import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type"; diff --git a/apps/web/src/app/vault/org-vault/vault-items.component.ts b/apps/web/src/app/vault/org-vault/vault-items.component.ts index 2faa2ea9ff..18a32a4842 100644 --- a/apps/web/src/app/vault/org-vault/vault-items.component.ts +++ b/apps/web/src/app/vault/org-vault/vault-items.component.ts @@ -6,27 +6,27 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService } from "@bitwarden/components"; -import { CollectionAdminView } from "../../organizations/core"; -import { GroupService } from "../../organizations/core/services/group/group.service"; import { CollectionDialogResult, CollectionDialogTabType, openCollectionDialog, -} from "../../organizations/shared/components/collection-dialog/collection-dialog.component"; +} from "../../admin-console/organizations/shared/components/collection-dialog"; +import { CollectionAdminView } from "../../organizations/core"; +import { GroupService } from "../../organizations/core/services/group/group.service"; import { BulkDeleteDialogResult, openBulkDeleteDialog, diff --git a/apps/web/src/app/vault/org-vault/vault-routing.module.ts b/apps/web/src/app/vault/org-vault/vault-routing.module.ts index 12a5a3b9b3..e6e67fdae6 100644 --- a/apps/web/src/app/vault/org-vault/vault-routing.module.ts +++ b/apps/web/src/app/vault/org-vault/vault-routing.module.ts @@ -1,9 +1,9 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { canAccessVaultTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { canAccessVaultTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { OrganizationPermissionsGuard } from "../../organizations/guards/org-permissions.guard"; +import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard"; import { VaultComponent } from "./vault.component"; const routes: Routes = [ diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts index 37104a9a72..b207d1f38e 100644 --- a/apps/web/src/app/vault/org-vault/vault.component.ts +++ b/apps/web/src/app/vault/org-vault/vault.component.ts @@ -15,17 +15,16 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService } from "@bitwarden/components"; -import { EntityEventsComponent } from "../../organizations/manage/entity-events.component"; -import { CollectionsComponent } from "../../organizations/vault/collections.component"; +import { EntityEventsComponent } from "../../admin-console/organizations/manage/entity-events.component"; import { VaultFilterService } from "../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service"; import { VaultFilter } from "../../vault/individual-vault/vault-filter/shared/models/vault-filter.model"; import { RoutedVaultFilterBridgeService } from "../individual-vault/vault-filter/services/routed-vault-filter-bridge.service"; @@ -33,6 +32,7 @@ import { RoutedVaultFilterService } from "../individual-vault/vault-filter/servi import { AddEditComponent } from "./add-edit.component"; import { AttachmentsComponent } from "./attachments.component"; +import { CollectionsComponent } from "./collections.component"; import { VaultFilterComponent } from "./vault-filter/vault-filter.component"; import { VaultItemsComponent } from "./vault-items.component"; diff --git a/apps/web/src/auth/accept-organization.component.ts b/apps/web/src/auth/accept-organization.component.ts index ececc3c370..561c7567a0 100644 --- a/apps/web/src/auth/accept-organization.component.ts +++ b/apps/web/src/auth/accept-organization.component.ts @@ -7,13 +7,13 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserAcceptRequest } from "@bitwarden/common/abstractions/organization-user/requests"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +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"; import { Utils } from "@bitwarden/common/misc/utils"; -import { Policy } from "@bitwarden/common/models/domain/policy"; import { BaseAcceptComponent } from "../app/common/base.accept.component"; diff --git a/apps/web/src/auth/login/login.component.ts b/apps/web/src/auth/login/login.component.ts index dae68c617e..91555b07cd 100644 --- a/apps/web/src/auth/login/login.component.ts +++ b/apps/web/src/auth/login/login.component.ts @@ -14,15 +14,15 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; +import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; +import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; +import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; -import { PolicyData } from "@bitwarden/common/models/data/policy.data"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; -import { Policy } from "@bitwarden/common/models/domain/policy"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; -import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { RouterService, StateService } from "../../app/core"; diff --git a/apps/web/src/auth/register-form/register-form.component.ts b/apps/web/src/auth/register-form/register-form.component.ts index 5601829c20..6b14a518b1 100644 --- a/apps/web/src/auth/register-form/register-form.component.ts +++ b/apps/web/src/auth/register-form/register-form.component.ts @@ -11,10 +11,10 @@ import { FormValidationErrorsService } from "@bitwarden/common/abstractions/form import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +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 { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; diff --git a/apps/web/src/auth/set-password.component.ts b/apps/web/src/auth/set-password.component.ts index c31cd2b17c..a5e62696cb 100644 --- a/apps/web/src/auth/set-password.component.ts +++ b/apps/web/src/auth/set-password.component.ts @@ -7,11 +7,11 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts index 8579856898..64034b86cf 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts @@ -8,15 +8,15 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data"; +import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; +import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; import { EmergencyAccessPasswordRequest } from "@bitwarden/common/auth/models/request/emergency-access-password.request"; import { KdfType } from "@bitwarden/common/enums/kdfType"; -import { PolicyData } from "@bitwarden/common/models/data/policy.data"; -import { Policy } from "@bitwarden/common/models/domain/policy"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access.component.ts index 56dd5d7a71..daabe1288c 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-access.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access.component.ts @@ -7,9 +7,9 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { EmergencyAccessStatusType } from "@bitwarden/common/auth/enums/emergency-access-status-type"; import { EmergencyAccessType } from "@bitwarden/common/auth/enums/emergency-access-type"; import { EmergencyAccessConfirmRequest } from "@bitwarden/common/auth/models/request/emergency-access-confirm.request"; diff --git a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts index b5815be43f..f3ca697682 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts @@ -1,16 +1,16 @@ import { Component } from "@angular/core"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password/"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/web/src/auth/settings/two-factor-setup.component.ts b/apps/web/src/auth/settings/two-factor-setup.component.ts index dc5c08e81b..9b1fbbc8d9 100644 --- a/apps/web/src/auth/settings/two-factor-setup.component.ts +++ b/apps/web/src/auth/settings/two-factor-setup.component.ts @@ -5,11 +5,11 @@ import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; import { TwoFactorProviders } from "@bitwarden/common/auth/services/two-factor.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; import { TwoFactorAuthenticatorComponent } from "./two-factor-authenticator.component"; import { TwoFactorDuoComponent } from "./two-factor-duo.component"; diff --git a/apps/web/src/auth/update-password.component.ts b/apps/web/src/auth/update-password.component.ts index 3baa3bc0d4..0e9cf28c35 100644 --- a/apps/web/src/auth/update-password.component.ts +++ b/apps/web/src/auth/update-password.component.ts @@ -8,9 +8,9 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ diff --git a/apps/web/src/auth/update-temp-password.component.ts b/apps/web/src/auth/update-temp-password.component.ts index 7c55f7b2ba..912d7d2b85 100644 --- a/apps/web/src/auth/update-temp-password.component.ts +++ b/apps/web/src/auth/update-temp-password.component.ts @@ -7,8 +7,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/bitwarden_license/bit-web/src/app/organizations/components/base-cva.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/components/base-cva.component.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/organizations/components/base-cva.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/organizations/components/base-cva.component.ts diff --git a/bitwarden_license/bit-web/src/app/organizations/components/input-checkbox.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/components/input-checkbox.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/organizations/components/input-checkbox.component.html rename to bitwarden_license/bit-web/src/app/admin-console/organizations/components/input-checkbox.component.html diff --git a/bitwarden_license/bit-web/src/app/organizations/components/input-checkbox.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/components/input-checkbox.component.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/organizations/components/input-checkbox.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/organizations/components/input-checkbox.component.ts diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/organizations/manage/scim.component.html rename to bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.html diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts similarity index 90% rename from bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts index bb7bc921f4..88f3e638c5 100644 --- a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts @@ -5,16 +5,16 @@ import { ActivatedRoute } from "@angular/router"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationApiKeyType } from "@bitwarden/common/auth/enums/organization-api-key-type"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { OrganizationApiKeyType } from "@bitwarden/common/admin-console/enums/organization-api-key-type"; +import { OrganizationConnectionType } from "@bitwarden/common/admin-console/enums/organization-connection-type"; +import { ScimConfigApi } from "@bitwarden/common/admin-console/models/api/scim-config.api"; +import { OrganizationConnectionRequest } from "@bitwarden/common/admin-console/models/request/organization-connection.request"; +import { ScimConfigRequest } from "@bitwarden/common/admin-console/models/request/scim-config.request"; +import { OrganizationConnectionResponse } from "@bitwarden/common/admin-console/models/response/organization-connection.response"; import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response"; -import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; -import { ScimConfigApi } from "@bitwarden/common/models/api/scim-config.api"; import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organization-api-key.request"; -import { OrganizationConnectionRequest } from "@bitwarden/common/models/request/organization-connection.request"; -import { ScimConfigRequest } from "@bitwarden/common/models/request/scim-config.request"; -import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organization-connection.response"; @Component({ selector: "app-org-manage-scim", diff --git a/bitwarden_license/bit-web/src/app/organizations/organizations-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts similarity index 72% rename from bitwarden_license/bit-web/src/app/organizations/organizations-routing.module.ts rename to bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts index 3805650768..1613de2e47 100644 --- a/bitwarden_license/bit-web/src/app/organizations/organizations-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts @@ -2,15 +2,15 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard"; -import { canAccessSettingsTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationPermissionsGuard } from "@bitwarden/web-vault/app/organizations/guards/org-permissions.guard"; -import { OrganizationLayoutComponent } from "@bitwarden/web-vault/app/organizations/layouts/organization-layout.component"; -import { SettingsComponent } from "@bitwarden/web-vault/app/organizations/settings/settings.component"; +import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { OrganizationPermissionsGuard } from "@bitwarden/web-vault/app/admin-console/organizations/guards/org-permissions.guard"; +import { OrganizationLayoutComponent } from "@bitwarden/web-vault/app/admin-console/organizations/layouts/organization-layout.component"; +import { SettingsComponent } from "@bitwarden/web-vault/app/admin-console/organizations/settings/settings.component"; -import { SsoComponent } from "../auth/sso/sso.component"; +import { SsoComponent } from "../../auth/sso/sso.component"; +import { DomainVerificationComponent } from "../../organizations/manage/domain-verification/domain-verification.component"; -import { DomainVerificationComponent } from "./manage/domain-verification/domain-verification.component"; import { ScimComponent } from "./manage/scim.component"; const routes: Routes = [ diff --git a/bitwarden_license/bit-web/src/app/organizations/organizations.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts similarity index 64% rename from bitwarden_license/bit-web/src/app/organizations/organizations.module.ts rename to bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts index 3cef36c0ca..a8e904ef24 100644 --- a/bitwarden_license/bit-web/src/app/organizations/organizations.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts @@ -2,11 +2,11 @@ import { NgModule } from "@angular/core"; import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module"; -import { SsoComponent } from "../auth/sso/sso.component"; +import { SsoComponent } from "../../auth/sso/sso.component"; +import { DomainAddEditDialogComponent } from "../../organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component"; +import { DomainVerificationComponent } from "../../organizations/manage/domain-verification/domain-verification.component"; import { InputCheckboxComponent } from "./components/input-checkbox.component"; -import { DomainAddEditDialogComponent } from "./manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component"; -import { DomainVerificationComponent } from "./manage/domain-verification/domain-verification.component"; import { ScimComponent } from "./manage/scim.component"; import { OrganizationsRoutingModule } from "./organizations-routing.module"; diff --git a/bitwarden_license/bit-web/src/app/policies/activate-autofill.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/policies/activate-autofill.component.html rename to bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.html diff --git a/bitwarden_license/bit-web/src/app/policies/activate-autofill.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.ts similarity index 68% rename from bitwarden_license/bit-web/src/app/policies/activate-autofill.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.ts index da39a2fc45..cdafc98bca 100644 --- a/bitwarden_license/bit-web/src/app/policies/activate-autofill.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { BasePolicy, BasePolicyComponent, -} from "@bitwarden/web-vault/app/organizations/policies/base-policy.component"; +} from "@bitwarden/web-vault/app/admin-console/organizations/policies/base-policy.component"; export class ActivateAutofillPolicy extends BasePolicy { name = "activateAutofill"; diff --git a/bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/disable-personal-vault-export.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.html rename to bitwarden_license/bit-web/src/app/admin-console/policies/disable-personal-vault-export.component.html diff --git a/bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/disable-personal-vault-export.component.ts similarity index 76% rename from bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/policies/disable-personal-vault-export.component.ts index bd43b56afe..74464df953 100644 --- a/bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/policies/disable-personal-vault-export.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { BasePolicy, BasePolicyComponent, -} from "@bitwarden/web-vault/app/organizations/policies/base-policy.component"; +} from "@bitwarden/web-vault/app/admin-console/organizations/policies/base-policy.component"; export class DisablePersonalVaultExportPolicy extends BasePolicy { name = "disablePersonalVaultExport"; diff --git a/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.html rename to bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.html diff --git a/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.ts similarity index 87% rename from bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.ts index c1e193fc64..941a450091 100644 --- a/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.ts @@ -2,12 +2,12 @@ import { Component } from "@angular/core"; import { UntypedFormBuilder } from "@angular/forms"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { PolicyRequest } from "@bitwarden/common/models/request/policy.request"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request"; import { BasePolicy, BasePolicyComponent, -} from "@bitwarden/web-vault/app/organizations/policies/base-policy.component"; +} from "@bitwarden/web-vault/app/admin-console/organizations/policies/base-policy.component"; export class MaximumVaultTimeoutPolicy extends BasePolicy { name = "maximumVaultTimeout"; diff --git a/bitwarden_license/bit-web/src/app/providers/clients/add-organization.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/clients/add-organization.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/clients/add-organization.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts similarity index 89% rename from bitwarden_license/bit-web/src/app/providers/clients/add-organization.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts index 292c4649a9..74d44b8b10 100644 --- a/bitwarden_license/bit-web/src/app/providers/clients/add-organization.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts @@ -2,12 +2,12 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { Provider } from "@bitwarden/common/models/domain/provider"; -import { WebProviderService } from "../services/webProvider.service"; +import { WebProviderService } from "../services/web-provider.service"; @Component({ selector: "provider-add-organization", diff --git a/bitwarden_license/bit-web/src/app/providers/clients/clients.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/clients/clients.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts similarity index 89% rename from bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts index 5c22f52c82..f5b1aacb98 100644 --- a/bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts @@ -6,18 +6,18 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { PlanType } from "@bitwarden/common/enums/planType"; -import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/models/response/provider/provider-organization.response"; +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 { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; +import { ProviderUserType } from "@bitwarden/common/admin-console/enums/provider-user-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response"; +import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; -import { WebProviderService } from "../services/webProvider.service"; +import { WebProviderService } from "../services/web-provider.service"; import { AddOrganizationComponent } from "./add-organization.component"; diff --git a/bitwarden_license/bit-web/src/app/providers/clients/create-organization.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/clients/create-organization.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/clients/create-organization.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts similarity index 93% rename from bitwarden_license/bit-web/src/app/providers/clients/create-organization.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts index 64d746d0a1..53137514d4 100644 --- a/bitwarden_license/bit-web/src/app/providers/clients/create-organization.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/settings/organization-plans.component"; +import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing/settings/organization-plans.component"; @Component({ selector: "app-create-organization", diff --git a/bitwarden_license/bit-web/src/app/providers/guards/provider-permissions.guard.spec.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts similarity index 95% rename from bitwarden_license/bit-web/src/app/providers/guards/provider-permissions.guard.spec.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts index 8c2b8e5a5b..eda7abc875 100644 --- a/bitwarden_license/bit-web/src/app/providers/guards/provider-permissions.guard.spec.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts @@ -3,8 +3,8 @@ import { mock, MockProxy } from "jest-mock-extended"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; -import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; +import { ProviderUserType } from "@bitwarden/common/admin-console/enums/provider-user-type"; import { Provider } from "@bitwarden/common/models/domain/provider"; import { ProviderPermissionsGuard } from "./provider-permissions.guard"; diff --git a/bitwarden_license/bit-web/src/app/providers/guards/provider-permissions.guard.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts similarity index 93% rename from bitwarden_license/bit-web/src/app/providers/guards/provider-permissions.guard.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts index 01c6bb3c62..6606068e48 100644 --- a/bitwarden_license/bit-web/src/app/providers/guards/provider-permissions.guard.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts @@ -3,7 +3,7 @@ import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Provider } from "@bitwarden/common/models/domain/provider"; @Injectable() diff --git a/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts similarity index 92% rename from bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts index 4cb745e27b..3c4d2166bf 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts @@ -5,7 +5,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { ProviderUserAcceptRequest } from "@bitwarden/common/models/request/provider/provider-user-accept.request"; +import { ProviderUserAcceptRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-accept.request"; import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component"; @Component({ diff --git a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-confirm.component.ts similarity index 73% rename from bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-confirm.component.ts index 20c770daa1..dc91a7c2cf 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-confirm.component.ts @@ -1,14 +1,14 @@ import { Component, Input } from "@angular/core"; -import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; -import { ProviderUserBulkConfirmRequest } from "@bitwarden/common/models/request/provider/provider-user-bulk-confirm.request"; -import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/provider-user-bulk.request"; +import { ProviderUserStatusType } from "@bitwarden/common/admin-console/enums/provider-user-status-type"; +import { ProviderUserBulkConfirmRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk-confirm.request"; +import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request"; import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from "@bitwarden/web-vault/app/organizations/members/components/bulk/bulk-confirm.component"; import { BulkUserDetails } from "@bitwarden/web-vault/app/organizations/members/components/bulk/bulk-status.component"; @Component({ templateUrl: - "../../../../../../../apps/web/src/app/organizations/members/components/bulk/bulk-confirm.component.html", + "../../../../../../../../apps/web/src/app/organizations/members/components/bulk/bulk-confirm.component.html", }) export class BulkConfirmComponent extends OrganizationBulkConfirmComponent { @Input() providerId: string; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-remove.component.ts similarity index 72% rename from bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-remove.component.ts index 1a3d39c4ea..d69a1cc434 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-remove.component.ts @@ -1,11 +1,11 @@ import { Component, Input } from "@angular/core"; -import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/provider-user-bulk.request"; +import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request"; import { BulkRemoveComponent as OrganizationBulkRemoveComponent } from "@bitwarden/web-vault/app/organizations/members/components/bulk/bulk-remove.component"; @Component({ templateUrl: - "../../../../../../../apps/web/src/app/organizations/members/components/bulk/bulk-remove.component.html", + "../../../../../../../../apps/web/src/app/organizations/members/components/bulk/bulk-remove.component.html", }) export class BulkRemoveComponent extends OrganizationBulkRemoveComponent { @Input() providerId: string; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/events.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/manage/events.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/manage/events.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts similarity index 97% rename from bitwarden_license/bit-web/src/app/providers/manage/events.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts index 5c1105f6a7..f6316e617d 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/events.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts @@ -8,7 +8,7 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { EventResponse } from "@bitwarden/common/models/response/event.response"; import { BaseEventsComponent } from "@bitwarden/web-vault/app/common/base.events.component"; import { EventService } from "@bitwarden/web-vault/app/core"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/manage.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/manage/manage.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/manage/manage.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts similarity index 89% rename from bitwarden_license/bit-web/src/app/providers/manage/manage.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts index 21c3562b61..94d4490933 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/manage.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Provider } from "@bitwarden/common/models/domain/provider"; @Component({ diff --git a/bitwarden_license/bit-web/src/app/providers/manage/people.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/manage/people.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.ts similarity index 92% rename from bitwarden_license/bit-web/src/app/providers/manage/people.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.ts index 6029c6f2c3..0cb0c0bb7f 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.ts @@ -10,19 +10,19 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; -import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; -import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/provider-user-bulk.request"; -import { ProviderUserConfirmRequest } from "@bitwarden/common/models/request/provider/provider-user-confirm.request"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; +import { ProviderUserStatusType } from "@bitwarden/common/admin-console/enums/provider-user-status-type"; +import { ProviderUserType } from "@bitwarden/common/admin-console/enums/provider-user-type"; +import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request"; +import { ProviderUserConfirmRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-confirm.request"; +import { ProviderUserBulkResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user-bulk.response"; +import { ProviderUserUserDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user.response"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; -import { ProviderUserBulkResponse } from "@bitwarden/common/models/response/provider/provider-user-bulk.response"; -import { ProviderUserUserDetailsResponse } from "@bitwarden/common/models/response/provider/provider-user.response"; +import { EntityEventsComponent } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component"; import { BasePeopleComponent } from "@bitwarden/web-vault/app/common/base.people.component"; -import { EntityEventsComponent } from "@bitwarden/web-vault/app/organizations/manage/entity-events.component"; import { BulkStatusComponent } from "@bitwarden/web-vault/app/organizations/members/components/bulk/bulk-status.component"; import { BulkConfirmComponent } from "./bulk/bulk-confirm.component"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.ts similarity index 88% rename from bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.ts index 6b73709772..955f1dcc2c 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.ts @@ -4,10 +4,10 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; -import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api"; -import { ProviderUserInviteRequest } from "@bitwarden/common/models/request/provider/provider-user-invite.request"; -import { ProviderUserUpdateRequest } from "@bitwarden/common/models/request/provider/provider-user-update.request"; +import { ProviderUserType } from "@bitwarden/common/admin-console/enums/provider-user-type"; +import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api"; +import { ProviderUserInviteRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-invite.request"; +import { ProviderUserUpdateRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-update.request"; @Component({ selector: "provider-user-add-edit", diff --git a/bitwarden_license/bit-web/src/app/providers/providers-layout.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/providers-layout.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/providers-layout.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts similarity index 93% rename from bitwarden_license/bit-web/src/app/providers/providers-layout.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts index fbd5ad0677..de8ce219e6 100644 --- a/bitwarden_license/bit-web/src/app/providers/providers-layout.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Provider } from "@bitwarden/common/models/domain/provider"; @Component({ diff --git a/bitwarden_license/bit-web/src/app/providers/providers-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts similarity index 97% rename from bitwarden_license/bit-web/src/app/providers/providers-routing.module.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts index 21357e57ef..3be8ea6785 100644 --- a/bitwarden_license/bit-web/src/app/providers/providers-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts @@ -3,8 +3,8 @@ import { RouterModule, Routes } from "@angular/router"; import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard"; import { Provider } from "@bitwarden/common/models/domain/provider"; +import { ProvidersComponent } from "@bitwarden/web-vault/app/admin-console/providers/providers.component"; import { FrontendLayoutComponent } from "@bitwarden/web-vault/app/layouts/frontend-layout.component"; -import { ProvidersComponent } from "@bitwarden/web-vault/app/providers/providers.component"; import { ClientsComponent } from "./clients/clients.component"; import { CreateOrganizationComponent } from "./clients/create-organization.component"; diff --git a/bitwarden_license/bit-web/src/app/providers/providers.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts similarity index 97% rename from bitwarden_license/bit-web/src/app/providers/providers.module.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts index 99545b258a..cda2a108f7 100644 --- a/bitwarden_license/bit-web/src/app/providers/providers.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts @@ -19,7 +19,7 @@ import { PeopleComponent } from "./manage/people.component"; import { UserAddEditComponent } from "./manage/user-add-edit.component"; import { ProvidersLayoutComponent } from "./providers-layout.component"; import { ProvidersRoutingModule } from "./providers-routing.module"; -import { WebProviderService } from "./services/webProvider.service"; +import { WebProviderService } from "./services/web-provider.service"; import { AccountComponent } from "./settings/account.component"; import { SettingsComponent } from "./settings/settings.component"; import { SetupProviderComponent } from "./setup/setup-provider.component"; diff --git a/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts similarity index 94% rename from bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts index 3a5e0e0477..03e2b8c48d 100644 --- a/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts @@ -2,7 +2,7 @@ import { Injectable } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { ProviderAddOrganizationRequest } from "@bitwarden/common/models/request/provider/provider-add-organization.request"; +import { ProviderAddOrganizationRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-add-organization.request"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Injectable() diff --git a/bitwarden_license/bit-web/src/app/providers/settings/account.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/settings/account.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/settings/account.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/settings/account.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/settings/account.component.ts similarity index 90% rename from bitwarden_license/bit-web/src/app/providers/settings/account.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/settings/account.component.ts index 5f81860bf6..939623d8ef 100644 --- a/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/settings/account.component.ts @@ -5,8 +5,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ProviderUpdateRequest } from "@bitwarden/common/models/request/provider/provider-update.request"; -import { ProviderResponse } from "@bitwarden/common/models/response/provider/provider.response"; +import { ProviderUpdateRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-update.request"; +import { ProviderResponse } from "@bitwarden/common/admin-console/models/response/provider/provider.response"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ diff --git a/bitwarden_license/bit-web/src/app/providers/settings/settings.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/settings/settings.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/settings/settings.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/settings/settings.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/settings/settings.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/settings/settings.component.ts similarity index 86% rename from bitwarden_license/bit-web/src/app/providers/settings/settings.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/settings/settings.component.ts index e2b96f4ce4..be5d239cfa 100644 --- a/bitwarden_license/bit-web/src/app/providers/settings/settings.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/settings/settings.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; @Component({ selector: "provider-settings", diff --git a/bitwarden_license/bit-web/src/app/providers/setup/setup-provider.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/setup/setup-provider.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/setup/setup-provider.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/setup/setup-provider.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts diff --git a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/providers/setup/setup.component.html rename to bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html diff --git a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts similarity index 96% rename from bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts rename to bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts index 696567591f..46e4151ff3 100644 --- a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts @@ -7,7 +7,7 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { ProviderSetupRequest } from "@bitwarden/common/models/request/provider/provider-setup.request"; +import { ProviderSetupRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-setup.request"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ diff --git a/bitwarden_license/bit-web/src/app/app-routing.module.ts b/bitwarden_license/bit-web/src/app/app-routing.module.ts index aea521f3b0..c32fe78cb6 100644 --- a/bitwarden_license/bit-web/src/app/app-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/app-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { ProvidersModule } from "./providers/providers.module"; +import { ProvidersModule } from "./admin-console/providers/providers.module"; const routes: Routes = [ { diff --git a/bitwarden_license/bit-web/src/app/app.component.ts b/bitwarden_license/bit-web/src/app/app.component.ts index 34b7acbd9d..edefa20388 100644 --- a/bitwarden_license/bit-web/src/app/app.component.ts +++ b/bitwarden_license/bit-web/src/app/app.component.ts @@ -2,9 +2,9 @@ import { Component } from "@angular/core"; import { AppComponent as BaseAppComponent } from "@bitwarden/web-vault/app/app.component"; -import { ActivateAutofillPolicy } from "./policies/activate-autofill.component"; -import { DisablePersonalVaultExportPolicy } from "./policies/disable-personal-vault-export.component"; -import { MaximumVaultTimeoutPolicy } from "./policies/maximum-vault-timeout.component"; +import { ActivateAutofillPolicy } from "./admin-console/policies/activate-autofill.component"; +import { DisablePersonalVaultExportPolicy } from "./admin-console/policies/disable-personal-vault-export.component"; +import { MaximumVaultTimeoutPolicy } from "./admin-console/policies/maximum-vault-timeout.component"; @Component({ selector: "app-root", diff --git a/bitwarden_license/bit-web/src/app/app.module.ts b/bitwarden_license/bit-web/src/app/app.module.ts index e7d59d4fab..c5de6f6d5f 100644 --- a/bitwarden_license/bit-web/src/app/app.module.ts +++ b/bitwarden_license/bit-web/src/app/app.module.ts @@ -12,12 +12,12 @@ import { OssRoutingModule } from "@bitwarden/web-vault/app/oss-routing.module"; import { OssModule } from "@bitwarden/web-vault/app/oss.module"; import { WildcardRoutingModule } from "@bitwarden/web-vault/app/wildcard-routing.module"; +import { OrganizationsModule } from "./admin-console/organizations/organizations.module"; +import { ActivateAutofillPolicyComponent } from "./admin-console/policies/activate-autofill.component"; +import { DisablePersonalVaultExportPolicyComponent } from "./admin-console/policies/disable-personal-vault-export.component"; +import { MaximumVaultTimeoutPolicyComponent } from "./admin-console/policies/maximum-vault-timeout.component"; import { AppRoutingModule } from "./app-routing.module"; import { AppComponent } from "./app.component"; -import { OrganizationsModule } from "./organizations/organizations.module"; -import { ActivateAutofillPolicyComponent } from "./policies/activate-autofill.component"; -import { DisablePersonalVaultExportPolicyComponent } from "./policies/disable-personal-vault-export.component"; -import { MaximumVaultTimeoutPolicyComponent } from "./policies/maximum-vault-timeout.component"; @NgModule({ imports: [ diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts index e519b47985..56619a08fb 100644 --- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts +++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts @@ -13,9 +13,10 @@ import { SelectOptions } from "@bitwarden/angular/interfaces/selectOptions"; import { ControlsOf } from "@bitwarden/angular/types/controls-of"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +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 { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { OpenIdConnectRedirectBehavior, Saml2BindingType, @@ -28,7 +29,6 @@ import { OrganizationSsoRequest } from "@bitwarden/common/auth/models/request/or import { OrganizationSsoResponse } from "@bitwarden/common/auth/models/response/organization-sso.response"; import { SsoConfigView } from "@bitwarden/common/auth/models/view/sso-config.view"; import { Utils } from "@bitwarden/common/misc/utils"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { ssoTypeValidator } from "./sso-type.validator"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.stories.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.stories.ts index 5c35051d16..f3ae4f57c5 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.stories.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.stories.ts @@ -3,8 +3,8 @@ import { RouterModule } from "@angular/router"; import { Meta, Story, moduleMetadata } from "@storybook/angular"; import { BehaviorSubject } from "rxjs"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { IconModule } from "@bitwarden/components"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/tests/preloaded-english-i18n.module"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts index cf8b74a235..4b0449ef33 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts @@ -2,8 +2,8 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { map } from "rxjs"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { SecretsManagerLogo } from "./secrets-manager-logo"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts index d8decacf77..357ee3f2fe 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts @@ -2,8 +2,8 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { combineLatest, map, Observable } from "rxjs"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import type { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import type { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @Component({ selector: "org-switcher", diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts index fd7932560f..64ee4a0b73 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts @@ -14,9 +14,9 @@ import { } from "rxjs"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { DialogService } from "@bitwarden/components"; import { ProjectListView } from "../models/view/project-list.view"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts index 7c6ad26855..74d90c52a6 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts @@ -7,8 +7,8 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { UserVerificationPromptComponent } from "@bitwarden/web-vault/app/components/user-verification-prompt.component"; import { SecretsManagerPortingApiService } from "../services/sm-porting-api.service"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.ts index 19d764658e..72899223f3 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.ts @@ -6,8 +6,8 @@ import { Subject, takeUntil } from "rxjs"; import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { DialogService } from "@bitwarden/components"; import { diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/settings-routing.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/settings/settings-routing.module.ts index 325592beb3..0b10ec8752 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/settings-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/settings-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationPermissionsGuard } from "@bitwarden/web-vault/app/organizations/guards/org-permissions.guard"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { OrganizationPermissionsGuard } from "@bitwarden/web-vault/app/admin-console/organizations/guards/org-permissions.guard"; import { SecretsManagerExportComponent } from "./porting/sm-export.component"; import { SecretsManagerImportComponent } from "./porting/sm-import.component"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy.service.ts index 2adfc3b3b2..1157f4878f 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy.service.ts @@ -4,7 +4,7 @@ import { Subject } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts index 961c910ea5..236881c20b 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts @@ -2,8 +2,8 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationPermissionsGuard } from "@bitwarden/web-vault/app/organizations/guards/org-permissions.guard"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { OrganizationPermissionsGuard } from "@bitwarden/web-vault/app/admin-console/organizations/guards/org-permissions.guard"; import { buildFlaggedRoute } from "@bitwarden/web-vault/app/oss-routing.module"; import { LayoutComponent } from "./layout/layout.component"; diff --git a/libs/angular/src/components/collections.component.ts b/libs/angular/src/admin-console/components/collections.component.ts similarity index 93% rename from libs/angular/src/components/collections.component.ts rename to libs/angular/src/admin-console/components/collections.component.ts index 913ac3ec37..c26d3b930a 100644 --- a/libs/angular/src/components/collections.component.ts +++ b/libs/angular/src/admin-console/components/collections.component.ts @@ -1,10 +1,10 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/angular/src/auth/components/change-password.component.ts b/libs/angular/src/auth/components/change-password.component.ts index ce927ac3c5..88b652686b 100644 --- a/libs/angular/src/auth/components/change-password.component.ts +++ b/libs/angular/src/auth/components/change-password.component.ts @@ -5,13 +5,13 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +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"; import { KdfType } from "@bitwarden/common/enums/kdfType"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; diff --git a/libs/angular/src/auth/components/remove-password.component.ts b/libs/angular/src/auth/components/remove-password.component.ts index 8d01d39d27..d904d2e0ca 100644 --- a/libs/angular/src/auth/components/remove-password.component.ts +++ b/libs/angular/src/auth/components/remove-password.component.ts @@ -2,11 +2,11 @@ import { Directive, OnInit } from "@angular/core"; import { Router } from "@angular/router"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Directive() diff --git a/libs/angular/src/auth/components/update-password.component.ts b/libs/angular/src/auth/components/update-password.component.ts index a568f55e23..97de355b1c 100644 --- a/libs/angular/src/auth/components/update-password.component.ts +++ b/libs/angular/src/auth/components/update-password.component.ts @@ -7,13 +7,13 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; +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 { VerificationType } from "@bitwarden/common/auth/enums/verification-type"; import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { Verification } from "@bitwarden/common/types/verification"; diff --git a/libs/angular/src/auth/components/update-temp-password.component.ts b/libs/angular/src/auth/components/update-temp-password.component.ts index 6f46db3e18..9610f0444f 100644 --- a/libs/angular/src/auth/components/update-temp-password.component.ts +++ b/libs/angular/src/auth/components/update-temp-password.component.ts @@ -6,11 +6,11 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +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 { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/libs/angular/src/images/cards/amex-dark.png b/libs/angular/src/billing/images/cards/amex-dark.png similarity index 100% rename from libs/angular/src/images/cards/amex-dark.png rename to libs/angular/src/billing/images/cards/amex-dark.png diff --git a/libs/angular/src/images/cards/amex-light.png b/libs/angular/src/billing/images/cards/amex-light.png similarity index 100% rename from libs/angular/src/images/cards/amex-light.png rename to libs/angular/src/billing/images/cards/amex-light.png diff --git a/libs/angular/src/images/cards/diners_club-dark.png b/libs/angular/src/billing/images/cards/diners_club-dark.png similarity index 100% rename from libs/angular/src/images/cards/diners_club-dark.png rename to libs/angular/src/billing/images/cards/diners_club-dark.png diff --git a/libs/angular/src/images/cards/diners_club-light.png b/libs/angular/src/billing/images/cards/diners_club-light.png similarity index 100% rename from libs/angular/src/images/cards/diners_club-light.png rename to libs/angular/src/billing/images/cards/diners_club-light.png diff --git a/libs/angular/src/images/cards/discover-dark.png b/libs/angular/src/billing/images/cards/discover-dark.png similarity index 100% rename from libs/angular/src/images/cards/discover-dark.png rename to libs/angular/src/billing/images/cards/discover-dark.png diff --git a/libs/angular/src/images/cards/discover-light.png b/libs/angular/src/billing/images/cards/discover-light.png similarity index 100% rename from libs/angular/src/images/cards/discover-light.png rename to libs/angular/src/billing/images/cards/discover-light.png diff --git a/libs/angular/src/images/cards/jcb-dark.png b/libs/angular/src/billing/images/cards/jcb-dark.png similarity index 100% rename from libs/angular/src/images/cards/jcb-dark.png rename to libs/angular/src/billing/images/cards/jcb-dark.png diff --git a/libs/angular/src/images/cards/jcb-light.png b/libs/angular/src/billing/images/cards/jcb-light.png similarity index 100% rename from libs/angular/src/images/cards/jcb-light.png rename to libs/angular/src/billing/images/cards/jcb-light.png diff --git a/libs/angular/src/images/cards/maestro-dark.png b/libs/angular/src/billing/images/cards/maestro-dark.png similarity index 100% rename from libs/angular/src/images/cards/maestro-dark.png rename to libs/angular/src/billing/images/cards/maestro-dark.png diff --git a/libs/angular/src/images/cards/maestro-light.png b/libs/angular/src/billing/images/cards/maestro-light.png similarity index 100% rename from libs/angular/src/images/cards/maestro-light.png rename to libs/angular/src/billing/images/cards/maestro-light.png diff --git a/libs/angular/src/images/cards/mastercard-dark.png b/libs/angular/src/billing/images/cards/mastercard-dark.png similarity index 100% rename from libs/angular/src/images/cards/mastercard-dark.png rename to libs/angular/src/billing/images/cards/mastercard-dark.png diff --git a/libs/angular/src/images/cards/mastercard-light.png b/libs/angular/src/billing/images/cards/mastercard-light.png similarity index 100% rename from libs/angular/src/images/cards/mastercard-light.png rename to libs/angular/src/billing/images/cards/mastercard-light.png diff --git a/libs/angular/src/images/cards/ru_pay-dark.png b/libs/angular/src/billing/images/cards/ru_pay-dark.png similarity index 100% rename from libs/angular/src/images/cards/ru_pay-dark.png rename to libs/angular/src/billing/images/cards/ru_pay-dark.png diff --git a/libs/angular/src/images/cards/ru_pay-light.png b/libs/angular/src/billing/images/cards/ru_pay-light.png similarity index 100% rename from libs/angular/src/images/cards/ru_pay-light.png rename to libs/angular/src/billing/images/cards/ru_pay-light.png diff --git a/libs/angular/src/images/cards/union_pay-dark.png b/libs/angular/src/billing/images/cards/union_pay-dark.png similarity index 100% rename from libs/angular/src/images/cards/union_pay-dark.png rename to libs/angular/src/billing/images/cards/union_pay-dark.png diff --git a/libs/angular/src/images/cards/union_pay-light.png b/libs/angular/src/billing/images/cards/union_pay-light.png similarity index 100% rename from libs/angular/src/images/cards/union_pay-light.png rename to libs/angular/src/billing/images/cards/union_pay-light.png diff --git a/libs/angular/src/images/cards/visa-dark.png b/libs/angular/src/billing/images/cards/visa-dark.png similarity index 100% rename from libs/angular/src/images/cards/visa-dark.png rename to libs/angular/src/billing/images/cards/visa-dark.png diff --git a/libs/angular/src/images/cards/visa-light.png b/libs/angular/src/billing/images/cards/visa-light.png similarity index 100% rename from libs/angular/src/images/cards/visa-light.png rename to libs/angular/src/billing/images/cards/visa-light.png diff --git a/libs/angular/src/components/callout.component.ts b/libs/angular/src/components/callout.component.ts index 2ca5466f84..0edaafe17c 100644 --- a/libs/angular/src/components/callout.component.ts +++ b/libs/angular/src/components/callout.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; @Component({ selector: "app-callout", diff --git a/libs/angular/src/components/export-scope-callout.component.ts b/libs/angular/src/components/export-scope-callout.component.ts index 74e862ec81..d7c15657f5 100644 --- a/libs/angular/src/components/export-scope-callout.component.ts +++ b/libs/angular/src/components/export-scope-callout.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from "@angular/core"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; @Component({ selector: "app-export-scope-callout", diff --git a/libs/angular/src/components/export.component.ts b/libs/angular/src/components/export.component.ts index 34f196d57c..51dbb79e5b 100644 --- a/libs/angular/src/components/export.component.ts +++ b/libs/angular/src/components/export.component.ts @@ -9,11 +9,11 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { EncryptedExportType } from "@bitwarden/common/enums/encryptedExportType"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; @Directive() export class ExportComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/send/add-edit.component.ts b/libs/angular/src/components/send/add-edit.component.ts index 55b8a03b83..da00c502fa 100644 --- a/libs/angular/src/components/send/add-edit.component.ts +++ b/libs/angular/src/components/send/add-edit.component.ts @@ -7,10 +7,10 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SendService } from "@bitwarden/common/abstractions/send.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { SendType } from "@bitwarden/common/enums/sendType"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { Send } from "@bitwarden/common/models/domain/send"; diff --git a/libs/angular/src/components/send/send.component.ts b/libs/angular/src/components/send/send.component.ts index 9dd9e6ebbe..63c51c59a3 100644 --- a/libs/angular/src/components/send/send.component.ts +++ b/libs/angular/src/components/send/send.component.ts @@ -5,10 +5,10 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { SendType } from "@bitwarden/common/enums/sendType"; import { SendView } from "@bitwarden/common/models/view/send.view"; diff --git a/libs/angular/src/components/set-password.component.ts b/libs/angular/src/components/set-password.component.ts index 5a24494f16..90781b9be7 100644 --- a/libs/angular/src/components/set-password.component.ts +++ b/libs/angular/src/components/set-password.component.ts @@ -8,11 +8,11 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +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"; import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; import { DEFAULT_KDF_TYPE, DEFAULT_KDF_CONFIG } from "@bitwarden/common/enums/kdfType"; diff --git a/libs/angular/src/components/settings/vault-timeout-input.component.ts b/libs/angular/src/components/settings/vault-timeout-input.component.ts index 104370a3b3..a2bb01017c 100644 --- a/libs/angular/src/components/settings/vault-timeout-input.component.ts +++ b/libs/angular/src/components/settings/vault-timeout-input.component.ts @@ -9,9 +9,9 @@ import { import { combineLatestWith, Subject, takeUntil } from "rxjs"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { Policy } from "@bitwarden/common/models/domain/policy"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; @Directive() export class VaultTimeoutInputComponent diff --git a/libs/angular/src/components/share.component.ts b/libs/angular/src/components/share.component.ts index 77c9eba0d0..60f3a55cb1 100644 --- a/libs/angular/src/components/share.component.ts +++ b/libs/angular/src/components/share.component.ts @@ -1,18 +1,18 @@ import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core"; import { firstValueFrom, map, Observable, Subject, takeUntil } from "rxjs"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { isNotProviderUser, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { Utils } from "@bitwarden/common/misc/utils"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { Checkable, isChecked } from "@bitwarden/common/types/checkable"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/angular/src/pipes/user-type.pipe.ts b/libs/angular/src/pipes/user-type.pipe.ts index c0f8c8df8f..9b351a7a2a 100644 --- a/libs/angular/src/pipes/user-type.pipe.ts +++ b/libs/angular/src/pipes/user-type.pipe.ts @@ -1,7 +1,7 @@ import { Pipe, PipeTransform } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type"; @Pipe({ name: "userType", diff --git a/libs/angular/src/scss/icons.scss b/libs/angular/src/scss/icons.scss index 58c860ff7e..b7eeece68b 100644 --- a/libs/angular/src/scss/icons.scss +++ b/libs/angular/src/scss/icons.scss @@ -1,4 +1,4 @@ -$card-icons-base: "~@bitwarden/angular/src/images/cards/" !default; +$card-icons-base: "~@bitwarden/angular/src/billing/images/cards/" !default; $card-icons: ( "visa": $card-icons-base + "visa-light.png", "amex": $card-icons-base + "amex-light.png", diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index 4a0922acb9..bd54e3c819 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -6,7 +6,6 @@ import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstracti import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/abstractions/appId.service"; import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service"; import { BroadcasterService as BroadcasterServiceAbstraction } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/abstractions/collection.service"; import { ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction"; import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction"; import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service"; @@ -28,18 +27,7 @@ import { OrgDomainInternalServiceAbstraction, } from "@bitwarden/common/abstractions/organization-domain/org-domain.service.abstraction"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { - InternalOrganizationService, - OrganizationService as OrganizationServiceAbstraction, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { - InternalPolicyService, - PolicyService as PolicyServiceAbstraction, -} from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/abstractions/provider.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; import { SendService as SendServiceAbstraction } from "@bitwarden/common/abstractions/send.service"; import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service"; @@ -52,6 +40,24 @@ import { UserVerificationService as UserVerificationServiceAbstraction } from "@ import { ValidationService as ValidationServiceAbstraction } from "@bitwarden/common/abstractions/validation.service"; import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; +import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { + InternalOrganizationService, + OrganizationService as OrganizationServiceAbstraction, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; +import { + InternalPolicyService, + PolicyService as PolicyServiceAbstraction, +} from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider.service"; +import { CollectionService } from "@bitwarden/common/admin-console/services/collection.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 { 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"; import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/account-api.service"; import { AccountService as AccountServiceAbstraction, @@ -80,7 +86,6 @@ import { AnonymousHubService } from "@bitwarden/common/services/anonymousHub.ser import { ApiService } from "@bitwarden/common/services/api.service"; import { AppIdService } from "@bitwarden/common/services/appId.service"; import { AuditService } from "@bitwarden/common/services/audit.service"; -import { CollectionService } from "@bitwarden/common/services/collection.service"; import { ConfigApiService } from "@bitwarden/common/services/config/config-api.service"; import { ConfigService } from "@bitwarden/common/services/config/config.service"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; @@ -97,11 +102,6 @@ import { NotificationsService } from "@bitwarden/common/services/notifications.s 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 { OrganizationApiService } from "@bitwarden/common/services/organization/organization-api.service"; -import { OrganizationService } from "@bitwarden/common/services/organization/organization.service"; -import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service"; -import { PolicyService } from "@bitwarden/common/services/policy/policy.service"; -import { ProviderService } from "@bitwarden/common/services/provider.service"; import { SearchService } from "@bitwarden/common/services/search.service"; import { SendService } from "@bitwarden/common/services/send.service"; import { SettingsService } from "@bitwarden/common/services/settings.service"; diff --git a/libs/angular/src/tools/generator/components/generator.component.ts b/libs/angular/src/tools/generator/components/generator.component.ts index ec3ee0bff7..cf5bee4710 100644 --- a/libs/angular/src/tools/generator/components/generator.component.ts +++ b/libs/angular/src/tools/generator/components/generator.component.ts @@ -6,8 +6,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PasswordGeneratorPolicyOptions } from "@bitwarden/common/admin-console/models/domain/password-generator-policy-options"; import { EmailForwarderOptions } from "@bitwarden/common/models/domain/email-forwarder-options"; -import { PasswordGeneratorPolicyOptions } from "@bitwarden/common/models/domain/password-generator-policy-options"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username"; diff --git a/libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts b/libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts index e28cc2718b..74e3492125 100644 --- a/libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts +++ b/libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts @@ -1,7 +1,7 @@ import { Observable } from "rxjs"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { DynamicTreeNode } from "../vault-filter/models/dynamic-tree-node.model"; diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts index d632c3ce8d..b41ad26765 100644 --- a/libs/angular/src/vault/components/add-edit.component.ts +++ b/libs/angular/src/vault/components/add-edit.component.ts @@ -2,26 +2,26 @@ import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angu import { Observable, Subject, takeUntil, concatMap } from "rxjs"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { isNotProviderUser, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/libs/angular/src/vault/components/vault-items.component.ts b/libs/angular/src/vault/components/vault-items.component.ts index a4684786fd..8848cd5134 100644 --- a/libs/angular/src/vault/components/vault-items.component.ts +++ b/libs/angular/src/vault/components/vault-items.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @Directive() diff --git a/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts b/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts index 0e5cd97870..1d90f43ba2 100644 --- a/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; diff --git a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts index 448627d9be..26fd477271 100644 --- a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts @@ -1,6 +1,6 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; import { DisplayMode } from "../models/display-mode"; diff --git a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts index 3cc0acf3fe..1d4b5cf8bb 100644 --- a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts @@ -1,9 +1,9 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { firstValueFrom, Observable } from "rxjs"; -import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { DeprecatedVaultFilterService } from "../../abstractions/deprecated-vault-filter.service"; diff --git a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts index ced1b1b7e9..9e7bd1559c 100644 --- a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts +++ b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts @@ -1,18 +1,18 @@ import { Injectable } from "@angular/core"; import { firstValueFrom, from, mergeMap, Observable } from "rxjs"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { isNotProviderUser, OrganizationService, -} from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; -import { Organization } from "@bitwarden/common/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; diff --git a/libs/common/spec/models/domain/collection.spec.ts b/libs/common/spec/models/domain/collection.spec.ts index b36ac0ce60..6f3a5bcfec 100644 --- a/libs/common/spec/models/domain/collection.spec.ts +++ b/libs/common/spec/models/domain/collection.spec.ts @@ -1,5 +1,5 @@ -import { CollectionData } from "@bitwarden/common/models/data/collection.data"; -import { Collection } from "@bitwarden/common/models/domain/collection"; +import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; +import { Collection } from "@bitwarden/common/admin-console/models/domain/collection"; import { mockEnc } from "../../utils"; diff --git a/libs/common/spec/services/import.service.spec.ts b/libs/common/spec/services/import.service.spec.ts index 6f29d22437..98620d1064 100644 --- a/libs/common/spec/services/import.service.spec.ts +++ b/libs/common/spec/services/import.service.spec.ts @@ -1,10 +1,10 @@ // eslint-disable-next-line no-restricted-imports import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwarden-password-protected-importer"; import { Importer } from "@bitwarden/common/importers/importer"; import { Utils } from "@bitwarden/common/misc/utils"; diff --git a/libs/common/spec/services/organization/organization.service.spec.ts b/libs/common/spec/services/organization/organization.service.spec.ts index 42a327c18f..81ae60f947 100644 --- a/libs/common/spec/services/organization/organization.service.spec.ts +++ b/libs/common/spec/services/organization/organization.service.spec.ts @@ -2,8 +2,8 @@ import { MockProxy, mock, any, mockClear } from "jest-mock-extended"; import { BehaviorSubject, firstValueFrom } from "rxjs"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { OrganizationData } from "@bitwarden/common/models/data/organization.data"; -import { OrganizationService } from "@bitwarden/common/services/organization/organization.service"; +import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data"; +import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service"; describe("Organization Service", () => { let organizationService: OrganizationService; diff --git a/libs/common/spec/services/policy.service.spec.ts b/libs/common/spec/services/policy.service.spec.ts index cbdbfca2aa..39beca21b6 100644 --- a/libs/common/spec/services/policy.service.spec.ts +++ b/libs/common/spec/services/policy.service.spec.ts @@ -4,20 +4,20 @@ import { BehaviorSubject, firstValueFrom } from "rxjs"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api"; -import { OrganizationData } from "@bitwarden/common/models/data/organization.data"; -import { PolicyData } from "@bitwarden/common/models/data/policy.data"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; -import { Organization } from "@bitwarden/common/models/domain/organization"; -import { Policy } from "@bitwarden/common/models/domain/policy"; -import { ResetPasswordPolicyOptions } from "@bitwarden/common/models/domain/reset-password-policy-options"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type"; +import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; +import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api"; +import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data"; +import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; +import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; +import { ResetPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/reset-password-policy-options"; +import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response"; +import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; -import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; import { ContainerService } from "@bitwarden/common/services/container.service"; -import { PolicyService } from "@bitwarden/common/services/policy/policy.service"; import { StateService } from "@bitwarden/common/services/state.service"; describe("PolicyService", () => { diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts index 4c4dd68d85..3bf7c3f1f9 100644 --- a/libs/common/src/abstractions/api.service.ts +++ b/libs/common/src/abstractions/api.service.ts @@ -1,3 +1,42 @@ +import { OrganizationConnectionType } from "../admin-console/enums/organization-connection-type"; +import { CollectionRequest } from "../admin-console/models/request/collection.request"; +import { OrganizationConnectionRequest } from "../admin-console/models/request/organization-connection.request"; +import { OrganizationSponsorshipCreateRequest } from "../admin-console/models/request/organization/organization-sponsorship-create.request"; +import { OrganizationSponsorshipRedeemRequest } from "../admin-console/models/request/organization/organization-sponsorship-redeem.request"; +import { ProviderAddOrganizationRequest } from "../admin-console/models/request/provider/provider-add-organization.request"; +import { ProviderOrganizationCreateRequest } from "../admin-console/models/request/provider/provider-organization-create.request"; +import { ProviderSetupRequest } from "../admin-console/models/request/provider/provider-setup.request"; +import { ProviderUpdateRequest } from "../admin-console/models/request/provider/provider-update.request"; +import { ProviderUserAcceptRequest } from "../admin-console/models/request/provider/provider-user-accept.request"; +import { ProviderUserBulkConfirmRequest } from "../admin-console/models/request/provider/provider-user-bulk-confirm.request"; +import { ProviderUserBulkRequest } from "../admin-console/models/request/provider/provider-user-bulk.request"; +import { ProviderUserConfirmRequest } from "../admin-console/models/request/provider/provider-user-confirm.request"; +import { ProviderUserInviteRequest } from "../admin-console/models/request/provider/provider-user-invite.request"; +import { ProviderUserUpdateRequest } from "../admin-console/models/request/provider/provider-user-update.request"; +import { SelectionReadOnlyRequest } from "../admin-console/models/request/selection-read-only.request"; +import { + CollectionAccessDetailsResponse, + CollectionResponse, +} from "../admin-console/models/response/collection.response"; +import { + OrganizationConnectionConfigApis, + OrganizationConnectionResponse, +} from "../admin-console/models/response/organization-connection.response"; +import { OrganizationExportResponse } from "../admin-console/models/response/organization-export.response"; +import { OrganizationSponsorshipSyncStatusResponse } from "../admin-console/models/response/organization-sponsorship-sync-status.response"; +import { PolicyResponse } from "../admin-console/models/response/policy.response"; +import { + ProviderOrganizationOrganizationDetailsResponse, + ProviderOrganizationResponse, +} from "../admin-console/models/response/provider/provider-organization.response"; +import { ProviderUserBulkPublicKeyResponse } from "../admin-console/models/response/provider/provider-user-bulk-public-key.response"; +import { ProviderUserBulkResponse } from "../admin-console/models/response/provider/provider-user-bulk.response"; +import { + ProviderUserResponse, + ProviderUserUserDetailsResponse, +} from "../admin-console/models/response/provider/provider-user.response"; +import { ProviderResponse } from "../admin-console/models/response/provider/provider.response"; +import { SelectionReadOnlyResponse } from "../admin-console/models/response/selection-read-only.response"; import { DeviceVerificationRequest } from "../auth/models/request/device-verification.request"; import { EmailTokenRequest } from "../auth/models/request/email-token.request"; import { EmailRequest } from "../auth/models/request/email.request"; @@ -54,81 +93,42 @@ import { TwoFactorWebAuthnResponse, } from "../auth/models/response/two-factor-web-authn.response"; import { TwoFactorYubiKeyResponse } from "../auth/models/response/two-factor-yubi-key.response"; -import { OrganizationConnectionType } from "../enums/organizationConnectionType"; -import { BitPayInvoiceRequest } from "../models/request/bit-pay-invoice.request"; +import { BitPayInvoiceRequest } from "../billing/models/request/bit-pay-invoice.request"; +import { PaymentRequest } from "../billing/models/request/payment.request"; +import { TaxInfoUpdateRequest } from "../billing/models/request/tax-info-update.request"; +import { BillingHistoryResponse } from "../billing/models/response/billing-history.response"; +import { BillingPaymentResponse } from "../billing/models/response/billing-payment.response"; +import { PaymentResponse } from "../billing/models/response/payment.response"; +import { PlanResponse } from "../billing/models/response/plan.response"; +import { SubscriptionResponse } from "../billing/models/response/subscription.response"; +import { TaxInfoResponse } from "../billing/models/response/tax-info.response"; +import { TaxRateResponse } from "../billing/models/response/tax-rate.response"; import { CollectionBulkDeleteRequest } from "../models/request/collection-bulk-delete.request"; -import { CollectionRequest } from "../models/request/collection.request"; import { DeleteRecoverRequest } from "../models/request/delete-recover.request"; import { EventRequest } from "../models/request/event.request"; import { IapCheckRequest } from "../models/request/iap-check.request"; import { KdfRequest } from "../models/request/kdf.request"; import { KeysRequest } from "../models/request/keys.request"; -import { OrganizationConnectionRequest } from "../models/request/organization-connection.request"; import { OrganizationImportRequest } from "../models/request/organization-import.request"; -import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organization-sponsorship-create.request"; -import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organization-sponsorship-redeem.request"; -import { PaymentRequest } from "../models/request/payment.request"; import { PreloginRequest } from "../models/request/prelogin.request"; -import { ProviderAddOrganizationRequest } from "../models/request/provider/provider-add-organization.request"; -import { ProviderOrganizationCreateRequest } from "../models/request/provider/provider-organization-create.request"; -import { ProviderSetupRequest } from "../models/request/provider/provider-setup.request"; -import { ProviderUpdateRequest } from "../models/request/provider/provider-update.request"; -import { ProviderUserAcceptRequest } from "../models/request/provider/provider-user-accept.request"; -import { ProviderUserBulkConfirmRequest } from "../models/request/provider/provider-user-bulk-confirm.request"; -import { ProviderUserBulkRequest } from "../models/request/provider/provider-user-bulk.request"; -import { ProviderUserConfirmRequest } from "../models/request/provider/provider-user-confirm.request"; -import { ProviderUserInviteRequest } from "../models/request/provider/provider-user-invite.request"; -import { ProviderUserUpdateRequest } from "../models/request/provider/provider-user-update.request"; import { RegisterRequest } from "../models/request/register.request"; -import { SelectionReadOnlyRequest } from "../models/request/selection-read-only.request"; import { SendAccessRequest } from "../models/request/send-access.request"; import { SendRequest } from "../models/request/send.request"; import { StorageRequest } from "../models/request/storage.request"; -import { TaxInfoUpdateRequest } from "../models/request/tax-info-update.request"; import { UpdateAvatarRequest } from "../models/request/update-avatar.request"; import { UpdateDomainsRequest } from "../models/request/update-domains.request"; import { UpdateKeyRequest } from "../models/request/update-key.request"; import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; -import { BillingHistoryResponse } from "../models/response/billing-history.response"; -import { BillingPaymentResponse } from "../models/response/billing-payment.response"; import { BreachAccountResponse } from "../models/response/breach-account.response"; -import { - CollectionAccessDetailsResponse, - CollectionResponse, -} from "../models/response/collection.response"; import { DomainsResponse } from "../models/response/domains.response"; import { EventResponse } from "../models/response/event.response"; import { ListResponse } from "../models/response/list.response"; -import { - OrganizationConnectionConfigApis, - OrganizationConnectionResponse, -} from "../models/response/organization-connection.response"; -import { OrganizationExportResponse } from "../models/response/organization-export.response"; -import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/organization-sponsorship-sync-status.response"; -import { PaymentResponse } from "../models/response/payment.response"; -import { PlanResponse } from "../models/response/plan.response"; -import { PolicyResponse } from "../models/response/policy.response"; import { ProfileResponse } from "../models/response/profile.response"; -import { - ProviderOrganizationOrganizationDetailsResponse, - ProviderOrganizationResponse, -} from "../models/response/provider/provider-organization.response"; -import { ProviderUserBulkPublicKeyResponse } from "../models/response/provider/provider-user-bulk-public-key.response"; -import { ProviderUserBulkResponse } from "../models/response/provider/provider-user-bulk.response"; -import { - ProviderUserResponse, - ProviderUserUserDetailsResponse, -} from "../models/response/provider/provider-user.response"; -import { ProviderResponse } from "../models/response/provider/provider.response"; -import { SelectionReadOnlyResponse } from "../models/response/selection-read-only.response"; import { SendAccessResponse } from "../models/response/send-access.response"; import { SendFileDownloadDataResponse } from "../models/response/send-file-download-data.response"; import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; import { SendResponse } from "../models/response/send.response"; -import { SubscriptionResponse } from "../models/response/subscription.response"; -import { TaxInfoResponse } from "../models/response/tax-info.response"; -import { TaxRateResponse } from "../models/response/tax-rate.response"; import { UserKeyResponse } from "../models/response/user-key.response"; import { SendAccessView } from "../models/view/send-access.view"; import { AttachmentRequest } from "../vault/models/request/attachment.request"; diff --git a/libs/common/src/abstractions/crypto.service.ts b/libs/common/src/abstractions/crypto.service.ts index 62da94681e..cf05bb141d 100644 --- a/libs/common/src/abstractions/crypto.service.ts +++ b/libs/common/src/abstractions/crypto.service.ts @@ -1,3 +1,6 @@ +import { ProfileOrganizationResponse } from "../admin-console/models/response/profile-organization.response"; +import { ProfileProviderOrganizationResponse } from "../admin-console/models/response/profile-provider-organization.response"; +import { ProfileProviderResponse } from "../admin-console/models/response/profile-provider.response"; import { KdfConfig } from "../auth/models/domain/kdf-config"; import { HashPurpose } from "../enums/hashPurpose"; import { KdfType } from "../enums/kdfType"; @@ -5,9 +8,6 @@ import { KeySuffixOptions } from "../enums/keySuffixOptions"; import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; import { EncString } from "../models/domain/enc-string"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; -import { ProfileOrganizationResponse } from "../models/response/profile-organization.response"; -import { ProfileProviderOrganizationResponse } from "../models/response/profile-provider-organization.response"; -import { ProfileProviderResponse } from "../models/response/profile-provider.response"; export abstract class CryptoService { setKey: (key: SymmetricCryptoKey) => Promise; 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 index ac69f2cdbc..bea1fb214a 100644 --- 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 @@ -1,6 +1,6 @@ -import { OrganizationUserType } from "../../../enums/organizationUserType"; -import { PermissionsApi } from "../../../models/api/permissions.api"; -import { SelectionReadOnlyRequest } from "../../../models/request/selection-read-only.request"; +import { OrganizationUserType } from "../../../admin-console/enums/organization-user-type"; +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[] = []; 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 index 12addd7c98..137cae6368 100644 --- 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 @@ -1,6 +1,6 @@ -import { OrganizationUserType } from "../../../enums/organizationUserType"; -import { PermissionsApi } from "../../../models/api/permissions.api"; -import { SelectionReadOnlyRequest } from "../../../models/request/selection-read-only.request"; +import { OrganizationUserType } from "../../../admin-console/enums/organization-user-type"; +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; diff --git a/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts b/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts index ce70e6d872..c4fe762860 100644 --- a/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts +++ b/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts @@ -1,9 +1,9 @@ +import { OrganizationUserStatusType } from "../../../admin-console/enums/organization-user-status-type"; +import { OrganizationUserType } from "../../../admin-console/enums/organization-user-type"; +import { PermissionsApi } from "../../../admin-console/models/api/permissions.api"; +import { SelectionReadOnlyResponse } from "../../../admin-console/models/response/selection-read-only.response"; import { KdfType } from "../../../enums/kdfType"; -import { OrganizationUserStatusType } from "../../../enums/organizationUserStatusType"; -import { OrganizationUserType } from "../../../enums/organizationUserType"; -import { PermissionsApi } from "../../../models/api/permissions.api"; import { BaseResponse } from "../../../models/response/base.response"; -import { SelectionReadOnlyResponse } from "../../../models/response/selection-read-only.response"; export class OrganizationUserResponse extends BaseResponse { id: string; diff --git a/libs/common/src/abstractions/state.service.ts b/libs/common/src/abstractions/state.service.ts index 5c16578e06..368a6c8683 100644 --- a/libs/common/src/abstractions/state.service.ts +++ b/libs/common/src/abstractions/state.service.ts @@ -1,25 +1,25 @@ import { Observable } from "rxjs"; +import { CollectionData } from "../admin-console/models/data/collection.data"; +import { EncryptedOrganizationKeyData } from "../admin-console/models/data/encrypted-organization-key.data"; +import { OrganizationData } from "../admin-console/models/data/organization.data"; +import { PolicyData } from "../admin-console/models/data/policy.data"; +import { ProviderData } from "../admin-console/models/data/provider.data"; +import { Policy } from "../admin-console/models/domain/policy"; +import { CollectionView } from "../admin-console/models/view/collection.view"; import { EnvironmentUrls } from "../auth/models/domain/environment-urls"; import { KdfConfig } from "../auth/models/domain/kdf-config"; import { KdfType } from "../enums/kdfType"; import { ThemeType } from "../enums/themeType"; import { UriMatchType } from "../enums/uriMatchType"; -import { CollectionData } from "../models/data/collection.data"; -import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data"; import { EventData } from "../models/data/event.data"; -import { OrganizationData } from "../models/data/organization.data"; -import { PolicyData } from "../models/data/policy.data"; -import { ProviderData } from "../models/data/provider.data"; import { SendData } from "../models/data/send.data"; import { ServerConfigData } from "../models/data/server-config.data"; import { Account, AccountSettingsSettings } from "../models/domain/account"; import { EncString } from "../models/domain/enc-string"; -import { Policy } from "../models/domain/policy"; import { StorageOptions } from "../models/domain/storage-options"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { WindowState } from "../models/domain/window-state"; -import { CollectionView } from "../models/view/collection.view"; import { SendView } from "../models/view/send.view"; import { GeneratedPasswordHistory } from "../tools/generator/password"; import { CipherData } from "../vault/models/data/cipher.data"; diff --git a/libs/common/src/abstractions/collection.service.ts b/libs/common/src/admin-console/abstractions/collection.service.ts similarity index 94% rename from libs/common/src/abstractions/collection.service.ts rename to libs/common/src/admin-console/abstractions/collection.service.ts index 316794a556..18708406ab 100644 --- a/libs/common/src/abstractions/collection.service.ts +++ b/libs/common/src/admin-console/abstractions/collection.service.ts @@ -1,6 +1,6 @@ +import { TreeNode } from "../../models/domain/tree-node"; import { CollectionData } from "../models/data/collection.data"; import { Collection } from "../models/domain/collection"; -import { TreeNode } from "../models/domain/tree-node"; import { CollectionView } from "../models/view/collection.view"; export abstract class CollectionService { diff --git a/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts similarity index 67% rename from libs/common/src/abstractions/organization/organization-api.service.abstraction.ts rename to libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts index f3aec0a72e..3195f636b2 100644 --- a/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts +++ b/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts @@ -1,30 +1,30 @@ -import { OrganizationApiKeyType } from "../../auth/enums/organization-api-key-type"; -import { OrganizationSsoRequest } from "../../auth/models/request/organization-sso.request"; -import { SecretVerificationRequest } from "../../auth/models/request/secret-verification.request"; -import { ApiKeyResponse } from "../../auth/models/response/api-key.response"; -import { OrganizationSsoResponse } from "../../auth/models/response/organization-sso.response"; -import { ImportDirectoryRequest } from "../../models/request/import-directory.request"; -import { OrganizationApiKeyRequest } from "../../models/request/organization-api-key.request"; +import { OrganizationSsoRequest } from "../../../auth/models/request/organization-sso.request"; +import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request"; +import { ApiKeyResponse } from "../../../auth/models/response/api-key.response"; +import { OrganizationSsoResponse } from "../../../auth/models/response/organization-sso.response"; +import { OrganizationSubscriptionUpdateRequest } from "../../../billing/models/request/organization-subscription-update.request"; +import { OrganizationTaxInfoUpdateRequest } from "../../../billing/models/request/organization-tax-info-update.request"; +import { PaymentRequest } from "../../../billing/models/request/payment.request"; +import { BillingResponse } from "../../../billing/models/response/billing.response"; +import { OrganizationSubscriptionResponse } from "../../../billing/models/response/organization-subscription.response"; +import { PaymentResponse } from "../../../billing/models/response/payment.response"; +import { TaxInfoResponse } from "../../../billing/models/response/tax-info.response"; +import { ImportDirectoryRequest } from "../../../models/request/import-directory.request"; +import { OrganizationApiKeyRequest } from "../../../models/request/organization-api-key.request"; +import { SeatRequest } from "../../../models/request/seat.request"; +import { StorageRequest } from "../../../models/request/storage.request"; +import { VerifyBankRequest } from "../../../models/request/verify-bank.request"; +import { ListResponse } from "../../../models/response/list.response"; +import { OrganizationApiKeyType } from "../../enums/organization-api-key-type"; import { OrganizationCreateRequest } from "../../models/request/organization-create.request"; import { OrganizationKeysRequest } from "../../models/request/organization-keys.request"; -import { OrganizationSubscriptionUpdateRequest } from "../../models/request/organization-subscription-update.request"; -import { OrganizationTaxInfoUpdateRequest } from "../../models/request/organization-tax-info-update.request"; import { OrganizationUpdateRequest } from "../../models/request/organization-update.request"; import { OrganizationUpgradeRequest } from "../../models/request/organization-upgrade.request"; import { OrganizationEnrollSecretsManagerRequest } from "../../models/request/organization/organization-enroll-secrets-manager.request"; -import { PaymentRequest } from "../../models/request/payment.request"; -import { SeatRequest } from "../../models/request/seat.request"; -import { StorageRequest } from "../../models/request/storage.request"; -import { VerifyBankRequest } from "../../models/request/verify-bank.request"; -import { BillingResponse } from "../../models/response/billing.response"; -import { ListResponse } from "../../models/response/list.response"; import { OrganizationApiKeyInformationResponse } from "../../models/response/organization-api-key-information.response"; import { OrganizationAutoEnrollStatusResponse } from "../../models/response/organization-auto-enroll-status.response"; import { OrganizationKeysResponse } from "../../models/response/organization-keys.response"; -import { OrganizationSubscriptionResponse } from "../../models/response/organization-subscription.response"; import { OrganizationResponse } from "../../models/response/organization.response"; -import { PaymentResponse } from "../../models/response/payment.response"; -import { TaxInfoResponse } from "../../models/response/tax-info.response"; export class OrganizationApiServiceAbstraction { get: (id: string) => Promise; diff --git a/libs/common/src/abstractions/organization/organization.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts similarity index 95% rename from libs/common/src/abstractions/organization/organization.service.abstraction.ts rename to libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts index a00060c0c2..912728828e 100644 --- a/libs/common/src/abstractions/organization/organization.service.abstraction.ts +++ b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts @@ -1,9 +1,9 @@ import { map, Observable } from "rxjs"; -import { Utils } from "../../misc/utils"; +import { I18nService } from "../../../abstractions/i18n.service"; +import { Utils } from "../../../misc/utils"; import { OrganizationData } from "../../models/data/organization.data"; import { Organization } from "../../models/domain/organization"; -import { I18nService } from "../i18n.service"; export function canAccessVaultTab(org: Organization): boolean { return org.canViewAssignedCollections || org.canViewAllCollections || org.canManageGroups; diff --git a/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/policy/policy-api.service.abstraction.ts similarity index 88% rename from libs/common/src/abstractions/policy/policy-api.service.abstraction.ts rename to libs/common/src/admin-console/abstractions/policy/policy-api.service.abstraction.ts index 91419cc4b2..22caca7b49 100644 --- a/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts +++ b/libs/common/src/admin-console/abstractions/policy/policy-api.service.abstraction.ts @@ -1,7 +1,7 @@ -import { PolicyType } from "../../enums/policyType"; +import { ListResponse } from "../../../models/response/list.response"; +import { PolicyType } from "../../enums/policy-type"; import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options"; import { PolicyRequest } from "../../models/request/policy.request"; -import { ListResponse } from "../../models/response/list.response"; import { PolicyResponse } from "../../models/response/policy.response"; export class PolicyApiServiceAbstraction { diff --git a/libs/common/src/abstractions/policy/policy.service.abstraction.ts b/libs/common/src/admin-console/abstractions/policy/policy.service.abstraction.ts similarity index 92% rename from libs/common/src/abstractions/policy/policy.service.abstraction.ts rename to libs/common/src/admin-console/abstractions/policy/policy.service.abstraction.ts index 90469a69bf..3130c294d0 100644 --- a/libs/common/src/abstractions/policy/policy.service.abstraction.ts +++ b/libs/common/src/admin-console/abstractions/policy/policy.service.abstraction.ts @@ -1,11 +1,11 @@ import { Observable } from "rxjs"; -import { PolicyType } from "../../enums/policyType"; +import { ListResponse } from "../../../models/response/list.response"; +import { PolicyType } from "../../enums/policy-type"; import { PolicyData } from "../../models/data/policy.data"; import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options"; import { Policy } from "../../models/domain/policy"; import { ResetPasswordPolicyOptions } from "../../models/domain/reset-password-policy-options"; -import { ListResponse } from "../../models/response/list.response"; import { PolicyResponse } from "../../models/response/policy.response"; export abstract class PolicyService { diff --git a/libs/common/src/abstractions/provider.service.ts b/libs/common/src/admin-console/abstractions/provider.service.ts similarity index 81% rename from libs/common/src/abstractions/provider.service.ts rename to libs/common/src/admin-console/abstractions/provider.service.ts index d843154f3f..3c62776a90 100644 --- a/libs/common/src/abstractions/provider.service.ts +++ b/libs/common/src/admin-console/abstractions/provider.service.ts @@ -1,5 +1,5 @@ +import { Provider } from "../../models/domain/provider"; import { ProviderData } from "../models/data/provider.data"; -import { Provider } from "../models/domain/provider"; export abstract class ProviderService { get: (id: string) => Promise; diff --git a/libs/common/src/auth/enums/organization-api-key-type.ts b/libs/common/src/admin-console/enums/organization-api-key-type.ts similarity index 100% rename from libs/common/src/auth/enums/organization-api-key-type.ts rename to libs/common/src/admin-console/enums/organization-api-key-type.ts diff --git a/libs/common/src/enums/organizationConnectionType.ts b/libs/common/src/admin-console/enums/organization-connection-type.ts similarity index 100% rename from libs/common/src/enums/organizationConnectionType.ts rename to libs/common/src/admin-console/enums/organization-connection-type.ts diff --git a/libs/common/src/enums/organizationUserStatusType.ts b/libs/common/src/admin-console/enums/organization-user-status-type.ts similarity index 100% rename from libs/common/src/enums/organizationUserStatusType.ts rename to libs/common/src/admin-console/enums/organization-user-status-type.ts diff --git a/libs/common/src/enums/organizationUserType.ts b/libs/common/src/admin-console/enums/organization-user-type.ts similarity index 100% rename from libs/common/src/enums/organizationUserType.ts rename to libs/common/src/admin-console/enums/organization-user-type.ts diff --git a/libs/common/src/enums/policyType.ts b/libs/common/src/admin-console/enums/policy-type.ts similarity index 100% rename from libs/common/src/enums/policyType.ts rename to libs/common/src/admin-console/enums/policy-type.ts diff --git a/libs/common/src/enums/providerUserStatusType.ts b/libs/common/src/admin-console/enums/provider-user-status-type.ts similarity index 100% rename from libs/common/src/enums/providerUserStatusType.ts rename to libs/common/src/admin-console/enums/provider-user-status-type.ts diff --git a/libs/common/src/enums/providerUserType.ts b/libs/common/src/admin-console/enums/provider-user-type.ts similarity index 100% rename from libs/common/src/enums/providerUserType.ts rename to libs/common/src/admin-console/enums/provider-user-type.ts diff --git a/libs/common/src/enums/scimProviderType.ts b/libs/common/src/admin-console/enums/scim-provider-type.ts similarity index 100% rename from libs/common/src/enums/scimProviderType.ts rename to libs/common/src/admin-console/enums/scim-provider-type.ts diff --git a/libs/common/src/models/api/permissions.api.ts b/libs/common/src/admin-console/models/api/permissions.api.ts similarity index 95% rename from libs/common/src/models/api/permissions.api.ts rename to libs/common/src/admin-console/models/api/permissions.api.ts index bac4d2ce11..4eb055ea79 100644 --- a/libs/common/src/models/api/permissions.api.ts +++ b/libs/common/src/admin-console/models/api/permissions.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class PermissionsApi extends BaseResponse { accessEventLogs: boolean; diff --git a/libs/common/src/models/api/scim-config.api.ts b/libs/common/src/admin-console/models/api/scim-config.api.ts similarity index 70% rename from libs/common/src/models/api/scim-config.api.ts rename to libs/common/src/admin-console/models/api/scim-config.api.ts index 68e7f76cd4..1d86f4a8ab 100644 --- a/libs/common/src/models/api/scim-config.api.ts +++ b/libs/common/src/admin-console/models/api/scim-config.api.ts @@ -1,5 +1,5 @@ -import { ScimProviderType } from "../../enums/scimProviderType"; -import { BaseResponse } from "../response/base.response"; +import { BaseResponse } from "../../../models/response/base.response"; +import { ScimProviderType } from "../../enums/scim-provider-type"; export class ScimConfigApi extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/data/collection.data.ts b/libs/common/src/admin-console/models/data/collection.data.ts similarity index 100% rename from libs/common/src/models/data/collection.data.ts rename to libs/common/src/admin-console/models/data/collection.data.ts diff --git a/libs/common/src/models/data/encrypted-organization-key.data.ts b/libs/common/src/admin-console/models/data/encrypted-organization-key.data.ts similarity index 100% rename from libs/common/src/models/data/encrypted-organization-key.data.ts rename to libs/common/src/admin-console/models/data/encrypted-organization-key.data.ts diff --git a/libs/common/src/models/data/organization.data.ts b/libs/common/src/admin-console/models/data/organization.data.ts similarity index 95% rename from libs/common/src/models/data/organization.data.ts rename to libs/common/src/admin-console/models/data/organization.data.ts index 5ed04f7532..d58152d05f 100644 --- a/libs/common/src/models/data/organization.data.ts +++ b/libs/common/src/admin-console/models/data/organization.data.ts @@ -1,6 +1,6 @@ -import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType"; -import { OrganizationUserType } from "../../enums/organizationUserType"; -import { ProductType } from "../../enums/productType"; +import { ProductType } from "../../../enums/productType"; +import { OrganizationUserStatusType } from "../../enums/organization-user-status-type"; +import { OrganizationUserType } from "../../enums/organization-user-type"; import { PermissionsApi } from "../api/permissions.api"; import { ProfileOrganizationResponse } from "../response/profile-organization.response"; diff --git a/libs/common/src/models/data/policy.data.ts b/libs/common/src/admin-console/models/data/policy.data.ts similarity index 88% rename from libs/common/src/models/data/policy.data.ts rename to libs/common/src/admin-console/models/data/policy.data.ts index 2ede4d80bf..1e00ba5bf6 100644 --- a/libs/common/src/models/data/policy.data.ts +++ b/libs/common/src/admin-console/models/data/policy.data.ts @@ -1,4 +1,4 @@ -import { PolicyType } from "../../enums/policyType"; +import { PolicyType } from "../../enums/policy-type"; import { PolicyResponse } from "../response/policy.response"; export class PolicyData { diff --git a/libs/common/src/models/data/provider.data.ts b/libs/common/src/admin-console/models/data/provider.data.ts similarity index 79% rename from libs/common/src/models/data/provider.data.ts rename to libs/common/src/admin-console/models/data/provider.data.ts index 690e91d9dd..c86122f72b 100644 --- a/libs/common/src/models/data/provider.data.ts +++ b/libs/common/src/admin-console/models/data/provider.data.ts @@ -1,5 +1,5 @@ -import { ProviderUserStatusType } from "../../enums/providerUserStatusType"; -import { ProviderUserType } from "../../enums/providerUserType"; +import { ProviderUserStatusType } from "../../enums/provider-user-status-type"; +import { ProviderUserType } from "../../enums/provider-user-type"; import { ProfileProviderResponse } from "../response/profile-provider.response"; export class ProviderData { diff --git a/libs/common/src/models/domain/collection.ts b/libs/common/src/admin-console/models/domain/collection.ts similarity index 87% rename from libs/common/src/models/domain/collection.ts rename to libs/common/src/admin-console/models/domain/collection.ts index 63145c17c6..22c26bc11c 100644 --- a/libs/common/src/models/domain/collection.ts +++ b/libs/common/src/admin-console/models/domain/collection.ts @@ -1,9 +1,8 @@ +import Domain from "../../../models/domain/domain-base"; +import { EncString } from "../../../models/domain/enc-string"; import { CollectionData } from "../data/collection.data"; import { CollectionView } from "../view/collection.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; - export class Collection extends Domain { id: string; organizationId: string; diff --git a/libs/common/src/models/domain/encrypted-organization-key.ts b/libs/common/src/admin-console/models/domain/encrypted-organization-key.ts similarity index 87% rename from libs/common/src/models/domain/encrypted-organization-key.ts rename to libs/common/src/admin-console/models/domain/encrypted-organization-key.ts index 5b60ea5029..4e7dd9ef2b 100644 --- a/libs/common/src/models/domain/encrypted-organization-key.ts +++ b/libs/common/src/admin-console/models/domain/encrypted-organization-key.ts @@ -1,9 +1,8 @@ -import { CryptoService } from "../../abstractions/crypto.service"; +import { CryptoService } from "../../../abstractions/crypto.service"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { EncryptedOrganizationKeyData } from "../data/encrypted-organization-key.data"; -import { EncString } from "./enc-string"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export abstract class BaseEncryptedOrganizationKey { decrypt: (cryptoService: CryptoService) => Promise; diff --git a/libs/common/src/models/domain/master-password-policy-options.ts b/libs/common/src/admin-console/models/domain/master-password-policy-options.ts similarity index 77% rename from libs/common/src/models/domain/master-password-policy-options.ts rename to libs/common/src/admin-console/models/domain/master-password-policy-options.ts index 9389d0e4c5..4aceca9b2d 100644 --- a/libs/common/src/models/domain/master-password-policy-options.ts +++ b/libs/common/src/admin-console/models/domain/master-password-policy-options.ts @@ -1,4 +1,4 @@ -import Domain from "./domain-base"; +import Domain from "../../../models/domain/domain-base"; export class MasterPasswordPolicyOptions extends Domain { minComplexity = 0; diff --git a/libs/common/src/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts similarity index 97% rename from libs/common/src/models/domain/organization.ts rename to libs/common/src/admin-console/models/domain/organization.ts index ea6c235a8a..1ecf2c9f6f 100644 --- a/libs/common/src/models/domain/organization.ts +++ b/libs/common/src/admin-console/models/domain/organization.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; -import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType"; -import { OrganizationUserType } from "../../enums/organizationUserType"; -import { ProductType } from "../../enums/productType"; +import { ProductType } from "../../../enums/productType"; +import { OrganizationUserStatusType } from "../../enums/organization-user-status-type"; +import { OrganizationUserType } from "../../enums/organization-user-type"; import { PermissionsApi } from "../api/permissions.api"; import { OrganizationData } from "../data/organization.data"; diff --git a/libs/common/src/models/domain/password-generator-policy-options.ts b/libs/common/src/admin-console/models/domain/password-generator-policy-options.ts similarity index 91% rename from libs/common/src/models/domain/password-generator-policy-options.ts rename to libs/common/src/admin-console/models/domain/password-generator-policy-options.ts index a4500e6ba0..eba15fae26 100644 --- a/libs/common/src/models/domain/password-generator-policy-options.ts +++ b/libs/common/src/admin-console/models/domain/password-generator-policy-options.ts @@ -1,4 +1,4 @@ -import Domain from "./domain-base"; +import Domain from "../../../models/domain/domain-base"; export class PasswordGeneratorPolicyOptions extends Domain { defaultType = ""; diff --git a/libs/common/src/models/domain/policy.ts b/libs/common/src/admin-console/models/domain/policy.ts similarity index 79% rename from libs/common/src/models/domain/policy.ts rename to libs/common/src/admin-console/models/domain/policy.ts index 8f520d3324..a23df0fadd 100644 --- a/libs/common/src/models/domain/policy.ts +++ b/libs/common/src/admin-console/models/domain/policy.ts @@ -1,8 +1,7 @@ -import { PolicyType } from "../../enums/policyType"; +import Domain from "../../../models/domain/domain-base"; +import { PolicyType } from "../../enums/policy-type"; import { PolicyData } from "../data/policy.data"; -import Domain from "./domain-base"; - export class Policy extends Domain { id: string; organizationId: string; diff --git a/libs/common/src/models/domain/reset-password-policy-options.ts b/libs/common/src/admin-console/models/domain/reset-password-policy-options.ts similarity index 60% rename from libs/common/src/models/domain/reset-password-policy-options.ts rename to libs/common/src/admin-console/models/domain/reset-password-policy-options.ts index dda3dd7635..efa8ecdeca 100644 --- a/libs/common/src/models/domain/reset-password-policy-options.ts +++ b/libs/common/src/admin-console/models/domain/reset-password-policy-options.ts @@ -1,4 +1,4 @@ -import Domain from "./domain-base"; +import Domain from "../../../models/domain/domain-base"; export class ResetPasswordPolicyOptions extends Domain { autoEnrollEnabled = false; diff --git a/libs/common/src/models/request/collection.request.ts b/libs/common/src/admin-console/models/request/collection.request.ts similarity index 100% rename from libs/common/src/models/request/collection.request.ts rename to libs/common/src/admin-console/models/request/collection.request.ts diff --git a/libs/common/src/models/request/organization-connection.request.ts b/libs/common/src/admin-console/models/request/organization-connection.request.ts similarity index 80% rename from libs/common/src/models/request/organization-connection.request.ts rename to libs/common/src/admin-console/models/request/organization-connection.request.ts index fcb4a6f906..9ab7b4ea59 100644 --- a/libs/common/src/models/request/organization-connection.request.ts +++ b/libs/common/src/admin-console/models/request/organization-connection.request.ts @@ -1,6 +1,6 @@ -import { OrganizationConnectionType } from "../../enums/organizationConnectionType"; +import { BillingSyncConfigRequest } from "../../../billing/models/request/billing-sync-config.request"; +import { OrganizationConnectionType } from "../../enums/organization-connection-type"; -import { BillingSyncConfigRequest } from "./billing-sync-config.request"; import { ScimConfigRequest } from "./scim-config.request"; /**API request config types for OrganizationConnectionRequest */ diff --git a/libs/common/src/models/request/organization-create.request.ts b/libs/common/src/admin-console/models/request/organization-create.request.ts similarity index 82% rename from libs/common/src/models/request/organization-create.request.ts rename to libs/common/src/admin-console/models/request/organization-create.request.ts index a0c08fd43a..81ab7c44d2 100644 --- a/libs/common/src/models/request/organization-create.request.ts +++ b/libs/common/src/admin-console/models/request/organization-create.request.ts @@ -1,5 +1,5 @@ -import { PaymentMethodType } from "../../enums/paymentMethodType"; -import { PlanType } from "../../enums/planType"; +import { PaymentMethodType } from "../../../billing/enums/payment-method-type"; +import { PlanType } from "../../../billing/enums/plan-type"; import { OrganizationKeysRequest } from "./organization-keys.request"; diff --git a/libs/common/src/models/request/organization-keys.request.ts b/libs/common/src/admin-console/models/request/organization-keys.request.ts similarity index 71% rename from libs/common/src/models/request/organization-keys.request.ts rename to libs/common/src/admin-console/models/request/organization-keys.request.ts index cabb948542..d6bc989575 100644 --- a/libs/common/src/models/request/organization-keys.request.ts +++ b/libs/common/src/admin-console/models/request/organization-keys.request.ts @@ -1,4 +1,4 @@ -import { KeysRequest } from "./keys.request"; +import { KeysRequest } from "../../../models/request/keys.request"; export class OrganizationKeysRequest extends KeysRequest { constructor(publicKey: string, encryptedPrivateKey: string) { diff --git a/libs/common/src/models/request/organization-update.request.ts b/libs/common/src/admin-console/models/request/organization-update.request.ts similarity index 100% rename from libs/common/src/models/request/organization-update.request.ts rename to libs/common/src/admin-console/models/request/organization-update.request.ts diff --git a/libs/common/src/models/request/organization-upgrade.request.ts b/libs/common/src/admin-console/models/request/organization-upgrade.request.ts similarity index 85% rename from libs/common/src/models/request/organization-upgrade.request.ts rename to libs/common/src/admin-console/models/request/organization-upgrade.request.ts index 2c13cd4873..462936dff1 100644 --- a/libs/common/src/models/request/organization-upgrade.request.ts +++ b/libs/common/src/admin-console/models/request/organization-upgrade.request.ts @@ -1,4 +1,4 @@ -import { PlanType } from "../../enums/planType"; +import { PlanType } from "../../../billing/enums/plan-type"; import { OrganizationKeysRequest } from "./organization-keys.request"; diff --git a/libs/common/src/models/request/organization/organization-enroll-secrets-manager.request.ts b/libs/common/src/admin-console/models/request/organization/organization-enroll-secrets-manager.request.ts similarity index 100% rename from libs/common/src/models/request/organization/organization-enroll-secrets-manager.request.ts rename to libs/common/src/admin-console/models/request/organization/organization-enroll-secrets-manager.request.ts diff --git a/libs/common/src/models/request/organization/organization-sponsorship-create.request.ts b/libs/common/src/admin-console/models/request/organization/organization-sponsorship-create.request.ts similarity index 63% rename from libs/common/src/models/request/organization/organization-sponsorship-create.request.ts rename to libs/common/src/admin-console/models/request/organization/organization-sponsorship-create.request.ts index 7cc854b67b..5fe0591403 100644 --- a/libs/common/src/models/request/organization/organization-sponsorship-create.request.ts +++ b/libs/common/src/admin-console/models/request/organization/organization-sponsorship-create.request.ts @@ -1,4 +1,4 @@ -import { PlanSponsorshipType } from "../../../enums/planSponsorshipType"; +import { PlanSponsorshipType } from "../../../../billing/enums/plan-sponsorship-type"; export class OrganizationSponsorshipCreateRequest { sponsoredEmail: string; diff --git a/libs/common/src/models/request/organization/organization-sponsorship-redeem.request.ts b/libs/common/src/admin-console/models/request/organization/organization-sponsorship-redeem.request.ts similarity index 60% rename from libs/common/src/models/request/organization/organization-sponsorship-redeem.request.ts rename to libs/common/src/admin-console/models/request/organization/organization-sponsorship-redeem.request.ts index 4c73836e56..cf83ffef3d 100644 --- a/libs/common/src/models/request/organization/organization-sponsorship-redeem.request.ts +++ b/libs/common/src/admin-console/models/request/organization/organization-sponsorship-redeem.request.ts @@ -1,4 +1,4 @@ -import { PlanSponsorshipType } from "../../../enums/planSponsorshipType"; +import { PlanSponsorshipType } from "../../../../billing/enums/plan-sponsorship-type"; export class OrganizationSponsorshipRedeemRequest { planSponsorshipType: PlanSponsorshipType; diff --git a/libs/common/src/models/request/policy.request.ts b/libs/common/src/admin-console/models/request/policy.request.ts similarity index 61% rename from libs/common/src/models/request/policy.request.ts rename to libs/common/src/admin-console/models/request/policy.request.ts index 98b05912b4..f26fd7fe43 100644 --- a/libs/common/src/models/request/policy.request.ts +++ b/libs/common/src/admin-console/models/request/policy.request.ts @@ -1,4 +1,4 @@ -import { PolicyType } from "../../enums/policyType"; +import { PolicyType } from "../../enums/policy-type"; export class PolicyRequest { type: PolicyType; diff --git a/libs/common/src/models/request/provider/provider-add-organization.request.ts b/libs/common/src/admin-console/models/request/provider/provider-add-organization.request.ts similarity index 100% rename from libs/common/src/models/request/provider/provider-add-organization.request.ts rename to libs/common/src/admin-console/models/request/provider/provider-add-organization.request.ts diff --git a/libs/common/src/models/request/provider/provider-organization-create.request.ts b/libs/common/src/admin-console/models/request/provider/provider-organization-create.request.ts similarity index 64% rename from libs/common/src/models/request/provider/provider-organization-create.request.ts rename to libs/common/src/admin-console/models/request/provider/provider-organization-create.request.ts index 145aca9cae..e75634cae2 100644 --- a/libs/common/src/models/request/provider/provider-organization-create.request.ts +++ b/libs/common/src/admin-console/models/request/provider/provider-organization-create.request.ts @@ -1,4 +1,4 @@ -import { OrganizationCreateRequest } from "../organization-create.request"; +import { OrganizationCreateRequest } from "../../../models/request/organization-create.request"; export class ProviderOrganizationCreateRequest { constructor( diff --git a/libs/common/src/models/request/provider/provider-setup.request.ts b/libs/common/src/admin-console/models/request/provider/provider-setup.request.ts similarity index 100% rename from libs/common/src/models/request/provider/provider-setup.request.ts rename to libs/common/src/admin-console/models/request/provider/provider-setup.request.ts diff --git a/libs/common/src/models/request/provider/provider-update.request.ts b/libs/common/src/admin-console/models/request/provider/provider-update.request.ts similarity index 100% rename from libs/common/src/models/request/provider/provider-update.request.ts rename to libs/common/src/admin-console/models/request/provider/provider-update.request.ts diff --git a/libs/common/src/models/request/provider/provider-user-accept.request.ts b/libs/common/src/admin-console/models/request/provider/provider-user-accept.request.ts similarity index 100% rename from libs/common/src/models/request/provider/provider-user-accept.request.ts rename to libs/common/src/admin-console/models/request/provider/provider-user-accept.request.ts diff --git a/libs/common/src/models/request/provider/provider-user-bulk-confirm.request.ts b/libs/common/src/admin-console/models/request/provider/provider-user-bulk-confirm.request.ts similarity index 100% rename from libs/common/src/models/request/provider/provider-user-bulk-confirm.request.ts rename to libs/common/src/admin-console/models/request/provider/provider-user-bulk-confirm.request.ts diff --git a/libs/common/src/models/request/provider/provider-user-bulk.request.ts b/libs/common/src/admin-console/models/request/provider/provider-user-bulk.request.ts similarity index 100% rename from libs/common/src/models/request/provider/provider-user-bulk.request.ts rename to libs/common/src/admin-console/models/request/provider/provider-user-bulk.request.ts diff --git a/libs/common/src/models/request/provider/provider-user-confirm.request.ts b/libs/common/src/admin-console/models/request/provider/provider-user-confirm.request.ts similarity index 100% rename from libs/common/src/models/request/provider/provider-user-confirm.request.ts rename to libs/common/src/admin-console/models/request/provider/provider-user-confirm.request.ts diff --git a/libs/common/src/models/request/provider/provider-user-invite.request.ts b/libs/common/src/admin-console/models/request/provider/provider-user-invite.request.ts similarity index 57% rename from libs/common/src/models/request/provider/provider-user-invite.request.ts rename to libs/common/src/admin-console/models/request/provider/provider-user-invite.request.ts index 65d8ba67f6..312da5fdc4 100644 --- a/libs/common/src/models/request/provider/provider-user-invite.request.ts +++ b/libs/common/src/admin-console/models/request/provider/provider-user-invite.request.ts @@ -1,4 +1,4 @@ -import { ProviderUserType } from "../../../enums/providerUserType"; +import { ProviderUserType } from "../../../enums/provider-user-type"; export class ProviderUserInviteRequest { emails: string[] = []; diff --git a/libs/common/src/models/request/provider/provider-user-update.request.ts b/libs/common/src/admin-console/models/request/provider/provider-user-update.request.ts similarity index 50% rename from libs/common/src/models/request/provider/provider-user-update.request.ts rename to libs/common/src/admin-console/models/request/provider/provider-user-update.request.ts index 25efdd89ce..4c3ff2c753 100644 --- a/libs/common/src/models/request/provider/provider-user-update.request.ts +++ b/libs/common/src/admin-console/models/request/provider/provider-user-update.request.ts @@ -1,4 +1,4 @@ -import { ProviderUserType } from "../../../enums/providerUserType"; +import { ProviderUserType } from "../../../enums/provider-user-type"; export class ProviderUserUpdateRequest { type: ProviderUserType; diff --git a/libs/common/src/models/request/scim-config.request.ts b/libs/common/src/admin-console/models/request/scim-config.request.ts similarity index 65% rename from libs/common/src/models/request/scim-config.request.ts rename to libs/common/src/admin-console/models/request/scim-config.request.ts index 87420d85ea..77d1f1e24e 100644 --- a/libs/common/src/models/request/scim-config.request.ts +++ b/libs/common/src/admin-console/models/request/scim-config.request.ts @@ -1,4 +1,4 @@ -import { ScimProviderType } from "../../enums/scimProviderType"; +import { ScimProviderType } from "../../enums/scim-provider-type"; export class ScimConfigRequest { constructor(private enabled: boolean, private scimProvider: ScimProviderType = null) {} diff --git a/libs/common/src/models/request/selection-read-only.request.ts b/libs/common/src/admin-console/models/request/selection-read-only.request.ts similarity index 100% rename from libs/common/src/models/request/selection-read-only.request.ts rename to libs/common/src/admin-console/models/request/selection-read-only.request.ts diff --git a/libs/common/src/models/response/collection.response.ts b/libs/common/src/admin-console/models/response/collection.response.ts similarity index 95% rename from libs/common/src/models/response/collection.response.ts rename to libs/common/src/admin-console/models/response/collection.response.ts index 52fa50342f..5efc3b90ae 100644 --- a/libs/common/src/models/response/collection.response.ts +++ b/libs/common/src/admin-console/models/response/collection.response.ts @@ -1,4 +1,5 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; + import { SelectionReadOnlyResponse } from "./selection-read-only.response"; export class CollectionResponse extends BaseResponse { diff --git a/libs/common/src/models/response/organization-api-key-information.response.ts b/libs/common/src/admin-console/models/response/organization-api-key-information.response.ts similarity index 59% rename from libs/common/src/models/response/organization-api-key-information.response.ts rename to libs/common/src/admin-console/models/response/organization-api-key-information.response.ts index 0c956777bc..2f2e7212d3 100644 --- a/libs/common/src/models/response/organization-api-key-information.response.ts +++ b/libs/common/src/admin-console/models/response/organization-api-key-information.response.ts @@ -1,6 +1,5 @@ -import { OrganizationApiKeyType } from "../../auth/enums/organization-api-key-type"; - -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; +import { OrganizationApiKeyType } from "../../enums/organization-api-key-type"; export class OrganizationApiKeyInformationResponse extends BaseResponse { keyType: OrganizationApiKeyType; diff --git a/libs/common/src/models/response/organization-auto-enroll-status.response.ts b/libs/common/src/admin-console/models/response/organization-auto-enroll-status.response.ts similarity index 81% rename from libs/common/src/models/response/organization-auto-enroll-status.response.ts rename to libs/common/src/admin-console/models/response/organization-auto-enroll-status.response.ts index 5063bdfa0a..f2d22fafcd 100644 --- a/libs/common/src/models/response/organization-auto-enroll-status.response.ts +++ b/libs/common/src/admin-console/models/response/organization-auto-enroll-status.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class OrganizationAutoEnrollStatusResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/organization-connection.response.ts b/libs/common/src/admin-console/models/response/organization-connection.response.ts similarity index 83% rename from libs/common/src/models/response/organization-connection.response.ts rename to libs/common/src/admin-console/models/response/organization-connection.response.ts index c64bfc6d1a..c8c76c1c07 100644 --- a/libs/common/src/models/response/organization-connection.response.ts +++ b/libs/common/src/admin-console/models/response/organization-connection.response.ts @@ -1,9 +1,8 @@ -import { OrganizationConnectionType } from "../../enums/organizationConnectionType"; -import { BillingSyncConfigApi } from "../api/billing-sync-config.api"; +import { BillingSyncConfigApi } from "../../../billing/models/api/billing-sync-config.api"; +import { BaseResponse } from "../../../models/response/base.response"; +import { OrganizationConnectionType } from "../../enums/organization-connection-type"; import { ScimConfigApi } from "../api/scim-config.api"; -import { BaseResponse } from "./base.response"; - /**API response config types for OrganizationConnectionResponse */ export type OrganizationConnectionConfigApis = BillingSyncConfigApi | ScimConfigApi; diff --git a/libs/common/src/models/response/organization-export.response.ts b/libs/common/src/admin-console/models/response/organization-export.response.ts similarity index 79% rename from libs/common/src/models/response/organization-export.response.ts rename to libs/common/src/admin-console/models/response/organization-export.response.ts index 5aa2f2de6e..9be0607473 100644 --- a/libs/common/src/models/response/organization-export.response.ts +++ b/libs/common/src/admin-console/models/response/organization-export.response.ts @@ -1,6 +1,6 @@ -import { CipherResponse } from "../../vault/models/response/cipher.response"; +import { BaseResponse } from "../../../models/response/base.response"; +import { CipherResponse } from "../../../vault/models/response/cipher.response"; -import { BaseResponse } from "./base.response"; import { CollectionResponse } from "./collection.response"; export class OrganizationExportResponse extends BaseResponse { diff --git a/libs/common/src/models/response/organization-keys.response.ts b/libs/common/src/admin-console/models/response/organization-keys.response.ts similarity index 62% rename from libs/common/src/models/response/organization-keys.response.ts rename to libs/common/src/admin-console/models/response/organization-keys.response.ts index 9fcca4ef61..e9959d468e 100644 --- a/libs/common/src/models/response/organization-keys.response.ts +++ b/libs/common/src/admin-console/models/response/organization-keys.response.ts @@ -1,4 +1,4 @@ -import { KeysResponse } from "./keys.response"; +import { KeysResponse } from "../../../models/response/keys.response"; export class OrganizationKeysResponse extends KeysResponse { constructor(response: any) { diff --git a/libs/common/src/models/response/organization-sponsorship-sync-status.response.ts b/libs/common/src/admin-console/models/response/organization-sponsorship-sync-status.response.ts similarity index 81% rename from libs/common/src/models/response/organization-sponsorship-sync-status.response.ts rename to libs/common/src/admin-console/models/response/organization-sponsorship-sync-status.response.ts index 905c015cc5..37cde2af27 100644 --- a/libs/common/src/models/response/organization-sponsorship-sync-status.response.ts +++ b/libs/common/src/admin-console/models/response/organization-sponsorship-sync-status.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class OrganizationSponsorshipSyncStatusResponse extends BaseResponse { lastSyncDate?: Date; diff --git a/libs/common/src/models/response/organization.response.ts b/libs/common/src/admin-console/models/response/organization.response.ts similarity index 91% rename from libs/common/src/models/response/organization.response.ts rename to libs/common/src/admin-console/models/response/organization.response.ts index 9f7649646d..e327fa3001 100644 --- a/libs/common/src/models/response/organization.response.ts +++ b/libs/common/src/admin-console/models/response/organization.response.ts @@ -1,7 +1,6 @@ -import { PlanType } from "../../enums/planType"; - -import { BaseResponse } from "./base.response"; -import { PlanResponse } from "./plan.response"; +import { PlanType } from "../../../billing/enums/plan-type"; +import { PlanResponse } from "../../../billing/models/response/plan.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class OrganizationResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/policy.response.ts b/libs/common/src/admin-console/models/response/policy.response.ts similarity index 79% rename from libs/common/src/models/response/policy.response.ts rename to libs/common/src/admin-console/models/response/policy.response.ts index 1429d74c11..6cb1072ee5 100644 --- a/libs/common/src/models/response/policy.response.ts +++ b/libs/common/src/admin-console/models/response/policy.response.ts @@ -1,6 +1,5 @@ -import { PolicyType } from "../../enums/policyType"; - -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; +import { PolicyType } from "../../enums/policy-type"; export class PolicyResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts similarity index 95% rename from libs/common/src/models/response/profile-organization.response.ts rename to libs/common/src/admin-console/models/response/profile-organization.response.ts index 608a126e91..cd58bd55fe 100644 --- a/libs/common/src/models/response/profile-organization.response.ts +++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts @@ -1,10 +1,9 @@ -import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType"; -import { OrganizationUserType } from "../../enums/organizationUserType"; -import { ProductType } from "../../enums/productType"; +import { ProductType } from "../../../enums/productType"; +import { BaseResponse } from "../../../models/response/base.response"; +import { OrganizationUserStatusType } from "../../enums/organization-user-status-type"; +import { OrganizationUserType } from "../../enums/organization-user-type"; import { PermissionsApi } from "../api/permissions.api"; -import { BaseResponse } from "./base.response"; - export class ProfileOrganizationResponse extends BaseResponse { id: string; name: string; diff --git a/libs/common/src/models/response/profile-provider-organization.response.ts b/libs/common/src/admin-console/models/response/profile-provider-organization.response.ts similarity index 100% rename from libs/common/src/models/response/profile-provider-organization.response.ts rename to libs/common/src/admin-console/models/response/profile-provider-organization.response.ts diff --git a/libs/common/src/models/response/profile-provider.response.ts b/libs/common/src/admin-console/models/response/profile-provider.response.ts similarity index 80% rename from libs/common/src/models/response/profile-provider.response.ts rename to libs/common/src/admin-console/models/response/profile-provider.response.ts index 665a202690..ca16749201 100644 --- a/libs/common/src/models/response/profile-provider.response.ts +++ b/libs/common/src/admin-console/models/response/profile-provider.response.ts @@ -1,9 +1,8 @@ -import { ProviderUserStatusType } from "../../enums/providerUserStatusType"; -import { ProviderUserType } from "../../enums/providerUserType"; +import { BaseResponse } from "../../../models/response/base.response"; +import { ProviderUserStatusType } from "../../enums/provider-user-status-type"; +import { ProviderUserType } from "../../enums/provider-user-type"; import { PermissionsApi } from "../api/permissions.api"; -import { BaseResponse } from "./base.response"; - export class ProfileProviderResponse extends BaseResponse { id: string; name: string; diff --git a/libs/common/src/models/response/provider/provider-organization.response.ts b/libs/common/src/admin-console/models/response/provider/provider-organization.response.ts similarity index 94% rename from libs/common/src/models/response/provider/provider-organization.response.ts rename to libs/common/src/admin-console/models/response/provider/provider-organization.response.ts index e0e011f486..a7943343b7 100644 --- a/libs/common/src/models/response/provider/provider-organization.response.ts +++ b/libs/common/src/admin-console/models/response/provider/provider-organization.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../base.response"; +import { BaseResponse } from "../../../../models/response/base.response"; export class ProviderOrganizationResponse extends BaseResponse { id: string; diff --git a/libs/common/src/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 similarity index 77% rename from libs/common/src/models/response/provider/provider-user-bulk-public-key.response.ts rename to libs/common/src/admin-console/models/response/provider/provider-user-bulk-public-key.response.ts index 39e5747ade..8d0e5c7365 100644 --- a/libs/common/src/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/models/response/provider/provider-user-bulk.response.ts b/libs/common/src/admin-console/models/response/provider/provider-user-bulk.response.ts similarity index 77% rename from libs/common/src/models/response/provider/provider-user-bulk.response.ts rename to libs/common/src/admin-console/models/response/provider/provider-user-bulk.response.ts index 25804346f2..c9e7911b10 100644 --- a/libs/common/src/models/response/provider/provider-user-bulk.response.ts +++ b/libs/common/src/admin-console/models/response/provider/provider-user-bulk.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../base.response"; +import { BaseResponse } from "../../../../models/response/base.response"; export class ProviderUserBulkResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/provider/provider-user.response.ts b/libs/common/src/admin-console/models/response/provider/provider-user.response.ts similarity index 79% rename from libs/common/src/models/response/provider/provider-user.response.ts rename to libs/common/src/admin-console/models/response/provider/provider-user.response.ts index a1a2ed50a8..42685e4283 100644 --- a/libs/common/src/models/response/provider/provider-user.response.ts +++ b/libs/common/src/admin-console/models/response/provider/provider-user.response.ts @@ -1,7 +1,7 @@ -import { ProviderUserStatusType } from "../../../enums/providerUserStatusType"; -import { ProviderUserType } from "../../../enums/providerUserType"; +import { BaseResponse } from "../../../../models/response/base.response"; +import { ProviderUserStatusType } from "../../../enums/provider-user-status-type"; +import { ProviderUserType } from "../../../enums/provider-user-type"; import { PermissionsApi } from "../../api/permissions.api"; -import { BaseResponse } from "../base.response"; export class ProviderUserResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/provider/provider.response.ts b/libs/common/src/admin-console/models/response/provider/provider.response.ts similarity index 84% rename from libs/common/src/models/response/provider/provider.response.ts rename to libs/common/src/admin-console/models/response/provider/provider.response.ts index 95d038cb96..de53f5e7be 100644 --- a/libs/common/src/models/response/provider/provider.response.ts +++ b/libs/common/src/admin-console/models/response/provider/provider.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../base.response"; +import { BaseResponse } from "../../../../models/response/base.response"; export class ProviderResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/selection-read-only.response.ts b/libs/common/src/admin-console/models/response/selection-read-only.response.ts similarity index 83% rename from libs/common/src/models/response/selection-read-only.response.ts rename to libs/common/src/admin-console/models/response/selection-read-only.response.ts index e62fcf01a6..29c54422c9 100644 --- a/libs/common/src/models/response/selection-read-only.response.ts +++ b/libs/common/src/admin-console/models/response/selection-read-only.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class SelectionReadOnlyResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/view/collection.view.ts b/libs/common/src/admin-console/models/view/collection.view.ts similarity index 85% rename from libs/common/src/models/view/collection.view.ts rename to libs/common/src/admin-console/models/view/collection.view.ts index fca2851620..24c53055d2 100644 --- a/libs/common/src/models/view/collection.view.ts +++ b/libs/common/src/admin-console/models/view/collection.view.ts @@ -1,9 +1,8 @@ +import { ITreeNodeObject } from "../../../models/domain/tree-node"; +import { View } from "../../../models/view/view"; import { Collection } from "../domain/collection"; -import { ITreeNodeObject } from "../domain/tree-node"; import { CollectionAccessDetailsResponse } from "../response/collection.response"; -import { View } from "./view"; - export class CollectionView implements View, ITreeNodeObject { id: string = null; organizationId: string = null; diff --git a/libs/common/src/services/collection.service.ts b/libs/common/src/admin-console/services/collection.service.ts similarity index 93% rename from libs/common/src/services/collection.service.ts rename to libs/common/src/admin-console/services/collection.service.ts index d563f20f15..ccd5845511 100644 --- a/libs/common/src/services/collection.service.ts +++ b/libs/common/src/admin-console/services/collection.service.ts @@ -1,12 +1,12 @@ +import { CryptoService } from "../../abstractions/crypto.service"; +import { I18nService } from "../../abstractions/i18n.service"; +import { StateService } from "../../abstractions/state.service"; +import { ServiceUtils } from "../../misc/serviceUtils"; +import { Utils } from "../../misc/utils"; +import { TreeNode } from "../../models/domain/tree-node"; import { CollectionService as CollectionServiceAbstraction } from "../abstractions/collection.service"; -import { CryptoService } from "../abstractions/crypto.service"; -import { I18nService } from "../abstractions/i18n.service"; -import { StateService } from "../abstractions/state.service"; -import { ServiceUtils } from "../misc/serviceUtils"; -import { Utils } from "../misc/utils"; import { CollectionData } from "../models/data/collection.data"; import { Collection } from "../models/domain/collection"; -import { TreeNode } from "../models/domain/tree-node"; import { CollectionView } from "../models/view/collection.view"; const NestingDelimiter = "/"; diff --git a/libs/common/src/services/organization/organization-api.service.ts b/libs/common/src/admin-console/services/organization/organization-api.service.ts similarity index 83% rename from libs/common/src/services/organization/organization-api.service.ts rename to libs/common/src/admin-console/services/organization/organization-api.service.ts index b5c02e7b08..c9bbafe085 100644 --- a/libs/common/src/services/organization/organization-api.service.ts +++ b/libs/common/src/admin-console/services/organization/organization-api.service.ts @@ -1,33 +1,33 @@ -import { ApiService } from "../../abstractions/api.service"; +import { ApiService } from "../../../abstractions/api.service"; +import { OrganizationSsoRequest } from "../../../auth/models/request/organization-sso.request"; +import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request"; +import { ApiKeyResponse } from "../../../auth/models/response/api-key.response"; +import { OrganizationSsoResponse } from "../../../auth/models/response/organization-sso.response"; +import { OrganizationSubscriptionUpdateRequest } from "../../../billing/models/request/organization-subscription-update.request"; +import { OrganizationTaxInfoUpdateRequest } from "../../../billing/models/request/organization-tax-info-update.request"; +import { PaymentRequest } from "../../../billing/models/request/payment.request"; +import { BillingResponse } from "../../../billing/models/response/billing.response"; +import { OrganizationSubscriptionResponse } from "../../../billing/models/response/organization-subscription.response"; +import { PaymentResponse } from "../../../billing/models/response/payment.response"; +import { TaxInfoResponse } from "../../../billing/models/response/tax-info.response"; +import { ImportDirectoryRequest } from "../../../models/request/import-directory.request"; +import { OrganizationApiKeyRequest } from "../../../models/request/organization-api-key.request"; +import { SeatRequest } from "../../../models/request/seat.request"; +import { StorageRequest } from "../../../models/request/storage.request"; +import { VerifyBankRequest } from "../../../models/request/verify-bank.request"; +import { ListResponse } from "../../../models/response/list.response"; +import { SyncService } from "../../../vault/abstractions/sync/sync.service.abstraction"; import { OrganizationApiServiceAbstraction } from "../../abstractions/organization/organization-api.service.abstraction"; -import { OrganizationApiKeyType } from "../../auth/enums/organization-api-key-type"; -import { OrganizationSsoRequest } from "../../auth/models/request/organization-sso.request"; -import { SecretVerificationRequest } from "../../auth/models/request/secret-verification.request"; -import { ApiKeyResponse } from "../../auth/models/response/api-key.response"; -import { OrganizationSsoResponse } from "../../auth/models/response/organization-sso.response"; -import { ImportDirectoryRequest } from "../../models/request/import-directory.request"; -import { OrganizationApiKeyRequest } from "../../models/request/organization-api-key.request"; +import { OrganizationApiKeyType } from "../../enums/organization-api-key-type"; import { OrganizationCreateRequest } from "../../models/request/organization-create.request"; import { OrganizationKeysRequest } from "../../models/request/organization-keys.request"; -import { OrganizationSubscriptionUpdateRequest } from "../../models/request/organization-subscription-update.request"; -import { OrganizationTaxInfoUpdateRequest } from "../../models/request/organization-tax-info-update.request"; import { OrganizationUpdateRequest } from "../../models/request/organization-update.request"; import { OrganizationUpgradeRequest } from "../../models/request/organization-upgrade.request"; import { OrganizationEnrollSecretsManagerRequest } from "../../models/request/organization/organization-enroll-secrets-manager.request"; -import { PaymentRequest } from "../../models/request/payment.request"; -import { SeatRequest } from "../../models/request/seat.request"; -import { StorageRequest } from "../../models/request/storage.request"; -import { VerifyBankRequest } from "../../models/request/verify-bank.request"; -import { BillingResponse } from "../../models/response/billing.response"; -import { ListResponse } from "../../models/response/list.response"; import { OrganizationApiKeyInformationResponse } from "../../models/response/organization-api-key-information.response"; import { OrganizationAutoEnrollStatusResponse } from "../../models/response/organization-auto-enroll-status.response"; import { OrganizationKeysResponse } from "../../models/response/organization-keys.response"; -import { OrganizationSubscriptionResponse } from "../../models/response/organization-subscription.response"; import { OrganizationResponse } from "../../models/response/organization.response"; -import { PaymentResponse } from "../../models/response/payment.response"; -import { TaxInfoResponse } from "../../models/response/tax-info.response"; -import { SyncService } from "../../vault/abstractions/sync/sync.service.abstraction"; export class OrganizationApiService implements OrganizationApiServiceAbstraction { constructor(private apiService: ApiService, private syncService: SyncService) {} diff --git a/libs/common/src/services/organization/organization.service.ts b/libs/common/src/admin-console/services/organization/organization.service.ts similarity index 98% rename from libs/common/src/services/organization/organization.service.ts rename to libs/common/src/admin-console/services/organization/organization.service.ts index e2b7e50d4d..94cc4b5c35 100644 --- a/libs/common/src/services/organization/organization.service.ts +++ b/libs/common/src/admin-console/services/organization/organization.service.ts @@ -1,7 +1,7 @@ import { BehaviorSubject, concatMap, map, Observable } from "rxjs"; +import { StateService } from "../../../abstractions/state.service"; import { InternalOrganizationService as InternalOrganizationServiceAbstraction } from "../../abstractions/organization/organization.service.abstraction"; -import { StateService } from "../../abstractions/state.service"; import { OrganizationData } from "../../models/data/organization.data"; import { Organization } from "../../models/domain/organization"; diff --git a/libs/common/src/services/policy/policy-api.service.ts b/libs/common/src/admin-console/services/policy/policy-api.service.ts similarity index 91% rename from libs/common/src/services/policy/policy-api.service.ts rename to libs/common/src/admin-console/services/policy/policy-api.service.ts index 5b15f0199e..e078f8bfcb 100644 --- a/libs/common/src/services/policy/policy-api.service.ts +++ b/libs/common/src/admin-console/services/policy/policy-api.service.ts @@ -1,15 +1,15 @@ import { firstValueFrom } from "rxjs"; -import { ApiService } from "../../abstractions/api.service"; +import { ApiService } from "../../../abstractions/api.service"; +import { StateService } from "../../../abstractions/state.service"; +import { Utils } from "../../../misc/utils"; +import { ListResponse } from "../../../models/response/list.response"; import { PolicyApiServiceAbstraction } from "../../abstractions/policy/policy-api.service.abstraction"; import { InternalPolicyService } from "../../abstractions/policy/policy.service.abstraction"; -import { StateService } from "../../abstractions/state.service"; -import { PolicyType } from "../../enums/policyType"; -import { Utils } from "../../misc/utils"; +import { PolicyType } from "../../enums/policy-type"; import { PolicyData } from "../../models/data/policy.data"; import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options"; import { PolicyRequest } from "../../models/request/policy.request"; -import { ListResponse } from "../../models/response/list.response"; import { PolicyResponse } from "../../models/response/policy.response"; export class PolicyApiService implements PolicyApiServiceAbstraction { diff --git a/libs/common/src/services/policy/policy.service.ts b/libs/common/src/admin-console/services/policy/policy.service.ts similarity index 96% rename from libs/common/src/services/policy/policy.service.ts rename to libs/common/src/admin-console/services/policy/policy.service.ts index 2a837b807c..d8a1a5cf0e 100644 --- a/libs/common/src/services/policy/policy.service.ts +++ b/libs/common/src/admin-console/services/policy/policy.service.ts @@ -1,18 +1,18 @@ import { of, concatMap, BehaviorSubject, Observable, map } from "rxjs"; +import { StateService } from "../../../abstractions/state.service"; +import { Utils } from "../../../misc/utils"; +import { ListResponse } from "../../../models/response/list.response"; import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction"; import { InternalPolicyService as InternalPolicyServiceAbstraction } from "../../abstractions/policy/policy.service.abstraction"; -import { StateService } from "../../abstractions/state.service"; -import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType"; -import { OrganizationUserType } from "../../enums/organizationUserType"; -import { PolicyType } from "../../enums/policyType"; -import { Utils } from "../../misc/utils"; +import { OrganizationUserStatusType } from "../../enums/organization-user-status-type"; +import { OrganizationUserType } from "../../enums/organization-user-type"; +import { PolicyType } from "../../enums/policy-type"; import { PolicyData } from "../../models/data/policy.data"; import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options"; import { Organization } from "../../models/domain/organization"; import { Policy } from "../../models/domain/policy"; import { ResetPasswordPolicyOptions } from "../../models/domain/reset-password-policy-options"; -import { ListResponse } from "../../models/response/list.response"; import { PolicyResponse } from "../../models/response/policy.response"; export class PolicyService implements InternalPolicyServiceAbstraction { diff --git a/libs/common/src/services/provider.service.ts b/libs/common/src/admin-console/services/provider.service.ts similarity index 89% rename from libs/common/src/services/provider.service.ts rename to libs/common/src/admin-console/services/provider.service.ts index e8d96976dd..31934260ee 100644 --- a/libs/common/src/services/provider.service.ts +++ b/libs/common/src/admin-console/services/provider.service.ts @@ -1,7 +1,7 @@ +import { StateService } from "../../abstractions/state.service"; +import { Provider } from "../../models/domain/provider"; import { ProviderService as ProviderServiceAbstraction } from "../abstractions/provider.service"; -import { StateService } from "../abstractions/state.service"; import { ProviderData } from "../models/data/provider.data"; -import { Provider } from "../models/domain/provider"; export class ProviderService implements ProviderServiceAbstraction { constructor(private stateService: StateService) {} diff --git a/libs/common/src/auth/abstractions/key-connector.service.ts b/libs/common/src/auth/abstractions/key-connector.service.ts index 263282ff6c..0c4426a683 100644 --- a/libs/common/src/auth/abstractions/key-connector.service.ts +++ b/libs/common/src/auth/abstractions/key-connector.service.ts @@ -1,4 +1,4 @@ -import { Organization } from "../../models/domain/organization"; +import { Organization } from "../../admin-console/models/domain/organization"; import { IdentityTokenResponse } from "../models/response/identity-token.response"; export abstract class KeyConnectorService { diff --git a/libs/common/src/auth/services/key-connector.service.ts b/libs/common/src/auth/services/key-connector.service.ts index a667ed9b3e..19970a1de0 100644 --- a/libs/common/src/auth/services/key-connector.service.ts +++ b/libs/common/src/auth/services/key-connector.service.ts @@ -2,9 +2,9 @@ import { ApiService } from "../../abstractions/api.service"; import { CryptoService } from "../../abstractions/crypto.service"; import { CryptoFunctionService } from "../../abstractions/cryptoFunction.service"; import { LogService } from "../../abstractions/log.service"; -import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction"; import { StateService } from "../../abstractions/state.service"; -import { OrganizationUserType } from "../../enums/organizationUserType"; +import { OrganizationService } from "../../admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserType } from "../../admin-console/enums/organization-user-type"; import { Utils } from "../../misc/utils"; import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; import { KeysRequest } from "../../models/request/keys.request"; diff --git a/libs/common/src/enums/paymentMethodType.ts b/libs/common/src/billing/enums/payment-method-type.ts similarity index 100% rename from libs/common/src/enums/paymentMethodType.ts rename to libs/common/src/billing/enums/payment-method-type.ts diff --git a/libs/common/src/enums/planSponsorshipType.ts b/libs/common/src/billing/enums/plan-sponsorship-type.ts similarity index 100% rename from libs/common/src/enums/planSponsorshipType.ts rename to libs/common/src/billing/enums/plan-sponsorship-type.ts diff --git a/libs/common/src/enums/planType.ts b/libs/common/src/billing/enums/plan-type.ts similarity index 100% rename from libs/common/src/enums/planType.ts rename to libs/common/src/billing/enums/plan-type.ts diff --git a/libs/common/src/enums/transactionType.ts b/libs/common/src/billing/enums/transaction-type.ts similarity index 100% rename from libs/common/src/enums/transactionType.ts rename to libs/common/src/billing/enums/transaction-type.ts diff --git a/libs/common/src/models/api/billing-sync-config.api.ts b/libs/common/src/billing/models/api/billing-sync-config.api.ts similarity index 86% rename from libs/common/src/models/api/billing-sync-config.api.ts rename to libs/common/src/billing/models/api/billing-sync-config.api.ts index b99c6a89ce..bb3b8969a3 100644 --- a/libs/common/src/models/api/billing-sync-config.api.ts +++ b/libs/common/src/billing/models/api/billing-sync-config.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class BillingSyncConfigApi extends BaseResponse { billingSyncKey: string; diff --git a/libs/common/src/models/request/billing-sync-config.request.ts b/libs/common/src/billing/models/request/billing-sync-config.request.ts similarity index 100% rename from libs/common/src/models/request/billing-sync-config.request.ts rename to libs/common/src/billing/models/request/billing-sync-config.request.ts diff --git a/libs/common/src/models/request/bit-pay-invoice.request.ts b/libs/common/src/billing/models/request/bit-pay-invoice.request.ts similarity index 100% rename from libs/common/src/models/request/bit-pay-invoice.request.ts rename to libs/common/src/billing/models/request/bit-pay-invoice.request.ts diff --git a/libs/common/src/models/request/organization-subscription-update.request.ts b/libs/common/src/billing/models/request/organization-subscription-update.request.ts similarity index 100% rename from libs/common/src/models/request/organization-subscription-update.request.ts rename to libs/common/src/billing/models/request/organization-subscription-update.request.ts diff --git a/libs/common/src/models/request/organization-tax-info-update.request.ts b/libs/common/src/billing/models/request/organization-tax-info-update.request.ts similarity index 100% rename from libs/common/src/models/request/organization-tax-info-update.request.ts rename to libs/common/src/billing/models/request/organization-tax-info-update.request.ts diff --git a/libs/common/src/models/request/payment.request.ts b/libs/common/src/billing/models/request/payment.request.ts similarity index 76% rename from libs/common/src/models/request/payment.request.ts rename to libs/common/src/billing/models/request/payment.request.ts index d9e937e8a1..f1f476ed1a 100644 --- a/libs/common/src/models/request/payment.request.ts +++ b/libs/common/src/billing/models/request/payment.request.ts @@ -1,4 +1,4 @@ -import { PaymentMethodType } from "../../enums/paymentMethodType"; +import { PaymentMethodType } from "../../enums/payment-method-type"; import { OrganizationTaxInfoUpdateRequest } from "./organization-tax-info-update.request"; diff --git a/libs/common/src/models/request/tax-info-update.request.ts b/libs/common/src/billing/models/request/tax-info-update.request.ts similarity index 100% rename from libs/common/src/models/request/tax-info-update.request.ts rename to libs/common/src/billing/models/request/tax-info-update.request.ts diff --git a/libs/common/src/models/response/billing-history.response.ts b/libs/common/src/billing/models/response/billing-history.response.ts similarity index 91% rename from libs/common/src/models/response/billing-history.response.ts rename to libs/common/src/billing/models/response/billing-history.response.ts index 6fba1bbfb2..c80ee43df5 100644 --- a/libs/common/src/models/response/billing-history.response.ts +++ b/libs/common/src/billing/models/response/billing-history.response.ts @@ -1,4 +1,5 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; + import { BillingInvoiceResponse, BillingTransactionResponse } from "./billing.response"; export class BillingHistoryResponse extends BaseResponse { diff --git a/libs/common/src/models/response/billing-payment.response.ts b/libs/common/src/billing/models/response/billing-payment.response.ts similarity index 86% rename from libs/common/src/models/response/billing-payment.response.ts rename to libs/common/src/billing/models/response/billing-payment.response.ts index 95459293fc..534df4d7c7 100644 --- a/libs/common/src/models/response/billing-payment.response.ts +++ b/libs/common/src/billing/models/response/billing-payment.response.ts @@ -1,4 +1,5 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; + import { BillingSourceResponse } from "./billing.response"; export class BillingPaymentResponse extends BaseResponse { diff --git a/libs/common/src/models/response/billing.response.ts b/libs/common/src/billing/models/response/billing.response.ts similarity index 93% rename from libs/common/src/models/response/billing.response.ts rename to libs/common/src/billing/models/response/billing.response.ts index 102a479880..b4a7fa8c2a 100644 --- a/libs/common/src/models/response/billing.response.ts +++ b/libs/common/src/billing/models/response/billing.response.ts @@ -1,7 +1,6 @@ -import { PaymentMethodType } from "../../enums/paymentMethodType"; -import { TransactionType } from "../../enums/transactionType"; - -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; +import { PaymentMethodType } from "../../enums/payment-method-type"; +import { TransactionType } from "../../enums/transaction-type"; export class BillingResponse extends BaseResponse { balance: number; diff --git a/libs/common/src/models/response/organization-subscription.response.ts b/libs/common/src/billing/models/response/organization-subscription.response.ts similarity index 90% rename from libs/common/src/models/response/organization-subscription.response.ts rename to libs/common/src/billing/models/response/organization-subscription.response.ts index ce412a987b..09c9f3a758 100644 --- a/libs/common/src/models/response/organization-subscription.response.ts +++ b/libs/common/src/billing/models/response/organization-subscription.response.ts @@ -1,4 +1,5 @@ -import { OrganizationResponse } from "./organization.response"; +import { OrganizationResponse } from "../../../admin-console/models/response/organization.response"; + import { BillingSubscriptionResponse, BillingSubscriptionUpcomingInvoiceResponse, diff --git a/libs/common/src/models/response/payment.response.ts b/libs/common/src/billing/models/response/payment.response.ts similarity index 77% rename from libs/common/src/models/response/payment.response.ts rename to libs/common/src/billing/models/response/payment.response.ts index 4a6a43aa2d..87338e6389 100644 --- a/libs/common/src/models/response/payment.response.ts +++ b/libs/common/src/billing/models/response/payment.response.ts @@ -1,5 +1,5 @@ -import { BaseResponse } from "./base.response"; -import { ProfileResponse } from "./profile.response"; +import { BaseResponse } from "../../../models/response/base.response"; +import { ProfileResponse } from "../../../models/response/profile.response"; export class PaymentResponse extends BaseResponse { userProfile: ProfileResponse; diff --git a/libs/common/src/models/response/plan.response.ts b/libs/common/src/billing/models/response/plan.response.ts similarity index 95% rename from libs/common/src/models/response/plan.response.ts rename to libs/common/src/billing/models/response/plan.response.ts index fcb23b5a13..d2d18db6f5 100644 --- a/libs/common/src/models/response/plan.response.ts +++ b/libs/common/src/billing/models/response/plan.response.ts @@ -1,7 +1,6 @@ -import { PlanType } from "../../enums/planType"; -import { ProductType } from "../../enums/productType"; - -import { BaseResponse } from "./base.response"; +import { ProductType } from "../../../enums/productType"; +import { BaseResponse } from "../../../models/response/base.response"; +import { PlanType } from "../../enums/plan-type"; export class PlanResponse extends BaseResponse { type: PlanType; diff --git a/libs/common/src/models/response/subscription.response.ts b/libs/common/src/billing/models/response/subscription.response.ts similarity index 97% rename from libs/common/src/models/response/subscription.response.ts rename to libs/common/src/billing/models/response/subscription.response.ts index 1b5f57a32d..35f93cc265 100644 --- a/libs/common/src/models/response/subscription.response.ts +++ b/libs/common/src/billing/models/response/subscription.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class SubscriptionResponse extends BaseResponse { storageName: string; diff --git a/libs/common/src/models/response/tax-info.response.ts b/libs/common/src/billing/models/response/tax-info.response.ts similarity index 90% rename from libs/common/src/models/response/tax-info.response.ts rename to libs/common/src/billing/models/response/tax-info.response.ts index 8886ad5ce7..72a745f8fe 100644 --- a/libs/common/src/models/response/tax-info.response.ts +++ b/libs/common/src/billing/models/response/tax-info.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class TaxInfoResponse extends BaseResponse { taxId: string; diff --git a/libs/common/src/models/response/tax-rate.response.ts b/libs/common/src/billing/models/response/tax-rate.response.ts similarity index 86% rename from libs/common/src/models/response/tax-rate.response.ts rename to libs/common/src/billing/models/response/tax-rate.response.ts index 5bc9608f65..2c07129ba2 100644 --- a/libs/common/src/models/response/tax-rate.response.ts +++ b/libs/common/src/billing/models/response/tax-rate.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class TaxRateResponse extends BaseResponse { id: string; diff --git a/libs/common/src/importers/base-importer.ts b/libs/common/src/importers/base-importer.ts index 0f0a4e54e0..3f0f548f1f 100644 --- a/libs/common/src/importers/base-importer.ts +++ b/libs/common/src/importers/base-importer.ts @@ -1,11 +1,11 @@ import * as papa from "papaparse"; import { LogService } from "../abstractions/log.service"; +import { CollectionView } from "../admin-console/models/view/collection.view"; import { FieldType } from "../enums/fieldType"; import { SecureNoteType } from "../enums/secureNoteType"; import { Utils } from "../misc/utils"; import { ImportResult } from "../models/domain/import-result"; -import { CollectionView } from "../models/view/collection.view"; import { ConsoleLogService } from "../services/consoleLog.service"; import { CipherType } from "../vault/enums/cipher-type"; import { CipherView } from "../vault/models/view/cipher.view"; diff --git a/libs/common/src/importers/bitwarden-csv-importer.ts b/libs/common/src/importers/bitwarden-csv-importer.ts index e40294b6b2..c7d0d334b0 100644 --- a/libs/common/src/importers/bitwarden-csv-importer.ts +++ b/libs/common/src/importers/bitwarden-csv-importer.ts @@ -1,7 +1,7 @@ +import { CollectionView } from "../admin-console/models/view/collection.view"; import { FieldType } from "../enums/fieldType"; import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; -import { CollectionView } from "../models/view/collection.view"; import { CipherRepromptType } from "../vault/enums/cipher-reprompt-type"; import { CipherType } from "../vault/enums/cipher-type"; import { CipherView } from "../vault/models/view/cipher.view"; diff --git a/libs/common/src/importers/padlock-csv-importer.ts b/libs/common/src/importers/padlock-csv-importer.ts index 7976e0ea3a..0cca4dec82 100644 --- a/libs/common/src/importers/padlock-csv-importer.ts +++ b/libs/common/src/importers/padlock-csv-importer.ts @@ -1,5 +1,5 @@ +import { CollectionView } from "../admin-console/models/view/collection.view"; import { ImportResult } from "../models/domain/import-result"; -import { CollectionView } from "../models/view/collection.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passpack-csv-importer.ts b/libs/common/src/importers/passpack-csv-importer.ts index 5f9f708c8a..628cdcf2b6 100644 --- a/libs/common/src/importers/passpack-csv-importer.ts +++ b/libs/common/src/importers/passpack-csv-importer.ts @@ -1,5 +1,5 @@ +import { CollectionView } from "../admin-console/models/view/collection.view"; import { ImportResult } from "../models/domain/import-result"; -import { CollectionView } from "../models/view/collection.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts index efd6208d36..f862989909 100644 --- a/libs/common/src/models/domain/account.ts +++ b/libs/common/src/models/domain/account.ts @@ -1,5 +1,12 @@ import { Jsonify } from "type-fest"; +import { CollectionData } from "../../admin-console/models/data/collection.data"; +import { EncryptedOrganizationKeyData } from "../../admin-console/models/data/encrypted-organization-key.data"; +import { OrganizationData } from "../../admin-console/models/data/organization.data"; +import { PolicyData } from "../../admin-console/models/data/policy.data"; +import { ProviderData } from "../../admin-console/models/data/provider.data"; +import { Policy } from "../../admin-console/models/domain/policy"; +import { CollectionView } from "../../admin-console/models/view/collection.view"; import { AuthenticationStatus } from "../../auth/enums/authentication-status"; import { EnvironmentUrls } from "../../auth/models/domain/environment-urls"; import { KdfType } from "../../enums/kdfType"; @@ -10,19 +17,12 @@ import { DeepJsonify } from "../../types/deep-jsonify"; import { CipherData } from "../../vault/models/data/cipher.data"; import { FolderData } from "../../vault/models/data/folder.data"; import { CipherView } from "../../vault/models/view/cipher.view"; -import { CollectionData } from "../data/collection.data"; -import { EncryptedOrganizationKeyData } from "../data/encrypted-organization-key.data"; import { EventData } from "../data/event.data"; -import { OrganizationData } from "../data/organization.data"; -import { PolicyData } from "../data/policy.data"; -import { ProviderData } from "../data/provider.data"; import { SendData } from "../data/send.data"; import { ServerConfigData } from "../data/server-config.data"; -import { CollectionView } from "../view/collection.view"; import { SendView } from "../view/send.view"; import { EncString } from "./enc-string"; -import { Policy } from "./policy"; import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class EncryptionPair { diff --git a/libs/common/src/models/domain/import-result.ts b/libs/common/src/models/domain/import-result.ts index 815801d09c..cb731d2eb5 100644 --- a/libs/common/src/models/domain/import-result.ts +++ b/libs/common/src/models/domain/import-result.ts @@ -1,6 +1,6 @@ +import { CollectionView } from "../../admin-console/models/view/collection.view"; import { CipherView } from "../../vault/models/view/cipher.view"; import { FolderView } from "../../vault/models/view/folder.view"; -import { CollectionView } from "../view/collection.view"; export class ImportResult { success = false; diff --git a/libs/common/src/models/domain/provider.ts b/libs/common/src/models/domain/provider.ts index 0968a92dc2..843bd299b4 100644 --- a/libs/common/src/models/domain/provider.ts +++ b/libs/common/src/models/domain/provider.ts @@ -1,6 +1,6 @@ -import { ProviderUserStatusType } from "../../enums/providerUserStatusType"; -import { ProviderUserType } from "../../enums/providerUserType"; -import { ProviderData } from "../data/provider.data"; +import { ProviderUserStatusType } from "../../admin-console/enums/provider-user-status-type"; +import { ProviderUserType } from "../../admin-console/enums/provider-user-type"; +import { ProviderData } from "../../admin-console/models/data/provider.data"; export class Provider { id: string; diff --git a/libs/common/src/models/export/collection-with-id.export.ts b/libs/common/src/models/export/collection-with-id.export.ts index 1978cc707e..603c4fe87f 100644 --- a/libs/common/src/models/export/collection-with-id.export.ts +++ b/libs/common/src/models/export/collection-with-id.export.ts @@ -1,5 +1,5 @@ -import { Collection as CollectionDomain } from "../domain/collection"; -import { CollectionView } from "../view/collection.view"; +import { Collection as CollectionDomain } from "../../admin-console/models/domain/collection"; +import { CollectionView } from "../../admin-console/models/view/collection.view"; import { CollectionExport } from "./collection.export"; diff --git a/libs/common/src/models/export/collection.export.ts b/libs/common/src/models/export/collection.export.ts index 68277ee4e3..aa0d7d194f 100644 --- a/libs/common/src/models/export/collection.export.ts +++ b/libs/common/src/models/export/collection.export.ts @@ -1,6 +1,6 @@ -import { Collection as CollectionDomain } from "../domain/collection"; +import { Collection as CollectionDomain } from "../../admin-console/models/domain/collection"; +import { CollectionView } from "../../admin-console/models/view/collection.view"; import { EncString } from "../domain/enc-string"; -import { CollectionView } from "../view/collection.view"; export class CollectionExport { static template(): CollectionExport { diff --git a/libs/common/src/models/request/iap-check.request.ts b/libs/common/src/models/request/iap-check.request.ts index b8796e8c90..94799fab23 100644 --- a/libs/common/src/models/request/iap-check.request.ts +++ b/libs/common/src/models/request/iap-check.request.ts @@ -1,4 +1,4 @@ -import { PaymentMethodType } from "../../enums/paymentMethodType"; +import { PaymentMethodType } from "../../billing/enums/payment-method-type"; export class IapCheckRequest { paymentMethodType: PaymentMethodType; diff --git a/libs/common/src/models/request/import-organization-ciphers.request.ts b/libs/common/src/models/request/import-organization-ciphers.request.ts index d0f3e9398a..03d0056090 100644 --- a/libs/common/src/models/request/import-organization-ciphers.request.ts +++ b/libs/common/src/models/request/import-organization-ciphers.request.ts @@ -1,6 +1,6 @@ +import { CollectionRequest } from "../../admin-console/models/request/collection.request"; import { CipherRequest } from "../../vault/models/request/cipher.request"; -import { CollectionRequest } from "./collection.request"; import { KvpRequest } from "./kvp.request"; export class ImportOrganizationCiphersRequest { diff --git a/libs/common/src/models/request/organization-api-key.request.ts b/libs/common/src/models/request/organization-api-key.request.ts index 77d695c523..a16f3e5092 100644 --- a/libs/common/src/models/request/organization-api-key.request.ts +++ b/libs/common/src/models/request/organization-api-key.request.ts @@ -1,4 +1,4 @@ -import { OrganizationApiKeyType } from "../../auth/enums/organization-api-key-type"; +import { OrganizationApiKeyType } from "../../admin-console/enums/organization-api-key-type"; import { SecretVerificationRequest } from "../../auth/models/request/secret-verification.request"; export class OrganizationApiKeyRequest extends SecretVerificationRequest { diff --git a/libs/common/src/models/response/profile.response.ts b/libs/common/src/models/response/profile.response.ts index 1be086ea43..b1267411e5 100644 --- a/libs/common/src/models/response/profile.response.ts +++ b/libs/common/src/models/response/profile.response.ts @@ -1,7 +1,8 @@ +import { ProfileOrganizationResponse } from "../../admin-console/models/response/profile-organization.response"; +import { ProfileProviderOrganizationResponse } from "../../admin-console/models/response/profile-provider-organization.response"; +import { ProfileProviderResponse } from "../../admin-console/models/response/profile-provider.response"; + import { BaseResponse } from "./base.response"; -import { ProfileOrganizationResponse } from "./profile-organization.response"; -import { ProfileProviderOrganizationResponse } from "./profile-provider-organization.response"; -import { ProfileProviderResponse } from "./profile-provider.response"; export class ProfileResponse extends BaseResponse { id: string; diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index 5776348816..0833bcbdc4 100644 --- a/libs/common/src/services/api.service.ts +++ b/libs/common/src/services/api.service.ts @@ -2,6 +2,45 @@ import { ApiService as ApiServiceAbstraction } from "../abstractions/api.service import { AppIdService } from "../abstractions/appId.service"; import { EnvironmentService } from "../abstractions/environment.service"; import { PlatformUtilsService } from "../abstractions/platformUtils.service"; +import { OrganizationConnectionType } from "../admin-console/enums/organization-connection-type"; +import { CollectionRequest } from "../admin-console/models/request/collection.request"; +import { OrganizationConnectionRequest } from "../admin-console/models/request/organization-connection.request"; +import { OrganizationSponsorshipCreateRequest } from "../admin-console/models/request/organization/organization-sponsorship-create.request"; +import { OrganizationSponsorshipRedeemRequest } from "../admin-console/models/request/organization/organization-sponsorship-redeem.request"; +import { ProviderAddOrganizationRequest } from "../admin-console/models/request/provider/provider-add-organization.request"; +import { ProviderOrganizationCreateRequest } from "../admin-console/models/request/provider/provider-organization-create.request"; +import { ProviderSetupRequest } from "../admin-console/models/request/provider/provider-setup.request"; +import { ProviderUpdateRequest } from "../admin-console/models/request/provider/provider-update.request"; +import { ProviderUserAcceptRequest } from "../admin-console/models/request/provider/provider-user-accept.request"; +import { ProviderUserBulkConfirmRequest } from "../admin-console/models/request/provider/provider-user-bulk-confirm.request"; +import { ProviderUserBulkRequest } from "../admin-console/models/request/provider/provider-user-bulk.request"; +import { ProviderUserConfirmRequest } from "../admin-console/models/request/provider/provider-user-confirm.request"; +import { ProviderUserInviteRequest } from "../admin-console/models/request/provider/provider-user-invite.request"; +import { ProviderUserUpdateRequest } from "../admin-console/models/request/provider/provider-user-update.request"; +import { SelectionReadOnlyRequest } from "../admin-console/models/request/selection-read-only.request"; +import { + CollectionAccessDetailsResponse, + CollectionResponse, +} from "../admin-console/models/response/collection.response"; +import { + OrganizationConnectionConfigApis, + OrganizationConnectionResponse, +} from "../admin-console/models/response/organization-connection.response"; +import { OrganizationExportResponse } from "../admin-console/models/response/organization-export.response"; +import { OrganizationSponsorshipSyncStatusResponse } from "../admin-console/models/response/organization-sponsorship-sync-status.response"; +import { PolicyResponse } from "../admin-console/models/response/policy.response"; +import { + ProviderOrganizationOrganizationDetailsResponse, + ProviderOrganizationResponse, +} from "../admin-console/models/response/provider/provider-organization.response"; +import { ProviderUserBulkPublicKeyResponse } from "../admin-console/models/response/provider/provider-user-bulk-public-key.response"; +import { ProviderUserBulkResponse } from "../admin-console/models/response/provider/provider-user-bulk.response"; +import { + ProviderUserResponse, + ProviderUserUserDetailsResponse, +} from "../admin-console/models/response/provider/provider-user.response"; +import { ProviderResponse } from "../admin-console/models/response/provider/provider.response"; +import { SelectionReadOnlyResponse } from "../admin-console/models/response/selection-read-only.response"; import { TokenService } from "../auth/abstractions/token.service"; import { DeviceVerificationRequest } from "../auth/models/request/device-verification.request"; import { EmailTokenRequest } from "../auth/models/request/email-token.request"; @@ -61,84 +100,45 @@ import { TwoFactorWebAuthnResponse, } from "../auth/models/response/two-factor-web-authn.response"; import { TwoFactorYubiKeyResponse } from "../auth/models/response/two-factor-yubi-key.response"; +import { BitPayInvoiceRequest } from "../billing/models/request/bit-pay-invoice.request"; +import { PaymentRequest } from "../billing/models/request/payment.request"; +import { TaxInfoUpdateRequest } from "../billing/models/request/tax-info-update.request"; +import { BillingHistoryResponse } from "../billing/models/response/billing-history.response"; +import { BillingPaymentResponse } from "../billing/models/response/billing-payment.response"; +import { PaymentResponse } from "../billing/models/response/payment.response"; +import { PlanResponse } from "../billing/models/response/plan.response"; +import { SubscriptionResponse } from "../billing/models/response/subscription.response"; +import { TaxInfoResponse } from "../billing/models/response/tax-info.response"; +import { TaxRateResponse } from "../billing/models/response/tax-rate.response"; import { DeviceType } from "../enums/deviceType"; -import { OrganizationConnectionType } from "../enums/organizationConnectionType"; import { Utils } from "../misc/utils"; -import { BitPayInvoiceRequest } from "../models/request/bit-pay-invoice.request"; import { CollectionBulkDeleteRequest } from "../models/request/collection-bulk-delete.request"; -import { CollectionRequest } from "../models/request/collection.request"; import { DeleteRecoverRequest } from "../models/request/delete-recover.request"; import { EventRequest } from "../models/request/event.request"; import { IapCheckRequest } from "../models/request/iap-check.request"; import { KdfRequest } from "../models/request/kdf.request"; import { KeysRequest } from "../models/request/keys.request"; -import { OrganizationConnectionRequest } from "../models/request/organization-connection.request"; import { OrganizationImportRequest } from "../models/request/organization-import.request"; -import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organization-sponsorship-create.request"; -import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organization-sponsorship-redeem.request"; -import { PaymentRequest } from "../models/request/payment.request"; import { PreloginRequest } from "../models/request/prelogin.request"; -import { ProviderAddOrganizationRequest } from "../models/request/provider/provider-add-organization.request"; -import { ProviderOrganizationCreateRequest } from "../models/request/provider/provider-organization-create.request"; -import { ProviderSetupRequest } from "../models/request/provider/provider-setup.request"; -import { ProviderUpdateRequest } from "../models/request/provider/provider-update.request"; -import { ProviderUserAcceptRequest } from "../models/request/provider/provider-user-accept.request"; -import { ProviderUserBulkConfirmRequest } from "../models/request/provider/provider-user-bulk-confirm.request"; -import { ProviderUserBulkRequest } from "../models/request/provider/provider-user-bulk.request"; -import { ProviderUserConfirmRequest } from "../models/request/provider/provider-user-confirm.request"; -import { ProviderUserInviteRequest } from "../models/request/provider/provider-user-invite.request"; -import { ProviderUserUpdateRequest } from "../models/request/provider/provider-user-update.request"; import { RegisterRequest } from "../models/request/register.request"; -import { SelectionReadOnlyRequest } from "../models/request/selection-read-only.request"; import { SendAccessRequest } from "../models/request/send-access.request"; import { SendRequest } from "../models/request/send.request"; import { StorageRequest } from "../models/request/storage.request"; -import { TaxInfoUpdateRequest } from "../models/request/tax-info-update.request"; import { UpdateAvatarRequest } from "../models/request/update-avatar.request"; import { UpdateDomainsRequest } from "../models/request/update-domains.request"; import { UpdateKeyRequest } from "../models/request/update-key.request"; import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; -import { BillingHistoryResponse } from "../models/response/billing-history.response"; -import { BillingPaymentResponse } from "../models/response/billing-payment.response"; import { BreachAccountResponse } from "../models/response/breach-account.response"; -import { - CollectionAccessDetailsResponse, - CollectionResponse, -} from "../models/response/collection.response"; import { DomainsResponse } from "../models/response/domains.response"; import { ErrorResponse } from "../models/response/error.response"; import { EventResponse } from "../models/response/event.response"; import { ListResponse } from "../models/response/list.response"; -import { - OrganizationConnectionConfigApis, - OrganizationConnectionResponse, -} from "../models/response/organization-connection.response"; -import { OrganizationExportResponse } from "../models/response/organization-export.response"; -import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/organization-sponsorship-sync-status.response"; -import { PaymentResponse } from "../models/response/payment.response"; -import { PlanResponse } from "../models/response/plan.response"; -import { PolicyResponse } from "../models/response/policy.response"; import { ProfileResponse } from "../models/response/profile.response"; -import { - ProviderOrganizationOrganizationDetailsResponse, - ProviderOrganizationResponse, -} from "../models/response/provider/provider-organization.response"; -import { ProviderUserBulkPublicKeyResponse } from "../models/response/provider/provider-user-bulk-public-key.response"; -import { ProviderUserBulkResponse } from "../models/response/provider/provider-user-bulk.response"; -import { - ProviderUserResponse, - ProviderUserUserDetailsResponse, -} from "../models/response/provider/provider-user.response"; -import { ProviderResponse } from "../models/response/provider/provider.response"; -import { SelectionReadOnlyResponse } from "../models/response/selection-read-only.response"; import { SendAccessResponse } from "../models/response/send-access.response"; import { SendFileDownloadDataResponse } from "../models/response/send-file-download-data.response"; import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; import { SendResponse } from "../models/response/send.response"; -import { SubscriptionResponse } from "../models/response/subscription.response"; -import { TaxInfoResponse } from "../models/response/tax-info.response"; -import { TaxRateResponse } from "../models/response/tax-rate.response"; import { UserKeyResponse } from "../models/response/user-key.response"; import { SendAccessView } from "../models/view/send-access.view"; import { AttachmentRequest } from "../vault/models/request/attachment.request"; diff --git a/libs/common/src/services/crypto.service.ts b/libs/common/src/services/crypto.service.ts index 3381cddb31..5c2c5d37bb 100644 --- a/libs/common/src/services/crypto.service.ts +++ b/libs/common/src/services/crypto.service.ts @@ -6,6 +6,11 @@ import { EncryptService } from "../abstractions/encrypt.service"; import { LogService } from "../abstractions/log.service"; import { PlatformUtilsService } from "../abstractions/platformUtils.service"; import { StateService } from "../abstractions/state.service"; +import { EncryptedOrganizationKeyData } from "../admin-console/models/data/encrypted-organization-key.data"; +import { BaseEncryptedOrganizationKey } from "../admin-console/models/domain/encrypted-organization-key"; +import { ProfileOrganizationResponse } from "../admin-console/models/response/profile-organization.response"; +import { ProfileProviderOrganizationResponse } from "../admin-console/models/response/profile-provider-organization.response"; +import { ProfileProviderResponse } from "../admin-console/models/response/profile-provider.response"; import { KdfConfig } from "../auth/models/domain/kdf-config"; import { EncryptionType } from "../enums/encryptionType"; import { HashPurpose } from "../enums/hashPurpose"; @@ -19,14 +24,9 @@ import { KeySuffixOptions } from "../enums/keySuffixOptions"; import { sequentialize } from "../misc/sequentialize"; import { Utils } from "../misc/utils"; import { EFFLongWordList } from "../misc/wordlist"; -import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data"; import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; import { EncString } from "../models/domain/enc-string"; -import { BaseEncryptedOrganizationKey } from "../models/domain/encrypted-organization-key"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; -import { ProfileOrganizationResponse } from "../models/response/profile-organization.response"; -import { ProfileProviderOrganizationResponse } from "../models/response/profile-provider-organization.response"; -import { ProfileProviderResponse } from "../models/response/profile-provider.response"; export class CryptoService implements CryptoServiceAbstraction { constructor( diff --git a/libs/common/src/services/event/event-collection.service.ts b/libs/common/src/services/event/event-collection.service.ts index be982286cf..8d7e46e0a0 100644 --- a/libs/common/src/services/event/event-collection.service.ts +++ b/libs/common/src/services/event/event-collection.service.ts @@ -1,7 +1,7 @@ import { EventCollectionService as EventCollectionServiceAbstraction } from "../../abstractions/event/event-collection.service"; import { EventUploadService } from "../../abstractions/event/event-upload.service"; -import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction"; import { StateService } from "../../abstractions/state.service"; +import { OrganizationService } from "../../admin-console/abstractions/organization/organization.service.abstraction"; import { EventType } from "../../enums/eventType"; import { EventData } from "../../models/data/event.data"; import { CipherService } from "../../vault/abstractions/cipher.service"; diff --git a/libs/common/src/services/export.service.ts b/libs/common/src/services/export.service.ts index 045824694c..10764599ec 100644 --- a/libs/common/src/services/export.service.ts +++ b/libs/common/src/services/export.service.ts @@ -7,17 +7,17 @@ import { ExportFormat, ExportService as ExportServiceAbstraction, } from "../abstractions/export.service"; +import { CollectionData } from "../admin-console/models/data/collection.data"; +import { Collection } from "../admin-console/models/domain/collection"; +import { CollectionDetailsResponse } from "../admin-console/models/response/collection.response"; +import { CollectionView } from "../admin-console/models/view/collection.view"; import { KdfConfig } from "../auth/models/domain/kdf-config"; import { DEFAULT_PBKDF2_ITERATIONS, KdfType } from "../enums/kdfType"; import { Utils } from "../misc/utils"; -import { CollectionData } from "../models/data/collection.data"; -import { Collection } from "../models/domain/collection"; import { CipherWithIdExport as CipherExport } from "../models/export/cipher-with-ids.export"; import { CollectionWithIdExport as CollectionExport } from "../models/export/collection-with-id.export"; import { EventExport } from "../models/export/event.export"; import { FolderWithIdExport as FolderExport } from "../models/export/folder-with-id.export"; -import { CollectionDetailsResponse } from "../models/response/collection.response"; -import { CollectionView } from "../models/view/collection.view"; import { EventView } from "../models/view/event.view"; import { CipherService } from "../vault/abstractions/cipher.service"; import { FolderService } from "../vault/abstractions/folder/folder.service.abstraction"; diff --git a/libs/common/src/services/import/import.service.ts b/libs/common/src/services/import/import.service.ts index 7afc86d48a..e05e585749 100644 --- a/libs/common/src/services/import/import.service.ts +++ b/libs/common/src/services/import/import.service.ts @@ -1,8 +1,9 @@ -import { CollectionService } from "../../abstractions/collection.service"; import { CryptoService } from "../../abstractions/crypto.service"; import { I18nService } from "../../abstractions/i18n.service"; import { ImportApiServiceAbstraction } from "../../abstractions/import/import-api.service.abstraction"; import { ImportService as ImportServiceAbstraction } from "../../abstractions/import/import.service.abstraction"; +import { CollectionService } from "../../admin-console/abstractions/collection.service"; +import { CollectionRequest } from "../../admin-console/models/request/collection.request"; import { featuredImportOptions, ImportOption, @@ -71,7 +72,6 @@ import { YotiCsvImporter } from "../../importers/yoti-csv-importer"; import { ZohoVaultCsvImporter } from "../../importers/zohovault-csv-importer"; import { Utils } from "../../misc/utils"; import { ImportResult } from "../../models/domain/import-result"; -import { CollectionRequest } from "../../models/request/collection.request"; import { ImportCiphersRequest } from "../../models/request/import-ciphers.request"; import { ImportOrganizationCiphersRequest } from "../../models/request/import-organization-ciphers.request"; import { KvpRequest } from "../../models/request/kvp.request"; diff --git a/libs/common/src/services/state.service.ts b/libs/common/src/services/state.service.ts index 23ac052985..c039d73bd3 100644 --- a/libs/common/src/services/state.service.ts +++ b/libs/common/src/services/state.service.ts @@ -8,6 +8,13 @@ import { AbstractMemoryStorageService, AbstractStorageService, } from "../abstractions/storage.service"; +import { CollectionData } from "../admin-console/models/data/collection.data"; +import { EncryptedOrganizationKeyData } from "../admin-console/models/data/encrypted-organization-key.data"; +import { OrganizationData } from "../admin-console/models/data/organization.data"; +import { PolicyData } from "../admin-console/models/data/policy.data"; +import { ProviderData } from "../admin-console/models/data/provider.data"; +import { Policy } from "../admin-console/models/domain/policy"; +import { CollectionView } from "../admin-console/models/view/collection.view"; import { EnvironmentUrls } from "../auth/models/domain/environment-urls"; import { KdfConfig } from "../auth/models/domain/kdf-config"; import { HtmlStorageLocation } from "../enums/htmlStorageLocation"; @@ -17,12 +24,7 @@ import { ThemeType } from "../enums/themeType"; import { UriMatchType } from "../enums/uriMatchType"; import { StateFactory } from "../factories/stateFactory"; import { Utils } from "../misc/utils"; -import { CollectionData } from "../models/data/collection.data"; -import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data"; import { EventData } from "../models/data/event.data"; -import { OrganizationData } from "../models/data/organization.data"; -import { PolicyData } from "../models/data/policy.data"; -import { ProviderData } from "../models/data/provider.data"; import { SendData } from "../models/data/send.data"; import { ServerConfigData } from "../models/data/server-config.data"; import { @@ -33,12 +35,10 @@ import { } from "../models/domain/account"; import { EncString } from "../models/domain/enc-string"; import { GlobalState } from "../models/domain/global-state"; -import { Policy } from "../models/domain/policy"; import { State } from "../models/domain/state"; import { StorageOptions } from "../models/domain/storage-options"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { WindowState } from "../models/domain/window-state"; -import { CollectionView } from "../models/view/collection.view"; import { SendView } from "../models/view/send.view"; import { GeneratedPasswordHistory } from "../tools/generator/password"; import { CipherData } from "../vault/models/data/cipher.data"; diff --git a/libs/common/src/services/stateMigration.service.ts b/libs/common/src/services/stateMigration.service.ts index 40b1b99905..de624aef12 100644 --- a/libs/common/src/services/stateMigration.service.ts +++ b/libs/common/src/services/stateMigration.service.ts @@ -1,4 +1,8 @@ import { AbstractStorageService } from "../abstractions/storage.service"; +import { CollectionData } from "../admin-console/models/data/collection.data"; +import { OrganizationData } from "../admin-console/models/data/organization.data"; +import { PolicyData } from "../admin-console/models/data/policy.data"; +import { ProviderData } from "../admin-console/models/data/provider.data"; import { EnvironmentUrls } from "../auth/models/domain/environment-urls"; import { TokenService } from "../auth/services/token.service"; import { HtmlStorageLocation } from "../enums/htmlStorageLocation"; @@ -6,11 +10,7 @@ import { KdfType } from "../enums/kdfType"; import { StateVersion } from "../enums/stateVersion"; import { ThemeType } from "../enums/themeType"; import { StateFactory } from "../factories/stateFactory"; -import { CollectionData } from "../models/data/collection.data"; import { EventData } from "../models/data/event.data"; -import { OrganizationData } from "../models/data/organization.data"; -import { PolicyData } from "../models/data/policy.data"; -import { ProviderData } from "../models/data/provider.data"; import { SendData } from "../models/data/send.data"; import { Account, diff --git a/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts b/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts index e2ac5780bd..f1744cf9c7 100644 --- a/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts +++ b/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts @@ -1,6 +1,5 @@ import { firstValueFrom } from "rxjs"; -import { CollectionService } from "../../abstractions/collection.service"; import { CryptoService } from "../../abstractions/crypto.service"; import { MessagingService } from "../../abstractions/messaging.service"; import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; @@ -8,6 +7,7 @@ import { SearchService } from "../../abstractions/search.service"; import { StateService } from "../../abstractions/state.service"; import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "../../abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "../../abstractions/vaultTimeout/vaultTimeoutSettings.service"; +import { CollectionService } from "../../admin-console/abstractions/collection.service"; import { AuthService } from "../../auth/abstractions/auth.service"; import { KeyConnectorService } from "../../auth/abstractions/key-connector.service"; import { AuthenticationStatus } from "../../auth/enums/authentication-status"; diff --git a/libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts b/libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts index ccecf54197..bdea750d0d 100644 --- a/libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts +++ b/libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts @@ -1,9 +1,9 @@ import { CryptoService } from "../../abstractions/crypto.service"; -import { PolicyService } from "../../abstractions/policy/policy.service.abstraction"; import { StateService } from "../../abstractions/state.service"; import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "../../abstractions/vaultTimeout/vaultTimeoutSettings.service"; +import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "../../admin-console/enums/policy-type"; import { TokenService } from "../../auth/abstractions/token.service"; -import { PolicyType } from "../../enums/policyType"; export class VaultTimeoutSettingsService implements VaultTimeoutSettingsServiceAbstraction { constructor( diff --git a/libs/common/src/tools/generator/password/password-generation.service.abstraction.ts b/libs/common/src/tools/generator/password/password-generation.service.abstraction.ts index eef48cf614..f6687021b6 100644 --- a/libs/common/src/tools/generator/password/password-generation.service.abstraction.ts +++ b/libs/common/src/tools/generator/password/password-generation.service.abstraction.ts @@ -1,6 +1,6 @@ import * as zxcvbn from "zxcvbn"; -import { PasswordGeneratorPolicyOptions } from "../../../models/domain/password-generator-policy-options"; +import { PasswordGeneratorPolicyOptions } from "../../../admin-console/models/domain/password-generator-policy-options"; import { GeneratedPasswordHistory } from "./generated-password-history"; import { PasswordGeneratorOptions } from "./password-generator-options"; diff --git a/libs/common/src/tools/generator/password/password-generation.service.ts b/libs/common/src/tools/generator/password/password-generation.service.ts index baa08ce599..4fdbef4cb4 100644 --- a/libs/common/src/tools/generator/password/password-generation.service.ts +++ b/libs/common/src/tools/generator/password/password-generation.service.ts @@ -1,12 +1,12 @@ import * as zxcvbn from "zxcvbn"; import { CryptoService } from "../../../abstractions/crypto.service"; -import { PolicyService } from "../../../abstractions/policy/policy.service.abstraction"; import { StateService } from "../../../abstractions/state.service"; -import { PolicyType } from "../../../enums/policyType"; +import { PolicyService } from "../../../admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyType } from "../../../admin-console/enums/policy-type"; +import { PasswordGeneratorPolicyOptions } from "../../../admin-console/models/domain/password-generator-policy-options"; import { EFFLongWordList } from "../../../misc/wordlist"; import { EncString } from "../../../models/domain/enc-string"; -import { PasswordGeneratorPolicyOptions } from "../../../models/domain/password-generator-policy-options"; import { GeneratedPasswordHistory } from "./generated-password-history"; import { PasswordGenerationServiceAbstraction } from "./password-generation.service.abstraction"; diff --git a/libs/common/src/vault/models/response/sync.response.ts b/libs/common/src/vault/models/response/sync.response.ts index d29a3a2989..d2248c5e96 100644 --- a/libs/common/src/vault/models/response/sync.response.ts +++ b/libs/common/src/vault/models/response/sync.response.ts @@ -1,7 +1,7 @@ +import { CollectionDetailsResponse } from "../../../admin-console/models/response/collection.response"; +import { PolicyResponse } from "../../../admin-console/models/response/policy.response"; import { BaseResponse } from "../../../models/response/base.response"; -import { CollectionDetailsResponse } from "../../../models/response/collection.response"; import { DomainsResponse } from "../../../models/response/domains.response"; -import { PolicyResponse } from "../../../models/response/policy.response"; import { ProfileResponse } from "../../../models/response/profile.response"; import { SendResponse } from "../../../models/response/send.response"; diff --git a/libs/common/src/vault/services/sync/sync.service.ts b/libs/common/src/vault/services/sync/sync.service.ts index d94424e302..e9a76c19cf 100644 --- a/libs/common/src/vault/services/sync/sync.service.ts +++ b/libs/common/src/vault/services/sync/sync.service.ts @@ -1,29 +1,29 @@ import { ApiService } from "../../../abstractions/api.service"; -import { CollectionService } from "../../../abstractions/collection.service"; import { CryptoService } from "../../../abstractions/crypto.service"; import { LogService } from "../../../abstractions/log.service"; import { MessagingService } from "../../../abstractions/messaging.service"; -import { InternalOrganizationService } from "../../../abstractions/organization/organization.service.abstraction"; -import { InternalPolicyService } from "../../../abstractions/policy/policy.service.abstraction"; -import { ProviderService } from "../../../abstractions/provider.service"; import { SendService } from "../../../abstractions/send.service"; import { SettingsService } from "../../../abstractions/settings.service"; import { StateService } from "../../../abstractions/state.service"; +import { CollectionService } from "../../../admin-console/abstractions/collection.service"; +import { InternalOrganizationService } from "../../../admin-console/abstractions/organization/organization.service.abstraction"; +import { InternalPolicyService } from "../../../admin-console/abstractions/policy/policy.service.abstraction"; +import { ProviderService } from "../../../admin-console/abstractions/provider.service"; +import { CollectionData } from "../../../admin-console/models/data/collection.data"; +import { OrganizationData } from "../../../admin-console/models/data/organization.data"; +import { PolicyData } from "../../../admin-console/models/data/policy.data"; +import { ProviderData } from "../../../admin-console/models/data/provider.data"; +import { CollectionDetailsResponse } from "../../../admin-console/models/response/collection.response"; +import { PolicyResponse } from "../../../admin-console/models/response/policy.response"; import { KeyConnectorService } from "../../../auth/abstractions/key-connector.service"; import { sequentialize } from "../../../misc/sequentialize"; -import { CollectionData } from "../../../models/data/collection.data"; -import { OrganizationData } from "../../../models/data/organization.data"; -import { PolicyData } from "../../../models/data/policy.data"; -import { ProviderData } from "../../../models/data/provider.data"; import { SendData } from "../../../models/data/send.data"; -import { CollectionDetailsResponse } from "../../../models/response/collection.response"; import { DomainsResponse } from "../../../models/response/domains.response"; import { SyncCipherNotification, SyncFolderNotification, SyncSendNotification, } from "../../../models/response/notification.response"; -import { PolicyResponse } from "../../../models/response/policy.response"; import { ProfileResponse } from "../../../models/response/profile.response"; import { SendResponse } from "../../../models/response/send.response"; import { CipherService } from "../../../vault/abstractions/cipher.service"; diff --git a/libs/components/src/styles.scss b/libs/components/src/styles.scss index 510b7ac88a..f03d2dd340 100644 --- a/libs/components/src/styles.scss +++ b/libs/components/src/styles.scss @@ -1,5 +1,5 @@ $icomoon-font-path: "../fonts/"; -$card-icons-base: "../images/cards/"; +$card-icons-base: "../../src/billing/images/cards/"; @import "../../angular/src/scss/webfonts.css"; @import "./variables";