diff --git a/.eslintignore b/.eslintignore index e1bc65d74b..96ea1708da 100644 --- a/.eslintignore +++ b/.eslintignore @@ -11,7 +11,7 @@ storybook-static **/gulpfile.js apps/browser/config/config.js -apps/browser/src/content/autofill.js +apps/browser/src/autofill/content/autofill.js apps/browser/src/scripts/duo.js apps/desktop/desktop_native diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index 2339c1756b..b100c980f0 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -27,7 +27,6 @@ ./libs/angular/src/components/captchaProtected.component.ts ./libs/angular/src/validators/inputsFieldMatch.validator.ts ./libs/angular/src/validators/notAllowedValueAsync.validator.ts -./libs/angular/src/services/passwordReprompt.service.ts ./libs/angular/src/services/theming/themeBuilder.ts ./libs/angular/src/interfaces/selectOptions.ts ./libs/components/src/stories/Introduction.stories.mdx @@ -36,14 +35,7 @@ ./libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts ./libs/common/spec/web/services/webCryptoFunction.service.spec.ts ./libs/common/spec/shared/interceptConsole.ts -./libs/common/spec/models/view/passwordHistoryView.spec.ts -./libs/common/spec/models/view/cipherView.spec.ts -./libs/common/spec/models/view/folderView.spec.ts -./libs/common/spec/models/view/attachmentView.spec.ts -./libs/common/spec/models/view/loginView.spec.ts -./libs/common/spec/models/domain/loginUri.spec.ts ./libs/common/spec/models/domain/encString.spec.ts -./libs/common/spec/models/domain/secureNote.spec.ts ./libs/common/spec/models/domain/symmetricCryptoKey.spec.ts ./libs/common/spec/models/domain/encArrayBuffer.spec.ts ./libs/common/spec/models/domain/sendAccess.spec.ts @@ -63,10 +55,8 @@ ./libs/common/src/misc/serviceUtils.spec.ts ./libs/common/src/types/twoFactorResponse.ts ./libs/common/src/types/authResponse.ts -./libs/common/src/types/syncEventArgs.ts ./libs/common/src/enums/kdfType.ts ./libs/common/src/enums/fileUploadType.ts -./libs/common/src/enums/cipherType.ts ./libs/common/src/enums/twoFactorProviderType.ts ./libs/common/src/enums/clientType.ts ./libs/common/src/enums/encryptedExportType.ts @@ -107,7 +97,6 @@ ./libs/common/src/enums/authRequestType.ts ./libs/common/src/enums/emergencyAccessStatusType.ts ./libs/common/src/enums/nativeMessagingVersion.ts -./libs/common/src/enums/cipherRepromptType.ts ./libs/common/src/enums/organizationUserType.ts ./libs/common/src/factories/accountFactory.ts ./libs/common/src/factories/globalStateFactory.ts @@ -120,7 +109,6 @@ ./libs/common/src/abstractions/fileDownload/fileDownload.service.ts ./libs/common/src/abstractions/fileDownload/fileDownloadRequest.ts ./libs/common/src/abstractions/passwordGeneration.service.ts -./libs/common/src/abstractions/passwordReprompt.service.ts ./libs/common/src/abstractions/formValidationErrors.service.ts ./libs/common/src/abstractions/vaultTimeout/vaultTimeoutSettings.service.ts ./libs/common/src/abstractions/vaultTimeout/vaultTimeout.service.ts @@ -131,7 +119,6 @@ ./libs/common/src/abstractions/appId.service.ts ./libs/common/src/abstractions/usernameGeneration.service.ts ./libs/common/src/abstractions/twoFactor.service.ts -./libs/common/src/abstractions/sync/syncNotifier.service.abstraction.ts ./libs/common/src/services/userVerification/userVerification-api.service.ts ./libs/common/src/services/userVerification/userVerification.service.ts ./libs/common/src/services/azureFileUpload.service.ts @@ -148,7 +135,6 @@ ./libs/common/src/services/usernameGeneration.service.ts ./libs/common/src/services/noopMessaging.service.ts ./libs/common/src/services/twoFactor.service.ts -./libs/common/src/services/sync/syncNotifier.service.ts ./libs/common/src/services/memoryStorage.service.ts ./libs/common/src/services/bitwardenFileUpload.service.ts ./libs/common/src/services/webCryptoFunction.service.ts @@ -178,24 +164,16 @@ ./apps/browser/src/background/models/addLoginRuntimeMessage.ts ./apps/browser/src/background/models/addChangePasswordQueueMessage.ts ./apps/browser/src/background/models/addLoginQueueMessage.ts -./apps/browser/src/background/models/iconDetails.ts ./apps/browser/src/background/models/changePasswordRuntimeMessage.ts ./apps/browser/src/background/models/notificationQueueMessage.ts ./apps/browser/src/background/models/notificationQueueMessageType.ts ./apps/browser/src/background/models/lockedVaultPendingNotificationsItem.ts -./apps/browser/src/background/contextMenus.background.ts ./apps/browser/src/background/webRequest.background.ts ./apps/browser/src/popup/services/debounceNavigationService.ts -./apps/browser/src/content/contextMenuHandler.ts -./apps/browser/src/content/notificationBar.ts ./apps/browser/src/models/browserComponentState.ts -./apps/browser/src/models/autofillScript.ts ./apps/browser/src/models/browserSendComponentState.ts ./apps/browser/src/models/browserGroupingsComponentState.ts ./apps/browser/src/models/biometricErrors.ts -./apps/browser/src/models/autofillPageDetails.ts -./apps/browser/src/models/autofillForm.ts -./apps/browser/src/models/autofillField.ts ./apps/browser/src/browser/safariApp.ts ./apps/browser/src/browser/browserApi.ts ./apps/browser/src/safari/desktop/ViewController.swift @@ -222,7 +200,6 @@ ./apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts ./apps/browser/src/services/browserLocalStorage.service.ts ./apps/browser/src/services/localBackedSessionStorage.service.ts -./apps/browser/src/services/vaultFilter.service.ts ./apps/browser/src/services/browserMessagingPrivateModePopup.service.ts ./apps/browser/src/services/browserMessaging.service.ts ./apps/browser/src/services/keyGeneration.service.ts diff --git a/.prettierignore b/.prettierignore index d4257ee2d0..245cb91c21 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,7 +9,7 @@ storybook-static # External libraries / auto synced locales apps/browser/src/_locales apps/browser/src/scripts/duo.js -apps/browser/src/content/autofill.js +apps/browser/src/autofill/content/autofill.js apps/browser/src/safari apps/desktop/src/locales diff --git a/apps/browser/src/alarms/alarm-state.ts b/apps/browser/src/alarms/alarm-state.ts index 774bcfe1c0..71f7b51819 100644 --- a/apps/browser/src/alarms/alarm-state.ts +++ b/apps/browser/src/alarms/alarm-state.ts @@ -1,5 +1,5 @@ +import { clearClipboardAlarmName } from "../autofill/clipboard"; import { BrowserApi } from "../browser/browserApi"; -import { clearClipboardAlarmName } from "../clipboard"; export const alarmKeys = [clearClipboardAlarmName] as const; export type AlarmKeys = typeof alarmKeys[number]; diff --git a/apps/browser/src/alarms/on-alarm-listener.ts b/apps/browser/src/alarms/on-alarm-listener.ts index 4b24690877..a476b6e496 100644 --- a/apps/browser/src/alarms/on-alarm-listener.ts +++ b/apps/browser/src/alarms/on-alarm-listener.ts @@ -1,4 +1,4 @@ -import { ClearClipboard, clearClipboardAlarmName } from "../clipboard"; +import { ClearClipboard, clearClipboardAlarmName } from "../autofill/clipboard"; import { alarmKeys, clearAlarmTime, getAlarmTime } from "./alarm-state"; diff --git a/apps/browser/src/background/contextMenus.background.ts b/apps/browser/src/autofill/background/context-menus.background.ts similarity index 86% rename from apps/browser/src/background/contextMenus.background.ts rename to apps/browser/src/autofill/background/context-menus.background.ts index 9a9ba0f514..9d04571a7c 100644 --- a/apps/browser/src/background/contextMenus.background.ts +++ b/apps/browser/src/autofill/background/context-menus.background.ts @@ -1,8 +1,7 @@ -import { BrowserApi } from "../browser/browserApi"; +import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; +import { BrowserApi } from "../../browser/browserApi"; import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler"; -import LockedVaultPendingNotificationsItem from "./models/lockedVaultPendingNotificationsItem"; - export default class ContextMenusBackground { private contextMenus: typeof chrome.contextMenus; diff --git a/apps/browser/src/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts similarity index 92% rename from apps/browser/src/background/notification.background.ts rename to apps/browser/src/autofill/background/notification.background.ts index 2da4791857..6729fc8bd6 100644 --- a/apps/browser/src/background/notification.background.ts +++ b/apps/browser/src/autofill/background/notification.background.ts @@ -1,28 +1,27 @@ import { firstValueFrom } from "rxjs"; import { AuthService } from "@bitwarden/common/abstractions/auth.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { ThemeType } from "@bitwarden/common/enums/themeType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; -import { LoginView } from "@bitwarden/common/models/view/login.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 { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; -import { BrowserApi } from "../browser/browserApi"; +import AddChangePasswordQueueMessage from "../../background/models/addChangePasswordQueueMessage"; +import AddLoginQueueMessage from "../../background/models/addLoginQueueMessage"; +import AddLoginRuntimeMessage from "../../background/models/addLoginRuntimeMessage"; +import ChangePasswordRuntimeMessage from "../../background/models/changePasswordRuntimeMessage"; +import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; +import { NotificationQueueMessageType } from "../../background/models/notificationQueueMessageType"; +import { BrowserApi } from "../../browser/browserApi"; +import { BrowserStateService } from "../../services/abstractions/browser-state.service"; import { AutofillService } from "../services/abstractions/autofill.service"; -import { BrowserStateService } from "../services/abstractions/browser-state.service"; - -import AddChangePasswordQueueMessage from "./models/addChangePasswordQueueMessage"; -import AddLoginQueueMessage from "./models/addLoginQueueMessage"; -import AddLoginRuntimeMessage from "./models/addLoginRuntimeMessage"; -import ChangePasswordRuntimeMessage from "./models/changePasswordRuntimeMessage"; -import LockedVaultPendingNotificationsItem from "./models/lockedVaultPendingNotificationsItem"; -import { NotificationQueueMessageType } from "./models/notificationQueueMessageType"; export default class NotificationBackground { private notificationQueue: (AddLoginQueueMessage | AddChangePasswordQueueMessage)[] = []; diff --git a/apps/browser/src/background/service_factories/autofill-service.factory.ts b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts similarity index 59% rename from apps/browser/src/background/service_factories/autofill-service.factory.ts rename to apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts index 1df2ec9bbd..6187a87161 100644 --- a/apps/browser/src/background/service_factories/autofill-service.factory.ts +++ b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts @@ -1,15 +1,30 @@ -import { AutofillService as AbstractAutoFillService } from "../../services/abstractions/autofill.service"; -import AutofillService from "../../services/autofill.service"; - -import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory"; import { EventCollectionServiceInitOptions, eventCollectionServiceFactory, -} from "./event-collection-service.factory"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; -import { totpServiceFactory, TotpServiceInitOptions } from "./totp-service.factory"; +} from "../../../background/service_factories/event-collection-service.factory"; +import { + CachedServices, + factory, + FactoryOptions, +} from "../../../background/service_factories/factory-options"; +import { + logServiceFactory, + LogServiceInitOptions, +} from "../../../background/service_factories/log-service.factory"; +import { + stateServiceFactory, + StateServiceInitOptions, +} from "../../../background/service_factories/state-service.factory"; +import { + totpServiceFactory, + TotpServiceInitOptions, +} from "../../../background/service_factories/totp-service.factory"; +import { + cipherServiceFactory, + CipherServiceInitOptions, +} from "../../../vault/background/service_factories/cipher-service.factory"; +import { AutofillService as AbstractAutoFillService } from "../../services/abstractions/autofill.service"; +import AutofillService from "../../services/autofill.service"; type AutoFillServiceOptions = FactoryOptions; diff --git a/apps/browser/src/background/tabs.background.ts b/apps/browser/src/autofill/background/tabs.background.ts similarity index 96% rename from apps/browser/src/background/tabs.background.ts rename to apps/browser/src/autofill/background/tabs.background.ts index 70d2ce1f00..0f724c84dd 100644 --- a/apps/browser/src/background/tabs.background.ts +++ b/apps/browser/src/autofill/background/tabs.background.ts @@ -1,4 +1,5 @@ -import MainBackground from "./main.background"; +import MainBackground from "../../background/main.background"; + import NotificationBackground from "./notification.background"; export default class TabsBackground { diff --git a/apps/browser/src/browser/cipher-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts similarity index 93% rename from apps/browser/src/browser/cipher-context-menu-handler.spec.ts rename to apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts index 39b7f8e361..fe1e5b4271 100644 --- a/apps/browser/src/browser/cipher-context-menu-handler.spec.ts +++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts @@ -1,10 +1,10 @@ import { mock, MockProxy } from "jest-mock-extended"; import { AuthService } from "@bitwarden/common/abstractions/auth.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherContextMenuHandler } from "./cipher-context-menu-handler"; import { MainContextMenuHandler } from "./main-context-menu-handler"; diff --git a/apps/browser/src/browser/cipher-context-menu-handler.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts similarity index 88% rename from apps/browser/src/browser/cipher-context-menu-handler.ts rename to apps/browser/src/autofill/browser/cipher-context-menu-handler.ts index 5942ce3b14..366f2e4659 100644 --- a/apps/browser/src/browser/cipher-context-menu-handler.ts +++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts @@ -1,27 +1,27 @@ import { AuthService } from "@bitwarden/common/abstractions/auth.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { Utils } from "@bitwarden/common/misc/utils"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { authServiceFactory, AuthServiceInitOptions, -} from "../background/service_factories/auth-service.factory"; +} from "../../background/service_factories/auth-service.factory"; +import { CachedServices } from "../../background/service_factories/factory-options"; +import { searchServiceFactory } from "../../background/service_factories/search-service.factory"; +import { BrowserApi } from "../../browser/browserApi"; +import { Account } from "../../models/account"; import { cipherServiceFactory, CipherServiceInitOptions, -} from "../background/service_factories/cipher-service.factory"; -import { CachedServices } from "../background/service_factories/factory-options"; -import { searchServiceFactory } from "../background/service_factories/search-service.factory"; -import { Account } from "../models/account"; +} from "../../vault/background/service_factories/cipher-service.factory"; -import { BrowserApi } from "./browserApi"; import { MainContextMenuHandler } from "./main-context-menu-handler"; const NOT_IMPLEMENTED = (..._args: unknown[]) => Promise.resolve(); diff --git a/apps/browser/src/browser/context-menu-clicked-handler.spec.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts similarity index 93% rename from apps/browser/src/browser/context-menu-clicked-handler.spec.ts rename to apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts index a4d84aad12..89e9751257 100644 --- a/apps/browser/src/browser/context-menu-clicked-handler.spec.ts +++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts @@ -1,13 +1,13 @@ import { mock, MockProxy } from "jest-mock-extended"; import { AuthService } from "@bitwarden/common/abstractions/auth.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { AutofillTabCommand } from "../commands/autofill-tab-command"; diff --git a/apps/browser/src/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts similarity index 87% rename from apps/browser/src/browser/context-menu-clicked-handler.ts rename to apps/browser/src/autofill/browser/context-menu-clicked-handler.ts index f0043805da..63b83049df 100644 --- a/apps/browser/src/browser/context-menu-clicked-handler.ts +++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts @@ -1,35 +1,35 @@ import { AuthService } from "@bitwarden/common/abstractions/auth.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { EventType } from "@bitwarden/common/enums/eventType"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import LockedVaultPendingNotificationsItem from "../background/models/lockedVaultPendingNotificationsItem"; +import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; import { authServiceFactory, AuthServiceInitOptions, -} from "../background/service_factories/auth-service.factory"; -import { autofillServiceFactory } from "../background/service_factories/autofill-service.factory"; +} from "../../background/service_factories/auth-service.factory"; +import { eventCollectionServiceFactory } from "../../background/service_factories/event-collection-service.factory"; +import { CachedServices } from "../../background/service_factories/factory-options"; +import { passwordGenerationServiceFactory } from "../../background/service_factories/password-generation-service.factory"; +import { searchServiceFactory } from "../../background/service_factories/search-service.factory"; +import { stateServiceFactory } from "../../background/service_factories/state-service.factory"; +import { totpServiceFactory } from "../../background/service_factories/totp-service.factory"; +import { BrowserApi } from "../../browser/browserApi"; +import { Account } from "../../models/account"; import { cipherServiceFactory, CipherServiceInitOptions, -} from "../background/service_factories/cipher-service.factory"; -import { eventCollectionServiceFactory } from "../background/service_factories/event-collection-service.factory"; -import { CachedServices } from "../background/service_factories/factory-options"; -import { passwordGenerationServiceFactory } from "../background/service_factories/password-generation-service.factory"; -import { searchServiceFactory } from "../background/service_factories/search-service.factory"; -import { stateServiceFactory } from "../background/service_factories/state-service.factory"; -import { totpServiceFactory } from "../background/service_factories/totp-service.factory"; -import { BrowserApi } from "../browser/browserApi"; +} from "../../vault/background/service_factories/cipher-service.factory"; +import { autofillServiceFactory } from "../background/service_factories/autofill-service.factory"; import { copyToClipboard, GeneratePasswordToClipboardCommand } from "../clipboard"; import { AutofillTabCommand } from "../commands/autofill-tab-command"; -import { Account } from "../models/account"; import { AUTOFILL_ID, diff --git a/apps/browser/src/browser/main-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts similarity index 92% rename from apps/browser/src/browser/main-context-menu-handler.spec.ts rename to apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts index 2dd41faf04..d3a9014010 100644 --- a/apps/browser/src/browser/main-context-menu-handler.spec.ts +++ b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts @@ -1,11 +1,11 @@ import { mock, MockProxy } from "jest-mock-extended"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { BrowserStateService } from "../services/abstractions/browser-state.service"; +import { BrowserStateService } from "../../services/abstractions/browser-state.service"; import { MainContextMenuHandler } from "./main-context-menu-handler"; diff --git a/apps/browser/src/browser/main-context-menu-handler.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.ts similarity index 92% rename from apps/browser/src/browser/main-context-menu-handler.ts rename to apps/browser/src/autofill/browser/main-context-menu-handler.ts index e78fb89023..898bd46e4a 100644 --- a/apps/browser/src/browser/main-context-menu-handler.ts +++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts @@ -1,21 +1,21 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { Utils } from "@bitwarden/common/misc/utils"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { CachedServices } from "../background/service_factories/factory-options"; +import { CachedServices } from "../../background/service_factories/factory-options"; import { i18nServiceFactory, I18nServiceInitOptions, -} from "../background/service_factories/i18n-service.factory"; +} from "../../background/service_factories/i18n-service.factory"; import { stateServiceFactory, StateServiceInitOptions, -} from "../background/service_factories/state-service.factory"; -import { Account } from "../models/account"; -import { BrowserStateService } from "../services/abstractions/browser-state.service"; +} from "../../background/service_factories/state-service.factory"; +import { Account } from "../../models/account"; +import { BrowserStateService } from "../../services/abstractions/browser-state.service"; export const ROOT_ID = "root"; diff --git a/apps/browser/src/clipboard/clear-clipboard.spec.ts b/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts similarity index 95% rename from apps/browser/src/clipboard/clear-clipboard.spec.ts rename to apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts index 0166bdb47a..baced83894 100644 --- a/apps/browser/src/clipboard/clear-clipboard.spec.ts +++ b/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts @@ -1,4 +1,4 @@ -import { BrowserApi } from "../browser/browserApi"; +import { BrowserApi } from "../../browser/browserApi"; import { ClearClipboard } from "./clear-clipboard"; diff --git a/apps/browser/src/clipboard/clear-clipboard.ts b/apps/browser/src/autofill/clipboard/clear-clipboard.ts similarity index 92% rename from apps/browser/src/clipboard/clear-clipboard.ts rename to apps/browser/src/autofill/clipboard/clear-clipboard.ts index 149992555b..a96a72fc65 100644 --- a/apps/browser/src/clipboard/clear-clipboard.ts +++ b/apps/browser/src/autofill/clipboard/clear-clipboard.ts @@ -1,4 +1,4 @@ -import { BrowserApi } from "../browser/browserApi"; +import { BrowserApi } from "../../browser/browserApi"; export const clearClipboardAlarmName = "clearClipboard"; diff --git a/apps/browser/src/clipboard/copy-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts similarity index 92% rename from apps/browser/src/clipboard/copy-to-clipboard-command.ts rename to apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts index e1f2cca3f2..926b78b976 100644 --- a/apps/browser/src/clipboard/copy-to-clipboard-command.ts +++ b/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts @@ -1,4 +1,4 @@ -import { BrowserApi } from "../browser/browserApi"; +import { BrowserApi } from "../../browser/browserApi"; /** * Copies text to the clipboard in a MV3 safe way. diff --git a/apps/browser/src/clipboard/generate-password-to-clipboard-command.spec.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts similarity index 90% rename from apps/browser/src/clipboard/generate-password-to-clipboard-command.spec.ts rename to apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts index 5d119513f4..4c1460c86e 100644 --- a/apps/browser/src/clipboard/generate-password-to-clipboard-command.spec.ts +++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts @@ -2,14 +2,14 @@ import { mock, MockProxy } from "jest-mock-extended"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { setAlarmTime } from "../alarms/alarm-state"; -import { BrowserApi } from "../browser/browserApi"; -import { BrowserStateService } from "../services/abstractions/browser-state.service"; +import { setAlarmTime } from "../../alarms/alarm-state"; +import { BrowserApi } from "../../browser/browserApi"; +import { BrowserStateService } from "../../services/abstractions/browser-state.service"; import { clearClipboardAlarmName } from "./clear-clipboard"; import { GeneratePasswordToClipboardCommand } from "./generate-password-to-clipboard-command"; -jest.mock("../alarms/alarm-state", () => { +jest.mock("../../alarms/alarm-state", () => { return { setAlarmTime: jest.fn(), }; diff --git a/apps/browser/src/clipboard/generate-password-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts similarity index 85% rename from apps/browser/src/clipboard/generate-password-to-clipboard-command.ts rename to apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts index 0cd8eec2c9..eec0b31834 100644 --- a/apps/browser/src/clipboard/generate-password-to-clipboard-command.ts +++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts @@ -1,7 +1,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { setAlarmTime } from "../alarms/alarm-state"; -import { BrowserStateService } from "../services/abstractions/browser-state.service"; +import { setAlarmTime } from "../../alarms/alarm-state"; +import { BrowserStateService } from "../../services/abstractions/browser-state.service"; import { clearClipboardAlarmName } from "./clear-clipboard"; import { copyToClipboard } from "./copy-to-clipboard-command"; diff --git a/apps/browser/src/clipboard/index.ts b/apps/browser/src/autofill/clipboard/index.ts similarity index 100% rename from apps/browser/src/clipboard/index.ts rename to apps/browser/src/autofill/clipboard/index.ts diff --git a/apps/browser/src/commands/autofill-tab-command.ts b/apps/browser/src/autofill/commands/autofill-tab-command.ts similarity index 91% rename from apps/browser/src/commands/autofill-tab-command.ts rename to apps/browser/src/autofill/commands/autofill-tab-command.ts index cf94dc93ae..4910a6cf6f 100644 --- a/apps/browser/src/commands/autofill-tab-command.ts +++ b/apps/browser/src/autofill/commands/autofill-tab-command.ts @@ -1,6 +1,6 @@ -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import AutofillPageDetails from "../models/autofillPageDetails"; +import AutofillPageDetails from "../models/autofill-page-details"; import { AutofillService } from "../services/abstractions/autofill.service"; export class AutofillTabCommand { diff --git a/apps/browser/src/content/autofill.css b/apps/browser/src/autofill/content/autofill.css similarity index 100% rename from apps/browser/src/content/autofill.css rename to apps/browser/src/autofill/content/autofill.css diff --git a/apps/browser/src/content/autofill.js b/apps/browser/src/autofill/content/autofill.js similarity index 100% rename from apps/browser/src/content/autofill.js rename to apps/browser/src/autofill/content/autofill.js diff --git a/apps/browser/src/content/autofiller.ts b/apps/browser/src/autofill/content/autofiller.ts similarity index 100% rename from apps/browser/src/content/autofiller.ts rename to apps/browser/src/autofill/content/autofiller.ts diff --git a/apps/browser/src/content/contextMenuHandler.ts b/apps/browser/src/autofill/content/context-menu-handler.ts similarity index 100% rename from apps/browser/src/content/contextMenuHandler.ts rename to apps/browser/src/autofill/content/context-menu-handler.ts diff --git a/apps/browser/src/content/message_handler.ts b/apps/browser/src/autofill/content/message_handler.ts similarity index 100% rename from apps/browser/src/content/message_handler.ts rename to apps/browser/src/autofill/content/message_handler.ts diff --git a/apps/browser/src/content/misc-utils.ts b/apps/browser/src/autofill/content/misc-utils.ts similarity index 89% rename from apps/browser/src/content/misc-utils.ts rename to apps/browser/src/autofill/content/misc-utils.ts index 94e2e0f7a0..b34a27a30a 100644 --- a/apps/browser/src/content/misc-utils.ts +++ b/apps/browser/src/autofill/content/misc-utils.ts @@ -1,4 +1,4 @@ -import { TabMessage } from "../types/tab-messages"; +import { TabMessage } from "../../types/tab-messages"; async function copyText(text: string) { await window.navigator.clipboard.writeText(text); diff --git a/apps/browser/src/content/notificationBar.ts b/apps/browser/src/autofill/content/notification-bar.ts similarity index 99% rename from apps/browser/src/content/notificationBar.ts rename to apps/browser/src/autofill/content/notification-bar.ts index 76a8a7c277..5a6d519b75 100644 --- a/apps/browser/src/content/notificationBar.ts +++ b/apps/browser/src/autofill/content/notification-bar.ts @@ -1,5 +1,5 @@ -import AddLoginRuntimeMessage from "../background/models/addLoginRuntimeMessage"; -import ChangePasswordRuntimeMessage from "../background/models/changePasswordRuntimeMessage"; +import AddLoginRuntimeMessage from "../../background/models/addLoginRuntimeMessage"; +import ChangePasswordRuntimeMessage from "../../background/models/changePasswordRuntimeMessage"; document.addEventListener("DOMContentLoaded", (event) => { if (window.location.hostname.endsWith("vault.bitwarden.com")) { diff --git a/apps/browser/src/models/autofillField.ts b/apps/browser/src/autofill/models/autofill-field.ts similarity index 100% rename from apps/browser/src/models/autofillField.ts rename to apps/browser/src/autofill/models/autofill-field.ts diff --git a/apps/browser/src/models/autofillForm.ts b/apps/browser/src/autofill/models/autofill-form.ts similarity index 100% rename from apps/browser/src/models/autofillForm.ts rename to apps/browser/src/autofill/models/autofill-form.ts diff --git a/apps/browser/src/models/autofillPageDetails.ts b/apps/browser/src/autofill/models/autofill-page-details.ts similarity index 72% rename from apps/browser/src/models/autofillPageDetails.ts rename to apps/browser/src/autofill/models/autofill-page-details.ts index 1c91386930..144ba07f63 100644 --- a/apps/browser/src/models/autofillPageDetails.ts +++ b/apps/browser/src/autofill/models/autofill-page-details.ts @@ -1,5 +1,5 @@ -import AutofillField from "./autofillField"; -import AutofillForm from "./autofillForm"; +import AutofillField from "./autofill-field"; +import AutofillForm from "./autofill-form"; export default class AutofillPageDetails { documentUUID: string; diff --git a/apps/browser/src/models/autofillScript.ts b/apps/browser/src/autofill/models/autofill-script.ts similarity index 100% rename from apps/browser/src/models/autofillScript.ts rename to apps/browser/src/autofill/models/autofill-script.ts diff --git a/apps/browser/src/notification/bar.html b/apps/browser/src/autofill/notification/bar.html similarity index 100% rename from apps/browser/src/notification/bar.html rename to apps/browser/src/autofill/notification/bar.html diff --git a/apps/browser/src/notification/bar.js b/apps/browser/src/autofill/notification/bar.js similarity index 100% rename from apps/browser/src/notification/bar.js rename to apps/browser/src/autofill/notification/bar.js diff --git a/apps/browser/src/notification/bar.scss b/apps/browser/src/autofill/notification/bar.scss similarity index 100% rename from apps/browser/src/notification/bar.scss rename to apps/browser/src/autofill/notification/bar.scss diff --git a/apps/browser/src/notification/variables.scss b/apps/browser/src/autofill/notification/variables.scss similarity index 100% rename from apps/browser/src/notification/variables.scss rename to apps/browser/src/autofill/notification/variables.scss diff --git a/apps/browser/src/services/abstractions/autofill.service.ts b/apps/browser/src/autofill/services/abstractions/autofill.service.ts similarity index 78% rename from apps/browser/src/services/abstractions/autofill.service.ts rename to apps/browser/src/autofill/services/abstractions/autofill.service.ts index c900875f5e..b65467eec7 100644 --- a/apps/browser/src/services/abstractions/autofill.service.ts +++ b/apps/browser/src/autofill/services/abstractions/autofill.service.ts @@ -1,8 +1,8 @@ -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import AutofillField from "../../models/autofillField"; -import AutofillForm from "../../models/autofillForm"; -import AutofillPageDetails from "../../models/autofillPageDetails"; +import AutofillField from "../../models/autofill-field"; +import AutofillForm from "../../models/autofill-form"; +import AutofillPageDetails from "../../models/autofill-page-details"; export interface PageDetail { frameId: number; diff --git a/apps/browser/src/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts similarity index 98% rename from apps/browser/src/services/autofill.service.ts rename to apps/browser/src/autofill/services/autofill.service.ts index 60bcf3100f..c7f9d879a4 100644 --- a/apps/browser/src/services/autofill.service.ts +++ b/apps/browser/src/autofill/services/autofill.service.ts @@ -1,19 +1,25 @@ -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { FieldView } from "@bitwarden/common/models/view/field.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; -import { BrowserApi } from "../browser/browserApi"; -import AutofillField from "../models/autofillField"; -import AutofillPageDetails from "../models/autofillPageDetails"; -import AutofillScript from "../models/autofillScript"; +import { BrowserApi } from "../../browser/browserApi"; +import { BrowserStateService } from "../../services/abstractions/browser-state.service"; +import { + AutoFillConstants, + CreditCardAutoFillConstants, + IdentityAutoFillConstants, +} from "../../services/autofillConstants"; +import AutofillField from "../models/autofill-field"; +import AutofillPageDetails from "../models/autofill-page-details"; +import AutofillScript from "../models/autofill-script"; import { AutoFillOptions, @@ -21,12 +27,6 @@ import { PageDetail, FormData, } from "./abstractions/autofill.service"; -import { BrowserStateService } from "./abstractions/browser-state.service"; -import { - AutoFillConstants, - CreditCardAutoFillConstants, - IdentityAutoFillConstants, -} from "./autofillConstants"; export interface GenerateFillScriptOptions { skipUsernameOnlyFill: boolean; diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 6b92367193..8561564975 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -3,7 +3,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 { AuthService as AuthServiceAbstraction } from "@bitwarden/common/abstractions/auth.service"; -import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/abstractions/cipher.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"; @@ -12,8 +11,6 @@ import { EventCollectionService as EventCollectionServiceAbstraction } from "@bi import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service"; import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service"; import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { InternalFolderService as InternalFolderServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/abstractions/keyConnector.service"; import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service"; @@ -32,8 +29,6 @@ import { AbstractMemoryStorageService, AbstractStorageService, } from "@bitwarden/common/abstractions/storage.service"; -import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/abstractions/sync/syncNotifier.service.abstraction"; import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abstractions/system.service"; import { TokenService as TokenServiceAbstraction } from "@bitwarden/common/abstractions/token.service"; import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service"; @@ -45,13 +40,11 @@ import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarde import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { AvatarUpdateService } from "@bitwarden/common/services/account/avatar-update.service"; 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 { AuthService } from "@bitwarden/common/services/auth.service"; -import { CipherService } from "@bitwarden/common/services/cipher.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"; @@ -61,7 +54,6 @@ import { EventCollectionService } from "@bitwarden/common/services/event/event-c import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; import { ExportService } from "@bitwarden/common/services/export.service"; import { FileUploadService } from "@bitwarden/common/services/fileUpload.service"; -import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service"; import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { NotificationsService } from "@bitwarden/common/services/notifications.service"; @@ -71,8 +63,6 @@ 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"; -import { SyncService } from "@bitwarden/common/services/sync/sync.service"; -import { SyncNotifierService } from "@bitwarden/common/services/sync/syncNotifier.service"; import { SystemService } from "@bitwarden/common/services/system.service"; import { TokenService } from "@bitwarden/common/services/token.service"; import { TotpService } from "@bitwarden/common/services/totp.service"; @@ -82,22 +72,34 @@ import { UserVerificationService } from "@bitwarden/common/services/userVerifica import { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service"; import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service"; +import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; +import { InternalFolderService as InternalFolderServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction"; +import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; +import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service"; +import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service"; +import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service"; +import ContextMenusBackground from "../autofill/background/context-menus.background"; +import NotificationBackground from "../autofill/background/notification.background"; +import TabsBackground from "../autofill/background/tabs.background"; +import { CipherContextMenuHandler } from "../autofill/browser/cipher-context-menu-handler"; +import { ContextMenuClickedHandler } from "../autofill/browser/context-menu-clicked-handler"; +import { MainContextMenuHandler } from "../autofill/browser/main-context-menu-handler"; +import { AutofillTabCommand } from "../autofill/commands/autofill-tab-command"; +import { AutofillService as AutofillServiceAbstraction } from "../autofill/services/abstractions/autofill.service"; +import AutofillService from "../autofill/services/autofill.service"; import { BrowserApi } from "../browser/browserApi"; -import { CipherContextMenuHandler } from "../browser/cipher-context-menu-handler"; -import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler"; -import { MainContextMenuHandler } from "../browser/main-context-menu-handler"; import { SafariApp } from "../browser/safariApp"; -import { AutofillTabCommand } from "../commands/autofill-tab-command"; import { flagEnabled } from "../flags"; import { UpdateBadge } from "../listeners/update-badge"; import { Account } from "../models/account"; import { PopupUtilsService } from "../popup/services/popup-utils.service"; -import { AutofillService as AutofillServiceAbstraction } from "../services/abstractions/autofill.service"; import { BrowserStateService as StateServiceAbstraction } from "../services/abstractions/browser-state.service"; -import AutofillService from "../services/autofill.service"; import { BrowserEnvironmentService } from "../services/browser-environment.service"; -import { BrowserFolderService } from "../services/browser-folder.service"; import { BrowserI18nService } from "../services/browser-i18n.service"; import { BrowserOrganizationService } from "../services/browser-organization.service"; import { BrowserPolicyService } from "../services/browser-policy.service"; @@ -110,16 +112,14 @@ import BrowserMessagingPrivateModeBackgroundService from "../services/browserMes import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service"; import { KeyGenerationService } from "../services/keyGeneration.service"; import { LocalBackedSessionStorageService } from "../services/localBackedSessionStorage.service"; -import { VaultFilterService } from "../services/vaultFilter.service"; import VaultTimeoutService from "../services/vaultTimeout/vaultTimeout.service"; +import { BrowserFolderService } from "../vault/services/browser-folder.service"; +import { VaultFilterService } from "../vault/services/vault-filter.service"; import CommandsBackground from "./commands.background"; -import ContextMenusBackground from "./contextMenus.background"; import IdleBackground from "./idle.background"; import { NativeMessagingBackground } from "./nativeMessaging.background"; -import NotificationBackground from "./notification.background"; import RuntimeBackground from "./runtime.background"; -import TabsBackground from "./tabs.background"; import WebRequestBackground from "./webRequest.background"; export default class MainBackground { diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts index 1e0dee9e78..5576640c54 100644 --- a/apps/browser/src/background/runtime.background.ts +++ b/apps/browser/src/background/runtime.background.ts @@ -5,8 +5,8 @@ import { NotificationsService } from "@bitwarden/common/abstractions/notificatio import { SystemService } from "@bitwarden/common/abstractions/system.service"; import { Utils } from "@bitwarden/common/misc/utils"; +import { AutofillService } from "../autofill/services/abstractions/autofill.service"; import { BrowserApi } from "../browser/browserApi"; -import { AutofillService } from "../services/abstractions/autofill.service"; import { BrowserEnvironmentService } from "../services/browser-environment.service"; import BrowserPlatformUtilsService from "../services/browserPlatformUtils.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 477797d1b4..4266db43ec 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,7 +1,11 @@ import { EventCollectionService as AbstractEventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service"; -import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory"; +import { + cipherServiceFactory, + CipherServiceInitOptions, +} from "../../vault/background/service_factories/cipher-service.factory"; + import { eventUploadServiceFactory, EventUploadServiceInitOptions, diff --git a/apps/browser/src/background/service_factories/search-service.factory.ts b/apps/browser/src/background/service_factories/search-service.factory.ts index 29318c4525..09d26237e1 100644 --- a/apps/browser/src/background/service_factories/search-service.factory.ts +++ b/apps/browser/src/background/service_factories/search-service.factory.ts @@ -1,7 +1,11 @@ import { SearchService as AbstractSearchService } from "@bitwarden/common/abstractions/search.service"; import { SearchService } from "@bitwarden/common/services/search.service"; -import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory"; +import { + cipherServiceFactory, + CipherServiceInitOptions, +} from "../../vault/background/service_factories/cipher-service.factory"; + import { CachedServices, factory, FactoryOptions } from "./factory-options"; import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory"; import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory"; 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 3029b94f00..7dc28fd88f 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,16 +1,22 @@ import { VaultTimeoutService as AbstractVaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import VaultTimeoutService from "../../services/vaultTimeout/vaultTimeout.service"; +import { + cipherServiceFactory, + CipherServiceInitOptions, +} from "../../vault/background/service_factories/cipher-service.factory"; +import { + folderServiceFactory, + FolderServiceInitOptions, +} from "../../vault/background/service_factories/folder-service.factory"; import { authServiceFactory, AuthServiceInitOptions } from "./auth-service.factory"; -import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory"; import { collectionServiceFactory, CollectionServiceInitOptions, } from "./collection-service.factory"; import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { folderServiceFactory, FolderServiceInitOptions } from "./folder-service.factory"; import { keyConnectorServiceFactory, KeyConnectorServiceInitOptions, diff --git a/apps/browser/src/background/webRequest.background.ts b/apps/browser/src/background/webRequest.background.ts index b4b4cc4f37..6424dec3b4 100644 --- a/apps/browser/src/background/webRequest.background.ts +++ b/apps/browser/src/background/webRequest.background.ts @@ -1,8 +1,8 @@ import { AuthService } from "@bitwarden/common/abstractions/auth.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { BrowserApi } from "../browser/browserApi"; diff --git a/apps/browser/src/listeners/index.ts b/apps/browser/src/listeners/index.ts index 0c00dea784..e9dc090827 100644 --- a/apps/browser/src/listeners/index.ts +++ b/apps/browser/src/listeners/index.ts @@ -1,5 +1,5 @@ -import { CipherContextMenuHandler } from "../browser/cipher-context-menu-handler"; -import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler"; +import { CipherContextMenuHandler } from "../autofill/browser/cipher-context-menu-handler"; +import { ContextMenuClickedHandler } from "../autofill/browser/context-menu-clicked-handler"; import { combine } from "./combine"; import { onCommandListener } from "./onCommandListener"; diff --git a/apps/browser/src/listeners/onCommandListener.ts b/apps/browser/src/listeners/onCommandListener.ts index 395285d40e..319dda7b01 100644 --- a/apps/browser/src/listeners/onCommandListener.ts +++ b/apps/browser/src/listeners/onCommandListener.ts @@ -3,8 +3,10 @@ import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStat import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; +import { autofillServiceFactory } from "../autofill/background/service_factories/autofill-service.factory"; +import { GeneratePasswordToClipboardCommand } from "../autofill/clipboard"; +import { AutofillTabCommand } from "../autofill/commands/autofill-tab-command"; import { authServiceFactory } from "../background/service_factories/auth-service.factory"; -import { autofillServiceFactory } from "../background/service_factories/autofill-service.factory"; import { CachedServices } from "../background/service_factories/factory-options"; import { logServiceFactory } from "../background/service_factories/log-service.factory"; import { @@ -13,8 +15,6 @@ import { } from "../background/service_factories/password-generation-service.factory"; import { stateServiceFactory } from "../background/service_factories/state-service.factory"; import { BrowserApi } from "../browser/browserApi"; -import { GeneratePasswordToClipboardCommand } from "../clipboard"; -import { AutofillTabCommand } from "../commands/autofill-tab-command"; import { Account } from "../models/account"; export const onCommandListener = async (command: string, tab: chrome.tabs.Tab) => { diff --git a/apps/browser/src/listeners/update-badge.ts b/apps/browser/src/listeners/update-badge.ts index ac1ce88038..8595d2ae43 100644 --- a/apps/browser/src/listeners/update-badge.ts +++ b/apps/browser/src/listeners/update-badge.ts @@ -1,5 +1,4 @@ import { AuthService } from "@bitwarden/common/abstractions/auth.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; @@ -7,16 +6,17 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { Utils } from "@bitwarden/common/misc/utils"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { ContainerService } from "@bitwarden/common/services/container.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import IconDetails from "../background/models/iconDetails"; import { authServiceFactory } from "../background/service_factories/auth-service.factory"; -import { cipherServiceFactory } from "../background/service_factories/cipher-service.factory"; import { searchServiceFactory } from "../background/service_factories/search-service.factory"; import { stateServiceFactory } from "../background/service_factories/state-service.factory"; import { BrowserApi } from "../browser/browserApi"; import { Account } from "../models/account"; import { BrowserStateService } from "../services/abstractions/browser-state.service"; import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service"; +import IconDetails from "../vault/background/models/icon-details"; +import { cipherServiceFactory } from "../vault/background/service_factories/cipher-service.factory"; export type BadgeOptions = { tab?: chrome.tabs.Tab; diff --git a/apps/browser/src/models/browserGroupingsComponentState.ts b/apps/browser/src/models/browserGroupingsComponentState.ts index f406e3d827..a09c336f96 100644 --- a/apps/browser/src/models/browserGroupingsComponentState.ts +++ b/apps/browser/src/models/browserGroupingsComponentState.ts @@ -1,9 +1,9 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.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"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { BrowserComponentState } from "./browserComponentState"; diff --git a/apps/browser/src/popup/accounts/login.component.ts b/apps/browser/src/popup/accounts/login.component.ts index 7630f31ac3..5defbb472b 100644 --- a/apps/browser/src/popup/accounts/login.component.ts +++ b/apps/browser/src/popup/accounts/login.component.ts @@ -15,8 +15,8 @@ import { LoginService } from "@bitwarden/common/abstractions/login.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { Utils } from "@bitwarden/common/misc/utils"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "app-login", diff --git a/apps/browser/src/popup/accounts/set-password.component.ts b/apps/browser/src/popup/accounts/set-password.component.ts index 25732b0714..c8d42b961a 100644 --- a/apps/browser/src/popup/accounts/set-password.component.ts +++ b/apps/browser/src/popup/accounts/set-password.component.ts @@ -13,7 +13,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "app-set-password", diff --git a/apps/browser/src/popup/accounts/sso.component.ts b/apps/browser/src/popup/accounts/sso.component.ts index 7483cc51a2..09b6cd8d85 100644 --- a/apps/browser/src/popup/accounts/sso.component.ts +++ b/apps/browser/src/popup/accounts/sso.component.ts @@ -11,9 +11,9 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { BrowserApi } from "../../browser/browserApi"; diff --git a/apps/browser/src/popup/accounts/two-factor.component.ts b/apps/browser/src/popup/accounts/two-factor.component.ts index 5bfb637e4c..d97cedeb3f 100644 --- a/apps/browser/src/popup/accounts/two-factor.component.ts +++ b/apps/browser/src/popup/accounts/two-factor.component.ts @@ -14,9 +14,9 @@ import { LoginService } from "@bitwarden/common/abstractions/login.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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { BrowserApi } from "../../browser/browserApi"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/popup/accounts/update-temp-password.component.ts b/apps/browser/src/popup/accounts/update-temp-password.component.ts index 9468209f36..aa9b75940a 100644 --- a/apps/browser/src/popup/accounts/update-temp-password.component.ts +++ b/apps/browser/src/popup/accounts/update-temp-password.component.ts @@ -10,7 +10,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "app-update-temp-password", diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 2ba44c1e4a..1969fb564a 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -5,6 +5,15 @@ import { AuthGuard } from "@bitwarden/angular/guards/auth.guard"; import { LockGuard } from "@bitwarden/angular/guards/lock.guard"; import { UnauthGuard } from "@bitwarden/angular/guards/unauth.guard"; +import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component"; +import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.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"; +import { VaultFilterComponent } from "../vault/popup/components/vault/vault-filter.component"; +import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items.component"; +import { ViewComponent } from "../vault/popup/components/vault/view.component"; + import { EnvironmentComponent } from "./accounts/environment.component"; import { HintComponent } from "./accounts/hint.component"; import { HomeComponent } from "./accounts/home.component"; @@ -32,15 +41,7 @@ import { PremiumComponent } from "./settings/premium.component"; import { SettingsComponent } from "./settings/settings.component"; import { SyncComponent } from "./settings/sync.component"; import { TabsComponent } from "./tabs.component"; -import { AddEditComponent } from "./vault/add-edit.component"; -import { AttachmentsComponent } from "./vault/attachments.component"; import { CollectionsComponent } from "./vault/collections.component"; -import { CurrentTabComponent } from "./vault/current-tab.component"; -import { PasswordHistoryComponent } from "./vault/password-history.component"; -import { ShareComponent } from "./vault/share.component"; -import { VaultFilterComponent } from "./vault/vault-filter.component"; -import { VaultItemsComponent } from "./vault/vault-items.component"; -import { ViewComponent } from "./vault/view.component"; const routes: Routes = [ { diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts index e871b2a787..5697541715 100644 --- a/apps/browser/src/popup/app.module.ts +++ b/apps/browser/src/popup/app.module.ts @@ -67,6 +67,22 @@ import { JslibModule } from "@bitwarden/angular/jslib.module"; import { ColorPasswordCountPipe } from "@bitwarden/angular/pipes/color-password-count.pipe"; import { ColorPasswordPipe } from "@bitwarden/angular/pipes/color-password.pipe"; +import { CollectionsComponent } from "../popup/vault/collections.component"; +import { ActionButtonsComponent } from "../vault/popup/components/action-buttons.component"; +import { CipherRowComponent } from "../vault/popup/components/cipher-row.component"; +import { PasswordRepromptComponent } from "../vault/popup/components/password-reprompt.component"; +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 { 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"; +import { VaultFilterComponent } from "../vault/popup/components/vault/vault-filter.component"; +import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items.component"; +import { VaultSelectComponent } from "../vault/popup/components/vault/vault-select.component"; +import { ViewCustomFieldsComponent } from "../vault/popup/components/vault/view-custom-fields.component"; +import { ViewComponent } from "../vault/popup/components/vault/view.component"; + import { EnvironmentComponent } from "./accounts/environment.component"; import { HintComponent } from "./accounts/hint.component"; import { HomeComponent } from "./accounts/home.component"; @@ -81,9 +97,6 @@ import { TwoFactorComponent } from "./accounts/two-factor.component"; import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component"; import { AppRoutingModule } from "./app-routing.module"; import { AppComponent } from "./app.component"; -import { ActionButtonsComponent } from "./components/action-buttons.component"; -import { CipherRowComponent } from "./components/cipher-row.component"; -import { PasswordRepromptComponent } from "./components/password-reprompt.component"; import { PopOutComponent } from "./components/pop-out.component"; import { PrivateModeWarningComponent } from "./components/private-mode-warning.component"; import { SendListComponent } from "./components/send-list.component"; @@ -107,18 +120,6 @@ import { SettingsComponent } from "./settings/settings.component"; import { SyncComponent } from "./settings/sync.component"; import { VaultTimeoutInputComponent } from "./settings/vault-timeout-input.component"; import { TabsComponent } from "./tabs.component"; -import { AddEditCustomFieldsComponent } from "./vault/add-edit-custom-fields.component"; -import { AddEditComponent } from "./vault/add-edit.component"; -import { AttachmentsComponent } from "./vault/attachments.component"; -import { CollectionsComponent } from "./vault/collections.component"; -import { CurrentTabComponent } from "./vault/current-tab.component"; -import { PasswordHistoryComponent } from "./vault/password-history.component"; -import { ShareComponent } from "./vault/share.component"; -import { VaultFilterComponent } from "./vault/vault-filter.component"; -import { VaultItemsComponent } from "./vault/vault-items.component"; -import { VaultSelectComponent } from "./vault/vault-select.component"; -import { ViewCustomFieldsComponent } from "./vault/view-custom-fields.component"; -import { ViewComponent } from "./vault/view.component"; registerLocaleData(localeAr, "ar"); registerLocaleData(localeAz, "az"); diff --git a/apps/browser/src/popup/generator/generator.component.ts b/apps/browser/src/popup/generator/generator.component.ts index cff5e9e3c3..d16115f53d 100644 --- a/apps/browser/src/popup/generator/generator.component.ts +++ b/apps/browser/src/popup/generator/generator.component.ts @@ -9,7 +9,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @Component({ selector: "app-generator", diff --git a/apps/browser/src/popup/send/send-groupings.component.ts b/apps/browser/src/popup/send/send-groupings.component.ts index a5d63eb9d5..5e442f7112 100644 --- a/apps/browser/src/popup/send/send-groupings.component.ts +++ b/apps/browser/src/popup/send/send-groupings.component.ts @@ -10,9 +10,9 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.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"; import { BrowserSendComponentState } from "../../models/browserSendComponentState"; import { BrowserStateService } from "../../services/abstractions/browser-state.service"; diff --git a/apps/browser/src/popup/services/popup-search.service.ts b/apps/browser/src/popup/services/popup-search.service.ts index bf65522b8f..b36ea5a060 100644 --- a/apps/browser/src/popup/services/popup-search.service.ts +++ b/apps/browser/src/popup/services/popup-search.service.ts @@ -1,7 +1,7 @@ -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { SearchService } from "@bitwarden/common/services/search.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; export class PopupSearchService extends SearchService { constructor( diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 5d9da20d2a..0ec710cc1c 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -10,7 +10,6 @@ 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 { AuthService as AuthServiceAbstraction } from "@bitwarden/common/abstractions/auth.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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"; @@ -23,11 +22,6 @@ import { EventUploadService } from "@bitwarden/common/abstractions/event/event-u import { ExportService } from "@bitwarden/common/abstractions/export.service"; import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; import { FileUploadService } from "@bitwarden/common/abstractions/fileUpload.service"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { - FolderService, - InternalFolderService, -} from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service"; @@ -36,7 +30,6 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; import { @@ -56,7 +49,6 @@ import { AbstractMemoryStorageService, AbstractStorageService, } from "@bitwarden/common/abstractions/storage.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; @@ -69,19 +61,26 @@ import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { AuthService } from "@bitwarden/common/services/auth.service"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { ContainerService } from "@bitwarden/common/services/container.service"; -import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service"; import { LoginService } from "@bitwarden/common/services/login.service"; import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service"; import { SearchService } from "@bitwarden/common/services/search.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; +import { + FolderService, + InternalFolderService, +} from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service"; +import { AutofillService } from "../../autofill/services/abstractions/autofill.service"; import MainBackground from "../../background/main.background"; import { BrowserApi } from "../../browser/browserApi"; import { Account } from "../../models/account"; -import { AutofillService } from "../../services/abstractions/autofill.service"; import { BrowserStateService as StateServiceAbstraction } from "../../services/abstractions/browser-state.service"; import { BrowserConfigService } from "../../services/browser-config.service"; import { BrowserEnvironmentService } from "../../services/browser-environment.service"; -import { BrowserFolderService } from "../../services/browser-folder.service"; import { BrowserI18nService } from "../../services/browser-i18n.service"; import { BrowserOrganizationService } from "../../services/browser-organization.service"; import { BrowserPolicyService } from "../../services/browser-policy.service"; @@ -90,12 +89,13 @@ import { BrowserStateService } from "../../services/browser-state.service"; import { BrowserFileDownloadService } from "../../services/browserFileDownloadService"; import BrowserMessagingService from "../../services/browserMessaging.service"; import BrowserMessagingPrivateModePopupService from "../../services/browserMessagingPrivateModePopup.service"; -import { VaultFilterService } from "../../services/vaultFilter.service"; +import { PasswordRepromptService } from "../../vault/popup/services/password-reprompt.service"; +import { BrowserFolderService } from "../../vault/services/browser-folder.service"; +import { VaultFilterService } from "../../vault/services/vault-filter.service"; import { DebounceNavigationService } from "./debounceNavigationService"; import { InitService } from "./init.service"; import { LockGuardService } from "./lock-guard.service"; -import { PasswordRepromptService } from "./password-reprompt.service"; import { PopupSearchService } from "./popup-search.service"; import { PopupUtilsService } from "./popup-utils.service"; import { UnauthGuardService } from "./unauth-guard.service"; diff --git a/apps/browser/src/popup/settings/folder-add-edit.component.ts b/apps/browser/src/popup/settings/folder-add-edit.component.ts index 8ff8ba3b1a..54c7cc7d43 100644 --- a/apps/browser/src/popup/settings/folder-add-edit.component.ts +++ b/apps/browser/src/popup/settings/folder-add-edit.component.ts @@ -2,12 +2,12 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/components/folder-add-edit.component"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; +import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/vault/components/folder-add-edit.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 { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; +import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; @Component({ selector: "app-folder-add-edit", diff --git a/apps/browser/src/popup/settings/folders.component.ts b/apps/browser/src/popup/settings/folders.component.ts index 45f92d5221..cae5d6f510 100644 --- a/apps/browser/src/popup/settings/folders.component.ts +++ b/apps/browser/src/popup/settings/folders.component.ts @@ -2,8 +2,8 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; import { map, Observable } from "rxjs"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; @Component({ selector: "app-folders", diff --git a/apps/browser/src/popup/settings/premium.component.ts b/apps/browser/src/popup/settings/premium.component.ts index d44fdb09a7..2bb7383da3 100644 --- a/apps/browser/src/popup/settings/premium.component.ts +++ b/apps/browser/src/popup/settings/premium.component.ts @@ -1,7 +1,7 @@ import { CurrencyPipe, Location } from "@angular/common"; import { Component } from "@angular/core"; -import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/components/premium.component"; +import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/vault/components/premium.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; diff --git a/apps/browser/src/popup/settings/sync.component.ts b/apps/browser/src/popup/settings/sync.component.ts index 4b77870aa1..2ce6d2c27b 100644 --- a/apps/browser/src/popup/settings/sync.component.ts +++ b/apps/browser/src/popup/settings/sync.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "app-sync", diff --git a/apps/browser/src/popup/vault/collections.component.ts b/apps/browser/src/popup/vault/collections.component.ts index 13e529ce73..766b51e2ec 100644 --- a/apps/browser/src/popup/vault/collections.component.ts +++ b/apps/browser/src/popup/vault/collections.component.ts @@ -4,11 +4,11 @@ import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/components/collections.component"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ selector: "app-vault-collections", diff --git a/apps/browser/src/background/models/iconDetails.ts b/apps/browser/src/vault/background/models/icon-details.ts similarity index 100% rename from apps/browser/src/background/models/iconDetails.ts rename to apps/browser/src/vault/background/models/icon-details.ts diff --git a/apps/browser/src/background/service_factories/cipher-service.factory.ts b/apps/browser/src/vault/background/service_factories/cipher-service.factory.ts similarity index 55% rename from apps/browser/src/background/service_factories/cipher-service.factory.ts rename to apps/browser/src/vault/background/service_factories/cipher-service.factory.ts index 020c19983c..ad2259f141 100644 --- a/apps/browser/src/background/service_factories/cipher-service.factory.ts +++ b/apps/browser/src/vault/background/service_factories/cipher-service.factory.ts @@ -1,19 +1,44 @@ -import { CipherService as AbstractCipherService } from "@bitwarden/common/abstractions/cipher.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { CipherService } from "@bitwarden/common/services/cipher.service"; +import { CipherService as AbstractCipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; -import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory"; -import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; -import { encryptServiceFactory, EncryptServiceInitOptions } from "./encrypt-service.factory"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; +import { + apiServiceFactory, + ApiServiceInitOptions, +} from "../../../background/service_factories/api-service.factory"; +import { + cryptoServiceFactory, + CryptoServiceInitOptions, +} from "../../../background/service_factories/crypto-service.factory"; +import { + encryptServiceFactory, + EncryptServiceInitOptions, +} from "../../../background/service_factories/encrypt-service.factory"; +import { + CachedServices, + factory, + FactoryOptions, +} from "../../../background/service_factories/factory-options"; import { FileUploadServiceInitOptions, fileUploadServiceFactory, -} from "./file-upload-service.factory"; -import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory"; -import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory"; -import { SettingsServiceInitOptions, settingsServiceFactory } from "./settings-service.factory"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; +} from "../../../background/service_factories/file-upload-service.factory"; +import { + i18nServiceFactory, + I18nServiceInitOptions, +} from "../../../background/service_factories/i18n-service.factory"; +import { + logServiceFactory, + LogServiceInitOptions, +} from "../../../background/service_factories/log-service.factory"; +import { + SettingsServiceInitOptions, + settingsServiceFactory, +} from "../../../background/service_factories/settings-service.factory"; +import { + stateServiceFactory, + StateServiceInitOptions, +} from "../../../background/service_factories/state-service.factory"; type CipherServiceFactoryOptions = FactoryOptions & { cipherServiceOptions?: { diff --git a/apps/browser/src/background/service_factories/folder-service.factory.ts b/apps/browser/src/vault/background/service_factories/folder-service.factory.ts similarity index 67% rename from apps/browser/src/background/service_factories/folder-service.factory.ts rename to apps/browser/src/vault/background/service_factories/folder-service.factory.ts index bb35970325..ba6cad613f 100644 --- a/apps/browser/src/background/service_factories/folder-service.factory.ts +++ b/apps/browser/src/vault/background/service_factories/folder-service.factory.ts @@ -1,15 +1,25 @@ -import { FolderService as AbstractFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; +import { FolderService as AbstractFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { BrowserFolderService } from "../../services/browser-folder.service"; - -import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory"; -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"; +import { BrowserFolderService } from "../../services/browser-folder.service"; + +import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory"; type FolderServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/sync-notifier-service.factory.ts b/apps/browser/src/vault/background/service_factories/sync-notifier-service.factory.ts similarity index 63% rename from apps/browser/src/background/service_factories/sync-notifier-service.factory.ts rename to apps/browser/src/vault/background/service_factories/sync-notifier-service.factory.ts index 58699bdff5..78ebb0c773 100644 --- a/apps/browser/src/background/service_factories/sync-notifier-service.factory.ts +++ b/apps/browser/src/vault/background/service_factories/sync-notifier-service.factory.ts @@ -1,7 +1,11 @@ -import { SyncNotifierService as AbstractSyncNotifierService } from "@bitwarden/common/abstractions/sync/syncNotifier.service.abstraction"; -import { SyncNotifierService } from "@bitwarden/common/services/sync/syncNotifier.service"; +import { SyncNotifierService as AbstractSyncNotifierService } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction"; +import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service"; -import { FactoryOptions, CachedServices, factory } from "./factory-options"; +import { + FactoryOptions, + CachedServices, + factory, +} from "../../../background/service_factories/factory-options"; type SyncNotifierServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/popup/components/action-buttons.component.html b/apps/browser/src/vault/popup/components/action-buttons.component.html similarity index 100% rename from apps/browser/src/popup/components/action-buttons.component.html rename to apps/browser/src/vault/popup/components/action-buttons.component.html diff --git a/apps/browser/src/popup/components/action-buttons.component.ts b/apps/browser/src/vault/popup/components/action-buttons.component.ts similarity index 88% rename from apps/browser/src/popup/components/action-buttons.component.ts rename to apps/browser/src/vault/popup/components/action-buttons.component.ts index 60bc0051fb..f2a75b7de5 100644 --- a/apps/browser/src/popup/components/action-buttons.component.ts +++ b/apps/browser/src/vault/popup/components/action-buttons.component.ts @@ -2,14 +2,14 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @Component({ selector: "app-action-buttons", diff --git a/apps/browser/src/popup/components/cipher-row.component.html b/apps/browser/src/vault/popup/components/cipher-row.component.html similarity index 100% rename from apps/browser/src/popup/components/cipher-row.component.html rename to apps/browser/src/vault/popup/components/cipher-row.component.html diff --git a/apps/browser/src/popup/components/cipher-row.component.ts b/apps/browser/src/vault/popup/components/cipher-row.component.ts similarity index 89% rename from apps/browser/src/popup/components/cipher-row.component.ts rename to apps/browser/src/vault/popup/components/cipher-row.component.ts index bb99316dd2..e2992ad184 100644 --- a/apps/browser/src/popup/components/cipher-row.component.ts +++ b/apps/browser/src/vault/popup/components/cipher-row.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @Component({ selector: "app-cipher-row", diff --git a/apps/browser/src/popup/components/password-reprompt.component.html b/apps/browser/src/vault/popup/components/password-reprompt.component.html similarity index 100% rename from apps/browser/src/popup/components/password-reprompt.component.html rename to apps/browser/src/vault/popup/components/password-reprompt.component.html diff --git a/apps/desktop/src/app/components/password-reprompt.component.ts b/apps/browser/src/vault/popup/components/password-reprompt.component.ts similarity index 76% rename from apps/desktop/src/app/components/password-reprompt.component.ts rename to apps/browser/src/vault/popup/components/password-reprompt.component.ts index ef72c8a7a1..f63da5ed48 100644 --- a/apps/desktop/src/app/components/password-reprompt.component.ts +++ b/apps/browser/src/vault/popup/components/password-reprompt.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/components/password-reprompt.component"; +import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/vault/components/password-reprompt.component"; @Component({ templateUrl: "password-reprompt.component.html", diff --git a/apps/browser/src/popup/vault/add-edit-custom-fields.component.html b/apps/browser/src/vault/popup/components/vault/add-edit-custom-fields.component.html similarity index 100% rename from apps/browser/src/popup/vault/add-edit-custom-fields.component.html rename to apps/browser/src/vault/popup/components/vault/add-edit-custom-fields.component.html diff --git a/apps/desktop/src/app/vault/add-edit-custom-fields.component.ts b/apps/browser/src/vault/popup/components/vault/add-edit-custom-fields.component.ts similarity index 87% rename from apps/desktop/src/app/vault/add-edit-custom-fields.component.ts rename to apps/browser/src/vault/popup/components/vault/add-edit-custom-fields.component.ts index 44f9e9539a..517e5016c6 100644 --- a/apps/desktop/src/app/vault/add-edit-custom-fields.component.ts +++ b/apps/browser/src/vault/popup/components/vault/add-edit-custom-fields.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/components/add-edit-custom-fields.component"; +import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/vault/components/add-edit-custom-fields.component"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; diff --git a/apps/browser/src/popup/vault/add-edit.component.html b/apps/browser/src/vault/popup/components/vault/add-edit.component.html similarity index 100% rename from apps/browser/src/popup/vault/add-edit.component.html rename to apps/browser/src/vault/popup/components/vault/add-edit.component.html diff --git a/apps/browser/src/popup/vault/add-edit.component.ts b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts similarity index 91% rename from apps/browser/src/popup/vault/add-edit.component.ts rename to apps/browser/src/vault/popup/components/vault/add-edit.component.ts index 54d8fb1ade..5bd1bde37b 100644 --- a/apps/browser/src/popup/vault/add-edit.component.ts +++ b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts @@ -3,25 +3,25 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.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 { CipherType } from "@bitwarden/common/enums/cipherType"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.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"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; -import { BrowserApi } from "../../browser/browserApi"; -import { PopupUtilsService } from "../services/popup-utils.service"; +import { BrowserApi } from "../../../../browser/browserApi"; +import { PopupUtilsService } from "../../../../popup/services/popup-utils.service"; @Component({ selector: "app-vault-add-edit", diff --git a/apps/browser/src/popup/vault/attachments.component.html b/apps/browser/src/vault/popup/components/vault/attachments.component.html similarity index 100% rename from apps/browser/src/popup/vault/attachments.component.html rename to apps/browser/src/vault/popup/components/vault/attachments.component.html diff --git a/apps/browser/src/popup/vault/attachments.component.ts b/apps/browser/src/vault/popup/components/vault/attachments.component.ts similarity index 93% rename from apps/browser/src/popup/vault/attachments.component.ts rename to apps/browser/src/vault/popup/components/vault/attachments.component.ts index a8dc7a5278..152ece9c09 100644 --- a/apps/browser/src/popup/vault/attachments.component.ts +++ b/apps/browser/src/vault/popup/components/vault/attachments.component.ts @@ -3,15 +3,15 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/components/attachments.component"; +import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/vault/components/attachments.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ selector: "app-vault-attachments", diff --git a/apps/browser/src/popup/vault/current-tab.component.html b/apps/browser/src/vault/popup/components/vault/current-tab.component.html similarity index 100% rename from apps/browser/src/popup/vault/current-tab.component.html rename to apps/browser/src/vault/popup/components/vault/current-tab.component.html diff --git a/apps/browser/src/popup/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts similarity index 90% rename from apps/browser/src/popup/vault/current-tab.component.ts rename to apps/browser/src/vault/popup/components/vault/current-tab.component.ts index fd0e356476..dca76d3ac1 100644 --- a/apps/browser/src/popup/vault/current-tab.component.ts +++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts @@ -4,23 +4,23 @@ import { Subject } from "rxjs"; import { debounceTime, takeUntil } from "rxjs/operators"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +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 { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { BrowserApi } from "../../browser/browserApi"; -import { AutofillService } from "../../services/abstractions/autofill.service"; -import { VaultFilterService } from "../../services/vaultFilter.service"; -import { PopupUtilsService } from "../services/popup-utils.service"; +import { AutofillService } from "../../../../autofill/services/abstractions/autofill.service"; +import { BrowserApi } from "../../../../browser/browserApi"; +import { PopupUtilsService } from "../../../../popup/services/popup-utils.service"; +import { VaultFilterService } from "../../../services/vault-filter.service"; const BroadcasterSubscriptionId = "CurrentTabComponent"; diff --git a/apps/browser/src/popup/vault/password-history.component.html b/apps/browser/src/vault/popup/components/vault/password-history.component.html similarity index 100% rename from apps/browser/src/popup/vault/password-history.component.html rename to apps/browser/src/vault/popup/components/vault/password-history.component.html diff --git a/apps/browser/src/popup/vault/password-history.component.ts b/apps/browser/src/vault/popup/components/vault/password-history.component.ts similarity index 89% rename from apps/browser/src/popup/vault/password-history.component.ts rename to apps/browser/src/vault/popup/components/vault/password-history.component.ts index 6210986927..44c5d683b8 100644 --- a/apps/browser/src/popup/vault/password-history.component.ts +++ b/apps/browser/src/vault/popup/components/vault/password-history.component.ts @@ -3,10 +3,10 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/components/password-history.component"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/vault/components/password-history.component"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ selector: "app-password-history", diff --git a/apps/browser/src/popup/vault/share.component.html b/apps/browser/src/vault/popup/components/vault/share.component.html similarity index 100% rename from apps/browser/src/popup/vault/share.component.html rename to apps/browser/src/vault/popup/components/vault/share.component.html diff --git a/apps/browser/src/popup/vault/share.component.ts b/apps/browser/src/vault/popup/components/vault/share.component.ts similarity index 96% rename from apps/browser/src/popup/vault/share.component.ts rename to apps/browser/src/vault/popup/components/vault/share.component.ts index 112b432c0e..23f5e91ca2 100644 --- a/apps/browser/src/popup/vault/share.component.ts +++ b/apps/browser/src/vault/popup/components/vault/share.component.ts @@ -3,12 +3,12 @@ import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ selector: "app-vault-share", diff --git a/apps/browser/src/popup/vault/vault-filter.component.html b/apps/browser/src/vault/popup/components/vault/vault-filter.component.html similarity index 100% rename from apps/browser/src/popup/vault/vault-filter.component.html rename to apps/browser/src/vault/popup/components/vault/vault-filter.component.html diff --git a/apps/browser/src/popup/vault/vault-filter.component.ts b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts similarity index 94% rename from apps/browser/src/popup/vault/vault-filter.component.ts rename to apps/browser/src/vault/popup/components/vault/vault-filter.component.ts index e67fe69f60..e40040c052 100644 --- a/apps/browser/src/popup/vault/vault-filter.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts @@ -6,21 +6,21 @@ import { first } from "rxjs/operators"; import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.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"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { BrowserApi } from "../../browser/browserApi"; -import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; -import { VaultFilterService } from "../../services/vaultFilter.service"; -import { PopupUtilsService } from "../services/popup-utils.service"; +import { BrowserApi } from "../../../../browser/browserApi"; +import { BrowserGroupingsComponentState } from "../../../../models/browserGroupingsComponentState"; +import { PopupUtilsService } from "../../../../popup/services/popup-utils.service"; +import { BrowserStateService } from "../../../../services/abstractions/browser-state.service"; +import { VaultFilterService } from "../../../services/vault-filter.service"; const ComponentId = "VaultComponent"; diff --git a/apps/browser/src/popup/vault/vault-items.component.html b/apps/browser/src/vault/popup/components/vault/vault-items.component.html similarity index 100% rename from apps/browser/src/popup/vault/vault-items.component.html rename to apps/browser/src/vault/popup/components/vault/vault-items.component.html diff --git a/apps/browser/src/popup/vault/vault-items.component.ts b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts similarity index 92% rename from apps/browser/src/popup/vault/vault-items.component.ts rename to apps/browser/src/vault/popup/components/vault/vault-items.component.ts index b7f63d6d71..b4141abbf3 100644 --- a/apps/browser/src/popup/vault/vault-items.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts @@ -3,27 +3,27 @@ import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angula import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/components/vault-items.component"; +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 { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { 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 { CipherType } from "@bitwarden/common/enums/cipherType"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.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 { BrowserApi } from "../../browser/browserApi"; -import { BrowserComponentState } from "../../models/browserComponentState"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; -import { VaultFilterService } from "../../services/vaultFilter.service"; -import { PopupUtilsService } from "../services/popup-utils.service"; +import { BrowserApi } from "../../../../browser/browserApi"; +import { BrowserComponentState } from "../../../../models/browserComponentState"; +import { PopupUtilsService } from "../../../../popup/services/popup-utils.service"; +import { BrowserStateService } from "../../../../services/abstractions/browser-state.service"; +import { VaultFilterService } from "../../../services/vault-filter.service"; const ComponentId = "VaultItemsComponent"; diff --git a/apps/browser/src/popup/vault/vault-select.component.html b/apps/browser/src/vault/popup/components/vault/vault-select.component.html similarity index 100% rename from apps/browser/src/popup/vault/vault-select.component.html rename to apps/browser/src/vault/popup/components/vault/vault-select.component.html diff --git a/apps/browser/src/popup/vault/vault-select.component.ts b/apps/browser/src/vault/popup/components/vault/vault-select.component.ts similarity index 98% rename from apps/browser/src/popup/vault/vault-select.component.ts rename to apps/browser/src/vault/popup/components/vault/vault-select.component.ts index 957e181ed9..2a0cd1b23e 100644 --- a/apps/browser/src/popup/vault/vault-select.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-select.component.ts @@ -23,7 +23,7 @@ import { import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { VaultFilterService } from "../../services/vaultFilter.service"; +import { VaultFilterService } from "../../../services/vault-filter.service"; @Component({ selector: "app-vault-select", diff --git a/apps/browser/src/popup/vault/view-custom-fields.component.html b/apps/browser/src/vault/popup/components/vault/view-custom-fields.component.html similarity index 100% rename from apps/browser/src/popup/vault/view-custom-fields.component.html rename to apps/browser/src/vault/popup/components/vault/view-custom-fields.component.html diff --git a/apps/browser/src/popup/vault/view-custom-fields.component.ts b/apps/browser/src/vault/popup/components/vault/view-custom-fields.component.ts similarity index 86% rename from apps/browser/src/popup/vault/view-custom-fields.component.ts rename to apps/browser/src/vault/popup/components/vault/view-custom-fields.component.ts index 3ea41db713..249f83c444 100644 --- a/apps/browser/src/popup/vault/view-custom-fields.component.ts +++ b/apps/browser/src/vault/popup/components/vault/view-custom-fields.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/components/view-custom-fields.component"; +import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/vault/components/view-custom-fields.component"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; @Component({ diff --git a/apps/browser/src/popup/vault/view.component.html b/apps/browser/src/vault/popup/components/vault/view.component.html similarity index 100% rename from apps/browser/src/popup/vault/view.component.html rename to apps/browser/src/vault/popup/components/vault/view.component.html diff --git a/apps/browser/src/popup/vault/view.component.ts b/apps/browser/src/vault/popup/components/vault/view.component.ts similarity index 91% rename from apps/browser/src/popup/vault/view.component.ts rename to apps/browser/src/vault/popup/components/vault/view.component.ts index 9a6aa03f18..c37283e698 100644 --- a/apps/browser/src/popup/vault/view.component.ts +++ b/apps/browser/src/vault/popup/components/vault/view.component.ts @@ -3,30 +3,30 @@ import { ChangeDetectorRef, Component, NgZone } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/components/view.component"; +import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/components/view.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.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"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; +import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; -import { BrowserApi } from "../../browser/browserApi"; -import { AutofillService } from "../../services/abstractions/autofill.service"; -import { PopupUtilsService } from "../services/popup-utils.service"; +import { AutofillService } from "../../../../autofill/services/abstractions/autofill.service"; +import { BrowserApi } from "../../../../browser/browserApi"; +import { PopupUtilsService } from "../../../../popup/services/popup-utils.service"; const BroadcasterSubscriptionId = "ChildViewComponent"; diff --git a/apps/web/src/app/core/password-reprompt.service.ts b/apps/browser/src/vault/popup/services/password-reprompt.service.ts similarity index 82% rename from apps/web/src/app/core/password-reprompt.service.ts rename to apps/browser/src/vault/popup/services/password-reprompt.service.ts index fdd176e42d..22bbcf44d7 100644 --- a/apps/web/src/app/core/password-reprompt.service.ts +++ b/apps/browser/src/vault/popup/services/password-reprompt.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/services/passwordReprompt.service"; +import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/vault/services/password-reprompt.service"; import { PasswordRepromptComponent } from "../components/password-reprompt.component"; diff --git a/apps/browser/src/services/browser-folder.service.ts b/apps/browser/src/vault/services/browser-folder.service.ts similarity index 60% rename from apps/browser/src/services/browser-folder.service.ts rename to apps/browser/src/vault/services/browser-folder.service.ts index a9573ab0f7..ca7b57989f 100644 --- a/apps/browser/src/services/browser-folder.service.ts +++ b/apps/browser/src/vault/services/browser-folder.service.ts @@ -1,10 +1,10 @@ import { BehaviorSubject } from "rxjs"; -import { Folder } from "@bitwarden/common/models/domain/folder"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; -import { FolderService as BaseFolderService } from "@bitwarden/common/services/folder/folder.service"; +import { Folder } from "@bitwarden/common/vault/models/domain/folder"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { FolderService as BaseFolderService } from "@bitwarden/common/vault/services/folder/folder.service"; -import { browserSession, sessionSync } from "../decorators/session-sync-observable"; +import { browserSession, sessionSync } from "../../decorators/session-sync-observable"; @browserSession export class BrowserFolderService extends BaseFolderService { diff --git a/apps/browser/src/services/vaultFilter.service.ts b/apps/browser/src/vault/services/vault-filter.service.ts similarity index 89% rename from apps/browser/src/services/vaultFilter.service.ts rename to apps/browser/src/vault/services/vault-filter.service.ts index f8b2e37d0e..bc7b7a6861 100644 --- a/apps/browser/src/services/vaultFilter.service.ts +++ b/apps/browser/src/vault/services/vault-filter.service.ts @@ -1,12 +1,12 @@ 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 { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { 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 { CipherView } from "@bitwarden/common/models/view/cipher.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"; export class VaultFilterService extends BaseVaultFilterService { vaultFilter: VaultFilter = new VaultFilter(); diff --git a/apps/browser/webpack.config.js b/apps/browser/webpack.config.js index dde421daa5..4d2f96d96a 100644 --- a/apps/browser/webpack.config.js +++ b/apps/browser/webpack.config.js @@ -92,7 +92,7 @@ const plugins = [ chunks: ["popup/polyfills", "popup/vendor-angular", "popup/vendor", "popup/main"], }), new HtmlWebpackPlugin({ - template: "./src/notification/bar.html", + template: "./src/autofill/notification/bar.html", filename: "notification/bar.html", chunks: ["notification/bar"], }), @@ -105,7 +105,7 @@ const plugins = [ { from: "./src/_locales", to: "_locales" }, { from: "./src/images", to: "images" }, { from: "./src/popup/images", to: "popup/images" }, - { from: "./src/content/autofill.css", to: "content" }, + { from: "./src/autofill/content/autofill.css", to: "content" }, ], }), new MiniCssExtractPlugin({ @@ -141,12 +141,12 @@ const mainConfig = { entry: { "popup/polyfills": "./src/popup/polyfills.ts", "popup/main": "./src/popup/main.ts", - "content/autofill": "./src/content/autofill.js", - "content/autofiller": "./src/content/autofiller.ts", - "content/notificationBar": "./src/content/notificationBar.ts", - "content/contextMenuHandler": "./src/content/contextMenuHandler.ts", - "content/message_handler": "./src/content/message_handler.ts", - "notification/bar": "./src/notification/bar.js", + "content/autofill": "./src/autofill/content/autofill.js", + "content/autofiller": "./src/autofill/content/autofiller.ts", + "content/notificationBar": "./src/autofill/content/notification-bar.ts", + "content/contextMenuHandler": "./src/autofill/content/context-menu-handler.ts", + "content/message_handler": "./src/autofill/content/message_handler.ts", + "notification/bar": "./src/autofill/notification/bar.js", "encrypt-worker": "../../libs/common/src/services/cryptography/encrypt.worker.ts", }, optimization: { @@ -254,7 +254,7 @@ if (manifestVersion == 2) { } else { // Manifest v3 needs an extra helper for utilities in the content script. // The javascript output of this should be added to manifest.v3.json - mainConfig.entry["content/misc-utils"] = "./src/content/misc-utils.ts"; + mainConfig.entry["content/misc-utils"] = "./src/autofill/content/misc-utils.ts"; /** * @type {import("webpack").Configuration} diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index 429b8e5388..3a62dbf185 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -4,7 +4,6 @@ import * as path from "path"; import * as program from "commander"; import * as jsdom from "jsdom"; -import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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"; @@ -18,7 +17,6 @@ import { AppIdService } from "@bitwarden/common/services/appId.service"; import { AuditService } from "@bitwarden/common/services/audit.service"; import { AuthService } from "@bitwarden/common/services/auth.service"; import { BroadcasterService } from "@bitwarden/common/services/broadcaster.service"; -import { CipherService } from "@bitwarden/common/services/cipher.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"; @@ -26,8 +24,6 @@ import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptog import { EnvironmentService } from "@bitwarden/common/services/environment.service"; import { ExportService } from "@bitwarden/common/services/export.service"; import { FileUploadService } from "@bitwarden/common/services/fileUpload.service"; -import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service"; -import { FolderService } from "@bitwarden/common/services/folder/folder.service"; import { ImportApiService } from "@bitwarden/common/services/import/import-api.service"; import { ImportService } from "@bitwarden/common/services/import/import.service"; import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service"; @@ -44,8 +40,6 @@ import { SendService } from "@bitwarden/common/services/send.service"; import { SettingsService } from "@bitwarden/common/services/settings.service"; import { StateService } from "@bitwarden/common/services/state.service"; import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; -import { SyncService } from "@bitwarden/common/services/sync/sync.service"; -import { SyncNotifierService } from "@bitwarden/common/services/sync/syncNotifier.service"; import { TokenService } from "@bitwarden/common/services/token.service"; import { TotpService } from "@bitwarden/common/services/totp.service"; import { TwoFactorService } from "@bitwarden/common/services/twoFactor.service"; @@ -53,6 +47,12 @@ import { UserVerificationApiService } from "@bitwarden/common/services/userVerif import { UserVerificationService } from "@bitwarden/common/services/userVerification/userVerification.service"; import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service"; +import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; +import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service"; +import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service"; +import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service"; +import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service"; import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service"; import { Program } from "./program"; 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 82756edc98..3d6149f2a5 100644 --- a/apps/cli/src/commands/convert-to-key-connector.command.ts +++ b/apps/cli/src/commands/convert-to-key-connector.command.ts @@ -3,7 +3,7 @@ import * as inquirer from "inquirer"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/message.response"; diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts index d6cd120da0..2a10065ace 100644 --- a/apps/cli/src/commands/edit.command.ts +++ b/apps/cli/src/commands/edit.command.ts @@ -1,21 +1,21 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { Response } from "../models/response"; -import { CipherResponse } from "../models/response/cipher.response"; -import { FolderResponse } from "../models/response/folder.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"; export class EditCommand { constructor( diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index 92d7e31258..78c80b9211 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -1,14 +1,11 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { CipherType } from "@bitwarden/common/enums/cipherType"; import { SendType } from "@bitwarden/common/enums/sendType"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; @@ -23,15 +20,16 @@ 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 { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.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 { Response } from "../models/response"; -import { CipherResponse } from "../models/response/cipher.response"; import { CollectionResponse } from "../models/response/collection.response"; -import { FolderResponse } from "../models/response/folder.response"; import { OrganizationCollectionResponse } from "../models/response/organization-collection.response"; import { OrganizationResponse } from "../models/response/organization.response"; import { SendResponse } from "../models/response/send.response"; @@ -39,6 +37,8 @@ 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"; import { DownloadCommand } from "./download.command"; diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index 7f7793620f..13292e1b64 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -1,7 +1,5 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; @@ -13,16 +11,18 @@ import { CollectionResponse as ApiCollectionResponse, } from "@bitwarden/common/models/response/collection.response"; import { ListResponse as ApiListResponse } from "@bitwarden/common/models/response/list.response"; -import { CipherView } from "@bitwarden/common/models/view/cipher.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"; import { Response } from "../models/response"; -import { CipherResponse } from "../models/response/cipher.response"; import { CollectionResponse } from "../models/response/collection.response"; -import { FolderResponse } from "../models/response/folder.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"; export class ListCommand { constructor( diff --git a/apps/cli/src/commands/login.command.ts b/apps/cli/src/commands/login.command.ts index b6ec7f3959..7942917622 100644 --- a/apps/cli/src/commands/login.command.ts +++ b/apps/cli/src/commands/login.command.ts @@ -15,7 +15,6 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; @@ -30,6 +29,7 @@ import { TokenTwoFactorRequest } from "@bitwarden/common/models/request/identity import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/two-factor-email.request"; import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/update-temp-password.request"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/message.response"; diff --git a/apps/cli/src/commands/restore.command.ts b/apps/cli/src/commands/restore.command.ts index 48e6b2aa9c..96179e7b68 100644 --- a/apps/cli/src/commands/restore.command.ts +++ b/apps/cli/src/commands/restore.command.ts @@ -1,4 +1,4 @@ -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { Response } from "../models/response"; diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts index 6b5dd97f03..854d71567b 100644 --- a/apps/cli/src/commands/serve.command.ts +++ b/apps/cli/src/commands/serve.command.ts @@ -11,10 +11,11 @@ import { Utils } from "@bitwarden/common/misc/utils"; import { Main } from "../bw"; import { Response } from "../models/response"; import { FileResponse } from "../models/response/file.response"; +import { CreateCommand } from "../vault/create.command"; +import { DeleteCommand } from "../vault/delete.command"; +import { SyncCommand } from "../vault/sync.command"; import { ConfirmCommand } from "./confirm.command"; -import { CreateCommand } from "./create.command"; -import { DeleteCommand } from "./delete.command"; import { EditCommand } from "./edit.command"; import { GenerateCommand } from "./generate.command"; import { GetCommand } from "./get.command"; @@ -29,7 +30,6 @@ import { SendListCommand } from "./send/list.command"; import { SendRemovePasswordCommand } from "./send/remove-password.command"; import { ShareCommand } from "./share.command"; import { StatusCommand } from "./status.command"; -import { SyncCommand } from "./sync.command"; import { UnlockCommand } from "./unlock.command"; export class ServeCommand { diff --git a/apps/cli/src/commands/share.command.ts b/apps/cli/src/commands/share.command.ts index c04760b9d9..cf76c353ef 100644 --- a/apps/cli/src/commands/share.command.ts +++ b/apps/cli/src/commands/share.command.ts @@ -1,8 +1,8 @@ -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { Response } from "../models/response"; -import { CipherResponse } from "../models/response/cipher.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/commands/status.command.ts b/apps/cli/src/commands/status.command.ts index 7cd109309c..c73dbdca88 100644 --- a/apps/cli/src/commands/status.command.ts +++ b/apps/cli/src/commands/status.command.ts @@ -1,8 +1,8 @@ import { AuthService } from "@bitwarden/common/abstractions/auth.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { Response } from "../models/response"; import { TemplateResponse } from "../models/response/template.response"; diff --git a/apps/cli/src/commands/unlock.command.ts b/apps/cli/src/commands/unlock.command.ts index 28c892b58b..73a4a80256 100644 --- a/apps/cli/src/commands/unlock.command.ts +++ b/apps/cli/src/commands/unlock.command.ts @@ -5,11 +5,11 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; import { Utils } from "@bitwarden/common/misc/utils"; import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/message.response"; diff --git a/apps/cli/src/models/response/login.response.ts b/apps/cli/src/models/response/login.response.ts index 7aa6e9184d..1f339743fa 100644 --- a/apps/cli/src/models/response/login.response.ts +++ b/apps/cli/src/models/response/login.response.ts @@ -1,5 +1,5 @@ import { LoginExport } from "@bitwarden/common/models/export/login.export"; -import { LoginView } from "@bitwarden/common/models/view/login.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; export class LoginResponse extends LoginExport { passwordRevisionDate: Date; diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts index 930d3f9344..e3e7613b53 100644 --- a/apps/cli/src/program.ts +++ b/apps/cli/src/program.ts @@ -14,7 +14,6 @@ import { LoginCommand } from "./commands/login.command"; import { LogoutCommand } from "./commands/logout.command"; import { ServeCommand } from "./commands/serve.command"; import { StatusCommand } from "./commands/status.command"; -import { SyncCommand } from "./commands/sync.command"; import { UnlockCommand } from "./commands/unlock.command"; import { UpdateCommand } from "./commands/update.command"; import { Response } from "./models/response"; @@ -23,6 +22,7 @@ import { MessageResponse } from "./models/response/message.response"; import { StringResponse } from "./models/response/string.response"; import { TemplateResponse } from "./models/response/template.response"; import { CliUtils } from "./utils"; +import { SyncCommand } from "./vault/sync.command"; const writeLn = CliUtils.writeLn; diff --git a/apps/cli/src/utils.ts b/apps/cli/src/utils.ts index e41c1c7896..cb6f8695bf 100644 --- a/apps/cli/src/utils.ts +++ b/apps/cli/src/utils.ts @@ -9,7 +9,7 @@ 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/models/view/folder.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { Response } from "./models/response"; import { MessageResponse } from "./models/response/message.response"; diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts index 4fe87a737a..c02812fb17 100644 --- a/apps/cli/src/vault.program.ts +++ b/apps/cli/src/vault.program.ts @@ -2,8 +2,6 @@ import * as program from "commander"; import { Main } from "./bw"; import { ConfirmCommand } from "./commands/confirm.command"; -import { CreateCommand } from "./commands/create.command"; -import { DeleteCommand } from "./commands/delete.command"; import { EditCommand } from "./commands/edit.command"; import { ExportCommand } from "./commands/export.command"; import { GetCommand } from "./commands/get.command"; @@ -14,6 +12,8 @@ import { ShareCommand } from "./commands/share.command"; import { Response } from "./models/response"; import { Program } from "./program"; import { CliUtils } from "./utils"; +import { CreateCommand } from "./vault/create.command"; +import { DeleteCommand } from "./vault/delete.command"; const writeLn = CliUtils.writeLn; diff --git a/apps/cli/src/commands/create.command.ts b/apps/cli/src/vault/create.command.ts similarity index 94% rename from apps/cli/src/commands/create.command.ts rename to apps/cli/src/vault/create.command.ts index 92855ee6f7..82ce29f643 100644 --- a/apps/cli/src/commands/create.command.ts +++ b/apps/cli/src/vault/create.command.ts @@ -2,10 +2,7 @@ import * as fs from "fs"; import * as path from "path"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Utils } from "@bitwarden/common/misc/utils"; import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; @@ -13,14 +10,18 @@ import { CollectionExport } from "@bitwarden/common/models/export/collection.exp 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 { Response } from "../models/response"; -import { CipherResponse } from "../models/response/cipher.response"; -import { FolderResponse } from "../models/response/folder.response"; import { OrganizationCollectionResponse } from "../models/response/organization-collection.response"; import { CliUtils } from "../utils"; +import { CipherResponse } from "./models/cipher.response"; +import { FolderResponse } from "./models/folder.response"; + export class CreateCommand { constructor( private cipherService: CipherService, diff --git a/apps/cli/src/commands/delete.command.ts b/apps/cli/src/vault/delete.command.ts similarity index 92% rename from apps/cli/src/commands/delete.command.ts rename to apps/cli/src/vault/delete.command.ts index 86bfc8cbbc..cf952e3a68 100644 --- a/apps/cli/src/commands/delete.command.ts +++ b/apps/cli/src/vault/delete.command.ts @@ -1,9 +1,9 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Utils } from "@bitwarden/common/misc/utils"; +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 { Response } from "../models/response"; import { CliUtils } from "../utils"; diff --git a/apps/cli/src/models/response/attachment.response.ts b/apps/cli/src/vault/models/attachment.response.ts similarity index 77% rename from apps/cli/src/models/response/attachment.response.ts rename to apps/cli/src/vault/models/attachment.response.ts index 2c6cb66e45..c4450fa8de 100644 --- a/apps/cli/src/models/response/attachment.response.ts +++ b/apps/cli/src/vault/models/attachment.response.ts @@ -1,4 +1,4 @@ -import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; +import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view"; export class AttachmentResponse { id: string; diff --git a/apps/cli/src/models/response/cipher.response.ts b/apps/cli/src/vault/models/cipher.response.ts similarity index 79% rename from apps/cli/src/models/response/cipher.response.ts rename to apps/cli/src/vault/models/cipher.response.ts index 182bff6e7f..a730894366 100644 --- a/apps/cli/src/models/response/cipher.response.ts +++ b/apps/cli/src/vault/models/cipher.response.ts @@ -1,10 +1,11 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { CipherWithIdExport } from "@bitwarden/common/models/export/cipher-with-ids.export"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; + +import { BaseResponse } from "../../models/response/base.response"; +import { LoginResponse } from "../../models/response/login.response"; import { AttachmentResponse } from "./attachment.response"; -import { BaseResponse } from "./base.response"; -import { LoginResponse } from "./login.response"; import { PasswordHistoryResponse } from "./password-history.response"; export class CipherResponse extends CipherWithIdExport implements BaseResponse { diff --git a/apps/cli/src/models/response/folder.response.ts b/apps/cli/src/vault/models/folder.response.ts similarity index 66% rename from apps/cli/src/models/response/folder.response.ts rename to apps/cli/src/vault/models/folder.response.ts index 5a73d7feb2..7b1b204deb 100644 --- a/apps/cli/src/models/response/folder.response.ts +++ b/apps/cli/src/vault/models/folder.response.ts @@ -1,7 +1,7 @@ import { FolderWithIdExport } from "@bitwarden/common/models/export/folder-with-id.export"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../models/response/base.response"; export class FolderResponse extends FolderWithIdExport implements BaseResponse { object: string; diff --git a/apps/cli/src/models/response/password-history.response.ts b/apps/cli/src/vault/models/password-history.response.ts similarity index 67% rename from apps/cli/src/models/response/password-history.response.ts rename to apps/cli/src/vault/models/password-history.response.ts index 32f8878a38..af22b694e1 100644 --- a/apps/cli/src/models/response/password-history.response.ts +++ b/apps/cli/src/vault/models/password-history.response.ts @@ -1,4 +1,4 @@ -import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view"; +import { PasswordHistoryView } from "@bitwarden/common/vault/models/view/password-history.view"; export class PasswordHistoryResponse { lastUsedDate: Date; diff --git a/apps/cli/src/commands/sync.command.ts b/apps/cli/src/vault/sync.command.ts similarity index 92% rename from apps/cli/src/commands/sync.command.ts rename to apps/cli/src/vault/sync.command.ts index 3d72b6b89e..073b9b5df4 100644 --- a/apps/cli/src/commands/sync.command.ts +++ b/apps/cli/src/vault/sync.command.ts @@ -1,4 +1,4 @@ -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/message.response"; diff --git a/apps/desktop/src/app/accounts/login.component.ts b/apps/desktop/src/app/accounts/login.component.ts index db77a78310..740dbcce07 100644 --- a/apps/desktop/src/app/accounts/login.component.ts +++ b/apps/desktop/src/app/accounts/login.component.ts @@ -18,7 +18,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { EnvironmentComponent } from "./environment.component"; diff --git a/apps/desktop/src/app/accounts/set-password.component.ts b/apps/desktop/src/app/accounts/set-password.component.ts index fd9d41a6ac..2fe0e161dc 100644 --- a/apps/desktop/src/app/accounts/set-password.component.ts +++ b/apps/desktop/src/app/accounts/set-password.component.ts @@ -14,7 +14,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; const BroadcasterSubscriptionId = "SetPasswordComponent"; diff --git a/apps/desktop/src/app/accounts/sso.component.ts b/apps/desktop/src/app/accounts/sso.component.ts index 1d0aebaa87..83af8dc4b0 100644 --- a/apps/desktop/src/app/accounts/sso.component.ts +++ b/apps/desktop/src/app/accounts/sso.component.ts @@ -11,7 +11,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "app-sso", diff --git a/apps/desktop/src/app/accounts/two-factor.component.ts b/apps/desktop/src/app/accounts/two-factor.component.ts index 858ddfc5ae..6b52899b1d 100644 --- a/apps/desktop/src/app/accounts/two-factor.component.ts +++ b/apps/desktop/src/app/accounts/two-factor.component.ts @@ -12,9 +12,9 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { LoginService } from "@bitwarden/common/abstractions/login.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { TwoFactorOptionsComponent } from "./two-factor-options.component"; diff --git a/apps/desktop/src/app/accounts/update-temp-password.component.ts b/apps/desktop/src/app/accounts/update-temp-password.component.ts index 109eec2300..64c40ddc75 100644 --- a/apps/desktop/src/app/accounts/update-temp-password.component.ts +++ b/apps/desktop/src/app/accounts/update-temp-password.component.ts @@ -10,7 +10,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "app-update-temp-password", diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index 239c14b203..1759eac3a6 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/apps/desktop/src/app/app-routing.module.ts @@ -4,6 +4,8 @@ import { RouterModule, Routes } from "@angular/router"; import { AuthGuard } from "@bitwarden/angular/guards/auth.guard"; import { LockGuard } from "@bitwarden/angular/guards/lock.guard"; +import { VaultComponent } from "../vault/app/vault/vault.component"; + import { AccessibilityCookieComponent } from "./accounts/accessibility-cookie.component"; import { HintComponent } from "./accounts/hint.component"; import { LockComponent } from "./accounts/lock.component"; @@ -16,7 +18,6 @@ import { TwoFactorComponent } from "./accounts/two-factor.component"; import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component"; import { LoginGuard } from "./guards/login.guard"; import { SendComponent } from "./send/send.component"; -import { VaultComponent } from "./vault/vault.component"; const routes: Routes = [ { path: "", redirectTo: "/vault", pathMatch: "full" }, diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts index 3d6d864f67..54d24bb7d8 100644 --- a/apps/desktop/src/app/app.component.ts +++ b/apps/desktop/src/app/app.component.ts @@ -17,11 +17,9 @@ import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { AuthService } from "@bitwarden/common/abstractions/auth.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; @@ -33,22 +31,24 @@ import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/pol 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; 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 { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { ExportComponent } from "../app/vault/export.component"; +import { GeneratorComponent } from "../app/vault/generator.component"; +import { PasswordGeneratorHistoryComponent } from "../app/vault/password-generator-history.component"; import { MenuUpdateRequest } from "../main/menu/menu.updater"; +import { PremiumComponent } from "../vault/app/accounts/premium.component"; +import { FolderAddEditComponent } from "../vault/app/vault/folder-add-edit.component"; import { DeleteAccountComponent } from "./accounts/delete-account.component"; -import { PremiumComponent } from "./accounts/premium.component"; import { SettingsComponent } from "./accounts/settings.component"; -import { ExportComponent } from "./vault/export.component"; -import { FolderAddEditComponent } from "./vault/folder-add-edit.component"; -import { GeneratorComponent } from "./vault/generator.component"; -import { PasswordGeneratorHistoryComponent } from "./vault/password-generator-history.component"; const BroadcasterSubscriptionId = "AppComponent"; const IdleTimeout = 60000 * 10; // 10 minutes diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index d40c9833f6..b07db465ed 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/apps/desktop/src/app/app.module.ts @@ -61,13 +61,30 @@ import { NgModule } from "@angular/core"; import { ColorPasswordCountPipe } from "@bitwarden/angular/pipes/color-password-count.pipe"; import { ColorPasswordPipe } from "@bitwarden/angular/pipes/color-password.pipe"; +import { CollectionsComponent } from "../app/vault/collections.component"; +import { ExportComponent } from "../app/vault/export.component"; +import { GeneratorComponent } from "../app/vault/generator.component"; +import { PasswordGeneratorHistoryComponent } from "../app/vault/password-generator-history.component"; +import { PremiumComponent } from "../vault/app/accounts/premium.component"; +import { PasswordRepromptComponent } from "../vault/app/components/password-reprompt.component"; +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 { 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"; +import { VaultFilterModule } from "../vault/app/vault/vault-filter/vault-filter.module"; +import { VaultItemsComponent } from "../vault/app/vault/vault-items.component"; +import { VaultComponent } from "../vault/app/vault/vault.component"; +import { ViewCustomFieldsComponent } from "../vault/app/vault/view-custom-fields.component"; +import { ViewComponent } from "../vault/app/vault/view.component"; + import { AccessibilityCookieComponent } from "./accounts/accessibility-cookie.component"; import { DeleteAccountComponent } from "./accounts/delete-account.component"; import { EnvironmentComponent } from "./accounts/environment.component"; import { HintComponent } from "./accounts/hint.component"; import { LockComponent } from "./accounts/lock.component"; import { LoginComponent } from "./accounts/login.component"; -import { PremiumComponent } from "./accounts/premium.component"; import { RegisterComponent } from "./accounts/register.component"; import { RemovePasswordComponent } from "./accounts/remove-password.component"; import { SetPasswordComponent } from "./accounts/set-password.component"; @@ -79,7 +96,6 @@ import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.com import { VaultTimeoutInputComponent } from "./accounts/vault-timeout-input.component"; import { AppRoutingModule } from "./app-routing.module"; import { AppComponent } from "./app.component"; -import { PasswordRepromptComponent } from "./components/password-reprompt.component"; import { SetPinComponent } from "./components/set-pin.component"; import { UserVerificationComponent } from "./components/user-verification.component"; import { AccountSwitcherComponent } from "./layout/account-switcher.component"; @@ -90,21 +106,6 @@ import { AddEditComponent as SendAddEditComponent } from "./send/add-edit.compon import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component"; import { SendComponent } from "./send/send.component"; import { SharedModule } from "./shared/shared.module"; -import { AddEditCustomFieldsComponent } from "./vault/add-edit-custom-fields.component"; -import { AddEditComponent } from "./vault/add-edit.component"; -import { AttachmentsComponent } from "./vault/attachments.component"; -import { CollectionsComponent } from "./vault/collections.component"; -import { ExportComponent } from "./vault/export.component"; -import { FolderAddEditComponent } from "./vault/folder-add-edit.component"; -import { GeneratorComponent } from "./vault/generator.component"; -import { PasswordGeneratorHistoryComponent } from "./vault/password-generator-history.component"; -import { PasswordHistoryComponent } from "./vault/password-history.component"; -import { ShareComponent } from "./vault/share.component"; -import { VaultFilterModule } from "./vault/vault-filter/vault-filter.module"; -import { VaultItemsComponent } from "./vault/vault-items.component"; -import { VaultComponent } from "./vault/vault.component"; -import { ViewCustomFieldsComponent } from "./vault/view-custom-fields.component"; -import { ViewComponent } from "./vault/view.component"; registerLocaleData(localeAf, "af"); registerLocaleData(localeAr, "ar"); diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts index fd29631ab4..b5158b5588 100644 --- a/apps/desktop/src/app/services/init.service.ts +++ b/apps/desktop/src/app/services/init.service.ts @@ -10,12 +10,12 @@ import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstrac import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; -import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service"; import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { ContainerService } from "@bitwarden/common/services/container.service"; import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; +import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { I18nService } from "../../services/i18n.service"; import { NativeMessagingService } from "../../services/native-messaging.service"; diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index 28d27a9ce2..bb6887a0ca 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -13,7 +13,6 @@ import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services. import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/abstractions/auth.service"; import { BroadcasterService as BroadcasterServiceAbstraction } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/abstractions/cipher.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"; @@ -26,7 +25,6 @@ import { import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/abstractions/login.service"; import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.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"; @@ -39,6 +37,8 @@ import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { LoginService } from "@bitwarden/common/services/login.service"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { SystemService } from "@bitwarden/common/services/system.service"; +import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { Account } from "../../models/account"; import { ElectronCryptoService } from "../../services/electron-crypto.service"; @@ -51,8 +51,8 @@ import { EncryptedMessageHandlerService } from "../../services/encrypted-message import { I18nService } from "../../services/i18n.service"; import { NativeMessageHandlerService } from "../../services/native-message-handler.service"; import { NativeMessagingService } from "../../services/native-messaging.service"; -import { PasswordRepromptService } from "../../services/password-reprompt.service"; import { StateService } from "../../services/state.service"; +import { PasswordRepromptService } from "../../vault/services/password-reprompt.service"; import { LoginGuard } from "../guards/login.guard"; import { SearchBarService } from "../layout/search/search-bar.service"; diff --git a/apps/desktop/src/app/vault/collections.component.ts b/apps/desktop/src/app/vault/collections.component.ts index 4b53f4d868..56beb83cfe 100644 --- a/apps/desktop/src/app/vault/collections.component.ts +++ b/apps/desktop/src/app/vault/collections.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/components/collections.component"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ selector: "app-vault-collections", diff --git a/apps/desktop/src/services/encrypted-message-handler.service.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts index 5f45118768..57550c9bc0 100644 --- a/apps/desktop/src/services/encrypted-message-handler.service.ts +++ b/apps/desktop/src/services/encrypted-message-handler.service.ts @@ -1,16 +1,16 @@ import { firstValueFrom } from "rxjs"; import { AuthService } from "@bitwarden/common/abstractions/auth.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; -import { LoginView } from "@bitwarden/common/models/view/login.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; import { DecryptedCommandData } from "../models/native-messaging/decrypted-command-data"; import { CredentialCreatePayload } from "../models/native-messaging/encrypted-message-payloads/credential-create-payload"; diff --git a/apps/desktop/src/app/accounts/premium.component.html b/apps/desktop/src/vault/app/accounts/premium.component.html similarity index 100% rename from apps/desktop/src/app/accounts/premium.component.html rename to apps/desktop/src/vault/app/accounts/premium.component.html diff --git a/apps/desktop/src/app/accounts/premium.component.ts b/apps/desktop/src/vault/app/accounts/premium.component.ts similarity index 94% rename from apps/desktop/src/app/accounts/premium.component.ts rename to apps/desktop/src/vault/app/accounts/premium.component.ts index c18584b0eb..c8c4710006 100644 --- a/apps/desktop/src/app/accounts/premium.component.ts +++ b/apps/desktop/src/vault/app/accounts/premium.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/components/premium.component"; +import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/vault/components/premium.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; diff --git a/apps/desktop/src/app/components/password-reprompt.component.html b/apps/desktop/src/vault/app/components/password-reprompt.component.html similarity index 100% rename from apps/desktop/src/app/components/password-reprompt.component.html rename to apps/desktop/src/vault/app/components/password-reprompt.component.html diff --git a/apps/browser/src/popup/components/password-reprompt.component.ts b/apps/desktop/src/vault/app/components/password-reprompt.component.ts similarity index 76% rename from apps/browser/src/popup/components/password-reprompt.component.ts rename to apps/desktop/src/vault/app/components/password-reprompt.component.ts index ef72c8a7a1..f63da5ed48 100644 --- a/apps/browser/src/popup/components/password-reprompt.component.ts +++ b/apps/desktop/src/vault/app/components/password-reprompt.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/components/password-reprompt.component"; +import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/vault/components/password-reprompt.component"; @Component({ templateUrl: "password-reprompt.component.html", diff --git a/apps/desktop/src/app/vault/add-edit-custom-fields.component.html b/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.html similarity index 100% rename from apps/desktop/src/app/vault/add-edit-custom-fields.component.html rename to apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.html diff --git a/apps/browser/src/popup/vault/add-edit-custom-fields.component.ts b/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.ts similarity index 87% rename from apps/browser/src/popup/vault/add-edit-custom-fields.component.ts rename to apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.ts index 44f9e9539a..517e5016c6 100644 --- a/apps/browser/src/popup/vault/add-edit-custom-fields.component.ts +++ b/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/components/add-edit-custom-fields.component"; +import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/vault/components/add-edit-custom-fields.component"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; diff --git a/apps/desktop/src/app/vault/add-edit.component.html b/apps/desktop/src/vault/app/vault/add-edit.component.html similarity index 100% rename from apps/desktop/src/app/vault/add-edit.component.html rename to apps/desktop/src/vault/app/vault/add-edit.component.html diff --git a/apps/desktop/src/app/vault/add-edit.component.ts b/apps/desktop/src/vault/app/vault/add-edit.component.ts similarity index 91% rename from apps/desktop/src/app/vault/add-edit.component.ts rename to apps/desktop/src/vault/app/vault/add-edit.component.ts index 3cf9475b6b..ab53f91ca4 100644 --- a/apps/desktop/src/app/vault/add-edit.component.ts +++ b/apps/desktop/src/vault/app/vault/add-edit.component.ts @@ -1,21 +1,21 @@ import { Component, NgZone, OnChanges, OnDestroy, ViewChild } from "@angular/core"; import { NgForm } from "@angular/forms"; -import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/add-edit.component"; +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 { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.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 { 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"; const BroadcasterSubscriptionId = "AddEditComponent"; diff --git a/apps/desktop/src/app/vault/attachments.component.html b/apps/desktop/src/vault/app/vault/attachments.component.html similarity index 100% rename from apps/desktop/src/app/vault/attachments.component.html rename to apps/desktop/src/vault/app/vault/attachments.component.html diff --git a/apps/desktop/src/app/vault/attachments.component.ts b/apps/desktop/src/vault/app/vault/attachments.component.ts similarity index 90% rename from apps/desktop/src/app/vault/attachments.component.ts rename to apps/desktop/src/vault/app/vault/attachments.component.ts index 40a3f619ee..6f6e546767 100644 --- a/apps/desktop/src/app/vault/attachments.component.ts +++ b/apps/desktop/src/vault/app/vault/attachments.component.ts @@ -1,14 +1,14 @@ import { Component } from "@angular/core"; -import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/components/attachments.component"; +import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/vault/components/attachments.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ selector: "app-vault-attachments", diff --git a/apps/desktop/src/app/vault/folder-add-edit.component.html b/apps/desktop/src/vault/app/vault/folder-add-edit.component.html similarity index 100% rename from apps/desktop/src/app/vault/folder-add-edit.component.html rename to apps/desktop/src/vault/app/vault/folder-add-edit.component.html diff --git a/apps/desktop/src/app/vault/folder-add-edit.component.ts b/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts similarity index 73% rename from apps/desktop/src/app/vault/folder-add-edit.component.ts rename to apps/desktop/src/vault/app/vault/folder-add-edit.component.ts index a014389577..08863c9ecf 100644 --- a/apps/desktop/src/app/vault/folder-add-edit.component.ts +++ b/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; -import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/components/folder-add-edit.component"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; +import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/vault/components/folder-add-edit.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 { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; +import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; @Component({ selector: "app-folder-add-edit", diff --git a/apps/desktop/src/app/vault/password-history.component.html b/apps/desktop/src/vault/app/vault/password-history.component.html similarity index 100% rename from apps/desktop/src/app/vault/password-history.component.html rename to apps/desktop/src/vault/app/vault/password-history.component.html diff --git a/apps/desktop/src/app/vault/password-history.component.ts b/apps/desktop/src/vault/app/vault/password-history.component.ts similarity index 80% rename from apps/desktop/src/app/vault/password-history.component.ts rename to apps/desktop/src/vault/app/vault/password-history.component.ts index 0413e9f67a..e52236a0c0 100644 --- a/apps/desktop/src/app/vault/password-history.component.ts +++ b/apps/desktop/src/vault/app/vault/password-history.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; -import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/components/password-history.component"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/vault/components/password-history.component"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ selector: "app-password-history", diff --git a/apps/desktop/src/app/vault/share.component.html b/apps/desktop/src/vault/app/vault/share.component.html similarity index 100% rename from apps/desktop/src/app/vault/share.component.html rename to apps/desktop/src/vault/app/vault/share.component.html diff --git a/apps/desktop/src/app/vault/share.component.ts b/apps/desktop/src/vault/app/vault/share.component.ts similarity index 93% rename from apps/desktop/src/app/vault/share.component.ts rename to apps/desktop/src/vault/app/vault/share.component.ts index 3b0eb9ad49..f11a7537d9 100644 --- a/apps/desktop/src/app/vault/share.component.ts +++ b/apps/desktop/src/vault/app/vault/share.component.ts @@ -2,12 +2,12 @@ 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 { CipherService } from "@bitwarden/common/abstractions/cipher.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 { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ selector: "app-vault-share", diff --git a/apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.html similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.html rename to apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.html diff --git a/apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.ts similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.ts rename to apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.ts diff --git a/apps/desktop/src/app/vault/vault-filter/filters/status-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.html similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/filters/status-filter.component.html rename to apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.html diff --git a/apps/desktop/src/app/vault/vault-filter/filters/status-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.ts similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/filters/status-filter.component.ts rename to apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.ts diff --git a/apps/desktop/src/app/vault/vault-filter/filters/type-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/filters/type-filter.component.html rename to apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html diff --git a/apps/desktop/src/app/vault/vault-filter/filters/type-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/filters/type-filter.component.ts rename to apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts diff --git a/apps/desktop/src/app/vault/vault-filter/vault-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.html similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/vault-filter.component.html rename to apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.html diff --git a/apps/desktop/src/app/vault/vault-filter/vault-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.ts similarity index 100% rename from apps/desktop/src/app/vault/vault-filter/vault-filter.component.ts rename to apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.ts diff --git a/apps/desktop/src/app/vault/vault-filter/vault-filter.module.ts b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts similarity index 76% rename from apps/desktop/src/app/vault/vault-filter/vault-filter.module.ts rename to apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts index 996bdf807a..9b9f0ab342 100644 --- a/apps/desktop/src/app/vault/vault-filter/vault-filter.module.ts +++ b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts @@ -1,13 +1,14 @@ import { NgModule } from "@angular/core"; import { BrowserModule } from "@angular/platform-browser"; -import { DeprecatedVaultFilterService as DeprecatedVaultFilterServiceAbstraction } from "@bitwarden/angular/abstractions/deprecated-vault-filter.service"; 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 "./filters/collection-filter.component"; +import { CollectionFilterComponent } from "../../../../app/vault/vault-filter/filters/collection-filter.component"; +import { OrganizationFilterComponent } from "../../../../app/vault/vault-filter/filters/organization-filter.component"; + import { FolderFilterComponent } from "./filters/folder-filter.component"; -import { OrganizationFilterComponent } from "./filters/organization-filter.component"; import { StatusFilterComponent } from "./filters/status-filter.component"; import { TypeFilterComponent } from "./filters/type-filter.component"; import { VaultFilterComponent } from "./vault-filter.component"; diff --git a/apps/desktop/src/app/vault/vault-items.component.html b/apps/desktop/src/vault/app/vault/vault-items.component.html similarity index 100% rename from apps/desktop/src/app/vault/vault-items.component.html rename to apps/desktop/src/vault/app/vault/vault-items.component.html diff --git a/apps/desktop/src/app/vault/vault-items.component.ts b/apps/desktop/src/vault/app/vault/vault-items.component.ts similarity index 77% rename from apps/desktop/src/app/vault/vault-items.component.ts rename to apps/desktop/src/vault/app/vault/vault-items.component.ts index 1bd039d699..c35f773051 100644 --- a/apps/desktop/src/app/vault/vault-items.component.ts +++ b/apps/desktop/src/vault/app/vault/vault-items.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; -import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/components/vault-items.component"; +import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/vault/components/vault-items.component"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { SearchBarService } from "../layout/search/search-bar.service"; +import { SearchBarService } from "../../../app/layout/search/search-bar.service"; @Component({ selector: "app-vault-items", diff --git a/apps/desktop/src/app/vault/vault.component.html b/apps/desktop/src/vault/app/vault/vault.component.html similarity index 100% rename from apps/desktop/src/app/vault/vault.component.html rename to apps/desktop/src/vault/app/vault/vault.component.html diff --git a/apps/desktop/src/app/vault/vault.component.ts b/apps/desktop/src/vault/app/vault/vault.component.ts similarity index 96% rename from apps/desktop/src/app/vault/vault.component.ts rename to apps/desktop/src/vault/app/vault/vault.component.ts index 530e452882..7d0f48809a 100644 --- a/apps/desktop/src/app/vault/vault.component.ts +++ b/apps/desktop/src/vault/app/vault/vault.component.ts @@ -17,25 +17,25 @@ import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.s import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +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 { invokeMenu, RendererMenuItem } from "../../utils"; -import { SearchBarService } from "../layout/search/search-bar.service"; +import { SearchBarService } from "../../../app/layout/search/search-bar.service"; +import { CollectionsComponent } from "../../../app/vault/collections.component"; +import { GeneratorComponent } from "../../../app/vault/generator.component"; +import { invokeMenu, RendererMenuItem } from "../../../utils"; import { AddEditComponent } from "./add-edit.component"; import { AttachmentsComponent } from "./attachments.component"; -import { CollectionsComponent } from "./collections.component"; import { FolderAddEditComponent } from "./folder-add-edit.component"; -import { GeneratorComponent } from "./generator.component"; import { PasswordHistoryComponent } from "./password-history.component"; import { ShareComponent } from "./share.component"; import { VaultFilterComponent } from "./vault-filter/vault-filter.component"; diff --git a/apps/desktop/src/app/vault/view-custom-fields.component.html b/apps/desktop/src/vault/app/vault/view-custom-fields.component.html similarity index 100% rename from apps/desktop/src/app/vault/view-custom-fields.component.html rename to apps/desktop/src/vault/app/vault/view-custom-fields.component.html diff --git a/apps/desktop/src/app/vault/view-custom-fields.component.ts b/apps/desktop/src/vault/app/vault/view-custom-fields.component.ts similarity index 86% rename from apps/desktop/src/app/vault/view-custom-fields.component.ts rename to apps/desktop/src/vault/app/vault/view-custom-fields.component.ts index 3ea41db713..249f83c444 100644 --- a/apps/desktop/src/app/vault/view-custom-fields.component.ts +++ b/apps/desktop/src/vault/app/vault/view-custom-fields.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/components/view-custom-fields.component"; +import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/vault/components/view-custom-fields.component"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; @Component({ diff --git a/apps/desktop/src/app/vault/view.component.html b/apps/desktop/src/vault/app/vault/view.component.html similarity index 100% rename from apps/desktop/src/app/vault/view.component.html rename to apps/desktop/src/vault/app/vault/view.component.html diff --git a/apps/desktop/src/app/vault/view.component.ts b/apps/desktop/src/vault/app/vault/view.component.ts similarity index 90% rename from apps/desktop/src/app/vault/view.component.ts rename to apps/desktop/src/vault/app/vault/view.component.ts index 70f55d400a..b409addd51 100644 --- a/apps/desktop/src/app/vault/view.component.ts +++ b/apps/desktop/src/vault/app/vault/view.component.ts @@ -7,24 +7,24 @@ import { Output, } from "@angular/core"; -import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/components/view.component"; +import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/components/view.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherView } from "@bitwarden/common/models/view/cipher.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"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; const BroadcasterSubscriptionId = "ViewComponent"; diff --git a/apps/desktop/src/services/password-reprompt.service.ts b/apps/desktop/src/vault/services/password-reprompt.service.ts similarity index 82% rename from apps/desktop/src/services/password-reprompt.service.ts rename to apps/desktop/src/vault/services/password-reprompt.service.ts index fc0ed81585..ebff838d5c 100644 --- a/apps/desktop/src/services/password-reprompt.service.ts +++ b/apps/desktop/src/vault/services/password-reprompt.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/services/passwordReprompt.service"; +import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/vault/services/password-reprompt.service"; import { PasswordRepromptComponent } from "../app/components/password-reprompt.component"; diff --git a/apps/web/src/app/accounts/set-password.component.ts b/apps/web/src/app/accounts/set-password.component.ts index 2e6deb2f5f..4046d3d087 100644 --- a/apps/web/src/app/accounts/set-password.component.ts +++ b/apps/web/src/app/accounts/set-password.component.ts @@ -13,7 +13,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "app-set-password", diff --git a/apps/web/src/app/accounts/trial-initiation/billing.component.ts b/apps/web/src/app/accounts/trial-initiation/billing.component.ts index 0817c19c26..b75258e6c9 100644 --- a/apps/web/src/app/accounts/trial-initiation/billing.component.ts +++ b/apps/web/src/app/accounts/trial-initiation/billing.component.ts @@ -11,8 +11,8 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { ProductType } from "@bitwarden/common/enums/productType"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { OrganizationPlansComponent } from "../../settings/organization-plans.component"; diff --git a/apps/web/src/app/accounts/update-temp-password.component.ts b/apps/web/src/app/accounts/update-temp-password.component.ts index 1bdc2b3bec..12a087d6b6 100644 --- a/apps/web/src/app/accounts/update-temp-password.component.ts +++ b/apps/web/src/app/accounts/update-temp-password.component.ts @@ -10,7 +10,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "app-update-temp-password", diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts index 12f499a01c..b9dac0c6db 100644 --- a/apps/web/src/app/app.component.ts +++ b/apps/web/src/app/app.component.ts @@ -9,11 +9,9 @@ import Swal from "sweetalert2"; import { AuthService } from "@bitwarden/common/abstractions/auth.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; @@ -23,8 +21,10 @@ import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/pol 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +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 { diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts index 8a37e5f44a..4b30a37ff5 100644 --- a/apps/web/src/app/core/core.module.ts +++ b/apps/web/src/app/core/core.module.ts @@ -15,7 +15,6 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/abstractions/login.service"; import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service"; @@ -23,6 +22,11 @@ import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.s import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { LoginService } from "@bitwarden/common/services/login.service"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; + +// TODO refine elsint rule for **/app/core/* +// eslint-disable-next-line no-restricted-imports +import { PasswordRepromptService } from "../../vault/app/core/password-reprompt.service"; import { BroadcasterMessagingService } from "./broadcaster-messaging.service"; import { EventService } from "./event.service"; @@ -30,7 +34,6 @@ import { HtmlStorageService } from "./html-storage.service"; import { I18nService } from "./i18n.service"; import { InitService } from "./init.service"; import { ModalService } from "./modal.service"; -import { PasswordRepromptService } from "./password-reprompt.service"; import { PolicyListService } from "./policy-list.service"; import { RouterService } from "./router.service"; import { Account, GlobalState, StateService } from "./state"; diff --git a/apps/web/src/app/core/state/state.service.ts b/apps/web/src/app/core/state/state.service.ts index 0b7a56790f..d2fcb55a10 100644 --- a/apps/web/src/app/core/state/state.service.ts +++ b/apps/web/src/app/core/state/state.service.ts @@ -13,12 +13,12 @@ import { AbstractStorageService, } from "@bitwarden/common/abstractions/storage.service"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { CipherData } from "@bitwarden/common/models/data/cipher.data"; import { CollectionData } from "@bitwarden/common/models/data/collection.data"; -import { FolderData } from "@bitwarden/common/models/data/folder.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"; +import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; +import { FolderData } from "@bitwarden/common/vault/models/data/folder.data"; import { Account } from "./account"; import { GlobalState } from "./global-state"; diff --git a/apps/web/src/app/layouts/navbar.component.ts b/apps/web/src/app/layouts/navbar.component.ts index aae5c516da..3fbcfc3e2b 100644 --- a/apps/web/src/app/layouts/navbar.component.ts +++ b/apps/web/src/app/layouts/navbar.component.ts @@ -10,10 +10,10 @@ import { } 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TokenService } from "@bitwarden/common/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"; @Component({ selector: "app-navbar", diff --git a/apps/web/src/app/organizations/guards/org-permissions.guard.spec.ts b/apps/web/src/app/organizations/guards/org-permissions.guard.spec.ts index 350f3879f0..64295fdebb 100644 --- a/apps/web/src/app/organizations/guards/org-permissions.guard.spec.ts +++ b/apps/web/src/app/organizations/guards/org-permissions.guard.spec.ts @@ -9,9 +9,9 @@ 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; import { Organization } from "@bitwarden/common/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/organizations/guards/org-permissions.guard.ts index 594c1d04b8..8cad346acc 100644 --- a/apps/web/src/app/organizations/guards/org-permissions.guard.ts +++ b/apps/web/src/app/organizations/guards/org-permissions.guard.ts @@ -7,8 +7,8 @@ import { OrganizationService, } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { Organization } from "@bitwarden/common/models/domain/organization"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Injectable({ providedIn: "root", diff --git a/apps/web/src/app/organizations/members/people.component.ts b/apps/web/src/app/organizations/members/people.component.ts index 5918538e4c..97cadf3a6c 100644 --- a/apps/web/src/app/organizations/members/people.component.ts +++ b/apps/web/src/app/organizations/members/people.component.ts @@ -22,7 +22,6 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; @@ -34,6 +33,7 @@ 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 { DialogService, SimpleDialogCloseType, diff --git a/apps/web/src/app/organizations/settings/delete-organization.component.ts b/apps/web/src/app/organizations/settings/delete-organization.component.ts index 1857a94f4c..279d2f3289 100644 --- a/apps/web/src/app/organizations/settings/delete-organization.component.ts +++ b/apps/web/src/app/organizations/settings/delete-organization.component.ts @@ -1,16 +1,16 @@ import { Component, EventEmitter, OnInit, Output } from "@angular/core"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { Verification } from "@bitwarden/common/types/verification"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; class CountBasedLocalizationKey { singular: string; diff --git a/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts index b0db38a850..0b7e291583 100644 --- a/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts +++ b/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts @@ -8,13 +8,13 @@ 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; import { PlanSponsorshipType } from "@bitwarden/common/enums/planSponsorshipType"; import { PlanType } from "@bitwarden/common/enums/planType"; 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 { DeleteOrganizationComponent } from "../../organizations/settings"; import { OrganizationPlansComponent } from "../../settings/organization-plans.component"; diff --git a/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts b/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts index 703ac038d7..ecc49e41fa 100644 --- a/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts +++ b/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts @@ -3,12 +3,12 @@ import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +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"; diff --git a/apps/web/src/app/organizations/tools/import-export/org-import-export.module.ts b/apps/web/src/app/organizations/tools/import-export/org-import-export.module.ts index 3140050262..8429ea983a 100644 --- a/apps/web/src/app/organizations/tools/import-export/org-import-export.module.ts +++ b/apps/web/src/app/organizations/tools/import-export/org-import-export.module.ts @@ -1,15 +1,15 @@ import { NgModule } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { 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"; diff --git a/apps/web/src/app/organizations/tools/import-export/org-import.component.ts b/apps/web/src/app/organizations/tools/import-export/org-import.component.ts index cf1935c85f..d30e411b3a 100644 --- a/apps/web/src/app/organizations/tools/import-export/org-import.component.ts +++ b/apps/web/src/app/organizations/tools/import-export/org-import.component.ts @@ -8,7 +8,7 @@ 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { ImportComponent } from "../../../tools/import-export/import.component"; diff --git a/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts b/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts index 5b6c3be08d..69b3b9b6a6 100644 --- a/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts @@ -2,12 +2,12 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; -import { CipherView } from "@bitwarden/common/models/view/cipher.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"; // eslint-disable-next-line no-restricted-imports import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../../reports/pages/inactive-two-factor-report.component"; diff --git a/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts b/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts index 1c43c7f748..00526b5154 100644 --- a/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts +++ b/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts @@ -2,13 +2,13 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +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"; diff --git a/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts b/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts index a2d46e6ae2..524947533a 100644 --- a/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts +++ b/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts @@ -2,11 +2,11 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; -import { CipherView } from "@bitwarden/common/models/view/cipher.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"; // eslint-disable-next-line no-restricted-imports import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../../reports/pages/unsecured-websites-report.component"; diff --git a/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts b/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts index ccf6bfb5e0..ea0c336526 100644 --- a/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts +++ b/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts @@ -2,13 +2,13 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +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 { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../../reports/pages/weak-passwords-report.component"; diff --git a/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts b/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts index 1b117636fa..d47e73baac 100644 --- a/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts +++ b/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts @@ -9,11 +9,11 @@ import { OrganizationUserService } from "@bitwarden/common/abstractions/organiza import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { Utils } from "@bitwarden/common/misc/utils"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { Verification } from "@bitwarden/common/types/verification"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "app-enroll-master-password-reset", diff --git a/apps/web/src/app/organizations/vault/add-edit.component.ts b/apps/web/src/app/organizations/vault/add-edit.component.ts index 6a03696c2e..5f05840c82 100644 --- a/apps/web/src/app/organizations/vault/add-edit.component.ts +++ b/apps/web/src/app/organizations/vault/add-edit.component.ts @@ -2,30 +2,30 @@ import { Component } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.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 { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherData } from "@bitwarden/common/models/data/cipher.data"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherCreateRequest } from "@bitwarden/common/models/request/cipher-create.request"; -import { CipherRequest } from "@bitwarden/common/models/request/cipher.request"; +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"; +import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; +import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; +import { CipherCreateRequest } from "@bitwarden/common/vault/models/request/cipher-create.request"; +import { CipherRequest } from "@bitwarden/common/vault/models/request/cipher.request"; -import { AddEditComponent as BaseAddEditComponent } from "../../vault/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "../../../vault/app/vault/add-edit.component"; @Component({ selector: "app-org-vault-add-edit", - templateUrl: "../../vault/add-edit.component.html", + templateUrl: "../../../vault/app/vault/add-edit.component.html", }) export class AddEditComponent extends BaseAddEditComponent { originalCipher: Cipher = null; diff --git a/apps/web/src/app/organizations/vault/attachments.component.ts b/apps/web/src/app/organizations/vault/attachments.component.ts index 79ed8e67b8..720c08bee5 100644 --- a/apps/web/src/app/organizations/vault/attachments.component.ts +++ b/apps/web/src/app/organizations/vault/attachments.component.ts @@ -1,23 +1,23 @@ import { Component } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { CipherData } from "@bitwarden/common/models/data/cipher.data"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; +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 { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view"; -import { AttachmentsComponent as BaseAttachmentsComponent } from "../../vault/attachments.component"; +import { AttachmentsComponent as BaseAttachmentsComponent } from "../../../vault/app/vault/attachments.component"; @Component({ selector: "app-org-vault-attachments", - templateUrl: "../../vault/attachments.component.html", + templateUrl: "../../../vault/app/vault/attachments.component.html", }) export class AttachmentsComponent extends BaseAttachmentsComponent { viewOnly = false; diff --git a/apps/web/src/app/organizations/vault/collection-badge/collection-badge.module.ts b/apps/web/src/app/organizations/vault/collection-badge/collection-badge.module.ts index fdaf76bbf9..5f1a21fdc2 100644 --- a/apps/web/src/app/organizations/vault/collection-badge/collection-badge.module.ts +++ b/apps/web/src/app/organizations/vault/collection-badge/collection-badge.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; +import { PipesModule } from "../../../../vault/app/vault/pipes/pipes.module"; import { SharedModule } from "../../../shared"; -import { PipesModule } from "../../../vault/pipes/pipes.module"; import { CollectionNameBadgeComponent } from "./collection-name.badge.component"; diff --git a/apps/web/src/app/organizations/vault/collections.component.ts b/apps/web/src/app/organizations/vault/collections.component.ts index 59fb4c8d15..e78f54aa68 100644 --- a/apps/web/src/app/organizations/vault/collections.component.ts +++ b/apps/web/src/app/organizations/vault/collections.component.ts @@ -1,21 +1,21 @@ import { Component } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CipherData } from "@bitwarden/common/models/data/cipher.data"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherCollectionsRequest } from "@bitwarden/common/models/request/cipher-collections.request"; +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/collections.component"; +import { CollectionsComponent as BaseCollectionsComponent } from "../../../vault/app/vault/collections.component"; @Component({ selector: "app-org-vault-collections", - templateUrl: "../../vault/collections.component.html", + templateUrl: "../../../vault/app/vault/collections.component.html", }) export class CollectionsComponent extends BaseCollectionsComponent { organization: Organization; diff --git a/apps/web/src/app/organizations/vault/group-badge/group-badge.module.ts b/apps/web/src/app/organizations/vault/group-badge/group-badge.module.ts index 9e997c97da..d243d50efc 100644 --- a/apps/web/src/app/organizations/vault/group-badge/group-badge.module.ts +++ b/apps/web/src/app/organizations/vault/group-badge/group-badge.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; +import { PipesModule } from "../../../../vault/app/vault/pipes/pipes.module"; import { SharedModule } from "../../../shared"; -import { PipesModule } from "../../../vault/pipes/pipes.module"; import { GroupNameBadgeComponent } from "./group-name-badge.component"; diff --git a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.component.ts b/apps/web/src/app/organizations/vault/vault-filter/vault-filter.component.ts index 5a2fa97ab1..44f53203b3 100644 --- a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.component.ts +++ b/apps/web/src/app/organizations/vault/vault-filter/vault-filter.component.ts @@ -5,16 +5,16 @@ 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 { VaultFilterComponent as BaseVaultFilterComponent } from "../../../vault/vault-filter/components/vault-filter.component"; +import { VaultFilterComponent as BaseVaultFilterComponent } from "../../../../vault/app/vault/vault-filter/components/vault-filter.component"; import { VaultFilterList, VaultFilterType, -} from "../../../vault/vault-filter/shared/models/vault-filter-section.type"; -import { CollectionFilter } from "../../../vault/vault-filter/shared/models/vault-filter.type"; +} from "../../../../vault/app/vault/vault-filter/shared/models/vault-filter-section.type"; +import { CollectionFilter } from "../../../../vault/app/vault/vault-filter/shared/models/vault-filter.type"; @Component({ selector: "app-organization-vault-filter", - templateUrl: "../../../vault/vault-filter/components/vault-filter.component.html", + templateUrl: "../../../../vault/app/vault/vault-filter/components/vault-filter.component.html", }) export class VaultFilterComponent extends BaseVaultFilterComponent implements OnInit, OnDestroy { @Input() set organization(value: Organization) { diff --git a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.module.ts b/apps/web/src/app/organizations/vault/vault-filter/vault-filter.module.ts index 04f08d8546..9bc5bdb2ee 100644 --- a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.module.ts +++ b/apps/web/src/app/organizations/vault/vault-filter/vault-filter.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; -import { VaultFilterService as VaultFilterServiceAbstraction } from "../../../vault/vault-filter/services/abstractions/vault-filter.service"; -import { VaultFilterSharedModule } from "../../../vault/vault-filter/shared/vault-filter-shared.module"; +import { VaultFilterService as VaultFilterServiceAbstraction } from "../../../../vault/app/vault/vault-filter/services/abstractions/vault-filter.service"; +import { VaultFilterSharedModule } from "../../../../vault/app/vault/vault-filter/shared/vault-filter-shared.module"; import { VaultFilterComponent } from "./vault-filter.component"; import { VaultFilterService } from "./vault-filter.service"; diff --git a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.service.ts b/apps/web/src/app/organizations/vault/vault-filter/vault-filter.service.ts index 737ac43125..49f2c0518e 100644 --- a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.service.ts +++ b/apps/web/src/app/organizations/vault/vault-filter/vault-filter.service.ts @@ -1,9 +1,7 @@ import { Injectable, OnDestroy } from "@angular/core"; import { filter, map, Observable, ReplaySubject, Subject, switchMap, takeUntil } from "rxjs"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { canAccessVaultTab, @@ -13,9 +11,11 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Organization } from "@bitwarden/common/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"; -import { VaultFilterService as BaseVaultFilterService } from "../../../vault/vault-filter/services/vault-filter.service"; -import { CollectionFilter } from "../../../vault/vault-filter/shared/models/vault-filter.type"; +import { VaultFilterService as BaseVaultFilterService } from "../../../../vault/app/vault/vault-filter/services/vault-filter.service"; +import { CollectionFilter } from "../../../../vault/app/vault/vault-filter/shared/models/vault-filter.type"; import { CollectionAdminView } from "../../core"; import { CollectionAdminService } from "../../core/services/collection-admin.service"; diff --git a/apps/web/src/app/organizations/vault/vault-items.component.ts b/apps/web/src/app/organizations/vault/vault-items.component.ts index 0a5a1a939f..3417a7f055 100644 --- a/apps/web/src/app/organizations/vault/vault-items.component.ts +++ b/apps/web/src/app/organizations/vault/vault-items.component.ts @@ -3,12 +3,10 @@ import { lastValueFrom } from "rxjs"; import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; @@ -16,20 +14,22 @@ import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; 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 { BulkDeleteDialogResult, openBulkDeleteDialog, -} from "../../vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component"; -import { VaultFilterService } from "../../vault/vault-filter/services/abstractions/vault-filter.service"; -import { CollectionFilter } from "../../vault/vault-filter/shared/models/vault-filter.type"; +} from "../../../vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component"; +import { VaultFilterService } from "../../../vault/app/vault/vault-filter/services/abstractions/vault-filter.service"; +import { CollectionFilter } from "../../../vault/app/vault/vault-filter/shared/models/vault-filter.type"; import { VaultItemRow, VaultItemsComponent as BaseVaultItemsComponent, -} from "../../vault/vault-items.component"; +} from "../../../vault/app/vault/vault-items.component"; import { CollectionAdminView } from "../core"; import { GroupService } from "../core/services/group/group.service"; import { @@ -42,7 +42,7 @@ const MaxCheckedCount = 500; @Component({ selector: "app-org-vault-items", - templateUrl: "../../vault/vault-items.component.html", + templateUrl: "../../../vault/app/vault/vault-items.component.html", }) export class VaultItemsComponent extends BaseVaultItemsComponent implements OnDestroy { @Input() set initOrganization(value: Organization) { diff --git a/apps/web/src/app/organizations/vault/vault.component.ts b/apps/web/src/app/organizations/vault/vault.component.ts index e3e6fbc741..b30b6ad349 100644 --- a/apps/web/src/app/organizations/vault/vault.component.ts +++ b/apps/web/src/app/organizations/vault/vault.component.ts @@ -13,17 +13,17 @@ import { first, switchMap, takeUntil } from "rxjs/operators"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; 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 { CipherView } from "@bitwarden/common/models/view/cipher.view"; +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, SimpleDialogCloseType, @@ -31,9 +31,9 @@ import { SimpleDialogType, } from "@bitwarden/components"; -import { VaultFilterService } from "../../vault/vault-filter/services/abstractions/vault-filter.service"; -import { VaultFilter } from "../../vault/vault-filter/shared/models/vault-filter.model"; -import { CollectionFilter } from "../../vault/vault-filter/shared/models/vault-filter.type"; +import { VaultFilterService } from "../../../vault/app/vault/vault-filter/services/abstractions/vault-filter.service"; +import { VaultFilter } from "../../../vault/app/vault/vault-filter/shared/models/vault-filter.model"; +import { CollectionFilter } from "../../../vault/app/vault/vault-filter/shared/models/vault-filter.type"; import { CollectionAdminService } from "../core"; import { EntityEventsComponent } from "../manage/entity-events.component"; import { diff --git a/apps/web/src/app/organizations/vault/vault.module.ts b/apps/web/src/app/organizations/vault/vault.module.ts index 97db97132b..9bd25cb761 100644 --- a/apps/web/src/app/organizations/vault/vault.module.ts +++ b/apps/web/src/app/organizations/vault/vault.module.ts @@ -2,10 +2,10 @@ import { NgModule } from "@angular/core"; import { BreadcrumbsModule } from "@bitwarden/components"; +import { OrganizationBadgeModule } from "../../../vault/app/vault/organization-badge/organization-badge.module"; +import { PipesModule } from "../../../vault/app/vault/pipes/pipes.module"; import { LooseComponentsModule } from "../../shared/loose-components.module"; import { SharedModule } from "../../shared/shared.module"; -import { OrganizationBadgeModule } from "../../vault/organization-badge/organization-badge.module"; -import { PipesModule } from "../../vault/pipes/pipes.module"; import { CollectionBadgeModule } from "./collection-badge/collection-badge.module"; import { GroupBadgeModule } from "./group-badge/group-badge.module"; diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 76b81f27ea..e2e4d40f10 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -6,6 +6,7 @@ import { LockGuard } from "@bitwarden/angular/guards/lock.guard"; import { UnauthGuard } from "@bitwarden/angular/guards/unauth.guard"; import { flagEnabled, Flags } from "../utils/flags"; +import { VaultModule } from "../vault/app/vault/vault.module"; import { AcceptEmergencyComponent } from "./accounts/accept-emergency.component"; import { AcceptOrganizationComponent } from "./accounts/accept-organization.component"; @@ -45,7 +46,6 @@ import { SponsoredFamiliesComponent } from "./settings/sponsored-families.compon import { SubscriptionRoutingModule } from "./settings/subscription-routing.module"; import { GeneratorComponent } from "./tools/generator.component"; import { ToolsComponent } from "./tools/tools.component"; -import { VaultModule } from "./vault/vault.module"; const routes: Routes = [ { diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts index 457200a0e9..99887178f2 100644 --- a/apps/web/src/app/oss.module.ts +++ b/apps/web/src/app/oss.module.ts @@ -1,13 +1,14 @@ import { NgModule } from "@angular/core"; +import { OrganizationBadgeModule } from "../vault/app/vault/organization-badge/organization-badge.module"; +import { VaultFilterModule } from "../vault/app/vault/vault-filter/vault-filter.module"; + import { LoginModule } from "./accounts/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 { LooseComponentsModule, SharedModule } from "./shared"; -import { OrganizationBadgeModule } from "./vault/organization-badge/organization-badge.module"; -import { VaultFilterModule } from "./vault/vault-filter/vault-filter.module"; @NgModule({ imports: [ 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 baec67eee3..3e987360fc 100644 --- a/apps/web/src/app/reports/pages/cipher-report.component.ts +++ b/apps/web/src/app/reports/pages/cipher-report.component.ts @@ -2,13 +2,13 @@ import { Directive, ViewChild, ViewContainerRef } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +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"; +import { AddEditComponent } from "../../../vault/app/vault/add-edit.component"; import { AddEditComponent as OrgAddEditComponent } from "../../organizations/vault/add-edit.component"; -import { AddEditComponent } from "../../vault/add-edit.component"; @Directive() export class CipherReportComponent { diff --git a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts index 5f51baa002..6489c07672 100644 --- a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts @@ -2,11 +2,11 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts index 0beaa53035..3691026d27 100644 --- a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts index adcfa0ec5c..04ee658762 100644 --- a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts index 3918116c22..456e9bba83 100644 --- a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts +++ b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts index 6d78178426..e354973fca 100644 --- a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { BadgeTypes } from "@bitwarden/components"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/shared/report-card/report-card.stories.ts b/apps/web/src/app/reports/shared/report-card/report-card.stories.ts index 52aa46fe28..dc56d81829 100644 --- a/apps/web/src/app/reports/shared/report-card/report-card.stories.ts +++ b/apps/web/src/app/reports/shared/report-card/report-card.stories.ts @@ -4,7 +4,7 @@ import { Meta, Story, moduleMetadata } from "@storybook/angular"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { BadgeModule, IconModule } from "@bitwarden/components"; -import { PremiumBadgeComponent } from "../../../components/premium-badge.component"; +import { PremiumBadgeComponent } from "../../../../vault/app/components/premium-badge.component"; import { PreloadedEnglishI18nModule } from "../../../tests/preloaded-english-i18n.module"; import { ReportVariant } from "../models/report-variant"; diff --git a/apps/web/src/app/reports/shared/report-list/report-list.stories.ts b/apps/web/src/app/reports/shared/report-list/report-list.stories.ts index d1cadbd356..e04d423f0e 100644 --- a/apps/web/src/app/reports/shared/report-list/report-list.stories.ts +++ b/apps/web/src/app/reports/shared/report-list/report-list.stories.ts @@ -4,7 +4,7 @@ import { Meta, Story, moduleMetadata } from "@storybook/angular"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { BadgeModule, IconModule } from "@bitwarden/components"; -import { PremiumBadgeComponent } from "../../../components/premium-badge.component"; +import { PremiumBadgeComponent } from "../../../../vault/app/components/premium-badge.component"; import { PreloadedEnglishI18nModule } from "../../../tests/preloaded-english-i18n.module"; import { reports } from "../../reports"; import { ReportVariant } from "../models/report-variant"; diff --git a/apps/web/src/app/settings/change-password.component.ts b/apps/web/src/app/settings/change-password.component.ts index 8d0266410f..6553f8acca 100644 --- a/apps/web/src/app/settings/change-password.component.ts +++ b/apps/web/src/app/settings/change-password.component.ts @@ -4,9 +4,7 @@ import { firstValueFrom } from "rxjs"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "@bitwarden/angular/components/change-password.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; @@ -19,17 +17,19 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { EmergencyAccessStatusType } from "@bitwarden/common/enums/emergencyAccessStatusType"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { CipherWithIdRequest } from "@bitwarden/common/models/request/cipher-with-id.request"; import { EmergencyAccessUpdateRequest } from "@bitwarden/common/models/request/emergency-access-update.request"; -import { FolderWithIdRequest } from "@bitwarden/common/models/request/folder-with-id.request"; import { PasswordRequest } from "@bitwarden/common/models/request/password.request"; import { SendWithIdRequest } from "@bitwarden/common/models/request/send-with-id.request"; import { UpdateKeyRequest } from "@bitwarden/common/models/request/update-key.request"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { CipherWithIdRequest } from "@bitwarden/common/vault/models/request/cipher-with-id.request"; +import { FolderWithIdRequest } from "@bitwarden/common/vault/models/request/folder-with-id.request"; @Component({ selector: "app-change-password", diff --git a/apps/web/src/app/settings/emergency-access-attachments.component.ts b/apps/web/src/app/settings/emergency-access-attachments.component.ts index 383078e336..6830fd27b7 100644 --- a/apps/web/src/app/settings/emergency-access-attachments.component.ts +++ b/apps/web/src/app/settings/emergency-access-attachments.component.ts @@ -1,19 +1,19 @@ import { Component } from "@angular/core"; -import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/components/attachments.component"; +import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/vault/components/attachments.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view"; @Component({ selector: "emergency-access-attachments", - templateUrl: "../vault/attachments.component.html", + templateUrl: "../../vault/app/vault/attachments.component.html", }) export class EmergencyAccessAttachmentsComponent extends BaseAttachmentsComponent { viewOnly = true; diff --git a/apps/web/src/app/settings/emergency-access-view.component.ts b/apps/web/src/app/settings/emergency-access-view.component.ts index 6c314aabc3..2cf95f4d2f 100644 --- a/apps/web/src/app/settings/emergency-access-view.component.ts +++ b/apps/web/src/app/settings/emergency-access-view.component.ts @@ -3,13 +3,13 @@ import { ActivatedRoute, Router } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CipherData } from "@bitwarden/common/models/data/cipher.data"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { EmergencyAccessViewResponse } from "@bitwarden/common/models/response/emergency-access.response"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +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 { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { EmergencyAccessAttachmentsComponent } from "./emergency-access-attachments.component"; import { EmergencyAddEditComponent } from "./emergency-add-edit.component"; diff --git a/apps/web/src/app/settings/emergency-add-edit.component.ts b/apps/web/src/app/settings/emergency-add-edit.component.ts index 3e97067d6f..63e4bd17f5 100644 --- a/apps/web/src/app/settings/emergency-add-edit.component.ts +++ b/apps/web/src/app/settings/emergency-add-edit.component.ts @@ -1,27 +1,27 @@ import { Component } from "@angular/core"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.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 { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; +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"; +import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; -import { AddEditComponent as BaseAddEditComponent } from "../vault/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "../../vault/app/vault/add-edit.component"; @Component({ selector: "app-org-vault-add-edit", - templateUrl: "../vault/add-edit.component.html", + templateUrl: "../../vault/app/vault/add-edit.component.html", }) export class EmergencyAddEditComponent extends BaseAddEditComponent { originalCipher: Cipher = null; diff --git a/apps/web/src/app/settings/organization-plans.component.ts b/apps/web/src/app/settings/organization-plans.component.ts index 5c44989423..7bf5bb4733 100644 --- a/apps/web/src/app/settings/organization-plans.component.ts +++ b/apps/web/src/app/settings/organization-plans.component.ts @@ -20,7 +20,6 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; import { PlanType } from "@bitwarden/common/enums/planType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; @@ -32,6 +31,7 @@ import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organi 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"; import { TaxInfoComponent } from "./tax-info.component"; diff --git a/apps/web/src/app/settings/premium.component.ts b/apps/web/src/app/settings/premium.component.ts index 1699eeb653..0dcab671ef 100644 --- a/apps/web/src/app/settings/premium.component.ts +++ b/apps/web/src/app/settings/premium.component.ts @@ -7,8 +7,8 @@ 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TokenService } from "@bitwarden/common/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"; diff --git a/apps/web/src/app/settings/purge-vault.component.ts b/apps/web/src/app/settings/purge-vault.component.ts index 52cb89e4c6..e93e68f91e 100644 --- a/apps/web/src/app/settings/purge-vault.component.ts +++ b/apps/web/src/app/settings/purge-vault.component.ts @@ -5,9 +5,9 @@ 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { Verification } from "@bitwarden/common/types/verification"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "app-purge-vault", diff --git a/apps/web/src/app/settings/sponsored-families.component.ts b/apps/web/src/app/settings/sponsored-families.component.ts index b0cf27e963..aad04e2dd2 100644 --- a/apps/web/src/app/settings/sponsored-families.component.ts +++ b/apps/web/src/app/settings/sponsored-families.component.ts @@ -8,9 +8,9 @@ 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { PlanSponsorshipType } from "@bitwarden/common/enums/planSponsorshipType"; import { Organization } from "@bitwarden/common/models/domain/organization"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; interface RequestSponsorshipForm { selectedSponsorshipOrgId: FormControl; diff --git a/apps/web/src/app/settings/update-key.component.ts b/apps/web/src/app/settings/update-key.component.ts index 5ebd432fb4..243c3334fa 100644 --- a/apps/web/src/app/settings/update-key.component.ts +++ b/apps/web/src/app/settings/update-key.component.ts @@ -2,18 +2,18 @@ import { Component } from "@angular/core"; import { firstValueFrom } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { CipherWithIdRequest } from "@bitwarden/common/models/request/cipher-with-id.request"; -import { FolderWithIdRequest } from "@bitwarden/common/models/request/folder-with-id.request"; import { UpdateKeyRequest } from "@bitwarden/common/models/request/update-key.request"; +import { CipherWithIdRequest } from "@bitwarden/common/vault//models/request/cipher-with-id.request"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { FolderWithIdRequest } from "@bitwarden/common/vault/models/request/folder-with-id.request"; @Component({ selector: "app-update-key", diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 1cb5832bc9..f00a4359b5 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -1,5 +1,13 @@ import { NgModule } from "@angular/core"; +import { PasswordRepromptComponent } from "../../../src/vault/app/components/password-reprompt.component"; +import { PremiumBadgeComponent } from "../../vault/app/components/premium-badge.component"; +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 { ShareComponent } from "../../vault/app/vault/share.component"; import { AcceptEmergencyComponent } from "../accounts/accept-emergency.component"; import { AcceptOrganizationComponent } from "../accounts/accept-organization.component"; import { HintComponent } from "../accounts/hint.component"; @@ -18,8 +26,6 @@ import { VerifyEmailTokenComponent } from "../accounts/verify-email-token.compon import { VerifyRecoverDeleteComponent } from "../accounts/verify-recover-delete.component"; import { DynamicAvatarComponent } from "../components/dynamic-avatar.component"; import { OrganizationSwitcherComponent } from "../components/organization-switcher.component"; -import { PasswordRepromptComponent } from "../components/password-reprompt.component"; -import { PremiumBadgeComponent } from "../components/premium-badge.component"; import { SelectableAvatarComponent } from "../components/selectable-avatar.component"; import { UserVerificationPromptComponent } from "../components/user-verification-prompt.component"; import { UserVerificationComponent } from "../components/user-verification.component"; @@ -105,12 +111,6 @@ import { VerifyEmailComponent } from "../settings/verify-email.component"; import { GeneratorComponent } from "../tools/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component"; import { ToolsComponent } from "../tools/tools.component"; -import { AddEditCustomFieldsComponent } from "../vault/add-edit-custom-fields.component"; -import { AddEditComponent } from "../vault/add-edit.component"; -import { AttachmentsComponent } from "../vault/attachments.component"; -import { CollectionsComponent } from "../vault/collections.component"; -import { FolderAddEditComponent } from "../vault/folder-add-edit.component"; -import { ShareComponent } from "../vault/share.component"; import { SharedModule } from "./shared.module"; 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 1d33cb1210..1f2647a29f 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,15 +1,15 @@ import { NgModule } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { 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"; 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 98310120f9..7d96109e8d 100644 --- a/apps/web/src/app/tools/import-export/import.component.ts +++ b/apps/web/src/app/tools/import-export/import.component.ts @@ -10,10 +10,10 @@ import { ImportService } from "@bitwarden/common/abstractions/import/import.serv 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; 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"; import { FilePasswordPromptComponent } from "./file-password-prompt.component"; diff --git a/apps/web/src/app/components/password-reprompt.component.html b/apps/web/src/vault/app/components/password-reprompt.component.html similarity index 100% rename from apps/web/src/app/components/password-reprompt.component.html rename to apps/web/src/vault/app/components/password-reprompt.component.html diff --git a/apps/web/src/app/components/password-reprompt.component.ts b/apps/web/src/vault/app/components/password-reprompt.component.ts similarity index 76% rename from apps/web/src/app/components/password-reprompt.component.ts rename to apps/web/src/vault/app/components/password-reprompt.component.ts index ef72c8a7a1..f63da5ed48 100644 --- a/apps/web/src/app/components/password-reprompt.component.ts +++ b/apps/web/src/vault/app/components/password-reprompt.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/components/password-reprompt.component"; +import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/vault/components/password-reprompt.component"; @Component({ templateUrl: "password-reprompt.component.html", diff --git a/apps/web/src/app/components/premium-badge.component.ts b/apps/web/src/vault/app/components/premium-badge.component.ts similarity index 100% rename from apps/web/src/app/components/premium-badge.component.ts rename to apps/web/src/vault/app/components/premium-badge.component.ts diff --git a/apps/web/src/app/components/premium-badge.stories.ts b/apps/web/src/vault/app/components/premium-badge.stories.ts similarity index 100% rename from apps/web/src/app/components/premium-badge.stories.ts rename to apps/web/src/vault/app/components/premium-badge.stories.ts diff --git a/apps/browser/src/popup/services/password-reprompt.service.ts b/apps/web/src/vault/app/core/password-reprompt.service.ts similarity index 82% rename from apps/browser/src/popup/services/password-reprompt.service.ts rename to apps/web/src/vault/app/core/password-reprompt.service.ts index fdd176e42d..22bbcf44d7 100644 --- a/apps/browser/src/popup/services/password-reprompt.service.ts +++ b/apps/web/src/vault/app/core/password-reprompt.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/services/passwordReprompt.service"; +import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/vault/services/password-reprompt.service"; import { PasswordRepromptComponent } from "../components/password-reprompt.component"; diff --git a/apps/web/src/app/vault/add-edit-custom-fields.component.html b/apps/web/src/vault/app/vault/add-edit-custom-fields.component.html similarity index 100% rename from apps/web/src/app/vault/add-edit-custom-fields.component.html rename to apps/web/src/vault/app/vault/add-edit-custom-fields.component.html diff --git a/apps/web/src/app/vault/add-edit-custom-fields.component.ts b/apps/web/src/vault/app/vault/add-edit-custom-fields.component.ts similarity index 89% rename from apps/web/src/app/vault/add-edit-custom-fields.component.ts rename to apps/web/src/vault/app/vault/add-edit-custom-fields.component.ts index aa51edaf9b..0deb3f9c0b 100644 --- a/apps/web/src/app/vault/add-edit-custom-fields.component.ts +++ b/apps/web/src/vault/app/vault/add-edit-custom-fields.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from "@angular/core"; -import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/components/add-edit-custom-fields.component"; +import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/vault/components/add-edit-custom-fields.component"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; diff --git a/apps/web/src/app/vault/add-edit.component.html b/apps/web/src/vault/app/vault/add-edit.component.html similarity index 100% rename from apps/web/src/app/vault/add-edit.component.html rename to apps/web/src/vault/app/vault/add-edit.component.html diff --git a/apps/web/src/app/vault/add-edit.component.ts b/apps/web/src/vault/app/vault/add-edit.component.ts similarity index 93% rename from apps/web/src/app/vault/add-edit.component.ts rename to apps/web/src/vault/app/vault/add-edit.component.ts index c17009fab9..1226a9e2f5 100644 --- a/apps/web/src/app/vault/add-edit.component.ts +++ b/apps/web/src/vault/app/vault/add-edit.component.ts @@ -1,24 +1,24 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; -import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.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 { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.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"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; @Component({ selector: "app-vault-add-edit", diff --git a/apps/web/src/app/vault/attachments.component.html b/apps/web/src/vault/app/vault/attachments.component.html similarity index 100% rename from apps/web/src/app/vault/attachments.component.html rename to apps/web/src/vault/app/vault/attachments.component.html diff --git a/apps/web/src/app/vault/attachments.component.ts b/apps/web/src/vault/app/vault/attachments.component.ts similarity index 88% rename from apps/web/src/app/vault/attachments.component.ts rename to apps/web/src/vault/app/vault/attachments.component.ts index 63e1f8bf39..82930f819d 100644 --- a/apps/web/src/app/vault/attachments.component.ts +++ b/apps/web/src/vault/app/vault/attachments.component.ts @@ -1,15 +1,15 @@ import { Component } from "@angular/core"; -import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/components/attachments.component"; +import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/vault/components/attachments.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view"; @Component({ selector: "app-vault-attachments", diff --git a/apps/web/src/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html similarity index 100% rename from apps/web/src/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html rename to apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html diff --git a/apps/web/src/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts similarity index 95% rename from apps/web/src/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts rename to apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts index e4a88b18c6..66f87c3458 100644 --- a/apps/web/src/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts +++ b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts @@ -2,12 +2,12 @@ import { DialogConfig, DialogRef, DIALOG_DATA } from "@angular/cdk/dialog"; import { Component, Inject } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { CipherBulkDeleteRequest } from "@bitwarden/common/models/request/cipher-bulk-delete.request"; 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"; import { DialogService } from "@bitwarden/components"; export interface BulkDeleteDialogParams { diff --git a/apps/web/src/app/vault/bulk-action-dialogs/bulk-dialogs.module.ts b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-dialogs.module.ts similarity index 93% rename from apps/web/src/app/vault/bulk-action-dialogs/bulk-dialogs.module.ts rename to apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-dialogs.module.ts index 90d49ee58e..3fe4979c1c 100644 --- a/apps/web/src/app/vault/bulk-action-dialogs/bulk-dialogs.module.ts +++ b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-dialogs.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../shared"; +import { SharedModule } from "../../../../app/shared"; import { BulkDeleteDialogComponent } from "./bulk-delete-dialog/bulk-delete-dialog.component"; import { BulkMoveDialogComponent } from "./bulk-move-dialog/bulk-move-dialog.component"; diff --git a/apps/web/src/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html similarity index 100% rename from apps/web/src/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html rename to apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html diff --git a/apps/web/src/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts similarity index 90% rename from apps/web/src/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts rename to apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts index 99688fcdf1..5aeb987dcc 100644 --- a/apps/web/src/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts +++ b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts @@ -3,11 +3,11 @@ import { Component, Inject, OnInit } from "@angular/core"; import { FormBuilder, Validators } from "@angular/forms"; import { firstValueFrom, Observable } from "rxjs"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { FolderView } from "@bitwarden/common/models/view/folder.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"; import { DialogService } from "@bitwarden/components"; export interface BulkMoveDialogParams { diff --git a/apps/web/src/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html similarity index 100% rename from apps/web/src/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html rename to apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html diff --git a/apps/web/src/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts similarity index 95% rename from apps/web/src/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts rename to apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts index 78a47fc70c..8f25a80527 100644 --- a/apps/web/src/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts +++ b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts @@ -1,9 +1,9 @@ import { DialogConfig, DialogRef, DIALOG_DATA } from "@angular/cdk/dialog"; import { Component, Inject } from "@angular/core"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { DialogService } from "@bitwarden/components"; export interface BulkRestoreDialogParams { diff --git a/apps/web/src/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html similarity index 100% rename from apps/web/src/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html rename to apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html diff --git a/apps/web/src/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts similarity index 96% rename from apps/web/src/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts rename to apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts index 7cfe8228e7..ebb08babd6 100644 --- a/apps/web/src/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts +++ b/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts @@ -1,16 +1,16 @@ import { DialogConfig, DialogRef, DIALOG_DATA } from "@angular/cdk/dialog"; import { Component, Inject, OnInit } from "@angular/core"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; 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"; import { DialogService } from "@bitwarden/components"; export interface BulkShareDialogParams { diff --git a/apps/web/src/app/vault/collections.component.html b/apps/web/src/vault/app/vault/collections.component.html similarity index 100% rename from apps/web/src/app/vault/collections.component.html rename to apps/web/src/vault/app/vault/collections.component.html diff --git a/apps/web/src/app/vault/collections.component.ts b/apps/web/src/vault/app/vault/collections.component.ts similarity index 94% rename from apps/web/src/app/vault/collections.component.ts rename to apps/web/src/vault/app/vault/collections.component.ts index d169bb7b33..739e88f1c1 100644 --- a/apps/web/src/app/vault/collections.component.ts +++ b/apps/web/src/vault/app/vault/collections.component.ts @@ -1,12 +1,12 @@ import { Component, OnDestroy } from "@angular/core"; import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/components/collections.component"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ selector: "app-vault-collections", diff --git a/apps/web/src/app/vault/folder-add-edit.component.html b/apps/web/src/vault/app/vault/folder-add-edit.component.html similarity index 100% rename from apps/web/src/app/vault/folder-add-edit.component.html rename to apps/web/src/vault/app/vault/folder-add-edit.component.html diff --git a/apps/web/src/app/vault/folder-add-edit.component.ts b/apps/web/src/vault/app/vault/folder-add-edit.component.ts similarity index 75% rename from apps/web/src/app/vault/folder-add-edit.component.ts rename to apps/web/src/vault/app/vault/folder-add-edit.component.ts index 9c1910b32c..bb3c03f750 100644 --- a/apps/web/src/app/vault/folder-add-edit.component.ts +++ b/apps/web/src/vault/app/vault/folder-add-edit.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; -import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/components/folder-add-edit.component"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; +import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/vault/components/folder-add-edit.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 { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; +import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; @Component({ selector: "app-folder-add-edit", diff --git a/apps/web/src/app/vault/organization-badge/organization-badge.module.ts b/apps/web/src/vault/app/vault/organization-badge/organization-badge.module.ts similarity index 84% rename from apps/web/src/app/vault/organization-badge/organization-badge.module.ts rename to apps/web/src/vault/app/vault/organization-badge/organization-badge.module.ts index 7da25980ac..ad4d0b2299 100644 --- a/apps/web/src/app/vault/organization-badge/organization-badge.module.ts +++ b/apps/web/src/vault/app/vault/organization-badge/organization-badge.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../shared"; +import { SharedModule } from "../../../../app/shared"; import { OrganizationNameBadgeComponent } from "./organization-name-badge.component"; diff --git a/apps/web/src/app/vault/organization-badge/organization-name-badge.component.html b/apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.html similarity index 100% rename from apps/web/src/app/vault/organization-badge/organization-name-badge.component.html rename to apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.html diff --git a/apps/web/src/app/vault/organization-badge/organization-name-badge.component.ts b/apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.ts similarity index 100% rename from apps/web/src/app/vault/organization-badge/organization-name-badge.component.ts rename to apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.ts diff --git a/apps/web/src/app/vault/pipes/get-collection-name.pipe.ts b/apps/web/src/vault/app/vault/pipes/get-collection-name.pipe.ts similarity index 100% rename from apps/web/src/app/vault/pipes/get-collection-name.pipe.ts rename to apps/web/src/vault/app/vault/pipes/get-collection-name.pipe.ts diff --git a/apps/web/src/app/vault/pipes/get-group-name.pipe.ts b/apps/web/src/vault/app/vault/pipes/get-group-name.pipe.ts similarity index 81% rename from apps/web/src/app/vault/pipes/get-group-name.pipe.ts rename to apps/web/src/vault/app/vault/pipes/get-group-name.pipe.ts index cd553fff35..45cdaa101a 100644 --- a/apps/web/src/app/vault/pipes/get-group-name.pipe.ts +++ b/apps/web/src/vault/app/vault/pipes/get-group-name.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { GroupView } from "../../organizations/core"; +import { GroupView } from "../../../../app/organizations/core"; @Pipe({ name: "groupNameFromId", diff --git a/apps/web/src/app/vault/pipes/get-organization-name.pipe.ts b/apps/web/src/vault/app/vault/pipes/get-organization-name.pipe.ts similarity index 100% rename from apps/web/src/app/vault/pipes/get-organization-name.pipe.ts rename to apps/web/src/vault/app/vault/pipes/get-organization-name.pipe.ts diff --git a/apps/web/src/app/vault/pipes/pipes.module.ts b/apps/web/src/vault/app/vault/pipes/pipes.module.ts similarity index 100% rename from apps/web/src/app/vault/pipes/pipes.module.ts rename to apps/web/src/vault/app/vault/pipes/pipes.module.ts diff --git a/apps/web/src/app/vault/share.component.html b/apps/web/src/vault/app/vault/share.component.html similarity index 100% rename from apps/web/src/app/vault/share.component.html rename to apps/web/src/vault/app/vault/share.component.html diff --git a/apps/web/src/app/vault/share.component.ts b/apps/web/src/vault/app/vault/share.component.ts similarity index 94% rename from apps/web/src/app/vault/share.component.ts rename to apps/web/src/vault/app/vault/share.component.ts index 2fd64268a8..fb3e1cb873 100644 --- a/apps/web/src/app/vault/share.component.ts +++ b/apps/web/src/vault/app/vault/share.component.ts @@ -1,13 +1,13 @@ import { Component, OnDestroy } from "@angular/core"; import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ selector: "app-vault-share", diff --git a/apps/web/src/app/vault/vault-filter/components/link-sso.component.html b/apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.html similarity index 100% rename from apps/web/src/app/vault/vault-filter/components/link-sso.component.html rename to apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.html diff --git a/apps/web/src/app/vault/vault-filter/components/link-sso.component.ts b/apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.ts similarity index 100% rename from apps/web/src/app/vault/vault-filter/components/link-sso.component.ts rename to apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.ts diff --git a/apps/web/src/app/vault/vault-filter/components/organization-options.component.html b/apps/web/src/vault/app/vault/vault-filter/components/organization-options.component.html similarity index 100% rename from apps/web/src/app/vault/vault-filter/components/organization-options.component.html rename to apps/web/src/vault/app/vault/vault-filter/components/organization-options.component.html diff --git a/apps/web/src/app/vault/vault-filter/components/organization-options.component.ts b/apps/web/src/vault/app/vault/vault-filter/components/organization-options.component.ts similarity index 96% rename from apps/web/src/app/vault/vault-filter/components/organization-options.component.ts rename to apps/web/src/vault/app/vault/vault-filter/components/organization-options.component.ts index 08bd5305ca..c9e6d2c726 100644 --- a/apps/web/src/app/vault/vault-filter/components/organization-options.component.ts +++ b/apps/web/src/vault/app/vault/vault-filter/components/organization-options.component.ts @@ -10,12 +10,12 @@ import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/commo 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.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 { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { EnrollMasterPasswordReset } from "../../../organizations/users/enroll-master-password-reset.component"; +import { EnrollMasterPasswordReset } from "../../../../../app/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/vault-filter/components/vault-filter.component.html b/apps/web/src/vault/app/vault/vault-filter/components/vault-filter.component.html similarity index 100% rename from apps/web/src/app/vault/vault-filter/components/vault-filter.component.html rename to apps/web/src/vault/app/vault/vault-filter/components/vault-filter.component.html diff --git a/apps/web/src/app/vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/vault/app/vault/vault-filter/components/vault-filter.component.ts similarity index 98% rename from apps/web/src/app/vault/vault-filter/components/vault-filter.component.ts rename to apps/web/src/vault/app/vault/vault-filter/components/vault-filter.component.ts index 985f9523a7..1b9a6821d5 100644 --- a/apps/web/src/app/vault/vault-filter/components/vault-filter.component.ts +++ b/apps/web/src/vault/app/vault/vault-filter/components/vault-filter.component.ts @@ -4,11 +4,11 @@ import { firstValueFrom, Subject, switchMap, takeUntil } 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 { CipherType } from "@bitwarden/common/enums/cipherType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { VaultFilterService } from "../services/abstractions/vault-filter.service"; import { diff --git a/apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.html b/apps/web/src/vault/app/vault/vault-filter/organization-filter/organization-filter.component.html similarity index 100% rename from apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.html rename to apps/web/src/vault/app/vault/vault-filter/organization-filter/organization-filter.component.html diff --git a/apps/web/src/app/vault/vault-filter/services/abstractions/vault-filter.service.ts b/apps/web/src/vault/app/vault/vault-filter/services/abstractions/vault-filter.service.ts similarity index 93% rename from apps/web/src/app/vault/vault-filter/services/abstractions/vault-filter.service.ts rename to apps/web/src/vault/app/vault/vault-filter/services/abstractions/vault-filter.service.ts index f5d9fd289d..7ae84244a8 100644 --- a/apps/web/src/app/vault/vault-filter/services/abstractions/vault-filter.service.ts +++ b/apps/web/src/vault/app/vault/vault-filter/services/abstractions/vault-filter.service.ts @@ -3,7 +3,7 @@ import { Observable } from "rxjs"; import { Organization } from "@bitwarden/common/src/models/domain/organization"; 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/models/view/folder.view"; +import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view"; import { CipherTypeFilter, diff --git a/apps/web/src/app/vault/vault-filter/services/vault-filter.service.spec.ts b/apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.spec.ts similarity index 97% rename from apps/web/src/app/vault/vault-filter/services/vault-filter.service.spec.ts rename to apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.spec.ts index b23074f813..e627258234 100644 --- a/apps/web/src/app/vault/vault-filter/services/vault-filter.service.spec.ts +++ b/apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.spec.ts @@ -1,18 +1,18 @@ import { mock, MockProxy } from "jest-mock-extended"; import { firstValueFrom, ReplaySubject, take } from "rxjs"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { 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 { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.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"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { VaultFilterService } from "./vault-filter.service"; diff --git a/apps/web/src/app/vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.ts similarity index 96% rename from apps/web/src/app/vault/vault-filter/services/vault-filter.service.ts rename to apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.ts index 397ce4ac25..bae89751b8 100644 --- a/apps/web/src/app/vault/vault-filter/services/vault-filter.service.ts +++ b/apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.ts @@ -10,9 +10,7 @@ import { switchMap, } from "rxjs"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { 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"; @@ -22,9 +20,11 @@ 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 { FolderView } from "@bitwarden/common/models/view/folder.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"; -import { CollectionAdminView } from "../../../organizations/core"; +import { CollectionAdminView } from "../../../../../app/organizations/core"; import { CipherTypeFilter, CollectionFilter, diff --git a/apps/web/src/app/vault/vault-filter/shared/components/vault-filter-section.component.html b/apps/web/src/vault/app/vault/vault-filter/shared/components/vault-filter-section.component.html similarity index 100% rename from apps/web/src/app/vault/vault-filter/shared/components/vault-filter-section.component.html rename to apps/web/src/vault/app/vault/vault-filter/shared/components/vault-filter-section.component.html diff --git a/apps/web/src/app/vault/vault-filter/shared/components/vault-filter-section.component.ts b/apps/web/src/vault/app/vault/vault-filter/shared/components/vault-filter-section.component.ts similarity index 100% rename from apps/web/src/app/vault/vault-filter/shared/components/vault-filter-section.component.ts rename to apps/web/src/vault/app/vault/vault-filter/shared/components/vault-filter-section.component.ts diff --git a/apps/web/src/app/vault/vault-filter/shared/models/vault-filter-section.type.ts b/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter-section.type.ts similarity index 100% rename from apps/web/src/app/vault/vault-filter/shared/models/vault-filter-section.type.ts rename to apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter-section.type.ts diff --git a/apps/web/src/app/vault/vault-filter/shared/models/vault-filter.model.spec.ts b/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.model.spec.ts similarity index 97% rename from apps/web/src/app/vault/vault-filter/shared/models/vault-filter.model.spec.ts rename to apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.model.spec.ts index 0e889c5cba..e47f6dfe30 100644 --- a/apps/web/src/app/vault/vault-filter/shared/models/vault-filter.model.spec.ts +++ b/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.model.spec.ts @@ -1,9 +1,9 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.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"; import { VaultFilter } from "./vault-filter.model"; import { diff --git a/apps/web/src/app/vault/vault-filter/shared/models/vault-filter.model.ts b/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.model.ts similarity index 96% rename from apps/web/src/app/vault/vault-filter/shared/models/vault-filter.model.ts rename to apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.model.ts index f1335c2e46..c3c0acd479 100644 --- a/apps/web/src/app/vault/vault-filter/shared/models/vault-filter.model.ts +++ b/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.model.ts @@ -1,6 +1,6 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CipherStatus, diff --git a/apps/web/src/app/vault/vault-filter/shared/models/vault-filter.type.ts b/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.type.ts similarity index 69% rename from apps/web/src/app/vault/vault-filter/shared/models/vault-filter.type.ts rename to apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.type.ts index 6b2fa6b17f..4f519517f7 100644 --- a/apps/web/src/app/vault/vault-filter/shared/models/vault-filter.type.ts +++ b/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.type.ts @@ -1,9 +1,9 @@ -import { CipherType } from "@bitwarden/common/src/enums/cipherType"; import { Organization } from "@bitwarden/common/src/models/domain/organization"; import { ITreeNodeObject } from "@bitwarden/common/src/models/domain/tree-node"; -import { FolderView } from "@bitwarden/common/src/models/view/folder.view"; +import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; -import { CollectionAdminView } from "../../../../organizations/core"; +import { CollectionAdminView } from "../../../../../../app/organizations/core"; export type CipherStatus = "all" | "favorites" | "trash" | CipherType; diff --git a/apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts b/apps/web/src/vault/app/vault/vault-filter/shared/vault-filter-shared.module.ts similarity index 67% rename from apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts rename to apps/web/src/vault/app/vault/vault-filter/shared/vault-filter-shared.module.ts index 04803ae2a7..b21a45e097 100644 --- a/apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts +++ b/apps/web/src/vault/app/vault/vault-filter/shared/vault-filter-shared.module.ts @@ -1,6 +1,8 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../../shared"; +// TODO refine elsint rule for **/app/shared/* +// eslint-disable-next-line no-restricted-imports +import { SharedModule } from "../../../../../app/shared"; import { VaultFilterSectionComponent } from "./components/vault-filter-section.component"; diff --git a/apps/web/src/app/vault/vault-filter/vault-filter.module.ts b/apps/web/src/vault/app/vault/vault-filter/vault-filter.module.ts similarity index 88% rename from apps/web/src/app/vault/vault-filter/vault-filter.module.ts rename to apps/web/src/vault/app/vault/vault-filter/vault-filter.module.ts index 7ca4ad3df8..d94dec5206 100644 --- a/apps/web/src/app/vault/vault-filter/vault-filter.module.ts +++ b/apps/web/src/vault/app/vault/vault-filter/vault-filter.module.ts @@ -1,11 +1,12 @@ import { NgModule } from "@angular/core"; +import { VaultFilterSharedModule } from "../../vault/vault-filter/shared/vault-filter-shared.module"; + import { LinkSsoComponent } from "./components/link-sso.component"; import { OrganizationOptionsComponent } from "./components/organization-options.component"; import { VaultFilterComponent } from "./components/vault-filter.component"; import { VaultFilterService as VaultFilterServiceAbstraction } from "./services/abstractions/vault-filter.service"; import { VaultFilterService } from "./services/vault-filter.service"; -import { VaultFilterSharedModule } from "./shared/vault-filter-shared.module"; @NgModule({ imports: [VaultFilterSharedModule], diff --git a/apps/web/src/app/vault/vault-items.component.html b/apps/web/src/vault/app/vault/vault-items.component.html similarity index 100% rename from apps/web/src/app/vault/vault-items.component.html rename to apps/web/src/vault/app/vault/vault-items.component.html diff --git a/apps/web/src/app/vault/vault-items.component.ts b/apps/web/src/vault/app/vault/vault-items.component.ts similarity index 96% rename from apps/web/src/app/vault/vault-items.component.ts rename to apps/web/src/vault/app/vault/vault-items.component.ts index afdba230de..7f662f09f3 100644 --- a/apps/web/src/app/vault/vault-items.component.ts +++ b/apps/web/src/vault/app/vault/vault-items.component.ts @@ -1,29 +1,29 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from "@angular/core"; import { lastValueFrom } from "rxjs"; -import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/components/vault-items.component"; import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/vault/components/vault-items.component"; 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 { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; 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 { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; 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 { CipherView } from "@bitwarden/common/models/view/cipher.view"; 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"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService, Icons } from "@bitwarden/components"; -import { CollectionAdminView, GroupView } from "../organizations/core"; +import { CollectionAdminView, GroupView } from "../../../app/organizations/core"; import { BulkDeleteDialogResult, diff --git a/apps/web/src/app/vault/vault-routing.module.ts b/apps/web/src/vault/app/vault/vault-routing.module.ts similarity index 100% rename from apps/web/src/app/vault/vault-routing.module.ts rename to apps/web/src/vault/app/vault/vault-routing.module.ts diff --git a/apps/web/src/app/vault/vault.component.html b/apps/web/src/vault/app/vault/vault.component.html similarity index 100% rename from apps/web/src/app/vault/vault.component.html rename to apps/web/src/vault/app/vault/vault.component.html diff --git a/apps/web/src/app/vault/vault.component.ts b/apps/web/src/vault/app/vault/vault.component.ts similarity index 97% rename from apps/web/src/app/vault/vault.component.ts rename to apps/web/src/vault/app/vault/vault.component.ts index e6764c14be..b58d53d8ff 100644 --- a/apps/web/src/app/vault/vault.component.ts +++ b/apps/web/src/vault/app/vault/vault.component.ts @@ -13,22 +13,22 @@ import { first, switchMap, takeUntil } from "rxjs/operators"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums/kdfType"; import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +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 { UpdateKeyComponent } from "../settings/update-key.component"; +import { UpdateKeyComponent } from "../../../app/settings/update-key.component"; import { AddEditComponent } from "./add-edit.component"; import { AttachmentsComponent } from "./attachments.component"; diff --git a/apps/web/src/app/vault/vault.module.ts b/apps/web/src/vault/app/vault/vault.module.ts similarity index 76% rename from apps/web/src/app/vault/vault.module.ts rename to apps/web/src/vault/app/vault/vault.module.ts index f9ec1366d1..4b3cdac4d0 100644 --- a/apps/web/src/app/vault/vault.module.ts +++ b/apps/web/src/vault/app/vault/vault.module.ts @@ -2,9 +2,9 @@ import { NgModule } from "@angular/core"; import { BreadcrumbsModule } from "@bitwarden/components"; -import { CollectionBadgeModule } from "../organizations/vault/collection-badge/collection-badge.module"; -import { GroupBadgeModule } from "../organizations/vault/group-badge/group-badge.module"; -import { SharedModule, LooseComponentsModule } from "../shared"; +import { CollectionBadgeModule } from "../../../app/organizations/vault/collection-badge/collection-badge.module"; +import { GroupBadgeModule } from "../../../app/organizations/vault/group-badge/group-badge.module"; +import { SharedModule, LooseComponentsModule } from "../../../app/shared"; import { BulkDialogsModule } from "./bulk-action-dialogs/bulk-dialogs.module"; import { OrganizationBadgeModule } from "./organization-badge/organization-badge.module"; diff --git a/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts b/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts index bcc633c65d..3a5e0e0477 100644 --- a/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts +++ b/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts @@ -2,8 +2,8 @@ import { Injectable } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { ProviderAddOrganizationRequest } from "@bitwarden/common/models/request/provider/provider-add-organization.request"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Injectable() export class WebProviderService { diff --git a/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts b/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts index adc62b03e4..5f81860bf6 100644 --- a/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts @@ -5,9 +5,9 @@ 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { ProviderUpdateRequest } from "@bitwarden/common/models/request/provider/provider-update.request"; import { ProviderResponse } from "@bitwarden/common/models/response/provider/provider.response"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "provider-account", diff --git a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts index f5a95e9300..696567591f 100644 --- a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts @@ -6,9 +6,9 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; import { ProviderSetupRequest } from "@bitwarden/common/models/request/provider/provider-setup.request"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ selector: "provider-setup", diff --git a/libs/angular/src/components/collections.component.ts b/libs/angular/src/components/collections.component.ts index 2265454ead..913ac3ec37 100644 --- a/libs/angular/src/components/collections.component.ts +++ b/libs/angular/src/components/collections.component.ts @@ -1,13 +1,13 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/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"; @Directive() export class CollectionsComponent implements OnInit { diff --git a/libs/angular/src/components/remove-password.component.ts b/libs/angular/src/components/remove-password.component.ts index 5294904f17..c1498a2980 100644 --- a/libs/angular/src/components/remove-password.component.ts +++ b/libs/angular/src/components/remove-password.component.ts @@ -6,8 +6,8 @@ import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { Organization } from "@bitwarden/common/models/domain/organization"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Directive() export class RemovePasswordComponent implements OnInit { diff --git a/libs/angular/src/components/set-password.component.ts b/libs/angular/src/components/set-password.component.ts index 1459e9fd03..ab0f56b585 100644 --- a/libs/angular/src/components/set-password.component.ts +++ b/libs/angular/src/components/set-password.component.ts @@ -14,7 +14,6 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; import { DEFAULT_KDF_TYPE, DEFAULT_KDF_CONFIG } from "@bitwarden/common/enums/kdfType"; import { Utils } from "@bitwarden/common/misc/utils"; @@ -22,6 +21,7 @@ import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { KeysRequest } from "@bitwarden/common/models/request/keys.request"; import { SetPasswordRequest } from "@bitwarden/common/models/request/set-password.request"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/angular/src/components/share.component.ts b/libs/angular/src/components/share.component.ts index e12aeb0211..77c9eba0d0 100644 --- a/libs/angular/src/components/share.component.ts +++ b/libs/angular/src/components/share.component.ts @@ -1,7 +1,6 @@ import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core"; import { firstValueFrom, map, Observable, Subject, takeUntil } from "rxjs"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.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"; @@ -13,9 +12,10 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; import { Utils } from "@bitwarden/common/misc/utils"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; 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"; @Directive() export class ShareComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/update-temp-password.component.ts b/libs/angular/src/components/update-temp-password.component.ts index 618d6816db..49a3b57146 100644 --- a/libs/angular/src/components/update-temp-password.component.ts +++ b/libs/angular/src/components/update-temp-password.component.ts @@ -9,11 +9,11 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo 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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/update-temp-password.request"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/angular/src/jslib.module.ts b/libs/angular/src/jslib.module.ts index 42dbc76cb6..3c08b4a77f 100644 --- a/libs/angular/src/jslib.module.ts +++ b/libs/angular/src/jslib.module.ts @@ -4,7 +4,6 @@ import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { CalloutComponent } from "./components/callout.component"; import { ExportScopeCalloutComponent } from "./components/export-scope-callout.component"; -import { IconComponent } from "./components/icon.component"; import { BitwardenToastModule } from "./components/toastr.component"; import { A11yInvalidDirective } from "./directives/a11y-invalid.directive"; import { A11yTitleDirective } from "./directives/a11y-title.directive"; @@ -29,6 +28,7 @@ import { SearchPipe } from "./pipes/search.pipe"; import { UserNamePipe } from "./pipes/user-name.pipe"; import { UserTypePipe } from "./pipes/user-type.pipe"; import { PasswordStrengthComponent } from "./shared/components/password-strength/password-strength.component"; +import { IconComponent } from "./vault/components/icon.component"; @NgModule({ imports: [ diff --git a/libs/angular/src/pipes/search-ciphers.pipe.ts b/libs/angular/src/pipes/search-ciphers.pipe.ts index 4e98aee9e2..04349e9842 100644 --- a/libs/angular/src/pipes/search-ciphers.pipe.ts +++ b/libs/angular/src/pipes/search-ciphers.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @Pipe({ name: "searchCiphers", diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index d1d01c3bc9..8202afa174 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -12,7 +12,6 @@ import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/abstr import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/abstractions/auth.service"; import { BroadcasterService as BroadcasterServiceAbstraction } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/abstractions/cipher.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"; @@ -24,11 +23,6 @@ import { EventCollectionService as EventCollectionServiceAbstraction } from "@bi import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service"; import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service"; import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { - FolderService as FolderServiceAbstraction, - InternalFolderService, -} from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { FormValidationErrorsService as FormValidationErrorsServiceAbstraction } from "@bitwarden/common/abstractions/formValidationErrors.service"; import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/abstractions/keyConnector.service"; @@ -43,7 +37,6 @@ import { OrganizationService as OrganizationServiceAbstraction, } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; import { @@ -57,8 +50,6 @@ import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common 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 { SyncService as SyncServiceAbstraction } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/abstractions/sync/syncNotifier.service.abstraction"; import { TokenService as TokenServiceAbstraction } from "@bitwarden/common/abstractions/token.service"; import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service"; import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service"; @@ -80,7 +71,6 @@ 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 { AuthService } from "@bitwarden/common/services/auth.service"; -import { CipherService } from "@bitwarden/common/services/cipher.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"; @@ -93,8 +83,6 @@ import { EventCollectionService } from "@bitwarden/common/services/event/event-c import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; import { ExportService } from "@bitwarden/common/services/export.service"; import { FileUploadService } from "@bitwarden/common/services/fileUpload.service"; -import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service"; -import { FolderService } from "@bitwarden/common/services/folder/folder.service"; import { FormValidationErrorsService } from "@bitwarden/common/services/formValidationErrors.service"; import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service"; import { LoginService } from "@bitwarden/common/services/login.service"; @@ -111,8 +99,6 @@ import { SendService } from "@bitwarden/common/services/send.service"; import { SettingsService } from "@bitwarden/common/services/settings.service"; import { StateService } from "@bitwarden/common/services/state.service"; import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; -import { SyncService } from "@bitwarden/common/services/sync/sync.service"; -import { SyncNotifierService } from "@bitwarden/common/services/sync/syncNotifier.service"; import { TokenService } from "@bitwarden/common/services/token.service"; import { TotpService } from "@bitwarden/common/services/totp.service"; import { TwoFactorService } from "@bitwarden/common/services/twoFactor.service"; @@ -123,10 +109,25 @@ import { ValidationService } from "@bitwarden/common/services/validation.service import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service"; import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service"; +import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; +import { + FolderService as FolderServiceAbstraction, + InternalFolderService, +} from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction"; +import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; +import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service"; +import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service"; +import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service"; +import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service"; import { AuthGuard } from "../guards/auth.guard"; import { LockGuard } from "../guards/lock.guard"; import { UnauthGuard } from "../guards/unauth.guard"; +import { PasswordRepromptService } from "../vault/services/password-reprompt.service"; import { BroadcasterService } from "./broadcaster.service"; import { @@ -142,7 +143,6 @@ import { WINDOW, } from "./injection-tokens"; import { ModalService } from "./modal.service"; -import { PasswordRepromptService } from "./passwordReprompt.service"; import { ThemingService } from "./theming/theming.service"; import { AbstractThemingService } from "./theming/theming.service.abstraction"; diff --git a/libs/angular/src/abstractions/deprecated-vault-filter.service.ts b/libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts similarity index 83% rename from libs/angular/src/abstractions/deprecated-vault-filter.service.ts rename to libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts index ef3444266c..e28cc2718b 100644 --- a/libs/angular/src/abstractions/deprecated-vault-filter.service.ts +++ b/libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts @@ -2,9 +2,9 @@ import { Observable } from "rxjs"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { DynamicTreeNode } from "../vault/vault-filter/models/dynamic-tree-node.model"; +import { DynamicTreeNode } from "../vault-filter/models/dynamic-tree-node.model"; /** * @deprecated August 30 2022: Use new VaultFilterService with observables diff --git a/libs/angular/src/components/add-edit-custom-fields.component.ts b/libs/angular/src/vault/components/add-edit-custom-fields.component.ts similarity index 93% rename from libs/angular/src/components/add-edit-custom-fields.component.ts rename to libs/angular/src/vault/components/add-edit-custom-fields.component.ts index 2be5e7d5a5..6b043981d6 100644 --- a/libs/angular/src/components/add-edit-custom-fields.component.ts +++ b/libs/angular/src/vault/components/add-edit-custom-fields.component.ts @@ -3,12 +3,12 @@ import { Directive, Input, OnChanges, SimpleChanges } from "@angular/core"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { FieldView } from "@bitwarden/common/models/view/field.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; @Directive() export class AddEditCustomFieldsComponent implements OnChanges { diff --git a/libs/angular/src/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts similarity index 94% rename from libs/angular/src/components/add-edit.component.ts rename to libs/angular/src/vault/components/add-edit.component.ts index 69d02306f5..0a7908ffcb 100644 --- a/libs/angular/src/components/add-edit.component.ts +++ b/libs/angular/src/vault/components/add-edit.component.ts @@ -2,10 +2,8 @@ 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 { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; @@ -13,28 +11,30 @@ import { isNotProviderUser, OrganizationService, } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.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 { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; 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 { Cipher } from "@bitwarden/common/models/domain/cipher"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CardView } from "@bitwarden/common/models/view/card.view"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; -import { IdentityView } from "@bitwarden/common/models/view/identity.view"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; -import { LoginView } from "@bitwarden/common/models/view/login.view"; -import { SecureNoteView } from "@bitwarden/common/models/view/secure-note.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"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; +import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; @Directive() export class AddEditComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/attachments.component.ts b/libs/angular/src/vault/components/attachments.component.ts similarity index 96% rename from libs/angular/src/components/attachments.component.ts rename to libs/angular/src/vault/components/attachments.component.ts index 8a8db67618..0cbcf6cddf 100644 --- a/libs/angular/src/components/attachments.component.ts +++ b/libs/angular/src/vault/components/attachments.component.ts @@ -1,18 +1,18 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; -import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; +import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @Directive() export class AttachmentsComponent implements OnInit { diff --git a/libs/angular/src/components/folder-add-edit.component.ts b/libs/angular/src/vault/components/folder-add-edit.component.ts similarity index 90% rename from libs/angular/src/components/folder-add-edit.component.ts rename to libs/angular/src/vault/components/folder-add-edit.component.ts index 02b8922b50..b3d5b9aa56 100644 --- a/libs/angular/src/components/folder-add-edit.component.ts +++ b/libs/angular/src/vault/components/folder-add-edit.component.ts @@ -1,11 +1,11 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; 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 { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; +import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; @Directive() export class FolderAddEditComponent implements OnInit { diff --git a/libs/angular/src/components/icon.component.html b/libs/angular/src/vault/components/icon.component.html similarity index 100% rename from libs/angular/src/components/icon.component.html rename to libs/angular/src/vault/components/icon.component.html diff --git a/libs/angular/src/components/icon.component.ts b/libs/angular/src/vault/components/icon.component.ts similarity index 95% rename from libs/angular/src/components/icon.component.ts rename to libs/angular/src/vault/components/icon.component.ts index 1c9b5a8b55..111f89ff83 100644 --- a/libs/angular/src/components/icon.component.ts +++ b/libs/angular/src/vault/components/icon.component.ts @@ -2,9 +2,9 @@ import { Component, Input, OnChanges } from "@angular/core"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; /** * Provides a mapping from supported card brands to diff --git a/libs/angular/src/components/password-history.component.ts b/libs/angular/src/vault/components/password-history.component.ts similarity index 86% rename from libs/angular/src/components/password-history.component.ts rename to libs/angular/src/vault/components/password-history.component.ts index 4385966941..d9d9654c8e 100644 --- a/libs/angular/src/components/password-history.component.ts +++ b/libs/angular/src/vault/components/password-history.component.ts @@ -1,9 +1,9 @@ import { Directive, OnInit } from "@angular/core"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { PasswordHistoryView } from "@bitwarden/common/vault/models/view/password-history.view"; @Directive() export class PasswordHistoryComponent implements OnInit { diff --git a/libs/angular/src/components/password-reprompt.component.ts b/libs/angular/src/vault/components/password-reprompt.component.ts similarity index 95% rename from libs/angular/src/components/password-reprompt.component.ts rename to libs/angular/src/vault/components/password-reprompt.component.ts index 188abee754..ca0d6fb769 100644 --- a/libs/angular/src/components/password-reprompt.component.ts +++ b/libs/angular/src/vault/components/password-reprompt.component.ts @@ -4,7 +4,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 { ModalRef } from "./modal/modal.ref"; +import { ModalRef } from "../../components/modal/modal.ref"; /** * Used to verify the user's Master Password for the "Master Password Re-prompt" feature only. diff --git a/libs/angular/src/components/premium.component.ts b/libs/angular/src/vault/components/premium.component.ts similarity index 100% rename from libs/angular/src/components/premium.component.ts rename to libs/angular/src/vault/components/premium.component.ts diff --git a/libs/angular/src/components/vault-items.component.ts b/libs/angular/src/vault/components/vault-items.component.ts similarity index 97% rename from libs/angular/src/components/vault-items.component.ts rename to libs/angular/src/vault/components/vault-items.component.ts index 90d4b32c0d..a4684786fd 100644 --- a/libs/angular/src/components/vault-items.component.ts +++ b/libs/angular/src/vault/components/vault-items.component.ts @@ -2,7 +2,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 { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @Directive() export class VaultItemsComponent { diff --git a/libs/angular/src/components/view-custom-fields.component.ts b/libs/angular/src/vault/components/view-custom-fields.component.ts similarity index 88% rename from libs/angular/src/components/view-custom-fields.component.ts rename to libs/angular/src/vault/components/view-custom-fields.component.ts index 46289fbc5e..55e12fcd13 100644 --- a/libs/angular/src/components/view-custom-fields.component.ts +++ b/libs/angular/src/vault/components/view-custom-fields.component.ts @@ -3,8 +3,8 @@ import { Directive, Input } from "@angular/core"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { EventType } from "@bitwarden/common/enums/eventType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { FieldView } from "@bitwarden/common/models/view/field.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; @Directive() export class ViewCustomFieldsComponent { diff --git a/libs/angular/src/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts similarity index 94% rename from libs/angular/src/components/view.component.ts rename to libs/angular/src/vault/components/view.component.ts index 243ca85ff9..3b417e7f1d 100644 --- a/libs/angular/src/components/view.component.ts +++ b/libs/angular/src/vault/components/view.component.ts @@ -13,28 +13,28 @@ import { firstValueFrom } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; -import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.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"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; const BroadcasterSubscriptionId = "ViewComponent"; diff --git a/libs/angular/src/services/passwordReprompt.service.ts b/libs/angular/src/vault/services/password-reprompt.service.ts similarity index 89% rename from libs/angular/src/services/passwordReprompt.service.ts rename to libs/angular/src/vault/services/password-reprompt.service.ts index e1fc916cd7..8984bc7fdf 100644 --- a/libs/angular/src/services/passwordReprompt.service.ts +++ b/libs/angular/src/vault/services/password-reprompt.service.ts @@ -1,12 +1,11 @@ import { Injectable } from "@angular/core"; import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; +import { ModalService } from "../../services/modal.service"; import { PasswordRepromptComponent } from "../components/password-reprompt.component"; -import { ModalService } from "./modal.service"; - /** * Used to verify the user's Master Password for the "Master Password Re-prompt" feature only. * See UserVerificationService for any other situation where you need to verify the user's identity. diff --git a/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts b/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts index 68faaa3007..b023944241 100644 --- a/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.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/type-filter.component.ts b/libs/angular/src/vault/vault-filter/components/type-filter.component.ts index 6fca1e7777..6ff5d21330 100644 --- a/libs/angular/src/vault/vault-filter/components/type-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/type-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; import { VaultFilter } from "../models/vault-filter.model"; 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 e220434741..3cc0acf3fe 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 @@ -4,9 +4,9 @@ import { firstValueFrom, Observable } from "rxjs"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { DeprecatedVaultFilterService } from "../../../abstractions/deprecated-vault-filter.service"; +import { DeprecatedVaultFilterService } from "../../abstractions/deprecated-vault-filter.service"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; import { VaultFilter } from "../models/vault-filter.model"; diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts index 12d458a127..1fab9727a5 100644 --- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts +++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts @@ -1,5 +1,5 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { VaultFilter } from "./vault-filter.model"; diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts index 0fd0fcc6d0..ae4151f964 100644 --- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts +++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts @@ -1,5 +1,5 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CipherStatus } from "./cipher-status.model"; 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 b37e651440..a56758a8bd 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,9 +1,7 @@ import { Injectable } from "@angular/core"; import { firstValueFrom, from, mergeMap, Observable } from "rxjs"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { isNotProviderUser, OrganizationService, @@ -15,9 +13,11 @@ 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 { FolderView } from "@bitwarden/common/models/view/folder.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"; -import { DeprecatedVaultFilterService as DeprecatedVaultFilterServiceAbstraction } from "../../../abstractions/deprecated-vault-filter.service"; +import { DeprecatedVaultFilterService as DeprecatedVaultFilterServiceAbstraction } from "../../abstractions/deprecated-vault-filter.service"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; const NestingDelimiter = "/"; diff --git a/libs/common/spec/importers/chrome-csv-importer.spec.ts b/libs/common/spec/importers/chrome-csv-importer.spec.ts index 8e57965d6d..746c573c23 100644 --- a/libs/common/spec/importers/chrome-csv-importer.spec.ts +++ b/libs/common/spec/importers/chrome-csv-importer.spec.ts @@ -1,7 +1,7 @@ import { ChromeCsvImporter as Importer } from "@bitwarden/common/importers/chrome-csv-importer"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; -import { LoginView } from "@bitwarden/common/models/view/login.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; import { data as androidData } from "./test-data/chrome-csv/android-data.csv"; import { data as simplePasswordData } from "./test-data/chrome-csv/simple-password-data.csv"; diff --git a/libs/common/spec/importers/dashlane-csv-importer.spec.ts b/libs/common/spec/importers/dashlane-csv-importer.spec.ts index 9948b9e47c..80a3579041 100644 --- a/libs/common/spec/importers/dashlane-csv-importer.spec.ts +++ b/libs/common/spec/importers/dashlane-csv-importer.spec.ts @@ -1,5 +1,5 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { DashlaneCsvImporter as Importer } from "@bitwarden/common/importers/dashlane/dashlane-csv-importer"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { credentialsData } from "./test-data/dashlane-csv/credentials.csv"; import { identityData } from "./test-data/dashlane-csv/id.csv"; diff --git a/libs/common/spec/importers/enpass/enpass-json-importer.spec.ts b/libs/common/spec/importers/enpass/enpass-json-importer.spec.ts index c4ed631206..bbbc2f7726 100644 --- a/libs/common/spec/importers/enpass/enpass-json-importer.spec.ts +++ b/libs/common/spec/importers/enpass/enpass-json-importer.spec.ts @@ -1,6 +1,6 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EnpassJsonImporter as Importer } from "@bitwarden/common/importers/enpass/enpass-json-importer"; -import { FieldView } from "@bitwarden/common/models/view/field.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; import { creditCard } from "./test-data/json/credit-card"; import { folders } from "./test-data/json/folders"; diff --git a/libs/common/spec/importers/firefox-csv-importer.spec.ts b/libs/common/spec/importers/firefox-csv-importer.spec.ts index e25535c5a2..0dbadd093f 100644 --- a/libs/common/spec/importers/firefox-csv-importer.spec.ts +++ b/libs/common/spec/importers/firefox-csv-importer.spec.ts @@ -1,7 +1,7 @@ import { FirefoxCsvImporter as Importer } from "@bitwarden/common/importers/firefox-csv-importer"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; -import { LoginView } from "@bitwarden/common/models/view/login.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; import { data as firefoxAccountsData } from "./test-data/firefox-csv/firefox-accounts-data.csv"; import { data as simplePasswordData } from "./test-data/firefox-csv/simple-password-data.csv"; diff --git a/libs/common/spec/importers/keepass2-xml-importer.spec.ts b/libs/common/spec/importers/keepass2-xml-importer.spec.ts index 285a1563ba..d335a8aca7 100644 --- a/libs/common/spec/importers/keepass2-xml-importer.spec.ts +++ b/libs/common/spec/importers/keepass2-xml-importer.spec.ts @@ -1,5 +1,5 @@ import { KeePass2XmlImporter as Importer } from "@bitwarden/common/importers/keepass2-xml-importer"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { TestData, TestData1, TestData2 } from "./keepass2-xml-importer-testdata"; diff --git a/libs/common/spec/importers/lastpass-csv-importer.spec.ts b/libs/common/spec/importers/lastpass-csv-importer.spec.ts index 8e5f5d8a55..36686aadc5 100644 --- a/libs/common/spec/importers/lastpass-csv-importer.spec.ts +++ b/libs/common/spec/importers/lastpass-csv-importer.spec.ts @@ -1,9 +1,9 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { LastPassCsvImporter as Importer } from "@bitwarden/common/importers/lastpass-csv-importer"; import { ImportResult } from "@bitwarden/common/models/domain/import-result"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { FieldView } from "@bitwarden/common/models/view/field.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; function baseExcept(result: ImportResult) { expect(result).not.toBeNull(); diff --git a/libs/common/spec/importers/myki-csv-importer.spec.ts b/libs/common/spec/importers/myki-csv-importer.spec.ts index b28e495cf8..6df40e7175 100644 --- a/libs/common/spec/importers/myki-csv-importer.spec.ts +++ b/libs/common/spec/importers/myki-csv-importer.spec.ts @@ -1,6 +1,6 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { MykiCsvImporter as Importer } from "@bitwarden/common/importers/myki-csv-importer"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { userAccountData } from "./test-data/myki-csv/user-account.csv"; import { userCreditCardData } from "./test-data/myki-csv/user-credit-card.csv"; diff --git a/libs/common/spec/importers/nordpass-csv-importer.spec.ts b/libs/common/spec/importers/nordpass-csv-importer.spec.ts index b9ef3c32a5..6a368c7180 100644 --- a/libs/common/spec/importers/nordpass-csv-importer.spec.ts +++ b/libs/common/spec/importers/nordpass-csv-importer.spec.ts @@ -1,8 +1,8 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; import { NordPassCsvImporter as Importer } from "@bitwarden/common/importers/nordpass-csv-importer"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { IdentityView } from "@bitwarden/common/models/view/identity.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; import { data as creditCardData } from "./test-data/nordpass-csv/nordpass.card.csv"; import { data as identityData } from "./test-data/nordpass-csv/nordpass.identity.csv"; diff --git a/libs/common/spec/importers/onepassword-1pux-importer.spec.ts b/libs/common/spec/importers/onepassword-1pux-importer.spec.ts index 98b9d6f1dd..0287f4134f 100644 --- a/libs/common/spec/importers/onepassword-1pux-importer.spec.ts +++ b/libs/common/spec/importers/onepassword-1pux-importer.spec.ts @@ -1,9 +1,9 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; import { OnePassword1PuxImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-1pux-importer"; import { Utils } from "@bitwarden/common/misc/utils"; -import { FieldView } from "@bitwarden/common/models/view/field.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; import { APICredentialsData } from "./test-data/onepassword-1pux/api-credentials"; import { BankAccountData } from "./test-data/onepassword-1pux/bank-account"; diff --git a/libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts b/libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts index fc61d9760c..0b9ade2662 100644 --- a/libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts +++ b/libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts @@ -1,6 +1,6 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { OnePasswordMacCsvImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-mac-csv-importer"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { data as creditCardData } from "./test-data/onepassword-csv/credit-card.mac.csv"; import { data as identityData } from "./test-data/onepassword-csv/identity.mac.csv"; diff --git a/libs/common/spec/importers/onepassword-win-csv-importer.spec.ts b/libs/common/spec/importers/onepassword-win-csv-importer.spec.ts index 5398f823ff..d5c40c2d13 100644 --- a/libs/common/spec/importers/onepassword-win-csv-importer.spec.ts +++ b/libs/common/spec/importers/onepassword-win-csv-importer.spec.ts @@ -1,8 +1,8 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { OnePasswordWinCsvImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-win-csv-importer"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { FieldView } from "@bitwarden/common/models/view/field.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; import { data as creditCardData } from "./test-data/onepassword-csv/credit-card.windows.csv"; import { data as identityData } from "./test-data/onepassword-csv/identity.windows.csv"; diff --git a/libs/common/spec/importers/psono-json-importer.spec.ts b/libs/common/spec/importers/psono-json-importer.spec.ts index f9fc5f8c7f..012df791e9 100644 --- a/libs/common/spec/importers/psono-json-importer.spec.ts +++ b/libs/common/spec/importers/psono-json-importer.spec.ts @@ -1,7 +1,7 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { PsonoJsonImporter as Importer } from "@bitwarden/common/importers/psono/psono-json-importer"; -import { FieldView } from "@bitwarden/common/models/view/field.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; import { ApplicationPasswordsData } from "./test-data/psono-json/application-passwords"; import { BookmarkData } from "./test-data/psono-json/bookmark.json"; diff --git a/libs/common/spec/importers/safari-csv-importer.spec.ts b/libs/common/spec/importers/safari-csv-importer.spec.ts index 3bb0f614ce..89a9c469a7 100644 --- a/libs/common/spec/importers/safari-csv-importer.spec.ts +++ b/libs/common/spec/importers/safari-csv-importer.spec.ts @@ -1,7 +1,7 @@ import { SafariCsvImporter as Importer } from "@bitwarden/common/importers/safari-csv-importer"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; -import { LoginView } from "@bitwarden/common/models/view/login.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; import { data as oldSimplePasswordData } from "./test-data/safari-csv/old-simple-password-data.csv"; import { data as simplePasswordData } from "./test-data/safari-csv/simple-password-data.csv"; diff --git a/libs/common/spec/services/export.service.spec.ts b/libs/common/spec/services/export.service.spec.ts index a10f9ddbac..330d4a9cfb 100644 --- a/libs/common/spec/services/export.service.spec.ts +++ b/libs/common/spec/services/export.service.spec.ts @@ -2,22 +2,22 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums/kdfType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { Folder } from "@bitwarden/common/models/domain/folder"; -import { Login } from "@bitwarden/common/models/domain/login"; import { CipherWithIdExport as CipherExport } from "@bitwarden/common/models/export/cipher-with-ids.export"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; -import { LoginView } from "@bitwarden/common/models/view/login.view"; import { ExportService } from "@bitwarden/common/services/export.service"; +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 { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; +import { Folder } from "@bitwarden/common/vault/models/domain/folder"; +import { Login } from "@bitwarden/common/vault/models/domain/login"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; import { BuildTestObject, GetUniqueString } from "../utils"; diff --git a/libs/common/spec/services/import.service.spec.ts b/libs/common/spec/services/import.service.spec.ts index e1e1c4914f..6f29d22437 100644 --- a/libs/common/spec/services/import.service.spec.ts +++ b/libs/common/spec/services/import.service.spec.ts @@ -1,16 +1,16 @@ // eslint-disable-next-line no-restricted-imports import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction"; import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwarden-password-protected-importer"; import { Importer } from "@bitwarden/common/importers/importer"; import { Utils } from "@bitwarden/common/misc/utils"; 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"; describe("ImportService", () => { let importService: ImportService; diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts index edf0092df9..1262e7730f 100644 --- a/libs/common/src/abstractions/api.service.ts +++ b/libs/common/src/abstractions/api.service.ts @@ -1,16 +1,6 @@ import { OrganizationConnectionType } from "../enums/organizationConnectionType"; import { SetKeyConnectorKeyRequest } from "../models/request/account/set-key-connector-key.request"; -import { AttachmentRequest } from "../models/request/attachment.request"; import { BitPayInvoiceRequest } from "../models/request/bit-pay-invoice.request"; -import { CipherBulkDeleteRequest } from "../models/request/cipher-bulk-delete.request"; -import { CipherBulkMoveRequest } from "../models/request/cipher-bulk-move.request"; -import { CipherBulkRestoreRequest } from "../models/request/cipher-bulk-restore.request"; -import { CipherBulkShareRequest } from "../models/request/cipher-bulk-share.request"; -import { CipherCollectionsRequest } from "../models/request/cipher-collections.request"; -import { CipherCreateRequest } from "../models/request/cipher-create.request"; -import { CipherPartialRequest } from "../models/request/cipher-partial.request"; -import { CipherShareRequest } from "../models/request/cipher-share.request"; -import { CipherRequest } from "../models/request/cipher.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"; @@ -74,14 +64,11 @@ import { UpdateTwoFactorYubioOtpRequest } from "../models/request/update-two-fac import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; import { ApiKeyResponse } from "../models/response/api-key.response"; -import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response"; -import { AttachmentResponse } from "../models/response/attachment.response"; import { AuthRequestResponse } from "../models/response/auth-request.response"; import { RegisterResponse } from "../models/response/authentication/register.response"; 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 { CipherResponse } from "../models/response/cipher.response"; import { CollectionAccessDetailsResponse, CollectionResponse, @@ -129,7 +116,6 @@ import { SendFileUploadDataResponse } from "../models/response/send-file-upload- import { SendResponse } from "../models/response/send.response"; import { SsoPreValidateResponse } from "../models/response/sso-pre-validate.response"; import { SubscriptionResponse } from "../models/response/subscription.response"; -import { SyncResponse } from "../models/response/sync.response"; import { TaxInfoResponse } from "../models/response/tax-info.response"; import { TaxRateResponse } from "../models/response/tax-rate.response"; import { TwoFactorAuthenticatorResponse } from "../models/response/two-factor-authenticator.response"; @@ -144,6 +130,20 @@ import { import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.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"; +import { CipherBulkDeleteRequest } from "../vault/models/request/cipher-bulk-delete.request"; +import { CipherBulkMoveRequest } from "../vault/models/request/cipher-bulk-move.request"; +import { CipherBulkRestoreRequest } from "../vault/models/request/cipher-bulk-restore.request"; +import { CipherBulkShareRequest } from "../vault/models/request/cipher-bulk-share.request"; +import { CipherCollectionsRequest } from "../vault/models/request/cipher-collections.request"; +import { CipherCreateRequest } from "../vault/models/request/cipher-create.request"; +import { CipherPartialRequest } from "../vault/models/request/cipher-partial.request"; +import { CipherShareRequest } from "../vault/models/request/cipher-share.request"; +import { CipherRequest } from "../vault/models/request/cipher.request"; +import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response"; +import { AttachmentResponse } from "../vault/models/response/attachment.response"; +import { CipherResponse } from "../vault/models/response/cipher.response"; +import { SyncResponse } from "../vault/models/response/sync.response"; /** * @deprecated The `ApiService` class is deprecated and calls should be extracted into individual diff --git a/libs/common/src/abstractions/fileUpload.service.ts b/libs/common/src/abstractions/fileUpload.service.ts index b8523f3218..0dbf8b3a6a 100644 --- a/libs/common/src/abstractions/fileUpload.service.ts +++ b/libs/common/src/abstractions/fileUpload.service.ts @@ -1,7 +1,7 @@ import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; import { EncString } from "../models/domain/enc-string"; -import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response"; import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; +import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response"; export abstract class FileUploadService { uploadSendFile: ( diff --git a/libs/common/src/abstractions/search.service.ts b/libs/common/src/abstractions/search.service.ts index 02eba41c13..3f37d4fe3a 100644 --- a/libs/common/src/abstractions/search.service.ts +++ b/libs/common/src/abstractions/search.service.ts @@ -1,5 +1,5 @@ -import { CipherView } from "../models/view/cipher.view"; import { SendView } from "../models/view/send.view"; +import { CipherView } from "../vault/models/view/cipher.view"; export abstract class SearchService { indexedEntityId?: string = null; diff --git a/libs/common/src/abstractions/state.service.ts b/libs/common/src/abstractions/state.service.ts index a2d2e3960e..9b88c9cb63 100644 --- a/libs/common/src/abstractions/state.service.ts +++ b/libs/common/src/abstractions/state.service.ts @@ -3,12 +3,9 @@ import { Observable } from "rxjs"; import { KdfType } from "../enums/kdfType"; import { ThemeType } from "../enums/themeType"; import { UriMatchType } from "../enums/uriMatchType"; -import { CipherData } from "../models/data/cipher.data"; import { CollectionData } from "../models/data/collection.data"; import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data"; import { EventData } from "../models/data/event.data"; -import { FolderData } from "../models/data/folder.data"; -import { LocalData } from "../models/data/local.data"; import { OrganizationData } from "../models/data/organization.data"; import { PolicyData } from "../models/data/policy.data"; import { ProviderData } from "../models/data/provider.data"; @@ -23,9 +20,12 @@ 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 { CipherView } from "../models/view/cipher.view"; import { CollectionView } from "../models/view/collection.view"; import { SendView } from "../models/view/send.view"; +import { CipherData } from "../vault/models/data/cipher.data"; +import { FolderData } from "../vault/models/data/folder.data"; +import { LocalData } from "../vault/models/data/local.data"; +import { CipherView } from "../vault/models/view/cipher.view"; export abstract class StateService { accounts$: Observable<{ [userId: string]: T }>; diff --git a/libs/common/src/importers/avast-json-importer.ts b/libs/common/src/importers/avast-json-importer.ts index 1c7a0e4a5d..203d98529f 100644 --- a/libs/common/src/importers/avast-json-importer.ts +++ b/libs/common/src/importers/avast-json-importer.ts @@ -1,6 +1,6 @@ -import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; +import { CipherType } from "../vault/enums/cipher-type"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/base-importer.ts b/libs/common/src/importers/base-importer.ts index dec6e2e715..69633ccadd 100644 --- a/libs/common/src/importers/base-importer.ts +++ b/libs/common/src/importers/base-importer.ts @@ -1,19 +1,19 @@ import * as papa from "papaparse"; import { LogService } from "../abstractions/log.service"; -import { CipherType } from "../enums/cipherType"; import { FieldType } from "../enums/fieldType"; import { SecureNoteType } from "../enums/secureNoteType"; import { Utils } from "../misc/utils"; import { ImportResult } from "../models/domain/import-result"; -import { CipherView } from "../models/view/cipher.view"; import { CollectionView } from "../models/view/collection.view"; -import { FieldView } from "../models/view/field.view"; -import { FolderView } from "../models/view/folder.view"; -import { LoginUriView } from "../models/view/login-uri.view"; -import { LoginView } from "../models/view/login.view"; -import { SecureNoteView } from "../models/view/secure-note.view"; import { ConsoleLogService } from "../services/consoleLog.service"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CipherView } from "../vault/models/view/cipher.view"; +import { FieldView } from "../vault/models/view/field.view"; +import { FolderView } from "../vault/models/view/folder.view"; +import { LoginUriView } from "../vault/models/view/login-uri.view"; +import { LoginView } from "../vault/models/view/login.view"; +import { SecureNoteView } from "../vault/models/view/secure-note.view"; export abstract class BaseImporter { organizationId: string = null; diff --git a/libs/common/src/importers/bitwarden-csv-importer.ts b/libs/common/src/importers/bitwarden-csv-importer.ts index f5f2554789..e40294b6b2 100644 --- a/libs/common/src/importers/bitwarden-csv-importer.ts +++ b/libs/common/src/importers/bitwarden-csv-importer.ts @@ -1,13 +1,13 @@ -import { CipherRepromptType } from "../enums/cipherRepromptType"; -import { CipherType } from "../enums/cipherType"; import { FieldType } from "../enums/fieldType"; import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; -import { CipherView } from "../models/view/cipher.view"; import { CollectionView } from "../models/view/collection.view"; -import { FieldView } from "../models/view/field.view"; -import { LoginView } from "../models/view/login.view"; -import { SecureNoteView } from "../models/view/secure-note.view"; +import { CipherRepromptType } from "../vault/enums/cipher-reprompt-type"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CipherView } from "../vault/models/view/cipher.view"; +import { FieldView } from "../vault/models/view/field.view"; +import { LoginView } from "../vault/models/view/login.view"; +import { SecureNoteView } from "../vault/models/view/secure-note.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/dashlane/dashlane-csv-importer.ts b/libs/common/src/importers/dashlane/dashlane-csv-importer.ts index f0b54ebdda..685b40042b 100644 --- a/libs/common/src/importers/dashlane/dashlane-csv-importer.ts +++ b/libs/common/src/importers/dashlane/dashlane-csv-importer.ts @@ -1,10 +1,10 @@ -import { CipherType } from "../../enums/cipherType"; import { SecureNoteType } from "../../enums/secureNoteType"; import { ImportResult } from "../../models/domain/import-result"; -import { CardView } from "../../models/view/card.view"; -import { CipherView } from "../../models/view/cipher.view"; -import { IdentityView } from "../../models/view/identity.view"; -import { LoginView } from "../../models/view/login.view"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CardView } from "../../vault/models/view/card.view"; +import { CipherView } from "../../vault/models/view/cipher.view"; +import { IdentityView } from "../../vault/models/view/identity.view"; +import { LoginView } from "../../vault/models/view/login.view"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/dashlane/dashlane-json-importer.ts b/libs/common/src/importers/dashlane/dashlane-json-importer.ts index d6812fe283..b2595d485c 100644 --- a/libs/common/src/importers/dashlane/dashlane-json-importer.ts +++ b/libs/common/src/importers/dashlane/dashlane-json-importer.ts @@ -1,10 +1,10 @@ -import { CipherType } from "../../enums/cipherType"; import { SecureNoteType } from "../../enums/secureNoteType"; import { ImportResult } from "../../models/domain/import-result"; -import { CardView } from "../../models/view/card.view"; -import { CipherView } from "../../models/view/cipher.view"; -import { IdentityView } from "../../models/view/identity.view"; -import { SecureNoteView } from "../../models/view/secure-note.view"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CardView } from "../../vault/models/view/card.view"; +import { CipherView } from "../../vault/models/view/cipher.view"; +import { IdentityView } from "../../vault/models/view/identity.view"; +import { SecureNoteView } from "../../vault/models/view/secure-note.view"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/encryptr-csv-importer.ts b/libs/common/src/importers/encryptr-csv-importer.ts index 68449d6c97..b5d6fb9669 100644 --- a/libs/common/src/importers/encryptr-csv-importer.ts +++ b/libs/common/src/importers/encryptr-csv-importer.ts @@ -1,6 +1,6 @@ -import { CipherType } from "../enums/cipherType"; import { ImportResult } from "../models/domain/import-result"; -import { CardView } from "../models/view/card.view"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CardView } from "../vault/models/view/card.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/enpass/enpass-csv-importer.ts b/libs/common/src/importers/enpass/enpass-csv-importer.ts index a73430ba8a..24c9196318 100644 --- a/libs/common/src/importers/enpass/enpass-csv-importer.ts +++ b/libs/common/src/importers/enpass/enpass-csv-importer.ts @@ -1,8 +1,8 @@ -import { CipherType } from "../../enums/cipherType"; import { SecureNoteType } from "../../enums/secureNoteType"; import { ImportResult } from "../../models/domain/import-result"; -import { CardView } from "../../models/view/card.view"; -import { SecureNoteView } from "../../models/view/secure-note.view"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CardView } from "../../vault/models/view/card.view"; +import { SecureNoteView } from "../../vault/models/view/secure-note.view"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/enpass/enpass-json-importer.ts b/libs/common/src/importers/enpass/enpass-json-importer.ts index 8dbf164ce4..d74f0e2ec9 100644 --- a/libs/common/src/importers/enpass/enpass-json-importer.ts +++ b/libs/common/src/importers/enpass/enpass-json-importer.ts @@ -1,9 +1,9 @@ -import { CipherType } from "../../enums/cipherType"; import { FieldType } from "../../enums/fieldType"; import { ImportResult } from "../../models/domain/import-result"; -import { CardView } from "../../models/view/card.view"; -import { CipherView } from "../../models/view/cipher.view"; -import { FolderView } from "../../models/view/folder.view"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CardView } from "../../vault/models/view/card.view"; +import { CipherView } from "../../vault/models/view/cipher.view"; +import { FolderView } from "../../vault/models/view/folder.view"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/fsecure/fsecure-fsk-importer.spec.ts b/libs/common/src/importers/fsecure/fsecure-fsk-importer.spec.ts index d8fab657ce..1eadb5c147 100644 --- a/libs/common/src/importers/fsecure/fsecure-fsk-importer.spec.ts +++ b/libs/common/src/importers/fsecure/fsecure-fsk-importer.spec.ts @@ -1,4 +1,4 @@ -import { CipherType } from "../../enums/cipherType"; +import { CipherType } from "../../vault/enums/cipher-type"; import { FSecureFskImporter as Importer } from "./fsecure-fsk-importer"; import { CreditCardTestEntry, LoginTestEntry } from "./fsk-test-data"; diff --git a/libs/common/src/importers/fsecure/fsecure-fsk-importer.ts b/libs/common/src/importers/fsecure/fsecure-fsk-importer.ts index c86c43640a..fcecf7a0a2 100644 --- a/libs/common/src/importers/fsecure/fsecure-fsk-importer.ts +++ b/libs/common/src/importers/fsecure/fsecure-fsk-importer.ts @@ -1,7 +1,7 @@ -import { CipherType } from "../../enums/cipherType"; import { ImportResult } from "../../models/domain/import-result"; -import { CardView } from "../../models/view/card.view"; -import { CipherView } from "../../models/view/cipher.view"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CardView } from "../../vault/models/view/card.view"; +import { CipherView } from "../../vault/models/view/cipher.view"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/keepass2-xml-importer.ts b/libs/common/src/importers/keepass2-xml-importer.ts index 2bb169c4d1..5017340679 100644 --- a/libs/common/src/importers/keepass2-xml-importer.ts +++ b/libs/common/src/importers/keepass2-xml-importer.ts @@ -1,6 +1,6 @@ import { FieldType } from "../enums/fieldType"; import { ImportResult } from "../models/domain/import-result"; -import { FolderView } from "../models/view/folder.view"; +import { FolderView } from "../vault/models/view/folder.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/lastpass-csv-importer.ts b/libs/common/src/importers/lastpass-csv-importer.ts index e75be31f54..a846a7d560 100644 --- a/libs/common/src/importers/lastpass-csv-importer.ts +++ b/libs/common/src/importers/lastpass-csv-importer.ts @@ -1,12 +1,12 @@ -import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; -import { CardView } from "../models/view/card.view"; -import { CipherView } from "../models/view/cipher.view"; -import { FolderView } from "../models/view/folder.view"; -import { IdentityView } from "../models/view/identity.view"; -import { LoginView } from "../models/view/login.view"; -import { SecureNoteView } from "../models/view/secure-note.view"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CardView } from "../vault/models/view/card.view"; +import { CipherView } from "../vault/models/view/cipher.view"; +import { FolderView } from "../vault/models/view/folder.view"; +import { IdentityView } from "../vault/models/view/identity.view"; +import { LoginView } from "../vault/models/view/login.view"; +import { SecureNoteView } from "../vault/models/view/secure-note.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/msecure-csv-importer.ts b/libs/common/src/importers/msecure-csv-importer.ts index cb17da5c17..52c397beaf 100644 --- a/libs/common/src/importers/msecure-csv-importer.ts +++ b/libs/common/src/importers/msecure-csv-importer.ts @@ -1,7 +1,7 @@ -import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; -import { SecureNoteView } from "../models/view/secure-note.view"; +import { CipherType } from "../vault/enums/cipher-type"; +import { SecureNoteView } from "../vault/models/view/secure-note.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/myki-csv-importer.ts b/libs/common/src/importers/myki-csv-importer.ts index a56b0de4d3..e419a2921b 100644 --- a/libs/common/src/importers/myki-csv-importer.ts +++ b/libs/common/src/importers/myki-csv-importer.ts @@ -1,10 +1,10 @@ -import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; -import { CardView } from "../models/view/card.view"; -import { CipherView } from "../models/view/cipher.view"; -import { IdentityView } from "../models/view/identity.view"; -import { SecureNoteView } from "../models/view/secure-note.view"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CardView } from "../vault/models/view/card.view"; +import { CipherView } from "../vault/models/view/cipher.view"; +import { IdentityView } from "../vault/models/view/identity.view"; +import { SecureNoteView } from "../vault/models/view/secure-note.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/nordpass-csv-importer.ts b/libs/common/src/importers/nordpass-csv-importer.ts index cf6b73e13f..bea4b8685f 100644 --- a/libs/common/src/importers/nordpass-csv-importer.ts +++ b/libs/common/src/importers/nordpass-csv-importer.ts @@ -1,8 +1,8 @@ -import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; -import { CipherView } from "../models/view/cipher.view"; -import { LoginView } from "../models/view/login.view"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CipherView } from "../vault/models/view/cipher.view"; +import { LoginView } from "../vault/models/view/login.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/onepassword/cipher-import-context.ts b/libs/common/src/importers/onepassword/cipher-import-context.ts index 4a8810205f..d8eb22caad 100644 --- a/libs/common/src/importers/onepassword/cipher-import-context.ts +++ b/libs/common/src/importers/onepassword/cipher-import-context.ts @@ -1,4 +1,4 @@ -import { CipherView } from "../../models/view/cipher.view"; +import { CipherView } from "../../vault/models/view/cipher.view"; export class CipherImportContext { lowerProperty: string; diff --git a/libs/common/src/importers/onepassword/onepassword-1pif-importer.ts b/libs/common/src/importers/onepassword/onepassword-1pif-importer.ts index a0b6bb84bf..f2e8c66222 100644 --- a/libs/common/src/importers/onepassword/onepassword-1pif-importer.ts +++ b/libs/common/src/importers/onepassword/onepassword-1pif-importer.ts @@ -1,12 +1,12 @@ -import { CipherType } from "../../enums/cipherType"; import { FieldType } from "../../enums/fieldType"; import { SecureNoteType } from "../../enums/secureNoteType"; import { ImportResult } from "../../models/domain/import-result"; -import { CardView } from "../../models/view/card.view"; -import { CipherView } from "../../models/view/cipher.view"; -import { IdentityView } from "../../models/view/identity.view"; -import { PasswordHistoryView } from "../../models/view/password-history.view"; -import { SecureNoteView } from "../../models/view/secure-note.view"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CardView } from "../../vault/models/view/card.view"; +import { CipherView } from "../../vault/models/view/cipher.view"; +import { IdentityView } from "../../vault/models/view/identity.view"; +import { PasswordHistoryView } from "../../vault/models/view/password-history.view"; +import { SecureNoteView } from "../../vault/models/view/secure-note.view"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/onepassword/onepassword-1pux-importer.ts b/libs/common/src/importers/onepassword/onepassword-1pux-importer.ts index 35027a1e90..9e516e53e3 100644 --- a/libs/common/src/importers/onepassword/onepassword-1pux-importer.ts +++ b/libs/common/src/importers/onepassword/onepassword-1pux-importer.ts @@ -1,14 +1,14 @@ -import { CipherRepromptType } from "../../enums/cipherRepromptType"; -import { CipherType } from "../../enums/cipherType"; import { FieldType } from "../../enums/fieldType"; import { SecureNoteType } from "../../enums/secureNoteType"; import { ImportResult } from "../../models/domain/import-result"; -import { CardView } from "../../models/view/card.view"; -import { CipherView } from "../../models/view/cipher.view"; -import { IdentityView } from "../../models/view/identity.view"; -import { LoginView } from "../../models/view/login.view"; -import { PasswordHistoryView } from "../../models/view/password-history.view"; -import { SecureNoteView } from "../../models/view/secure-note.view"; +import { CipherRepromptType } from "../../vault/enums/cipher-reprompt-type"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CardView } from "../../vault/models/view/card.view"; +import { CipherView } from "../../vault/models/view/cipher.view"; +import { IdentityView } from "../../vault/models/view/identity.view"; +import { LoginView } from "../../vault/models/view/login.view"; +import { PasswordHistoryView } from "../../vault/models/view/password-history.view"; +import { SecureNoteView } from "../../vault/models/view/secure-note.view"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/onepassword/onepassword-csv-importer.ts b/libs/common/src/importers/onepassword/onepassword-csv-importer.ts index 12433c135f..31ba984db7 100644 --- a/libs/common/src/importers/onepassword/onepassword-csv-importer.ts +++ b/libs/common/src/importers/onepassword/onepassword-csv-importer.ts @@ -1,7 +1,7 @@ -import { CipherType } from "../../enums/cipherType"; import { FieldType } from "../../enums/fieldType"; import { ImportResult } from "../../models/domain/import-result"; -import { CipherView } from "../../models/view/cipher.view"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CipherView } from "../../vault/models/view/cipher.view"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts b/libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts index 522e6b0ef4..8a6388c374 100644 --- a/libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts +++ b/libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts @@ -1,7 +1,7 @@ -import { CipherType } from "../../enums/cipherType"; -import { CardView } from "../../models/view/card.view"; -import { CipherView } from "../../models/view/cipher.view"; -import { IdentityView } from "../../models/view/identity.view"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CardView } from "../../vault/models/view/card.view"; +import { CipherView } from "../../vault/models/view/cipher.view"; +import { IdentityView } from "../../vault/models/view/identity.view"; import { Importer } from "../importer"; import { IgnoredProperties, OnePasswordCsvImporter } from "./onepassword-csv-importer"; diff --git a/libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts b/libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts index 5f0bca1c8a..b46d162aa9 100644 --- a/libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts +++ b/libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts @@ -1,8 +1,8 @@ -import { CipherType } from "../../enums/cipherType"; -import { CardView } from "../../models/view/card.view"; -import { CipherView } from "../../models/view/cipher.view"; -import { IdentityView } from "../../models/view/identity.view"; -import { LoginView } from "../../models/view/login.view"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CardView } from "../../vault/models/view/card.view"; +import { CipherView } from "../../vault/models/view/cipher.view"; +import { IdentityView } from "../../vault/models/view/identity.view"; +import { LoginView } from "../../vault/models/view/login.view"; import { Importer } from "../importer"; import { CipherImportContext } from "./cipher-import-context"; diff --git a/libs/common/src/importers/passwordboss-json-importer.ts b/libs/common/src/importers/passwordboss-json-importer.ts index dc29edf117..a9c25e21cf 100644 --- a/libs/common/src/importers/passwordboss-json-importer.ts +++ b/libs/common/src/importers/passwordboss-json-importer.ts @@ -1,7 +1,7 @@ -import { CipherType } from "../enums/cipherType"; import { ImportResult } from "../models/domain/import-result"; -import { CardView } from "../models/view/card.view"; -import { FolderView } from "../models/view/folder.view"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CardView } from "../vault/models/view/card.view"; +import { FolderView } from "../vault/models/view/folder.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/psono/psono-json-importer.ts b/libs/common/src/importers/psono/psono-json-importer.ts index 0e173b131d..517a3a5a5f 100644 --- a/libs/common/src/importers/psono/psono-json-importer.ts +++ b/libs/common/src/importers/psono/psono-json-importer.ts @@ -1,9 +1,9 @@ -import { CipherType } from "../../enums/cipherType"; import { FieldType } from "../../enums/fieldType"; import { SecureNoteType } from "../../enums/secureNoteType"; import { ImportResult } from "../../models/domain/import-result"; -import { CipherView } from "../../models/view/cipher.view"; -import { SecureNoteView } from "../../models/view/secure-note.view"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CipherView } from "../../vault/models/view/cipher.view"; +import { SecureNoteView } from "../../vault/models/view/secure-note.view"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/remembear-csv-importer.ts b/libs/common/src/importers/remembear-csv-importer.ts index 3ddb327140..7720fc79b8 100644 --- a/libs/common/src/importers/remembear-csv-importer.ts +++ b/libs/common/src/importers/remembear-csv-importer.ts @@ -1,6 +1,6 @@ -import { CipherType } from "../enums/cipherType"; import { ImportResult } from "../models/domain/import-result"; -import { CardView } from "../models/view/card.view"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CardView } from "../vault/models/view/card.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/safeincloud-xml-importer.ts b/libs/common/src/importers/safeincloud-xml-importer.ts index 5d81a001aa..39a48df348 100644 --- a/libs/common/src/importers/safeincloud-xml-importer.ts +++ b/libs/common/src/importers/safeincloud-xml-importer.ts @@ -1,11 +1,11 @@ -import { CipherType } from "../enums/cipherType"; import { FieldType } from "../enums/fieldType"; import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; -import { CipherView } from "../models/view/cipher.view"; -import { FieldView } from "../models/view/field.view"; -import { FolderView } from "../models/view/folder.view"; -import { SecureNoteView } from "../models/view/secure-note.view"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CipherView } from "../vault/models/view/cipher.view"; +import { FieldView } from "../vault/models/view/field.view"; +import { FolderView } from "../vault/models/view/folder.view"; +import { SecureNoteView } from "../vault/models/view/secure-note.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/splashid-csv-importer.ts b/libs/common/src/importers/splashid-csv-importer.ts index 0270d91d13..8708b56c34 100644 --- a/libs/common/src/importers/splashid-csv-importer.ts +++ b/libs/common/src/importers/splashid-csv-importer.ts @@ -1,5 +1,5 @@ import { ImportResult } from "../models/domain/import-result"; -import { CipherView } from "../models/view/cipher.view"; +import { CipherView } from "../vault/models/view/cipher.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/truekey-csv-importer.ts b/libs/common/src/importers/truekey-csv-importer.ts index 8b65dbd5d9..4b1bb4cbd4 100644 --- a/libs/common/src/importers/truekey-csv-importer.ts +++ b/libs/common/src/importers/truekey-csv-importer.ts @@ -1,8 +1,8 @@ -import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; -import { CardView } from "../models/view/card.view"; -import { SecureNoteView } from "../models/view/secure-note.view"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CardView } from "../vault/models/view/card.view"; +import { SecureNoteView } from "../vault/models/view/secure-note.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/zohovault-csv-importer.ts b/libs/common/src/importers/zohovault-csv-importer.ts index 2d4def098a..3387016a67 100644 --- a/libs/common/src/importers/zohovault-csv-importer.ts +++ b/libs/common/src/importers/zohovault-csv-importer.ts @@ -1,5 +1,5 @@ import { ImportResult } from "../models/domain/import-result"; -import { CipherView } from "../models/view/cipher.view"; +import { CipherView } from "../vault/models/view/cipher.view"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/misc/linkedFieldOption.decorator.ts b/libs/common/src/misc/linkedFieldOption.decorator.ts index 5296698a12..62755753a2 100644 --- a/libs/common/src/misc/linkedFieldOption.decorator.ts +++ b/libs/common/src/misc/linkedFieldOption.decorator.ts @@ -1,5 +1,5 @@ import { LinkedIdType } from "../enums/linkedIdType"; -import { ItemView } from "../models/view/item.view"; +import { ItemView } from "../vault/models/view/item.view"; export class LinkedMetadata { constructor(readonly propertyKey: string, private readonly _i18nKey?: string) {} diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts index 4a65f35a8e..038964498b 100644 --- a/libs/common/src/models/domain/account.ts +++ b/libs/common/src/models/domain/account.ts @@ -5,17 +5,17 @@ import { KdfType } from "../../enums/kdfType"; import { UriMatchType } from "../../enums/uriMatchType"; import { Utils } from "../../misc/utils"; import { DeepJsonify } from "../../types/deep-jsonify"; -import { CipherData } from "../data/cipher.data"; +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 { FolderData } from "../data/folder.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 { CipherView } from "../view/cipher.view"; import { CollectionView } from "../view/collection.view"; import { SendView } from "../view/send.view"; diff --git a/libs/common/src/models/domain/import-result.ts b/libs/common/src/models/domain/import-result.ts index 6c67826306..815801d09c 100644 --- a/libs/common/src/models/domain/import-result.ts +++ b/libs/common/src/models/domain/import-result.ts @@ -1,6 +1,6 @@ -import { CipherView } from "../view/cipher.view"; +import { CipherView } from "../../vault/models/view/cipher.view"; +import { FolderView } from "../../vault/models/view/folder.view"; import { CollectionView } from "../view/collection.view"; -import { FolderView } from "../view/folder.view"; export class ImportResult { success = false; diff --git a/libs/common/src/models/export/card.export.ts b/libs/common/src/models/export/card.export.ts index edd730b773..9818625e54 100644 --- a/libs/common/src/models/export/card.export.ts +++ b/libs/common/src/models/export/card.export.ts @@ -1,6 +1,6 @@ -import { Card as CardDomain } from "../domain/card"; +import { Card as CardDomain } from "../../vault/models/domain/card"; +import { CardView } from "../../vault/models/view/card.view"; import { EncString } from "../domain/enc-string"; -import { CardView } from "../view/card.view"; export class CardExport { static template(): CardExport { diff --git a/libs/common/src/models/export/cipher-with-ids.export.ts b/libs/common/src/models/export/cipher-with-ids.export.ts index 2ad601e9a6..4e6e9e9630 100644 --- a/libs/common/src/models/export/cipher-with-ids.export.ts +++ b/libs/common/src/models/export/cipher-with-ids.export.ts @@ -1,5 +1,5 @@ -import { Cipher as CipherDomain } from "../domain/cipher"; -import { CipherView } from "../view/cipher.view"; +import { Cipher as CipherDomain } from "../../vault/models/domain/cipher"; +import { CipherView } from "../../vault/models/view/cipher.view"; import { CipherExport } from "./cipher.export"; diff --git a/libs/common/src/models/export/cipher.export.ts b/libs/common/src/models/export/cipher.export.ts index b4585cb406..44b1cb4eff 100644 --- a/libs/common/src/models/export/cipher.export.ts +++ b/libs/common/src/models/export/cipher.export.ts @@ -1,8 +1,8 @@ -import { CipherRepromptType } from "../../enums/cipherRepromptType"; -import { CipherType } from "../../enums/cipherType"; -import { Cipher as CipherDomain } from "../domain/cipher"; +import { CipherRepromptType } from "../../vault/enums/cipher-reprompt-type"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { Cipher as CipherDomain } from "../../vault/models/domain/cipher"; +import { CipherView } from "../../vault/models/view/cipher.view"; import { EncString } from "../domain/enc-string"; -import { CipherView } from "../view/cipher.view"; import { CardExport } from "./card.export"; import { FieldExport } from "./field.export"; diff --git a/libs/common/src/models/export/field.export.ts b/libs/common/src/models/export/field.export.ts index 66c856d7bf..3e63a91e2b 100644 --- a/libs/common/src/models/export/field.export.ts +++ b/libs/common/src/models/export/field.export.ts @@ -1,8 +1,8 @@ import { FieldType } from "../../enums/fieldType"; import { LinkedIdType } from "../../enums/linkedIdType"; +import { Field as FieldDomain } from "../../vault/models/domain/field"; +import { FieldView } from "../../vault/models/view/field.view"; import { EncString } from "../domain/enc-string"; -import { Field as FieldDomain } from "../domain/field"; -import { FieldView } from "../view/field.view"; export class FieldExport { static template(): FieldExport { diff --git a/libs/common/src/models/export/folder-with-id.export.ts b/libs/common/src/models/export/folder-with-id.export.ts index 655fab077b..c0f3c55c4b 100644 --- a/libs/common/src/models/export/folder-with-id.export.ts +++ b/libs/common/src/models/export/folder-with-id.export.ts @@ -1,5 +1,5 @@ -import { Folder as FolderDomain } from "../domain/folder"; -import { FolderView } from "../view/folder.view"; +import { Folder as FolderDomain } from "../../vault/models/domain/folder"; +import { FolderView } from "../../vault/models/view/folder.view"; import { FolderExport } from "./folder.export"; diff --git a/libs/common/src/models/export/folder.export.ts b/libs/common/src/models/export/folder.export.ts index 839dcceaab..94446d7785 100644 --- a/libs/common/src/models/export/folder.export.ts +++ b/libs/common/src/models/export/folder.export.ts @@ -1,6 +1,6 @@ +import { Folder as FolderDomain } from "../../vault/models/domain/folder"; +import { FolderView } from "../../vault/models/view/folder.view"; import { EncString } from "../domain/enc-string"; -import { Folder as FolderDomain } from "../domain/folder"; -import { FolderView } from "../view/folder.view"; export class FolderExport { static template(): FolderExport { diff --git a/libs/common/src/models/export/identity.export.ts b/libs/common/src/models/export/identity.export.ts index d4180d44a9..4a1b405656 100644 --- a/libs/common/src/models/export/identity.export.ts +++ b/libs/common/src/models/export/identity.export.ts @@ -1,6 +1,6 @@ +import { Identity as IdentityDomain } from "../../vault/models/domain/identity"; +import { IdentityView } from "../../vault/models/view/identity.view"; import { EncString } from "../domain/enc-string"; -import { Identity as IdentityDomain } from "../domain/identity"; -import { IdentityView } from "../view/identity.view"; export class IdentityExport { static template(): IdentityExport { diff --git a/libs/common/src/models/export/login-uri.export.ts b/libs/common/src/models/export/login-uri.export.ts index ee0d883c98..03438cad14 100644 --- a/libs/common/src/models/export/login-uri.export.ts +++ b/libs/common/src/models/export/login-uri.export.ts @@ -1,7 +1,7 @@ import { UriMatchType } from "../../enums/uriMatchType"; +import { LoginUri as LoginUriDomain } from "../../vault/models/domain/login-uri"; +import { LoginUriView } from "../../vault/models/view/login-uri.view"; import { EncString } from "../domain/enc-string"; -import { LoginUri as LoginUriDomain } from "../domain/login-uri"; -import { LoginUriView } from "../view/login-uri.view"; export class LoginUriExport { static template(): LoginUriExport { diff --git a/libs/common/src/models/export/login.export.ts b/libs/common/src/models/export/login.export.ts index 6a143fb99a..f33fccc0db 100644 --- a/libs/common/src/models/export/login.export.ts +++ b/libs/common/src/models/export/login.export.ts @@ -1,6 +1,6 @@ +import { Login as LoginDomain } from "../../vault/models/domain/login"; +import { LoginView } from "../../vault/models/view/login.view"; import { EncString } from "../domain/enc-string"; -import { Login as LoginDomain } from "../domain/login"; -import { LoginView } from "../view/login.view"; import { LoginUriExport } from "./login-uri.export"; diff --git a/libs/common/src/models/export/secure-note.export.ts b/libs/common/src/models/export/secure-note.export.ts index 7b7e987698..254f020bf1 100644 --- a/libs/common/src/models/export/secure-note.export.ts +++ b/libs/common/src/models/export/secure-note.export.ts @@ -1,6 +1,6 @@ import { SecureNoteType } from "../../enums/secureNoteType"; -import { SecureNote as SecureNoteDomain } from "../domain/secure-note"; -import { SecureNoteView } from "../view/secure-note.view"; +import { SecureNote as SecureNoteDomain } from "../../vault/models/domain/secure-note"; +import { SecureNoteView } from "../../vault/models/view/secure-note.view"; export class SecureNoteExport { static template(): SecureNoteExport { diff --git a/libs/common/src/models/request/import-ciphers.request.ts b/libs/common/src/models/request/import-ciphers.request.ts index aa94239f23..065f1b2838 100644 --- a/libs/common/src/models/request/import-ciphers.request.ts +++ b/libs/common/src/models/request/import-ciphers.request.ts @@ -1,5 +1,6 @@ -import { CipherRequest } from "./cipher.request"; -import { FolderRequest } from "./folder.request"; +import { CipherRequest } from "../../vault/models/request/cipher.request"; +import { FolderRequest } from "../../vault/models/request/folder.request"; + import { KvpRequest } from "./kvp.request"; export class ImportCiphersRequest { 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 17eda64dab..d0f3e9398a 100644 --- a/libs/common/src/models/request/import-organization-ciphers.request.ts +++ b/libs/common/src/models/request/import-organization-ciphers.request.ts @@ -1,4 +1,5 @@ -import { CipherRequest } from "./cipher.request"; +import { CipherRequest } from "../../vault/models/request/cipher.request"; + import { CollectionRequest } from "./collection.request"; import { KvpRequest } from "./kvp.request"; diff --git a/libs/common/src/models/request/update-key.request.ts b/libs/common/src/models/request/update-key.request.ts index c7faa8eb2e..0679257a67 100644 --- a/libs/common/src/models/request/update-key.request.ts +++ b/libs/common/src/models/request/update-key.request.ts @@ -1,5 +1,6 @@ -import { CipherWithIdRequest } from "./cipher-with-id.request"; -import { FolderWithIdRequest } from "./folder-with-id.request"; +import { CipherWithIdRequest } from "../../vault/models/request/cipher-with-id.request"; +import { FolderWithIdRequest } from "../../vault/models/request/folder-with-id.request"; + import { SendWithIdRequest } from "./send-with-id.request"; export class UpdateKeyRequest { diff --git a/libs/common/src/models/response/emergency-access.response.ts b/libs/common/src/models/response/emergency-access.response.ts index 2259b4f029..9051c878c8 100644 --- a/libs/common/src/models/response/emergency-access.response.ts +++ b/libs/common/src/models/response/emergency-access.response.ts @@ -1,9 +1,9 @@ import { EmergencyAccessStatusType } from "../../enums/emergencyAccessStatusType"; import { EmergencyAccessType } from "../../enums/emergencyAccessType"; import { KdfType } from "../../enums/kdfType"; +import { CipherResponse } from "../../vault/models/response/cipher.response"; import { BaseResponse } from "./base.response"; -import { CipherResponse } from "./cipher.response"; export class EmergencyAccessGranteeDetailsResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/organization-export.response.ts b/libs/common/src/models/response/organization-export.response.ts index af1152dc2f..5aa2f2de6e 100644 --- a/libs/common/src/models/response/organization-export.response.ts +++ b/libs/common/src/models/response/organization-export.response.ts @@ -1,5 +1,6 @@ +import { CipherResponse } from "../../vault/models/response/cipher.response"; + import { BaseResponse } from "./base.response"; -import { CipherResponse } from "./cipher.response"; import { CollectionResponse } from "./collection.response"; export class OrganizationExportResponse extends BaseResponse { diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index 4412fcd75b..3ee6ef585b 100644 --- a/libs/common/src/services/api.service.ts +++ b/libs/common/src/services/api.service.ts @@ -7,16 +7,7 @@ import { DeviceType } from "../enums/deviceType"; import { OrganizationConnectionType } from "../enums/organizationConnectionType"; import { Utils } from "../misc/utils"; import { SetKeyConnectorKeyRequest } from "../models/request/account/set-key-connector-key.request"; -import { AttachmentRequest } from "../models/request/attachment.request"; import { BitPayInvoiceRequest } from "../models/request/bit-pay-invoice.request"; -import { CipherBulkDeleteRequest } from "../models/request/cipher-bulk-delete.request"; -import { CipherBulkMoveRequest } from "../models/request/cipher-bulk-move.request"; -import { CipherBulkShareRequest } from "../models/request/cipher-bulk-share.request"; -import { CipherCollectionsRequest } from "../models/request/cipher-collections.request"; -import { CipherCreateRequest } from "../models/request/cipher-create.request"; -import { CipherPartialRequest } from "../models/request/cipher-partial.request"; -import { CipherShareRequest } from "../models/request/cipher-share.request"; -import { CipherRequest } from "../models/request/cipher.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"; @@ -82,14 +73,11 @@ import { UpdateTwoFactorYubioOtpRequest } from "../models/request/update-two-fac import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; import { ApiKeyResponse } from "../models/response/api-key.response"; -import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response"; -import { AttachmentResponse } from "../models/response/attachment.response"; import { AuthRequestResponse } from "../models/response/auth-request.response"; import { RegisterResponse } from "../models/response/authentication/register.response"; 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 { CipherResponse } from "../models/response/cipher.response"; import { CollectionAccessDetailsResponse, CollectionResponse, @@ -138,7 +126,6 @@ import { SendFileUploadDataResponse } from "../models/response/send-file-upload- import { SendResponse } from "../models/response/send.response"; import { SsoPreValidateResponse } from "../models/response/sso-pre-validate.response"; import { SubscriptionResponse } from "../models/response/subscription.response"; -import { SyncResponse } from "../models/response/sync.response"; import { TaxInfoResponse } from "../models/response/tax-info.response"; import { TaxRateResponse } from "../models/response/tax-rate.response"; import { TwoFactorAuthenticatorResponse } from "../models/response/two-factor-authenticator.response"; @@ -153,6 +140,19 @@ import { import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.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"; +import { CipherBulkDeleteRequest } from "../vault/models/request/cipher-bulk-delete.request"; +import { CipherBulkMoveRequest } from "../vault/models/request/cipher-bulk-move.request"; +import { CipherBulkShareRequest } from "../vault/models/request/cipher-bulk-share.request"; +import { CipherCollectionsRequest } from "../vault/models/request/cipher-collections.request"; +import { CipherCreateRequest } from "../vault/models/request/cipher-create.request"; +import { CipherPartialRequest } from "../vault/models/request/cipher-partial.request"; +import { CipherShareRequest } from "../vault/models/request/cipher-share.request"; +import { CipherRequest } from "../vault/models/request/cipher.request"; +import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response"; +import { AttachmentResponse } from "../vault/models/response/attachment.response"; +import { CipherResponse } from "../vault/models/response/cipher.response"; +import { SyncResponse } from "../vault/models/response/sync.response"; /** * @deprecated The `ApiService` class is deprecated and calls should be extracted into individual diff --git a/libs/common/src/services/cryptography/get-class-initializer.ts b/libs/common/src/services/cryptography/get-class-initializer.ts index accdb1c4a4..1bd710eb3d 100644 --- a/libs/common/src/services/cryptography/get-class-initializer.ts +++ b/libs/common/src/services/cryptography/get-class-initializer.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; import { InitializerMetadata } from "../../interfaces/initializer-metadata.interface"; -import { Cipher } from "../../models/domain/cipher"; -import { CipherView } from "../../models/view/cipher.view"; +import { Cipher } from "../../vault/models/domain/cipher"; +import { CipherView } from "../../vault/models/view/cipher.view"; import { InitializerKey } from "./initializer-key"; diff --git a/libs/common/src/services/event/event-collection.service.ts b/libs/common/src/services/event/event-collection.service.ts index 52285f8577..be982286cf 100644 --- a/libs/common/src/services/event/event-collection.service.ts +++ b/libs/common/src/services/event/event-collection.service.ts @@ -1,10 +1,10 @@ -import { CipherService } from "../../abstractions/cipher.service"; 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 { EventType } from "../../enums/eventType"; import { EventData } from "../../models/data/event.data"; +import { CipherService } from "../../vault/abstractions/cipher.service"; export class EventCollectionService implements EventCollectionServiceAbstraction { constructor( diff --git a/libs/common/src/services/export.service.ts b/libs/common/src/services/export.service.ts index b385440448..fa40f18bcc 100644 --- a/libs/common/src/services/export.service.ts +++ b/libs/common/src/services/export.service.ts @@ -1,32 +1,32 @@ import * as papa from "papaparse"; import { ApiService } from "../abstractions/api.service"; -import { CipherService } from "../abstractions/cipher.service"; import { CryptoService } from "../abstractions/crypto.service"; import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; import { ExportFormat, ExportService as ExportServiceAbstraction, } from "../abstractions/export.service"; -import { FolderService } from "../abstractions/folder/folder.service.abstraction"; -import { CipherType } from "../enums/cipherType"; import { DEFAULT_PBKDF2_ITERATIONS, KdfType } from "../enums/kdfType"; import { Utils } from "../misc/utils"; -import { CipherData } from "../models/data/cipher.data"; import { CollectionData } from "../models/data/collection.data"; -import { Cipher } from "../models/domain/cipher"; import { Collection } from "../models/domain/collection"; -import { Folder } from "../models/domain/folder"; import { KdfConfig } from "../models/domain/kdf-config"; 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 { CipherView } from "../models/view/cipher.view"; import { CollectionView } from "../models/view/collection.view"; import { EventView } from "../models/view/event.view"; -import { FolderView } from "../models/view/folder.view"; +import { CipherService } from "../vault/abstractions/cipher.service"; +import { FolderService } from "../vault/abstractions/folder/folder.service.abstraction"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CipherData } from "../vault/models/data/cipher.data"; +import { Cipher } from "../vault/models/domain/cipher"; +import { Folder } from "../vault/models/domain/folder"; +import { CipherView } from "../vault/models/view/cipher.view"; +import { FolderView } from "../vault/models/view/folder.view"; export class ExportService implements ExportServiceAbstraction { constructor( diff --git a/libs/common/src/services/fileUpload.service.ts b/libs/common/src/services/fileUpload.service.ts index 7bc9ae4dc8..f452ed2c0c 100644 --- a/libs/common/src/services/fileUpload.service.ts +++ b/libs/common/src/services/fileUpload.service.ts @@ -4,8 +4,8 @@ import { LogService } from "../abstractions/log.service"; import { FileUploadType } from "../enums/fileUploadType"; import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; import { EncString } from "../models/domain/enc-string"; -import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response"; import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; +import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response"; import { AzureFileUploadService } from "./azureFileUpload.service"; import { BitwardenFileUploadService } from "./bitwardenFileUpload.service"; diff --git a/libs/common/src/services/import/import.service.ts b/libs/common/src/services/import/import.service.ts index 1b2c7846ce..7afc86d48a 100644 --- a/libs/common/src/services/import/import.service.ts +++ b/libs/common/src/services/import/import.service.ts @@ -1,11 +1,8 @@ -import { CipherService } from "../../abstractions/cipher.service"; import { CollectionService } from "../../abstractions/collection.service"; import { CryptoService } from "../../abstractions/crypto.service"; -import { FolderService } from "../../abstractions/folder/folder.service.abstraction"; 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 { CipherType } from "../../enums/cipherType"; import { featuredImportOptions, ImportOption, @@ -74,14 +71,17 @@ 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 { CipherRequest } from "../../models/request/cipher.request"; import { CollectionRequest } from "../../models/request/collection.request"; -import { FolderRequest } from "../../models/request/folder.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"; import { ErrorResponse } from "../../models/response/error.response"; -import { CipherView } from "../../models/view/cipher.view"; +import { CipherService } from "../../vault/abstractions/cipher.service"; +import { FolderService } from "../../vault/abstractions/folder/folder.service.abstraction"; +import { CipherType } from "../../vault/enums/cipher-type"; +import { CipherRequest } from "../../vault/models/request/cipher.request"; +import { FolderRequest } from "../../vault/models/request/folder.request"; +import { CipherView } from "../../vault/models/view/cipher.view"; export class ImportService implements ImportServiceAbstraction { featuredImportOptions = featuredImportOptions as readonly ImportOption[]; diff --git a/libs/common/src/services/notifications.service.ts b/libs/common/src/services/notifications.service.ts index cd5188eba3..e066d75c07 100644 --- a/libs/common/src/services/notifications.service.ts +++ b/libs/common/src/services/notifications.service.ts @@ -8,7 +8,6 @@ import { EnvironmentService } from "../abstractions/environment.service"; import { LogService } from "../abstractions/log.service"; import { NotificationsService as NotificationsServiceAbstraction } from "../abstractions/notifications.service"; import { StateService } from "../abstractions/state.service"; -import { SyncService } from "../abstractions/sync/sync.service.abstraction"; import { AuthenticationStatus } from "../enums/authenticationStatus"; import { NotificationType } from "../enums/notificationType"; import { @@ -17,6 +16,7 @@ import { SyncFolderNotification, SyncSendNotification, } from "../models/response/notification.response"; +import { SyncService } from "../vault/abstractions/sync/sync.service.abstraction"; export class NotificationsService implements NotificationsServiceAbstraction { private signalrConnection: signalR.HubConnection; diff --git a/libs/common/src/services/organization/organization-api.service.ts b/libs/common/src/services/organization/organization-api.service.ts index 51337eb91e..7e18b73b69 100644 --- a/libs/common/src/services/organization/organization-api.service.ts +++ b/libs/common/src/services/organization/organization-api.service.ts @@ -1,6 +1,5 @@ import { ApiService } from "../../abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "../../abstractions/organization/organization-api.service.abstraction"; -import { SyncService } from "../../abstractions/sync/sync.service.abstraction"; import { OrganizationApiKeyType } from "../../enums/organizationApiKeyType"; import { ImportDirectoryRequest } from "../../models/request/import-directory.request"; import { OrganizationApiKeyRequest } from "../../models/request/organization-api-key.request"; @@ -27,6 +26,7 @@ import { OrganizationResponse } from "../../models/response/organization.respons import { OrganizationSsoResponse } from "../../models/response/organization/organization-sso.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/search.service.ts b/libs/common/src/services/search.service.ts index 05f2423b17..8d147ae1e9 100644 --- a/libs/common/src/services/search.service.ts +++ b/libs/common/src/services/search.service.ts @@ -1,14 +1,14 @@ import * as lunr from "lunr"; -import { CipherService } from "../abstractions/cipher.service"; import { I18nService } from "../abstractions/i18n.service"; import { LogService } from "../abstractions/log.service"; import { SearchService as SearchServiceAbstraction } from "../abstractions/search.service"; -import { CipherType } from "../enums/cipherType"; import { FieldType } from "../enums/fieldType"; import { UriMatchType } from "../enums/uriMatchType"; -import { CipherView } from "../models/view/cipher.view"; import { SendView } from "../models/view/send.view"; +import { CipherService } from "../vault/abstractions/cipher.service"; +import { CipherType } from "../vault/enums/cipher-type"; +import { CipherView } from "../vault/models/view/cipher.view"; export class SearchService implements SearchServiceAbstraction { private static registeredPipeline = false; diff --git a/libs/common/src/services/state.service.ts b/libs/common/src/services/state.service.ts index 1637913afe..331ae8e174 100644 --- a/libs/common/src/services/state.service.ts +++ b/libs/common/src/services/state.service.ts @@ -15,12 +15,9 @@ import { ThemeType } from "../enums/themeType"; import { UriMatchType } from "../enums/uriMatchType"; import { StateFactory } from "../factories/stateFactory"; import { Utils } from "../misc/utils"; -import { CipherData } from "../models/data/cipher.data"; import { CollectionData } from "../models/data/collection.data"; import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data"; import { EventData } from "../models/data/event.data"; -import { FolderData } from "../models/data/folder.data"; -import { LocalData } from "../models/data/local.data"; import { OrganizationData } from "../models/data/organization.data"; import { PolicyData } from "../models/data/policy.data"; import { ProviderData } from "../models/data/provider.data"; @@ -42,9 +39,12 @@ 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 { CipherView } from "../models/view/cipher.view"; import { CollectionView } from "../models/view/collection.view"; import { SendView } from "../models/view/send.view"; +import { CipherData } from "../vault/models/data/cipher.data"; +import { FolderData } from "../vault/models/data/folder.data"; +import { LocalData } from "../vault/models/data/local.data"; +import { CipherView } from "../vault/models/view/cipher.view"; const keys = { state: "state", diff --git a/libs/common/src/services/stateMigration.service.ts b/libs/common/src/services/stateMigration.service.ts index 4d948c600a..b2281586e2 100644 --- a/libs/common/src/services/stateMigration.service.ts +++ b/libs/common/src/services/stateMigration.service.ts @@ -4,10 +4,8 @@ import { KdfType } from "../enums/kdfType"; import { StateVersion } from "../enums/stateVersion"; import { ThemeType } from "../enums/themeType"; import { StateFactory } from "../factories/stateFactory"; -import { CipherData } from "../models/data/cipher.data"; import { CollectionData } from "../models/data/collection.data"; import { EventData } from "../models/data/event.data"; -import { FolderData } from "../models/data/folder.data"; import { OrganizationData } from "../models/data/organization.data"; import { PolicyData } from "../models/data/policy.data"; import { ProviderData } from "../models/data/provider.data"; @@ -23,6 +21,8 @@ import { EnvironmentUrls } from "../models/domain/environment-urls"; import { GeneratedPasswordHistory } from "../models/domain/generated-password-history"; import { GlobalState } from "../models/domain/global-state"; import { StorageOptions } from "../models/domain/storage-options"; +import { CipherData } from "../vault/models/data/cipher.data"; +import { FolderData } from "../vault/models/data/folder.data"; import { TokenService } from "./token.service"; diff --git a/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts b/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts index 79521d686a..bdeb8818de 100644 --- a/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts +++ b/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts @@ -1,10 +1,8 @@ import { firstValueFrom } from "rxjs"; import { AuthService } from "../../abstractions/auth.service"; -import { CipherService } from "../../abstractions/cipher.service"; import { CollectionService } from "../../abstractions/collection.service"; import { CryptoService } from "../../abstractions/crypto.service"; -import { FolderService } from "../../abstractions/folder/folder.service.abstraction"; import { KeyConnectorService } from "../../abstractions/keyConnector.service"; import { MessagingService } from "../../abstractions/messaging.service"; import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; @@ -13,6 +11,8 @@ import { StateService } from "../../abstractions/state.service"; import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "../../abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "../../abstractions/vaultTimeout/vaultTimeoutSettings.service"; import { AuthenticationStatus } from "../../enums/authenticationStatus"; +import { CipherService } from "../../vault/abstractions/cipher.service"; +import { FolderService } from "../../vault/abstractions/folder/folder.service.abstraction"; export class VaultTimeoutService implements VaultTimeoutServiceAbstraction { private inited = false; diff --git a/libs/common/src/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts similarity index 94% rename from libs/common/src/abstractions/cipher.service.ts rename to libs/common/src/vault/abstractions/cipher.service.ts index 457bbcd962..c4955f95d4 100644 --- a/libs/common/src/abstractions/cipher.service.ts +++ b/libs/common/src/vault/abstractions/cipher.service.ts @@ -1,9 +1,9 @@ -import { CipherType } from "../enums/cipherType"; -import { UriMatchType } from "../enums/uriMatchType"; +import { UriMatchType } from "../../enums/uriMatchType"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; +import { CipherType } from "../enums/cipher-type"; import { CipherData } from "../models/data/cipher.data"; import { Cipher } from "../models/domain/cipher"; import { Field } from "../models/domain/field"; -import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { CipherView } from "../models/view/cipher.view"; import { FieldView } from "../models/view/field.view"; diff --git a/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts b/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts similarity index 100% rename from libs/common/src/abstractions/folder/folder-api.service.abstraction.ts rename to libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts diff --git a/libs/common/src/abstractions/folder/folder.service.abstraction.ts b/libs/common/src/vault/abstractions/folder/folder.service.abstraction.ts similarity index 92% rename from libs/common/src/abstractions/folder/folder.service.abstraction.ts rename to libs/common/src/vault/abstractions/folder/folder.service.abstraction.ts index 90b6fc2332..96b9820dc7 100644 --- a/libs/common/src/abstractions/folder/folder.service.abstraction.ts +++ b/libs/common/src/vault/abstractions/folder/folder.service.abstraction.ts @@ -1,8 +1,8 @@ import { Observable } from "rxjs"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { FolderData } from "../../models/data/folder.data"; import { Folder } from "../../models/domain/folder"; -import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; import { FolderView } from "../../models/view/folder.view"; export abstract class FolderService { diff --git a/libs/common/src/abstractions/passwordReprompt.service.ts b/libs/common/src/vault/abstractions/password-reprompt.service.ts similarity index 100% rename from libs/common/src/abstractions/passwordReprompt.service.ts rename to libs/common/src/vault/abstractions/password-reprompt.service.ts diff --git a/libs/common/src/abstractions/sync/syncNotifier.service.abstraction.ts b/libs/common/src/vault/abstractions/sync/sync-notifier.service.abstraction.ts similarity index 72% rename from libs/common/src/abstractions/sync/syncNotifier.service.abstraction.ts rename to libs/common/src/vault/abstractions/sync/sync-notifier.service.abstraction.ts index 9a8261961e..f519850aa6 100644 --- a/libs/common/src/abstractions/sync/syncNotifier.service.abstraction.ts +++ b/libs/common/src/vault/abstractions/sync/sync-notifier.service.abstraction.ts @@ -1,6 +1,6 @@ import { Observable } from "rxjs"; -import { SyncEventArgs } from "../../types/syncEventArgs"; +import { SyncEventArgs } from "../../types/sync-event-args"; export abstract class SyncNotifierService { sync$: Observable; diff --git a/libs/common/src/abstractions/sync/sync.service.abstraction.ts b/libs/common/src/vault/abstractions/sync/sync.service.abstraction.ts similarity index 93% rename from libs/common/src/abstractions/sync/sync.service.abstraction.ts rename to libs/common/src/vault/abstractions/sync/sync.service.abstraction.ts index 20ca01876c..cfe7331755 100644 --- a/libs/common/src/abstractions/sync/sync.service.abstraction.ts +++ b/libs/common/src/vault/abstractions/sync/sync.service.abstraction.ts @@ -2,7 +2,7 @@ import { SyncCipherNotification, SyncFolderNotification, SyncSendNotification, -} from "../../models/response/notification.response"; +} from "../../../models/response/notification.response"; export abstract class SyncService { syncInProgress: boolean; diff --git a/libs/common/src/enums/cipherRepromptType.ts b/libs/common/src/vault/enums/cipher-reprompt-type.ts similarity index 100% rename from libs/common/src/enums/cipherRepromptType.ts rename to libs/common/src/vault/enums/cipher-reprompt-type.ts diff --git a/libs/common/src/enums/cipherType.ts b/libs/common/src/vault/enums/cipher-type.ts similarity index 100% rename from libs/common/src/enums/cipherType.ts rename to libs/common/src/vault/enums/cipher-type.ts diff --git a/libs/common/src/models/data/attachment.data.ts b/libs/common/src/vault/models/data/attachment.data.ts similarity index 100% rename from libs/common/src/models/data/attachment.data.ts rename to libs/common/src/vault/models/data/attachment.data.ts diff --git a/libs/common/src/models/data/card.data.ts b/libs/common/src/vault/models/data/card.data.ts similarity index 88% rename from libs/common/src/models/data/card.data.ts rename to libs/common/src/vault/models/data/card.data.ts index fe80003a8f..c142266f6d 100644 --- a/libs/common/src/models/data/card.data.ts +++ b/libs/common/src/vault/models/data/card.data.ts @@ -1,4 +1,4 @@ -import { CardApi } from "../api/card.api"; +import { CardApi } from "../../../models/api/card.api"; export class CardData { cardholderName: string; diff --git a/libs/common/src/models/data/cipher.data.ts b/libs/common/src/vault/models/data/cipher.data.ts similarity index 95% rename from libs/common/src/models/data/cipher.data.ts rename to libs/common/src/vault/models/data/cipher.data.ts index 4cc57559c2..2f83ee194b 100644 --- a/libs/common/src/models/data/cipher.data.ts +++ b/libs/common/src/vault/models/data/cipher.data.ts @@ -1,5 +1,5 @@ -import { CipherRepromptType } from "../../enums/cipherRepromptType"; -import { CipherType } from "../../enums/cipherType"; +import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; +import { CipherType } from "../../enums/cipher-type"; import { CipherResponse } from "../response/cipher.response"; import { AttachmentData } from "./attachment.data"; diff --git a/libs/common/src/models/data/field.data.ts b/libs/common/src/vault/models/data/field.data.ts similarity index 65% rename from libs/common/src/models/data/field.data.ts rename to libs/common/src/vault/models/data/field.data.ts index 42e800cf6c..37d46babef 100644 --- a/libs/common/src/models/data/field.data.ts +++ b/libs/common/src/vault/models/data/field.data.ts @@ -1,6 +1,6 @@ -import { FieldType } from "../../enums/fieldType"; -import { LinkedIdType } from "../../enums/linkedIdType"; -import { FieldApi } from "../api/field.api"; +import { FieldType } from "../../../enums/fieldType"; +import { LinkedIdType } from "../../../enums/linkedIdType"; +import { FieldApi } from "../../../models/api/field.api"; export class FieldData { type: FieldType; diff --git a/libs/common/src/models/data/folder.data.ts b/libs/common/src/vault/models/data/folder.data.ts similarity index 100% rename from libs/common/src/models/data/folder.data.ts rename to libs/common/src/vault/models/data/folder.data.ts diff --git a/libs/common/src/models/data/identity.data.ts b/libs/common/src/vault/models/data/identity.data.ts similarity index 94% rename from libs/common/src/models/data/identity.data.ts rename to libs/common/src/vault/models/data/identity.data.ts index 620ec2ec43..9f71f9bc2b 100644 --- a/libs/common/src/models/data/identity.data.ts +++ b/libs/common/src/vault/models/data/identity.data.ts @@ -1,4 +1,4 @@ -import { IdentityApi } from "../api/identity.api"; +import { IdentityApi } from "../../../models/api/identity.api"; export class IdentityData { title: string; diff --git a/libs/common/src/models/data/local.data.ts b/libs/common/src/vault/models/data/local.data.ts similarity index 100% rename from libs/common/src/models/data/local.data.ts rename to libs/common/src/vault/models/data/local.data.ts diff --git a/libs/common/src/models/data/login-uri.data.ts b/libs/common/src/vault/models/data/login-uri.data.ts similarity index 63% rename from libs/common/src/models/data/login-uri.data.ts rename to libs/common/src/vault/models/data/login-uri.data.ts index 25db2146fb..4fd5a15140 100644 --- a/libs/common/src/models/data/login-uri.data.ts +++ b/libs/common/src/vault/models/data/login-uri.data.ts @@ -1,5 +1,5 @@ -import { UriMatchType } from "../../enums/uriMatchType"; -import { LoginUriApi } from "../api/login-uri.api"; +import { UriMatchType } from "../../../enums/uriMatchType"; +import { LoginUriApi } from "../../../models/api/login-uri.api"; export class LoginUriData { uri: string; diff --git a/libs/common/src/models/data/login.data.ts b/libs/common/src/vault/models/data/login.data.ts similarity index 91% rename from libs/common/src/models/data/login.data.ts rename to libs/common/src/vault/models/data/login.data.ts index a15b1f2ed6..585b46ac05 100644 --- a/libs/common/src/models/data/login.data.ts +++ b/libs/common/src/vault/models/data/login.data.ts @@ -1,4 +1,4 @@ -import { LoginApi } from "../api/login.api"; +import { LoginApi } from "../../../models/api/login.api"; import { LoginUriData } from "./login-uri.data"; diff --git a/libs/common/src/models/data/password-history.data.ts b/libs/common/src/vault/models/data/password-history.data.ts similarity index 100% rename from libs/common/src/models/data/password-history.data.ts rename to libs/common/src/vault/models/data/password-history.data.ts diff --git a/libs/common/src/models/data/secure-note.data.ts b/libs/common/src/vault/models/data/secure-note.data.ts similarity index 56% rename from libs/common/src/models/data/secure-note.data.ts rename to libs/common/src/vault/models/data/secure-note.data.ts index c09f584705..cc849db6c8 100644 --- a/libs/common/src/models/data/secure-note.data.ts +++ b/libs/common/src/vault/models/data/secure-note.data.ts @@ -1,5 +1,5 @@ -import { SecureNoteType } from "../../enums/secureNoteType"; -import { SecureNoteApi } from "../api/secure-note.api"; +import { SecureNoteType } from "../../../enums/secureNoteType"; +import { SecureNoteApi } from "../../../models/api/secure-note.api"; export class SecureNoteData { type: SecureNoteType; diff --git a/libs/common/spec/models/domain/attachment.spec.ts b/libs/common/src/vault/models/domain/attachment.spec.ts similarity index 87% rename from libs/common/spec/models/domain/attachment.spec.ts rename to libs/common/src/vault/models/domain/attachment.spec.ts index 50e5ee7cae..e061569f02 100644 --- a/libs/common/spec/models/domain/attachment.spec.ts +++ b/libs/common/src/vault/models/domain/attachment.spec.ts @@ -1,14 +1,13 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { AttachmentData } from "@bitwarden/common/models/data/attachment.data"; -import { Attachment } from "@bitwarden/common/models/domain/attachment"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { ContainerService } from "@bitwarden/common/services/container.service"; - -import { makeStaticByteArray, mockEnc, mockFromJson } from "../../utils"; +import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec/utils"; +import { CryptoService } from "../../../abstractions/crypto.service"; +import { EncryptService } from "../../../abstractions/encrypt.service"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; +import { ContainerService } from "../../../services/container.service"; +import { AttachmentData } from "../../models/data/attachment.data"; +import { Attachment } from "../../models/domain/attachment"; describe("Attachment", () => { let data: AttachmentData; diff --git a/libs/common/src/models/domain/attachment.ts b/libs/common/src/vault/models/domain/attachment.ts similarity index 90% rename from libs/common/src/models/domain/attachment.ts rename to libs/common/src/vault/models/domain/attachment.ts index a3fc69f55d..99d3d631fe 100644 --- a/libs/common/src/models/domain/attachment.ts +++ b/libs/common/src/vault/models/domain/attachment.ts @@ -1,13 +1,12 @@ import { Jsonify } from "type-fest"; -import { Utils } from "../../misc/utils"; +import { Utils } from "../../../misc/utils"; +import Domain from "../../../models/domain/domain-base"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { AttachmentData } from "../data/attachment.data"; import { AttachmentView } from "../view/attachment.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export class Attachment extends Domain { id: string; url: string; diff --git a/libs/common/spec/models/domain/card.spec.ts b/libs/common/src/vault/models/domain/card.spec.ts similarity index 90% rename from libs/common/spec/models/domain/card.spec.ts rename to libs/common/src/vault/models/domain/card.spec.ts index 8a734e36d9..a1556fefc5 100644 --- a/libs/common/spec/models/domain/card.spec.ts +++ b/libs/common/src/vault/models/domain/card.spec.ts @@ -1,8 +1,7 @@ -import { CardData } from "@bitwarden/common/models/data/card.data"; -import { Card } from "@bitwarden/common/models/domain/card"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; - -import { mockEnc, mockFromJson } from "../../utils"; +import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { EncString } from "../../../models/domain/enc-string"; +import { CardData } from "../../../vault/models/data/card.data"; +import { Card } from "../../models/domain/card"; describe("Card", () => { let data: CardData; diff --git a/libs/common/src/models/domain/card.ts b/libs/common/src/vault/models/domain/card.ts similarity index 89% rename from libs/common/src/models/domain/card.ts rename to libs/common/src/vault/models/domain/card.ts index 4b8ca11309..ba8a53dbaf 100644 --- a/libs/common/src/models/domain/card.ts +++ b/libs/common/src/vault/models/domain/card.ts @@ -1,12 +1,11 @@ import { Jsonify } from "type-fest"; +import Domain from "../../../models/domain/domain-base"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { CardData } from "../data/card.data"; import { CardView } from "../view/card.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export class Card extends Domain { cardholderName: EncString; brand: EncString; diff --git a/libs/common/spec/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts similarity index 94% rename from libs/common/spec/models/domain/cipher.spec.ts rename to libs/common/src/vault/models/domain/cipher.spec.ts index cd49ea5484..440097c87c 100644 --- a/libs/common/spec/models/domain/cipher.spec.ts +++ b/libs/common/src/vault/models/domain/cipher.spec.ts @@ -2,27 +2,26 @@ import { Substitute, Arg } from "@fluffy-spoon/substitute"; import { Jsonify } from "type-fest"; -import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; -import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; -import { CipherData } from "@bitwarden/common/models/data/cipher.data"; -import { Attachment } from "@bitwarden/common/models/domain/attachment"; -import { Card } from "@bitwarden/common/models/domain/card"; -import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { Field } from "@bitwarden/common/models/domain/field"; -import { Identity } from "@bitwarden/common/models/domain/identity"; -import { Login } from "@bitwarden/common/models/domain/login"; -import { Password } from "@bitwarden/common/models/domain/password"; -import { SecureNote } from "@bitwarden/common/models/domain/secure-note"; -import { CardView } from "@bitwarden/common/models/view/card.view"; -import { IdentityView } from "@bitwarden/common/models/view/identity.view"; -import { LoginView } from "@bitwarden/common/models/view/login.view"; -import { InitializerKey } from "@bitwarden/common/services/cryptography/initializer-key"; - -import { mockEnc, mockFromJson } from "../../utils"; +import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { FieldType } from "../../../enums/fieldType"; +import { SecureNoteType } from "../../../enums/secureNoteType"; +import { UriMatchType } from "../../../enums/uriMatchType"; +import { EncString } from "../../../models/domain/enc-string"; +import { InitializerKey } from "../../../services/cryptography/initializer-key"; +import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; +import { CipherType } from "../../enums/cipher-type"; +import { CipherData } from "../../models/data/cipher.data"; +import { Attachment } from "../../models/domain/attachment"; +import { Card } from "../../models/domain/card"; +import { Cipher } from "../../models/domain/cipher"; +import { Field } from "../../models/domain/field"; +import { Identity } from "../../models/domain/identity"; +import { Login } from "../../models/domain/login"; +import { Password } from "../../models/domain/password"; +import { SecureNote } from "../../models/domain/secure-note"; +import { CardView } from "../../models/view/card.view"; +import { IdentityView } from "../../models/view/identity.view"; +import { LoginView } from "../../models/view/login.view"; describe("Cipher DTO", () => { it("Convert from empty CipherData", () => { diff --git a/libs/common/src/models/domain/cipher.ts b/libs/common/src/vault/models/domain/cipher.ts similarity index 94% rename from libs/common/src/models/domain/cipher.ts rename to libs/common/src/vault/models/domain/cipher.ts index 7b4a4d4b1f..55ef16914c 100644 --- a/libs/common/src/models/domain/cipher.ts +++ b/libs/common/src/vault/models/domain/cipher.ts @@ -1,23 +1,23 @@ import { Jsonify } from "type-fest"; -import { CipherRepromptType } from "../../enums/cipherRepromptType"; -import { CipherType } from "../../enums/cipherType"; -import { Decryptable } from "../../interfaces/decryptable.interface"; -import { InitializerKey } from "../../services/cryptography/initializer-key"; +import { Decryptable } from "../../../interfaces/decryptable.interface"; +import Domain from "../../../models/domain/domain-base"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; +import { InitializerKey } from "../../../services/cryptography/initializer-key"; +import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; +import { CipherType } from "../../enums/cipher-type"; import { CipherData } from "../data/cipher.data"; import { LocalData } from "../data/local.data"; import { CipherView } from "../view/cipher.view"; import { Attachment } from "./attachment"; import { Card } from "./card"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; import { Field } from "./field"; import { Identity } from "./identity"; import { Login } from "./login"; import { Password } from "./password"; import { SecureNote } from "./secure-note"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class Cipher extends Domain implements Decryptable { readonly initializerKey = InitializerKey.Cipher; diff --git a/libs/common/spec/models/domain/field.spec.ts b/libs/common/src/vault/models/domain/field.spec.ts similarity index 84% rename from libs/common/spec/models/domain/field.spec.ts rename to libs/common/src/vault/models/domain/field.spec.ts index 42f0addaf4..7fe219ec5f 100644 --- a/libs/common/spec/models/domain/field.spec.ts +++ b/libs/common/src/vault/models/domain/field.spec.ts @@ -1,9 +1,8 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { FieldData } from "@bitwarden/common/models/data/field.data"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { Field } from "@bitwarden/common/models/domain/field"; - -import { mockEnc, mockFromJson } from "../../utils"; +import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { FieldType } from "../../../enums/fieldType"; +import { EncString } from "../../../models/domain/enc-string"; +import { FieldData } from "../../models/data/field.data"; +import { Field } from "../../models/domain/field"; describe("Field", () => { let data: FieldData; diff --git a/libs/common/src/models/domain/field.ts b/libs/common/src/vault/models/domain/field.ts similarity index 80% rename from libs/common/src/models/domain/field.ts rename to libs/common/src/vault/models/domain/field.ts index ed098f53ea..29d8b62790 100644 --- a/libs/common/src/models/domain/field.ts +++ b/libs/common/src/vault/models/domain/field.ts @@ -1,14 +1,13 @@ import { Jsonify } from "type-fest"; -import { FieldType } from "../../enums/fieldType"; -import { LinkedIdType } from "../../enums/linkedIdType"; +import { FieldType } from "../../../enums/fieldType"; +import { LinkedIdType } from "../../../enums/linkedIdType"; +import Domain from "../../../models/domain/domain-base"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { FieldData } from "../data/field.data"; import { FieldView } from "../view/field.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export class Field extends Domain { name: EncString; value: EncString; diff --git a/libs/common/spec/models/domain/folder.spec.ts b/libs/common/src/vault/models/domain/folder.spec.ts similarity index 80% rename from libs/common/spec/models/domain/folder.spec.ts rename to libs/common/src/vault/models/domain/folder.spec.ts index 9a95a51f61..cc08518a90 100644 --- a/libs/common/spec/models/domain/folder.spec.ts +++ b/libs/common/src/vault/models/domain/folder.spec.ts @@ -1,8 +1,7 @@ -import { FolderData } from "@bitwarden/common/models/data/folder.data"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { Folder } from "@bitwarden/common/models/domain/folder"; - -import { mockEnc, mockFromJson } from "../../utils"; +import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { EncString } from "../../../models/domain/enc-string"; +import { FolderData } from "../../models/data/folder.data"; +import { Folder } from "../../models/domain/folder"; describe("Folder", () => { let data: FolderData; @@ -41,7 +40,7 @@ describe("Folder", () => { }); describe("fromJSON", () => { - jest.mock("@bitwarden/common/models/domain/enc-string"); + jest.mock("../../../models/domain/enc-string"); jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson); it("initializes nested objects", () => { diff --git a/libs/common/src/models/domain/folder.ts b/libs/common/src/vault/models/domain/folder.ts similarity index 88% rename from libs/common/src/models/domain/folder.ts rename to libs/common/src/vault/models/domain/folder.ts index c01928e00c..160d119e86 100644 --- a/libs/common/src/models/domain/folder.ts +++ b/libs/common/src/vault/models/domain/folder.ts @@ -1,11 +1,10 @@ import { Jsonify } from "type-fest"; +import Domain from "../../../models/domain/domain-base"; +import { EncString } from "../../../models/domain/enc-string"; import { FolderData } from "../data/folder.data"; import { FolderView } from "../view/folder.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; - export class Folder extends Domain { id: string; name: EncString; diff --git a/libs/common/spec/models/domain/identity.spec.ts b/libs/common/src/vault/models/domain/identity.spec.ts similarity index 95% rename from libs/common/spec/models/domain/identity.spec.ts rename to libs/common/src/vault/models/domain/identity.spec.ts index 649da6aa88..8b53ec016f 100644 --- a/libs/common/spec/models/domain/identity.spec.ts +++ b/libs/common/src/vault/models/domain/identity.spec.ts @@ -1,8 +1,7 @@ -import { IdentityData } from "@bitwarden/common/models/data/identity.data"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { Identity } from "@bitwarden/common/models/domain/identity"; - -import { mockEnc, mockFromJson } from "../../utils"; +import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { EncString } from "../../../models/domain/enc-string"; +import { IdentityData } from "../../models/data/identity.data"; +import { Identity } from "../../models/domain/identity"; describe("Identity", () => { let data: IdentityData; diff --git a/libs/common/src/models/domain/identity.ts b/libs/common/src/vault/models/domain/identity.ts similarity index 94% rename from libs/common/src/models/domain/identity.ts rename to libs/common/src/vault/models/domain/identity.ts index 5888e59c4f..6a5fab7e34 100644 --- a/libs/common/src/models/domain/identity.ts +++ b/libs/common/src/vault/models/domain/identity.ts @@ -1,12 +1,11 @@ import { Jsonify } from "type-fest"; +import Domain from "../../../models/domain/domain-base"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { IdentityData } from "../data/identity.data"; import { IdentityView } from "../view/identity.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export class Identity extends Domain { title: EncString; firstName: EncString; diff --git a/libs/common/spec/models/domain/loginUri.spec.ts b/libs/common/src/vault/models/domain/login-uri.spec.ts similarity index 82% rename from libs/common/spec/models/domain/loginUri.spec.ts rename to libs/common/src/vault/models/domain/login-uri.spec.ts index 1a9f13c893..1c990eca66 100644 --- a/libs/common/spec/models/domain/loginUri.spec.ts +++ b/libs/common/src/vault/models/domain/login-uri.spec.ts @@ -1,11 +1,11 @@ import { Jsonify } from "type-fest"; -import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; -import { LoginUriData } from "@bitwarden/common/models/data/login-uri.data"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { LoginUri } from "@bitwarden/common/models/domain/login-uri"; +import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { UriMatchType } from "../../../enums/uriMatchType"; +import { EncString } from "../../../models/domain/enc-string"; +import { LoginUriData } from "../data/login-uri.data"; -import { mockEnc, mockFromJson } from "../../utils"; +import { LoginUri } from "./login-uri"; describe("LoginUri", () => { let data: LoginUriData; diff --git a/libs/common/src/models/domain/login-uri.ts b/libs/common/src/vault/models/domain/login-uri.ts similarity index 80% rename from libs/common/src/models/domain/login-uri.ts rename to libs/common/src/vault/models/domain/login-uri.ts index ac5317687d..4a411d39dc 100644 --- a/libs/common/src/models/domain/login-uri.ts +++ b/libs/common/src/vault/models/domain/login-uri.ts @@ -1,13 +1,12 @@ import { Jsonify } from "type-fest"; -import { UriMatchType } from "../../enums/uriMatchType"; +import { UriMatchType } from "../../../enums/uriMatchType"; +import Domain from "../../../models/domain/domain-base"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { LoginUriData } from "../data/login-uri.data"; import { LoginUriView } from "../view/login-uri.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export class LoginUri extends Domain { uri: EncString; match: UriMatchType; diff --git a/libs/common/spec/models/domain/login.spec.ts b/libs/common/src/vault/models/domain/login.spec.ts similarity index 88% rename from libs/common/spec/models/domain/login.spec.ts rename to libs/common/src/vault/models/domain/login.spec.ts index 1e5950a947..1cc0981853 100644 --- a/libs/common/spec/models/domain/login.spec.ts +++ b/libs/common/src/vault/models/domain/login.spec.ts @@ -1,14 +1,13 @@ // eslint-disable-next-line no-restricted-imports import { Substitute, Arg } from "@fluffy-spoon/substitute"; -import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; -import { LoginData } from "@bitwarden/common/models/data/login.data"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { Login } from "@bitwarden/common/models/domain/login"; -import { LoginUri } from "@bitwarden/common/models/domain/login-uri"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; - -import { mockEnc, mockFromJson } from "../../utils"; +import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { UriMatchType } from "../../../enums/uriMatchType"; +import { EncString } from "../../../models/domain/enc-string"; +import { LoginData } from "../../models/data/login.data"; +import { Login } from "../../models/domain/login"; +import { LoginUri } from "../../models/domain/login-uri"; +import { LoginUriView } from "../../models/view/login-uri.view"; describe("Login DTO", () => { it("Convert from empty LoginData", () => { diff --git a/libs/common/src/models/domain/login.ts b/libs/common/src/vault/models/domain/login.ts similarity index 92% rename from libs/common/src/models/domain/login.ts rename to libs/common/src/vault/models/domain/login.ts index 2ce11c850b..763fba212f 100644 --- a/libs/common/src/models/domain/login.ts +++ b/libs/common/src/vault/models/domain/login.ts @@ -1,12 +1,12 @@ import { Jsonify } from "type-fest"; +import Domain from "../../../models/domain/domain-base"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { LoginData } from "../data/login.data"; import { LoginView } from "../view/login.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; import { LoginUri } from "./login-uri"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class Login extends Domain { uris: LoginUri[]; diff --git a/libs/common/spec/models/domain/password.spec.ts b/libs/common/src/vault/models/domain/password.spec.ts similarity index 86% rename from libs/common/spec/models/domain/password.spec.ts rename to libs/common/src/vault/models/domain/password.spec.ts index 065bda4ad8..6128e37f28 100644 --- a/libs/common/spec/models/domain/password.spec.ts +++ b/libs/common/src/vault/models/domain/password.spec.ts @@ -1,8 +1,7 @@ -import { PasswordHistoryData } from "@bitwarden/common/models/data/password-history.data"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { Password } from "@bitwarden/common/models/domain/password"; - -import { mockEnc, mockFromJson } from "../../utils"; +import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { EncString } from "../../../models/domain/enc-string"; +import { PasswordHistoryData } from "../../models/data/password-history.data"; +import { Password } from "../../models/domain/password"; describe("Password", () => { let data: PasswordHistoryData; diff --git a/libs/common/src/models/domain/password.ts b/libs/common/src/vault/models/domain/password.ts similarity index 86% rename from libs/common/src/models/domain/password.ts rename to libs/common/src/vault/models/domain/password.ts index 4a1ffbd151..95b76e284f 100644 --- a/libs/common/src/models/domain/password.ts +++ b/libs/common/src/vault/models/domain/password.ts @@ -1,12 +1,11 @@ import { Jsonify } from "type-fest"; +import Domain from "../../../models/domain/domain-base"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { PasswordHistoryData } from "../data/password-history.data"; import { PasswordHistoryView } from "../view/password-history.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export class Password extends Domain { password: EncString; lastUsedDate: Date; diff --git a/libs/common/spec/models/domain/secureNote.spec.ts b/libs/common/src/vault/models/domain/secure-note.spec.ts similarity index 81% rename from libs/common/spec/models/domain/secureNote.spec.ts rename to libs/common/src/vault/models/domain/secure-note.spec.ts index 52f1e5ddcd..b78ad4120a 100644 --- a/libs/common/spec/models/domain/secureNote.spec.ts +++ b/libs/common/src/vault/models/domain/secure-note.spec.ts @@ -1,6 +1,7 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; -import { SecureNoteData } from "@bitwarden/common/models/data/secure-note.data"; -import { SecureNote } from "@bitwarden/common/models/domain/secure-note"; +import { SecureNoteType } from "../../../enums/secureNoteType"; +import { SecureNoteData } from "../data/secure-note.data"; + +import { SecureNote } from "./secure-note"; describe("SecureNote", () => { let data: SecureNoteData; diff --git a/libs/common/src/models/domain/secure-note.ts b/libs/common/src/vault/models/domain/secure-note.ts similarity index 79% rename from libs/common/src/models/domain/secure-note.ts rename to libs/common/src/vault/models/domain/secure-note.ts index b880677ce8..097635b9aa 100644 --- a/libs/common/src/models/domain/secure-note.ts +++ b/libs/common/src/vault/models/domain/secure-note.ts @@ -1,12 +1,11 @@ import { Jsonify } from "type-fest"; -import { SecureNoteType } from "../../enums/secureNoteType"; +import { SecureNoteType } from "../../../enums/secureNoteType"; +import Domain from "../../../models/domain/domain-base"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { SecureNoteData } from "../data/secure-note.data"; import { SecureNoteView } from "../view/secure-note.view"; -import Domain from "./domain-base"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export class SecureNote extends Domain { type: SecureNoteType; diff --git a/libs/common/src/models/domain/sorted-ciphers-cache.ts b/libs/common/src/vault/models/domain/sorted-ciphers-cache.ts similarity index 100% rename from libs/common/src/models/domain/sorted-ciphers-cache.ts rename to libs/common/src/vault/models/domain/sorted-ciphers-cache.ts diff --git a/libs/common/src/models/request/attachment.request.ts b/libs/common/src/vault/models/request/attachment.request.ts similarity index 100% rename from libs/common/src/models/request/attachment.request.ts rename to libs/common/src/vault/models/request/attachment.request.ts diff --git a/libs/common/src/models/request/cipher-bulk-delete.request.ts b/libs/common/src/vault/models/request/cipher-bulk-delete.request.ts similarity index 100% rename from libs/common/src/models/request/cipher-bulk-delete.request.ts rename to libs/common/src/vault/models/request/cipher-bulk-delete.request.ts diff --git a/libs/common/src/models/request/cipher-bulk-move.request.ts b/libs/common/src/vault/models/request/cipher-bulk-move.request.ts similarity index 100% rename from libs/common/src/models/request/cipher-bulk-move.request.ts rename to libs/common/src/vault/models/request/cipher-bulk-move.request.ts diff --git a/libs/common/src/models/request/cipher-bulk-restore.request.ts b/libs/common/src/vault/models/request/cipher-bulk-restore.request.ts similarity index 100% rename from libs/common/src/models/request/cipher-bulk-restore.request.ts rename to libs/common/src/vault/models/request/cipher-bulk-restore.request.ts diff --git a/libs/common/src/models/request/cipher-bulk-share.request.ts b/libs/common/src/vault/models/request/cipher-bulk-share.request.ts similarity index 100% rename from libs/common/src/models/request/cipher-bulk-share.request.ts rename to libs/common/src/vault/models/request/cipher-bulk-share.request.ts diff --git a/libs/common/src/models/request/cipher-collections.request.ts b/libs/common/src/vault/models/request/cipher-collections.request.ts similarity index 100% rename from libs/common/src/models/request/cipher-collections.request.ts rename to libs/common/src/vault/models/request/cipher-collections.request.ts diff --git a/libs/common/src/models/request/cipher-create.request.ts b/libs/common/src/vault/models/request/cipher-create.request.ts similarity index 100% rename from libs/common/src/models/request/cipher-create.request.ts rename to libs/common/src/vault/models/request/cipher-create.request.ts diff --git a/libs/common/src/models/request/cipher-partial.request.ts b/libs/common/src/vault/models/request/cipher-partial.request.ts similarity index 100% rename from libs/common/src/models/request/cipher-partial.request.ts rename to libs/common/src/vault/models/request/cipher-partial.request.ts diff --git a/libs/common/src/models/request/cipher-share.request.ts b/libs/common/src/vault/models/request/cipher-share.request.ts similarity index 100% rename from libs/common/src/models/request/cipher-share.request.ts rename to libs/common/src/vault/models/request/cipher-share.request.ts diff --git a/libs/common/src/models/request/cipher-with-id.request.ts b/libs/common/src/vault/models/request/cipher-with-id.request.ts similarity index 100% rename from libs/common/src/models/request/cipher-with-id.request.ts rename to libs/common/src/vault/models/request/cipher-with-id.request.ts diff --git a/libs/common/src/models/request/cipher.request.ts b/libs/common/src/vault/models/request/cipher.request.ts similarity index 93% rename from libs/common/src/models/request/cipher.request.ts rename to libs/common/src/vault/models/request/cipher.request.ts index b7717d9729..cae48fb7af 100644 --- a/libs/common/src/models/request/cipher.request.ts +++ b/libs/common/src/vault/models/request/cipher.request.ts @@ -1,11 +1,11 @@ -import { CipherRepromptType } from "../../enums/cipherRepromptType"; -import { CipherType } from "../../enums/cipherType"; -import { CardApi } from "../api/card.api"; -import { FieldApi } from "../api/field.api"; -import { IdentityApi } from "../api/identity.api"; -import { LoginUriApi } from "../api/login-uri.api"; -import { LoginApi } from "../api/login.api"; -import { SecureNoteApi } from "../api/secure-note.api"; +import { CardApi } from "../../../models/api/card.api"; +import { FieldApi } from "../../../models/api/field.api"; +import { IdentityApi } from "../../../models/api/identity.api"; +import { LoginUriApi } from "../../../models/api/login-uri.api"; +import { LoginApi } from "../../../models/api/login.api"; +import { SecureNoteApi } from "../../../models/api/secure-note.api"; +import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; +import { CipherType } from "../../enums/cipher-type"; import { Cipher } from "../domain/cipher"; import { AttachmentRequest } from "./attachment.request"; diff --git a/libs/common/src/models/request/folder-with-id.request.ts b/libs/common/src/vault/models/request/folder-with-id.request.ts similarity index 100% rename from libs/common/src/models/request/folder-with-id.request.ts rename to libs/common/src/vault/models/request/folder-with-id.request.ts diff --git a/libs/common/src/models/request/folder.request.ts b/libs/common/src/vault/models/request/folder.request.ts similarity index 100% rename from libs/common/src/models/request/folder.request.ts rename to libs/common/src/vault/models/request/folder.request.ts diff --git a/libs/common/src/models/request/password-history.request.ts b/libs/common/src/vault/models/request/password-history.request.ts similarity index 100% rename from libs/common/src/models/request/password-history.request.ts rename to libs/common/src/vault/models/request/password-history.request.ts diff --git a/libs/common/src/models/response/attachment-upload-data.response.ts b/libs/common/src/vault/models/response/attachment-upload-data.response.ts similarity index 86% rename from libs/common/src/models/response/attachment-upload-data.response.ts rename to libs/common/src/vault/models/response/attachment-upload-data.response.ts index 120aec6bb1..f2fbd02fc6 100644 --- a/libs/common/src/models/response/attachment-upload-data.response.ts +++ b/libs/common/src/vault/models/response/attachment-upload-data.response.ts @@ -1,6 +1,6 @@ -import { FileUploadType } from "../../enums/fileUploadType"; +import { FileUploadType } from "../../../enums/fileUploadType"; +import { BaseResponse } from "../../../models/response/base.response"; -import { BaseResponse } from "./base.response"; import { CipherResponse } from "./cipher.response"; export class AttachmentUploadDataResponse extends BaseResponse { diff --git a/libs/common/src/models/response/attachment.response.ts b/libs/common/src/vault/models/response/attachment.response.ts similarity index 88% rename from libs/common/src/models/response/attachment.response.ts rename to libs/common/src/vault/models/response/attachment.response.ts index 32e4b6bfb8..c7c851c1c8 100644 --- a/libs/common/src/models/response/attachment.response.ts +++ b/libs/common/src/vault/models/response/attachment.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class AttachmentResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/cipher.response.ts b/libs/common/src/vault/models/response/cipher.response.ts similarity index 86% rename from libs/common/src/models/response/cipher.response.ts rename to libs/common/src/vault/models/response/cipher.response.ts index 2c95c6a385..71e4337377 100644 --- a/libs/common/src/models/response/cipher.response.ts +++ b/libs/common/src/vault/models/response/cipher.response.ts @@ -1,12 +1,12 @@ -import { CipherRepromptType } from "../../enums/cipherRepromptType"; -import { CardApi } from "../api/card.api"; -import { FieldApi } from "../api/field.api"; -import { IdentityApi } from "../api/identity.api"; -import { LoginApi } from "../api/login.api"; -import { SecureNoteApi } from "../api/secure-note.api"; +import { CardApi } from "../../../models/api/card.api"; +import { FieldApi } from "../../../models/api/field.api"; +import { IdentityApi } from "../../../models/api/identity.api"; +import { LoginApi } from "../../../models/api/login.api"; +import { SecureNoteApi } from "../../../models/api/secure-note.api"; +import { BaseResponse } from "../../../models/response/base.response"; +import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; import { AttachmentResponse } from "./attachment.response"; -import { BaseResponse } from "./base.response"; import { PasswordHistoryResponse } from "./password-history.response"; export class CipherResponse extends BaseResponse { diff --git a/libs/common/src/models/response/folder.response.ts b/libs/common/src/vault/models/response/folder.response.ts similarity index 82% rename from libs/common/src/models/response/folder.response.ts rename to libs/common/src/vault/models/response/folder.response.ts index 4eeeddb9a9..1f6e6e5c3f 100644 --- a/libs/common/src/models/response/folder.response.ts +++ b/libs/common/src/vault/models/response/folder.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class FolderResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/password-history.response.ts b/libs/common/src/vault/models/response/password-history.response.ts similarity index 80% rename from libs/common/src/models/response/password-history.response.ts rename to libs/common/src/vault/models/response/password-history.response.ts index 16c0623215..5f6e31b272 100644 --- a/libs/common/src/models/response/password-history.response.ts +++ b/libs/common/src/vault/models/response/password-history.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class PasswordHistoryResponse extends BaseResponse { password: string; diff --git a/libs/common/src/models/response/sync.response.ts b/libs/common/src/vault/models/response/sync.response.ts similarity index 77% rename from libs/common/src/models/response/sync.response.ts rename to libs/common/src/vault/models/response/sync.response.ts index e2a39bb103..d29a3a2989 100644 --- a/libs/common/src/models/response/sync.response.ts +++ b/libs/common/src/vault/models/response/sync.response.ts @@ -1,11 +1,12 @@ -import { BaseResponse } from "./base.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"; + import { CipherResponse } from "./cipher.response"; -import { CollectionDetailsResponse } from "./collection.response"; -import { DomainsResponse } from "./domains.response"; import { FolderResponse } from "./folder.response"; -import { PolicyResponse } from "./policy.response"; -import { ProfileResponse } from "./profile.response"; -import { SendResponse } from "./send.response"; export class SyncResponse extends BaseResponse { profile?: ProfileResponse; diff --git a/libs/common/spec/models/view/attachmentView.spec.ts b/libs/common/src/vault/models/view/attachment.view.spec.ts similarity index 53% rename from libs/common/spec/models/view/attachmentView.spec.ts rename to libs/common/src/vault/models/view/attachment.view.spec.ts index de1b399d5d..7900465b03 100644 --- a/libs/common/spec/models/view/attachmentView.spec.ts +++ b/libs/common/src/vault/models/view/attachment.view.spec.ts @@ -1,9 +1,9 @@ -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; +import { mockFromJson } from "../../../../spec/utils"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; -import { mockFromJson } from "../../utils"; +import { AttachmentView } from "./attachment.view"; -jest.mock("@bitwarden/common/models/domain/symmetric-crypto-key"); +jest.mock("../../../models/domain/symmetric-crypto-key"); describe("AttachmentView", () => { it("fromJSON initializes nested objects", () => { diff --git a/libs/common/src/models/view/attachment.view.ts b/libs/common/src/vault/models/view/attachment.view.ts similarity index 86% rename from libs/common/src/models/view/attachment.view.ts rename to libs/common/src/vault/models/view/attachment.view.ts index 6a40ee52e5..e0387f9f79 100644 --- a/libs/common/src/models/view/attachment.view.ts +++ b/libs/common/src/vault/models/view/attachment.view.ts @@ -1,9 +1,8 @@ import { Jsonify } from "type-fest"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; +import { View } from "../../../models/view/view"; import { Attachment } from "../domain/attachment"; -import { SymmetricCryptoKey } from "../domain/symmetric-crypto-key"; - -import { View } from "./view"; export class AttachmentView implements View { id: string = null; diff --git a/libs/common/src/models/view/card.view.ts b/libs/common/src/vault/models/view/card.view.ts similarity index 93% rename from libs/common/src/models/view/card.view.ts rename to libs/common/src/vault/models/view/card.view.ts index 08beed7a77..e0bf8bc378 100644 --- a/libs/common/src/models/view/card.view.ts +++ b/libs/common/src/vault/models/view/card.view.ts @@ -1,7 +1,7 @@ import { Jsonify } from "type-fest"; -import { CardLinkedId as LinkedId } from "../../enums/linkedIdType"; -import { linkedFieldOption } from "../../misc/linkedFieldOption.decorator"; +import { CardLinkedId as LinkedId } from "../../../enums/linkedIdType"; +import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator"; import { ItemView } from "./item.view"; diff --git a/libs/common/spec/models/view/cipherView.spec.ts b/libs/common/src/vault/models/view/cipher.view.spec.ts similarity index 71% rename from libs/common/spec/models/view/cipherView.spec.ts rename to libs/common/src/vault/models/view/cipher.view.spec.ts index b58c82b156..a2de5b4a3a 100644 --- a/libs/common/spec/models/view/cipherView.spec.ts +++ b/libs/common/src/vault/models/view/cipher.view.spec.ts @@ -1,19 +1,19 @@ -import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; -import { CardView } from "@bitwarden/common/models/view/card.view"; -import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { FieldView } from "@bitwarden/common/models/view/field.view"; -import { IdentityView } from "@bitwarden/common/models/view/identity.view"; -import { LoginView } from "@bitwarden/common/models/view/login.view"; -import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view"; -import { SecureNoteView } from "@bitwarden/common/models/view/secure-note.view"; +import { mockFromJson } from "../../../../spec/utils"; +import { CipherType } from "../../enums/cipher-type"; -import { mockFromJson } from "../../utils"; +import { AttachmentView } from "./attachment.view"; +import { CardView } from "./card.view"; +import { CipherView } from "./cipher.view"; +import { FieldView } from "./field.view"; +import { IdentityView } from "./identity.view"; +import { LoginView } from "./login.view"; +import { PasswordHistoryView } from "./password-history.view"; +import { SecureNoteView } from "./secure-note.view"; -jest.mock("@bitwarden/common/models/view/login.view"); -jest.mock("@bitwarden/common/models/view/attachment.view"); -jest.mock("@bitwarden/common/models/view/field.view"); -jest.mock("@bitwarden/common/models/view/password-history.view"); +jest.mock("../../models/view/login.view"); +jest.mock("../../models/view/attachment.view"); +jest.mock("../../models/view/field.view"); +jest.mock("../../models/view/password-history.view"); describe("CipherView", () => { beforeEach(() => { diff --git a/libs/common/src/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts similarity index 92% rename from libs/common/src/models/view/cipher.view.ts rename to libs/common/src/vault/models/view/cipher.view.ts index c3c69b3b9e..a6f038f6ca 100644 --- a/libs/common/src/models/view/cipher.view.ts +++ b/libs/common/src/vault/models/view/cipher.view.ts @@ -1,10 +1,11 @@ import { Jsonify } from "type-fest"; -import { CipherRepromptType } from "../../enums/cipherRepromptType"; -import { CipherType } from "../../enums/cipherType"; -import { LinkedIdType } from "../../enums/linkedIdType"; -import { InitializerMetadata } from "../../interfaces/initializer-metadata.interface"; -import { InitializerKey } from "../../services/cryptography/initializer-key"; +import { LinkedIdType } from "../../../enums/linkedIdType"; +import { InitializerMetadata } from "../../../interfaces/initializer-metadata.interface"; +import { View } from "../../../models/view/view"; +import { InitializerKey } from "../../../services/cryptography/initializer-key"; +import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; +import { CipherType } from "../../enums/cipher-type"; import { LocalData } from "../data/local.data"; import { Cipher } from "../domain/cipher"; @@ -15,7 +16,6 @@ import { IdentityView } from "./identity.view"; import { LoginView } from "./login.view"; import { PasswordHistoryView } from "./password-history.view"; import { SecureNoteView } from "./secure-note.view"; -import { View } from "./view"; export class CipherView implements View, InitializerMetadata { readonly initializerKey = InitializerKey.CipherView; diff --git a/libs/common/src/models/view/field.view.ts b/libs/common/src/vault/models/view/field.view.ts similarity index 80% rename from libs/common/src/models/view/field.view.ts rename to libs/common/src/vault/models/view/field.view.ts index a022ad6f61..b41c3fdd36 100644 --- a/libs/common/src/models/view/field.view.ts +++ b/libs/common/src/vault/models/view/field.view.ts @@ -1,11 +1,10 @@ import { Jsonify } from "type-fest"; -import { FieldType } from "../../enums/fieldType"; -import { LinkedIdType } from "../../enums/linkedIdType"; +import { FieldType } from "../../../enums/fieldType"; +import { LinkedIdType } from "../../../enums/linkedIdType"; +import { View } from "../../../models/view/view"; import { Field } from "../domain/field"; -import { View } from "./view"; - export class FieldView implements View { name: string = null; value: string = null; diff --git a/libs/common/spec/models/view/folderView.spec.ts b/libs/common/src/vault/models/view/folder.view.spec.ts similarity index 87% rename from libs/common/spec/models/view/folderView.spec.ts rename to libs/common/src/vault/models/view/folder.view.spec.ts index 15663166f3..749e6ba5cd 100644 --- a/libs/common/spec/models/view/folderView.spec.ts +++ b/libs/common/src/vault/models/view/folder.view.spec.ts @@ -1,4 +1,4 @@ -import { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { FolderView } from "./folder.view"; describe("FolderView", () => { describe("fromJSON", () => { diff --git a/libs/common/src/models/view/folder.view.ts b/libs/common/src/vault/models/view/folder.view.ts similarity index 82% rename from libs/common/src/models/view/folder.view.ts rename to libs/common/src/vault/models/view/folder.view.ts index d18ef65aed..b3a11f9a43 100644 --- a/libs/common/src/models/view/folder.view.ts +++ b/libs/common/src/vault/models/view/folder.view.ts @@ -1,9 +1,8 @@ import { Jsonify } from "type-fest"; +import { ITreeNodeObject } from "../../../models/domain/tree-node"; +import { View } from "../../../models/view/view"; import { Folder } from "../domain/folder"; -import { ITreeNodeObject } from "../domain/tree-node"; - -import { View } from "./view"; export class FolderView implements View, ITreeNodeObject { id: string = null; diff --git a/libs/common/src/models/view/identity.view.ts b/libs/common/src/vault/models/view/identity.view.ts similarity index 94% rename from libs/common/src/models/view/identity.view.ts rename to libs/common/src/vault/models/view/identity.view.ts index 343135417d..978c2ec2fb 100644 --- a/libs/common/src/models/view/identity.view.ts +++ b/libs/common/src/vault/models/view/identity.view.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; -import { IdentityLinkedId as LinkedId } from "../../enums/linkedIdType"; -import { linkedFieldOption } from "../../misc/linkedFieldOption.decorator"; -import { Utils } from "../../misc/utils"; +import { IdentityLinkedId as LinkedId } from "../../../enums/linkedIdType"; +import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator"; +import { Utils } from "../../../misc/utils"; import { ItemView } from "./item.view"; diff --git a/libs/common/src/models/view/item.view.ts b/libs/common/src/vault/models/view/item.view.ts similarity index 52% rename from libs/common/src/models/view/item.view.ts rename to libs/common/src/vault/models/view/item.view.ts index 3a557ffa85..948982dbdc 100644 --- a/libs/common/src/models/view/item.view.ts +++ b/libs/common/src/vault/models/view/item.view.ts @@ -1,6 +1,5 @@ -import { LinkedMetadata } from "../../misc/linkedFieldOption.decorator"; - -import { View } from "./view"; +import { LinkedMetadata } from "../../../misc/linkedFieldOption.decorator"; +import { View } from "../../../models/view/view"; export abstract class ItemView implements View { linkedFieldOptions: Map; diff --git a/libs/common/spec/view/login-uri-view.spec.ts b/libs/common/src/vault/models/view/login-uri-view.spec.ts similarity index 93% rename from libs/common/spec/view/login-uri-view.spec.ts rename to libs/common/src/vault/models/view/login-uri-view.spec.ts index 7e29651b1e..3d5656428c 100644 --- a/libs/common/spec/view/login-uri-view.spec.ts +++ b/libs/common/src/vault/models/view/login-uri-view.spec.ts @@ -1,5 +1,6 @@ -import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; +import { UriMatchType } from "../../../enums/uriMatchType"; + +import { LoginUriView } from "./login-uri.view"; const testData = [ { diff --git a/libs/common/src/models/view/login-uri.view.ts b/libs/common/src/vault/models/view/login-uri.view.ts similarity index 95% rename from libs/common/src/models/view/login-uri.view.ts rename to libs/common/src/vault/models/view/login-uri.view.ts index b02d36cb3a..078c8c1457 100644 --- a/libs/common/src/models/view/login-uri.view.ts +++ b/libs/common/src/vault/models/view/login-uri.view.ts @@ -1,11 +1,10 @@ import { Jsonify } from "type-fest"; -import { UriMatchType } from "../../enums/uriMatchType"; -import { Utils } from "../../misc/utils"; +import { UriMatchType } from "../../../enums/uriMatchType"; +import { Utils } from "../../../misc/utils"; +import { View } from "../../../models/view/view"; import { LoginUri } from "../domain/login-uri"; -import { View } from "./view"; - const CanLaunchWhitelist = [ "https://", "http://", diff --git a/libs/common/spec/models/view/loginView.spec.ts b/libs/common/src/vault/models/view/login.view.spec.ts similarity index 70% rename from libs/common/spec/models/view/loginView.spec.ts rename to libs/common/src/vault/models/view/login.view.spec.ts index 3f6f7da841..92beb18bd6 100644 --- a/libs/common/spec/models/view/loginView.spec.ts +++ b/libs/common/src/vault/models/view/login.view.spec.ts @@ -1,9 +1,9 @@ -import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; -import { LoginView } from "@bitwarden/common/models/view/login.view"; +import { mockFromJson } from "../../../../spec/utils"; -import { mockFromJson } from "../../utils"; +import { LoginUriView } from "./login-uri.view"; +import { LoginView } from "./login.view"; -jest.mock("@bitwarden/common/models/view/login-uri.view"); +jest.mock("../../models/view/login-uri.view"); describe("LoginView", () => { beforeEach(() => { diff --git a/libs/common/src/models/view/login.view.ts b/libs/common/src/vault/models/view/login.view.ts similarity index 89% rename from libs/common/src/models/view/login.view.ts rename to libs/common/src/vault/models/view/login.view.ts index ee4035d2db..3aea220583 100644 --- a/libs/common/src/models/view/login.view.ts +++ b/libs/common/src/vault/models/view/login.view.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; -import { LoginLinkedId as LinkedId } from "../../enums/linkedIdType"; -import { linkedFieldOption } from "../../misc/linkedFieldOption.decorator"; -import { Utils } from "../../misc/utils"; +import { LoginLinkedId as LinkedId } from "../../../enums/linkedIdType"; +import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator"; +import { Utils } from "../../../misc/utils"; import { Login } from "../domain/login"; import { ItemView } from "./item.view"; diff --git a/libs/common/spec/models/view/passwordHistoryView.spec.ts b/libs/common/src/vault/models/view/password-history.view.spec.ts similarity index 76% rename from libs/common/spec/models/view/passwordHistoryView.spec.ts rename to libs/common/src/vault/models/view/password-history.view.spec.ts index 514bc32b51..7349e44454 100644 --- a/libs/common/spec/models/view/passwordHistoryView.spec.ts +++ b/libs/common/src/vault/models/view/password-history.view.spec.ts @@ -1,4 +1,4 @@ -import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view"; +import { PasswordHistoryView } from "./password-history.view"; describe("PasswordHistoryView", () => { it("fromJSON initializes nested objects", () => { diff --git a/libs/common/src/models/view/password-history.view.ts b/libs/common/src/vault/models/view/password-history.view.ts similarity index 92% rename from libs/common/src/models/view/password-history.view.ts rename to libs/common/src/vault/models/view/password-history.view.ts index 1d0b9eb8dd..bf45625484 100644 --- a/libs/common/src/models/view/password-history.view.ts +++ b/libs/common/src/vault/models/view/password-history.view.ts @@ -1,9 +1,8 @@ import { Jsonify } from "type-fest"; +import { View } from "../../../models/view/view"; import { Password } from "../domain/password"; -import { View } from "./view"; - export class PasswordHistoryView implements View { password: string = null; lastUsedDate: Date = null; diff --git a/libs/common/src/models/view/secure-note.view.ts b/libs/common/src/vault/models/view/secure-note.view.ts similarity index 88% rename from libs/common/src/models/view/secure-note.view.ts rename to libs/common/src/vault/models/view/secure-note.view.ts index 20174f9855..3fce6ed7e0 100644 --- a/libs/common/src/models/view/secure-note.view.ts +++ b/libs/common/src/vault/models/view/secure-note.view.ts @@ -1,6 +1,6 @@ import { Jsonify } from "type-fest"; -import { SecureNoteType } from "../../enums/secureNoteType"; +import { SecureNoteType } from "../../../enums/secureNoteType"; import { SecureNote } from "../domain/secure-note"; import { ItemView } from "./item.view"; diff --git a/libs/common/spec/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts similarity index 66% rename from libs/common/spec/services/cipher.service.spec.ts rename to libs/common/src/vault/services/cipher.service.spec.ts index 0dda930084..fc498d29ab 100644 --- a/libs/common/spec/services/cipher.service.spec.ts +++ b/libs/common/src/vault/services/cipher.service.spec.ts @@ -1,20 +1,21 @@ // eslint-disable-next-line no-restricted-imports import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -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 { FileUploadService } from "@bitwarden/common/abstractions/fileUpload.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -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 { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { CipherService } from "@bitwarden/common/services/cipher.service"; +import { ApiService } from "../../abstractions/api.service"; +import { CryptoService } from "../../abstractions/crypto.service"; +import { EncryptService } from "../../abstractions/encrypt.service"; +import { FileUploadService } from "../../abstractions/fileUpload.service"; +import { I18nService } from "../../abstractions/i18n.service"; +import { LogService } from "../../abstractions/log.service"; +import { SearchService } from "../../abstractions/search.service"; +import { SettingsService } from "../../abstractions/settings.service"; +import { StateService } from "../../abstractions/state.service"; +import { EncArrayBuffer } from "../../models/domain/enc-array-buffer"; +import { EncString } from "../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; +import { Cipher } from "../models/domain/cipher"; + +import { CipherService } from "./cipher.service"; const ENCRYPTED_TEXT = "This data has been encrypted"; const ENCRYPTED_BYTES = Substitute.for(); diff --git a/libs/common/src/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts similarity index 96% rename from libs/common/src/services/cipher.service.ts rename to libs/common/src/vault/services/cipher.service.ts index b93c60d622..25ce77f82e 100644 --- a/libs/common/src/services/cipher.service.ts +++ b/libs/common/src/vault/services/cipher.service.ts @@ -1,28 +1,31 @@ import { firstValueFrom } from "rxjs"; -import { ApiService } from "../abstractions/api.service"; +import { ApiService } from "../../abstractions/api.service"; +import { CryptoService } from "../../abstractions/crypto.service"; +import { EncryptService } from "../../abstractions/encrypt.service"; +import { FileUploadService } from "../../abstractions/fileUpload.service"; +import { I18nService } from "../../abstractions/i18n.service"; +import { LogService } from "../../abstractions/log.service"; +import { SearchService } from "../../abstractions/search.service"; +import { SettingsService } from "../../abstractions/settings.service"; +import { StateService } from "../../abstractions/state.service"; +import { FieldType } from "../../enums/fieldType"; +import { UriMatchType } from "../../enums/uriMatchType"; +import { sequentialize } from "../../misc/sequentialize"; +import { Utils } from "../../misc/utils"; +import { AccountSettingsSettings } from "../../models/domain/account"; +import Domain from "../../models/domain/domain-base"; +import { EncArrayBuffer } from "../../models/domain/enc-array-buffer"; +import { EncString } from "../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; +import { ErrorResponse } from "../../models/response/error.response"; +import { View } from "../../models/view/view"; import { CipherService as CipherServiceAbstraction } from "../abstractions/cipher.service"; -import { CryptoService } from "../abstractions/crypto.service"; -import { EncryptService } from "../abstractions/encrypt.service"; -import { FileUploadService } from "../abstractions/fileUpload.service"; -import { I18nService } from "../abstractions/i18n.service"; -import { LogService } from "../abstractions/log.service"; -import { SearchService } from "../abstractions/search.service"; -import { SettingsService } from "../abstractions/settings.service"; -import { StateService } from "../abstractions/state.service"; -import { CipherType } from "../enums/cipherType"; -import { FieldType } from "../enums/fieldType"; -import { UriMatchType } from "../enums/uriMatchType"; -import { sequentialize } from "../misc/sequentialize"; -import { Utils } from "../misc/utils"; +import { CipherType } from "../enums/cipher-type"; import { CipherData } from "../models/data/cipher.data"; -import { AccountSettingsSettings } from "../models/domain/account"; import { Attachment } from "../models/domain/attachment"; import { Card } from "../models/domain/card"; import { Cipher } from "../models/domain/cipher"; -import Domain from "../models/domain/domain-base"; -import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; -import { EncString } from "../models/domain/enc-string"; import { Field } from "../models/domain/field"; import { Identity } from "../models/domain/identity"; import { Login } from "../models/domain/login"; @@ -30,7 +33,6 @@ import { LoginUri } from "../models/domain/login-uri"; import { Password } from "../models/domain/password"; import { SecureNote } from "../models/domain/secure-note"; import { SortedCiphersCache } from "../models/domain/sorted-ciphers-cache"; -import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { AttachmentRequest } from "../models/request/attachment.request"; import { CipherBulkDeleteRequest } from "../models/request/cipher-bulk-delete.request"; import { CipherBulkMoveRequest } from "../models/request/cipher-bulk-move.request"; @@ -42,12 +44,10 @@ import { CipherPartialRequest } from "../models/request/cipher-partial.request"; import { CipherShareRequest } from "../models/request/cipher-share.request"; import { CipherRequest } from "../models/request/cipher.request"; import { CipherResponse } from "../models/response/cipher.response"; -import { ErrorResponse } from "../models/response/error.response"; import { AttachmentView } from "../models/view/attachment.view"; import { CipherView } from "../models/view/cipher.view"; import { FieldView } from "../models/view/field.view"; import { PasswordHistoryView } from "../models/view/password-history.view"; -import { View } from "../models/view/view"; const DomainMatchBlacklist = new Map>([ ["google.com", new Set(["script.google.com"])], diff --git a/libs/common/src/services/folder/folder-api.service.ts b/libs/common/src/vault/services/folder/folder-api.service.ts similarity index 71% rename from libs/common/src/services/folder/folder-api.service.ts rename to libs/common/src/vault/services/folder/folder-api.service.ts index 587dbb84f7..d49117264c 100644 --- a/libs/common/src/services/folder/folder-api.service.ts +++ b/libs/common/src/vault/services/folder/folder-api.service.ts @@ -1,10 +1,10 @@ -import { ApiService } from "../../abstractions/api.service"; -import { FolderApiServiceAbstraction } from "../../abstractions/folder/folder-api.service.abstraction"; -import { InternalFolderService } from "../../abstractions/folder/folder.service.abstraction"; -import { FolderData } from "../../models/data/folder.data"; -import { Folder } from "../../models/domain/folder"; -import { FolderRequest } from "../../models/request/folder.request"; -import { FolderResponse } from "../../models/response/folder.response"; +import { ApiService } from "../../../abstractions/api.service"; +import { FolderApiServiceAbstraction } from "../../../vault/abstractions/folder/folder-api.service.abstraction"; +import { InternalFolderService } from "../../../vault/abstractions/folder/folder.service.abstraction"; +import { FolderData } from "../../../vault/models/data/folder.data"; +import { Folder } from "../../../vault/models/domain/folder"; +import { FolderRequest } from "../../../vault/models/request/folder.request"; +import { FolderResponse } from "../../../vault/models/response/folder.response"; export class FolderApiService implements FolderApiServiceAbstraction { constructor(private folderService: InternalFolderService, private apiService: ApiService) {} diff --git a/libs/common/spec/services/folder.service.spec.ts b/libs/common/src/vault/services/folder/folder.service.spec.ts similarity index 88% rename from libs/common/spec/services/folder.service.spec.ts rename to libs/common/src/vault/services/folder/folder.service.spec.ts index 1c1f0b2a46..594a3ab137 100644 --- a/libs/common/spec/services/folder.service.spec.ts +++ b/libs/common/src/vault/services/folder/folder.service.spec.ts @@ -2,16 +2,16 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; import { BehaviorSubject, firstValueFrom } from "rxjs"; -import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { FolderData } from "@bitwarden/common/models/data/folder.data"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { FolderView } from "@bitwarden/common/models/view/folder.view"; -import { ContainerService } from "@bitwarden/common/services/container.service"; -import { FolderService } from "@bitwarden/common/services/folder/folder.service"; -import { StateService } from "@bitwarden/common/services/state.service"; +import { CryptoService } from "../../../abstractions/crypto.service"; +import { EncryptService } from "../../../abstractions/encrypt.service"; +import { I18nService } from "../../../abstractions/i18n.service"; +import { EncString } from "../../../models/domain/enc-string"; +import { ContainerService } from "../../../services/container.service"; +import { StateService } from "../../../services/state.service"; +import { CipherService } from "../../abstractions/cipher.service"; +import { FolderData } from "../../models/data/folder.data"; +import { FolderView } from "../../models/view/folder.view"; +import { FolderService } from "../../services/folder/folder.service"; describe("Folder Service", () => { let folderService: FolderService; diff --git a/libs/common/src/services/folder/folder.service.ts b/libs/common/src/vault/services/folder/folder.service.ts similarity index 87% rename from libs/common/src/services/folder/folder.service.ts rename to libs/common/src/vault/services/folder/folder.service.ts index 85ef564fd5..89ccf67a99 100644 --- a/libs/common/src/services/folder/folder.service.ts +++ b/libs/common/src/vault/services/folder/folder.service.ts @@ -1,16 +1,16 @@ import { BehaviorSubject, concatMap } from "rxjs"; -import { CipherService } from "../../abstractions/cipher.service"; -import { CryptoService } from "../../abstractions/crypto.service"; -import { InternalFolderService as InternalFolderServiceAbstraction } from "../../abstractions/folder/folder.service.abstraction"; -import { I18nService } from "../../abstractions/i18n.service"; -import { StateService } from "../../abstractions/state.service"; -import { Utils } from "../../misc/utils"; -import { CipherData } from "../../models/data/cipher.data"; -import { FolderData } from "../../models/data/folder.data"; -import { Folder } from "../../models/domain/folder"; -import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; -import { FolderView } from "../../models/view/folder.view"; +import { CryptoService } from "../../../abstractions/crypto.service"; +import { I18nService } from "../../../abstractions/i18n.service"; +import { StateService } from "../../../abstractions/state.service"; +import { Utils } from "../../../misc/utils"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; +import { CipherService } from "../../../vault/abstractions/cipher.service"; +import { InternalFolderService as InternalFolderServiceAbstraction } from "../../../vault/abstractions/folder/folder.service.abstraction"; +import { CipherData } from "../../../vault/models/data/cipher.data"; +import { FolderData } from "../../../vault/models/data/folder.data"; +import { Folder } from "../../../vault/models/domain/folder"; +import { FolderView } from "../../../vault/models/view/folder.view"; export class FolderService implements InternalFolderServiceAbstraction { protected _folders: BehaviorSubject = new BehaviorSubject([]); diff --git a/libs/common/src/services/sync/syncNotifier.service.ts b/libs/common/src/vault/services/sync/sync-notifier.service.ts similarity index 78% rename from libs/common/src/services/sync/syncNotifier.service.ts rename to libs/common/src/vault/services/sync/sync-notifier.service.ts index 996a54d656..870ccfb849 100644 --- a/libs/common/src/services/sync/syncNotifier.service.ts +++ b/libs/common/src/vault/services/sync/sync-notifier.service.ts @@ -1,7 +1,7 @@ import { Subject } from "rxjs"; -import { SyncNotifierService as SyncNotifierServiceAbstraction } from "../../abstractions/sync/syncNotifier.service.abstraction"; -import { SyncEventArgs } from "../../types/syncEventArgs"; +import { SyncNotifierService as SyncNotifierServiceAbstraction } from "../../abstractions/sync/sync-notifier.service.abstraction"; +import { SyncEventArgs } from "../../types/sync-event-args"; /** * This class should most likely have 0 dependencies because it will hopefully diff --git a/libs/common/src/services/sync/sync.service.ts b/libs/common/src/vault/services/sync/sync.service.ts similarity index 83% rename from libs/common/src/services/sync/sync.service.ts rename to libs/common/src/vault/services/sync/sync.service.ts index 7317b6c991..f5bacb0f41 100644 --- a/libs/common/src/services/sync/sync.service.ts +++ b/libs/common/src/vault/services/sync/sync.service.ts @@ -1,39 +1,39 @@ -import { ApiService } from "../../abstractions/api.service"; -import { CipherService } from "../../abstractions/cipher.service"; -import { CollectionService } from "../../abstractions/collection.service"; -import { CryptoService } from "../../abstractions/crypto.service"; -import { FolderApiServiceAbstraction } from "../../abstractions/folder/folder-api.service.abstraction"; -import { InternalFolderService } from "../../abstractions/folder/folder.service.abstraction"; -import { KeyConnectorService } from "../../abstractions/keyConnector.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 { SyncService as SyncServiceAbstraction } from "../../abstractions/sync/sync.service.abstraction"; -import { sequentialize } from "../../misc/sequentialize"; -import { CipherData } from "../../models/data/cipher.data"; -import { CollectionData } from "../../models/data/collection.data"; -import { FolderData } from "../../models/data/folder.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 { CipherResponse } from "../../models/response/cipher.response"; -import { CollectionDetailsResponse } from "../../models/response/collection.response"; -import { DomainsResponse } from "../../models/response/domains.response"; -import { FolderResponse } from "../../models/response/folder.response"; +import { ApiService } from "../../../abstractions/api.service"; +import { CollectionService } from "../../../abstractions/collection.service"; +import { CryptoService } from "../../../abstractions/crypto.service"; +import { KeyConnectorService } from "../../../abstractions/keyConnector.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 { 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"; +} 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"; +import { FolderApiServiceAbstraction } from "../../../vault/abstractions/folder/folder-api.service.abstraction"; +import { InternalFolderService } from "../../../vault/abstractions/folder/folder.service.abstraction"; +import { SyncService as SyncServiceAbstraction } from "../../../vault/abstractions/sync/sync.service.abstraction"; +import { CipherData } from "../../../vault/models/data/cipher.data"; +import { FolderData } from "../../../vault/models/data/folder.data"; +import { CipherResponse } from "../../../vault/models/response/cipher.response"; +import { FolderResponse } from "../../../vault/models/response/folder.response"; export class SyncService implements SyncServiceAbstraction { syncInProgress = false; diff --git a/libs/common/src/types/syncEventArgs.ts b/libs/common/src/vault/types/sync-event-args.ts similarity index 100% rename from libs/common/src/types/syncEventArgs.ts rename to libs/common/src/vault/types/sync-event-args.ts