diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index 64d1f6a76e5..26558ff99da 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -30,9 +30,6 @@ ./libs/common/spec/models/domain/encString.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 -./libs/common/spec/models/domain/sendFile.spec.ts -./libs/common/spec/models/domain/sendText.spec.ts ./libs/common/spec/matchers/toEqualBuffer.spec.ts ./libs/common/spec/matchers/toEqualBuffer.ts ./libs/common/spec/services/stateMigration.service.spec.ts @@ -46,7 +43,6 @@ ./libs/common/src/enums/clientType.ts ./libs/common/src/enums/encryptedExportType.ts ./libs/common/src/enums/linkedIdType.ts -./libs/common/src/enums/sendType.ts ./libs/common/src/enums/encryptionType.ts ./libs/common/src/enums/htmlStorageLocation.ts ./libs/common/src/enums/notificationType.ts diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 97cbe88d6ff..7ec277309c6 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -15,8 +15,6 @@ import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/comm import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; -import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { InternalSendService as InternalSendServiceAbstraction } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service"; import { AbstractMemoryStorageService, @@ -63,7 +61,6 @@ import { FileUploadService } from "@bitwarden/common/services/file-upload/file-u import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { NotificationsService } from "@bitwarden/common/services/notifications.service"; import { SearchService } from "@bitwarden/common/services/search.service"; -import { SendApiService } from "@bitwarden/common/services/send/send-api.service"; import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; import { SystemService } from "@bitwarden/common/services/system.service"; import { TotpService } from "@bitwarden/common/services/totp.service"; @@ -77,6 +74,9 @@ import { UsernameGenerationService, UsernameGenerationServiceAbstraction, } from "@bitwarden/common/tools/generator/username"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service"; +import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { InternalSendService as InternalSendServiceAbstraction } from "@bitwarden/common/tools/send/services/send.service.abstraction"; import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; diff --git a/apps/browser/src/background/service_factories/send-service.factory.ts b/apps/browser/src/background/service_factories/send-service.factory.ts index 5f9ff13aa6a..2da4d88a1d8 100644 --- a/apps/browser/src/background/service_factories/send-service.factory.ts +++ b/apps/browser/src/background/service_factories/send-service.factory.ts @@ -1,4 +1,4 @@ -import { InternalSendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; +import { InternalSendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; import { BrowserSendService } from "../../services/browser-send.service"; diff --git a/apps/browser/src/models/browserSendComponentState.ts b/apps/browser/src/models/browserSendComponentState.ts index 99508737ab1..d4086f3703b 100644 --- a/apps/browser/src/models/browserSendComponentState.ts +++ b/apps/browser/src/models/browserSendComponentState.ts @@ -1,6 +1,6 @@ -import { SendType } from "@bitwarden/common/enums/sendType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SendView } from "@bitwarden/common/models/view/send.view"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify"; import { BrowserComponentState } from "./browserComponentState"; diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 1b409fb0f44..be6b0c4328c 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -20,6 +20,9 @@ import { TwoFactorComponent } from "../auth/popup/two-factor.component"; import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component"; import { GeneratorComponent } from "../tools/popup/generator/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/popup/generator/password-generator-history.component"; +import { SendAddEditComponent } from "../tools/popup/send/send-add-edit.component"; +import { SendGroupingsComponent } from "../tools/popup/send/send-groupings.component"; +import { SendTypeComponent } from "../tools/popup/send/send-type.component"; import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component"; import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.component"; import { CollectionsComponent } from "../vault/popup/components/vault/collections.component"; @@ -30,9 +33,6 @@ import { VaultFilterComponent } from "../vault/popup/components/vault/vault-filt import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items.component"; import { ViewComponent } from "../vault/popup/components/vault/view.component"; -import { SendAddEditComponent } from "./send/send-add-edit.component"; -import { SendGroupingsComponent } from "./send/send-groupings.component"; -import { SendTypeComponent } from "./send/send-type.component"; import { DebounceNavigationService } from "./services/debounceNavigationService"; import { AutofillComponent } from "./settings/autofill.component"; import { ExcludedDomainsComponent } from "./settings/excluded-domains.component"; diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts index 9805e7f0950..c23d785d282 100644 --- a/apps/browser/src/popup/app.module.ts +++ b/apps/browser/src/popup/app.module.ts @@ -34,6 +34,11 @@ import { TwoFactorComponent } from "../auth/popup/two-factor.component"; import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component"; import { GeneratorComponent } from "../tools/popup/generator/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/popup/generator/password-generator-history.component"; +import { SendListComponent } from "../tools/popup/send/components/send-list.component"; +import { EffluxDatesComponent as SendEffluxDatesComponent } from "../tools/popup/send/efflux-dates.component"; +import { SendAddEditComponent } from "../tools/popup/send/send-add-edit.component"; +import { SendGroupingsComponent } from "../tools/popup/send/send-groupings.component"; +import { SendTypeComponent } from "../tools/popup/send/send-type.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"; @@ -54,13 +59,8 @@ import { AppRoutingModule } from "./app-routing.module"; import { AppComponent } from "./app.component"; import { PopOutComponent } from "./components/pop-out.component"; import { PrivateModeWarningComponent } from "./components/private-mode-warning.component"; -import { SendListComponent } from "./components/send-list.component"; import { SetPinComponent } from "./components/set-pin.component"; import { UserVerificationComponent } from "./components/user-verification.component"; -import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component"; -import { SendAddEditComponent } from "./send/send-add-edit.component"; -import { SendGroupingsComponent } from "./send/send-groupings.component"; -import { SendTypeComponent } from "./send/send-type.component"; import { ServicesModule } from "./services/services.module"; import { AboutComponent } from "./settings/about.component"; import { AutofillComponent } from "./settings/autofill.component"; diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 849eea0ec19..dae7bb34ae5 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -26,11 +26,6 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; -import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { - InternalSendService as InternalSendServiceAbstraction, - SendService, -} from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { StateService as BaseStateServiceAbstraction, @@ -66,9 +61,14 @@ import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { ContainerService } from "@bitwarden/common/services/container.service"; import { SearchService } from "@bitwarden/common/services/search.service"; -import { SendApiService } from "@bitwarden/common/services/send/send-api.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service"; +import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { + InternalSendService as InternalSendServiceAbstraction, + SendService, +} from "@bitwarden/common/tools/send/services/send.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherFileUploadService } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; diff --git a/apps/browser/src/services/browser-send.service.ts b/apps/browser/src/services/browser-send.service.ts index e2b6dadb412..d937a1387fb 100644 --- a/apps/browser/src/services/browser-send.service.ts +++ b/apps/browser/src/services/browser-send.service.ts @@ -1,8 +1,8 @@ import { BehaviorSubject } from "rxjs"; -import { Send } from "@bitwarden/common/models/domain/send"; -import { SendView } from "@bitwarden/common/models/view/send.view"; -import { SendService } from "@bitwarden/common/services/send/send.service"; +import { Send } from "@bitwarden/common/tools/send/models/domain/send"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service"; import { browserSession, sessionSync } from "../decorators/session-sync-observable"; diff --git a/apps/browser/src/services/browser-state.service.spec.ts b/apps/browser/src/services/browser-state.service.spec.ts index 84ac71664da..5ef70897b30 100644 --- a/apps/browser/src/services/browser-state.service.spec.ts +++ b/apps/browser/src/services/browser-state.service.spec.ts @@ -5,12 +5,12 @@ import { AbstractMemoryStorageService, AbstractStorageService, } from "@bitwarden/common/abstractions/storage.service"; -import { SendType } from "@bitwarden/common/enums/sendType"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { State } from "@bitwarden/common/models/domain/state"; -import { SendView } from "@bitwarden/common/models/view/send.view"; import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; import { Account } from "../models/account"; import { BrowserComponentState } from "../models/browserComponentState"; diff --git a/apps/browser/src/popup/components/send-list.component.html b/apps/browser/src/tools/popup/send/components/send-list.component.html similarity index 100% rename from apps/browser/src/popup/components/send-list.component.html rename to apps/browser/src/tools/popup/send/components/send-list.component.html diff --git a/apps/browser/src/popup/components/send-list.component.ts b/apps/browser/src/tools/popup/send/components/send-list.component.ts similarity index 84% rename from apps/browser/src/popup/components/send-list.component.ts rename to apps/browser/src/tools/popup/send/components/send-list.component.ts index 05254729eb3..032ffaa57cb 100644 --- a/apps/browser/src/popup/components/send-list.component.ts +++ b/apps/browser/src/tools/popup/send/components/send-list.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendView } from "@bitwarden/common/models/view/send.view"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; @Component({ selector: "app-send-list", diff --git a/apps/browser/src/popup/send/efflux-dates.component.html b/apps/browser/src/tools/popup/send/efflux-dates.component.html similarity index 100% rename from apps/browser/src/popup/send/efflux-dates.component.html rename to apps/browser/src/tools/popup/send/efflux-dates.component.html diff --git a/apps/browser/src/popup/send/efflux-dates.component.ts b/apps/browser/src/tools/popup/send/efflux-dates.component.ts similarity index 93% rename from apps/browser/src/popup/send/efflux-dates.component.ts rename to apps/browser/src/tools/popup/send/efflux-dates.component.ts index 8a58756dadc..0578cce2dda 100644 --- a/apps/browser/src/popup/send/efflux-dates.component.ts +++ b/apps/browser/src/tools/popup/send/efflux-dates.component.ts @@ -2,7 +2,7 @@ import { DatePipe } from "@angular/common"; import { Component, EventEmitter, Input, Output } from "@angular/core"; import { ControlContainer, NgForm } from "@angular/forms"; -import { EffluxDatesComponent as BaseEffluxDatesComponent } from "@bitwarden/angular/components/send/efflux-dates.component"; +import { EffluxDatesComponent as BaseEffluxDatesComponent } from "@bitwarden/angular/tools/send/efflux-dates.component"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; diff --git a/apps/browser/src/popup/send/send-add-edit.component.html b/apps/browser/src/tools/popup/send/send-add-edit.component.html similarity index 100% rename from apps/browser/src/popup/send/send-add-edit.component.html rename to apps/browser/src/tools/popup/send/send-add-edit.component.html diff --git a/apps/browser/src/popup/send/send-add-edit.component.ts b/apps/browser/src/tools/popup/send/send-add-edit.component.ts similarity index 91% rename from apps/browser/src/popup/send/send-add-edit.component.ts rename to apps/browser/src/tools/popup/send/send-add-edit.component.ts index 03f430e8b50..1140aa60f93 100644 --- a/apps/browser/src/popup/send/send-add-edit.component.ts +++ b/apps/browser/src/tools/popup/send/send-add-edit.component.ts @@ -3,18 +3,18 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/send/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/tools/send/add-edit.component"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; -import { PopupUtilsService } from "../services/popup-utils.service"; +import { PopupUtilsService } from "../../../popup/services/popup-utils.service"; +import { BrowserStateService } from "../../../services/abstractions/browser-state.service"; @Component({ selector: "app-send-add-edit", diff --git a/apps/browser/src/popup/send/send-groupings.component.html b/apps/browser/src/tools/popup/send/send-groupings.component.html similarity index 100% rename from apps/browser/src/popup/send/send-groupings.component.html rename to apps/browser/src/tools/popup/send/send-groupings.component.html diff --git a/apps/browser/src/popup/send/send-groupings.component.ts b/apps/browser/src/tools/popup/send/send-groupings.component.ts similarity index 89% rename from apps/browser/src/popup/send/send-groupings.component.ts rename to apps/browser/src/tools/popup/send/send-groupings.component.ts index 27e48888de2..c2188c6d4a7 100644 --- a/apps/browser/src/popup/send/send-groupings.component.ts +++ b/apps/browser/src/tools/popup/send/send-groupings.component.ts @@ -1,23 +1,23 @@ import { ChangeDetectorRef, Component, NgZone } from "@angular/core"; import { Router } from "@angular/router"; -import { SendComponent as BaseSendComponent } from "@bitwarden/angular/components/send/send.component"; +import { SendComponent as BaseSendComponent } from "@bitwarden/angular/tools/send/send.component"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendView } from "@bitwarden/common/models/view/send.view"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { BrowserSendComponentState } from "../../models/browserSendComponentState"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; -import { PopupUtilsService } from "../services/popup-utils.service"; +import { BrowserSendComponentState } from "../../../models/browserSendComponentState"; +import { PopupUtilsService } from "../../../popup/services/popup-utils.service"; +import { BrowserStateService } from "../../../services/abstractions/browser-state.service"; const ComponentId = "SendComponent"; diff --git a/apps/browser/src/popup/send/send-type.component.html b/apps/browser/src/tools/popup/send/send-type.component.html similarity index 100% rename from apps/browser/src/popup/send/send-type.component.html rename to apps/browser/src/tools/popup/send/send-type.component.html diff --git a/apps/browser/src/popup/send/send-type.component.ts b/apps/browser/src/tools/popup/send/send-type.component.ts similarity index 88% rename from apps/browser/src/popup/send/send-type.component.ts rename to apps/browser/src/tools/popup/send/send-type.component.ts index a8f8e97e6dd..836fcef714d 100644 --- a/apps/browser/src/popup/send/send-type.component.ts +++ b/apps/browser/src/tools/popup/send/send-type.component.ts @@ -3,22 +3,22 @@ import { ChangeDetectorRef, Component, NgZone } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { SendComponent as BaseSendComponent } from "@bitwarden/angular/components/send/send.component"; +import { SendComponent as BaseSendComponent } from "@bitwarden/angular/tools/send/send.component"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendView } from "@bitwarden/common/models/view/send.view"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; -import { BrowserComponentState } from "../../models/browserComponentState"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; -import { PopupUtilsService } from "../services/popup-utils.service"; +import { BrowserComponentState } from "../../../models/browserComponentState"; +import { PopupUtilsService } from "../../../popup/services/popup-utils.service"; +import { BrowserStateService } from "../../../services/abstractions/browser-state.service"; const ComponentId = "SendTypeComponent"; diff --git a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts index df0e8483c74..4e9f51f8505 100644 --- a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts +++ b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts @@ -10,11 +10,11 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index 90d6b50194c..432d8ea6dd7 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -36,8 +36,6 @@ import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.s import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service"; import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation"; import { SearchService } from "@bitwarden/common/services/search.service"; -import { SendApiService } from "@bitwarden/common/services/send/send-api.service"; -import { SendService } from "@bitwarden/common/services/send/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"; @@ -48,6 +46,8 @@ import { PasswordGenerationService, PasswordGenerationServiceAbstraction, } from "@bitwarden/common/tools/generator/password"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service"; import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service"; @@ -64,13 +64,13 @@ import { import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service"; import { Program } from "./program"; -import { SendProgram } from "./send.program"; import { CliPlatformUtilsService } from "./services/cli-platform-utils.service"; import { ConsoleLogService } from "./services/console-log.service"; import { I18nService } from "./services/i18n.service"; import { LowdbStorageService } from "./services/lowdb-storage.service"; import { NodeApiService } from "./services/node-api.service"; import { NodeEnvSecureStorageService } from "./services/node-env-secure-storage.service"; +import { SendProgram } from "./tools/send/send.program"; import { VaultProgram } from "./vault.program"; // Polyfills diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index 4c1d2033140..6ffe432b187 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -8,7 +8,6 @@ import { CollectionService } from "@bitwarden/common/admin-console/abstractions/ import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; -import { SendType } from "@bitwarden/common/enums/sendType"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { CardExport } from "@bitwarden/common/models/export/card.export"; @@ -21,6 +20,7 @@ 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 { SendType } from "@bitwarden/common/tools/send/enums/send-type"; 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"; @@ -33,9 +33,9 @@ import { OrganizationCollectionResponse } from "../admin-console/models/response import { OrganizationResponse } from "../admin-console/models/response/organization.response"; import { SelectionReadOnly } from "../admin-console/models/selection-read-only"; import { Response } from "../models/response"; -import { SendResponse } from "../models/response/send.response"; import { StringResponse } from "../models/response/string.response"; import { TemplateResponse } from "../models/response/template.response"; +import { SendResponse } from "../tools/send/models/send.response"; import { CliUtils } from "../utils"; import { CipherResponse } from "../vault/models/cipher.response"; import { FolderResponse } from "../vault/models/folder.response"; diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts index 3bb459383c2..0fa9333f8c4 100644 --- a/apps/cli/src/commands/serve.command.ts +++ b/apps/cli/src/commands/serve.command.ts @@ -16,6 +16,14 @@ import { Main } from "../bw"; import { Response } from "../models/response"; import { FileResponse } from "../models/response/file.response"; import { GenerateCommand } from "../tools/generate.command"; +import { + SendEditCommand, + SendCreateCommand, + SendDeleteCommand, + SendGetCommand, + SendListCommand, + SendRemovePasswordCommand, +} from "../tools/send"; import { CreateCommand } from "../vault/create.command"; import { DeleteCommand } from "../vault/delete.command"; import { SyncCommand } from "../vault/sync.command"; @@ -24,12 +32,6 @@ import { EditCommand } from "./edit.command"; import { GetCommand } from "./get.command"; import { ListCommand } from "./list.command"; import { RestoreCommand } from "./restore.command"; -import { SendCreateCommand } from "./send/create.command"; -import { SendDeleteCommand } from "./send/delete.command"; -import { SendEditCommand } from "./send/edit.command"; -import { SendGetCommand } from "./send/get.command"; -import { SendListCommand } from "./send/list.command"; -import { SendRemovePasswordCommand } from "./send/remove-password.command"; import { StatusCommand } from "./status.command"; export class ServeCommand { diff --git a/apps/cli/src/commands/send/create.command.ts b/apps/cli/src/tools/send/commands/create.command.ts similarity index 90% rename from apps/cli/src/commands/send/create.command.ts rename to apps/cli/src/tools/send/commands/create.command.ts index c5bd9e590a0..229babd5c26 100644 --- a/apps/cli/src/commands/send/create.command.ts +++ b/apps/cli/src/tools/send/commands/create.command.ts @@ -2,16 +2,16 @@ import * as fs from "fs"; import * as path from "path"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SendType } from "@bitwarden/common/enums/sendType"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; -import { Response } from "../../models/response"; -import { SendTextResponse } from "../../models/response/send-text.response"; -import { SendResponse } from "../../models/response/send.response"; -import { CliUtils } from "../../utils"; +import { Response } from "../../../models/response"; +import { CliUtils } from "../../../utils"; +import { SendTextResponse } from "../models/send-text.response"; +import { SendResponse } from "../models/send.response"; export class SendCreateCommand { constructor( diff --git a/apps/cli/src/commands/send/delete.command.ts b/apps/cli/src/tools/send/commands/delete.command.ts similarity index 63% rename from apps/cli/src/commands/send/delete.command.ts rename to apps/cli/src/tools/send/commands/delete.command.ts index f70e2a01e78..90cf5978859 100644 --- a/apps/cli/src/commands/send/delete.command.ts +++ b/apps/cli/src/tools/send/commands/delete.command.ts @@ -1,7 +1,7 @@ -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; -import { Response } from "../../models/response"; +import { Response } from "../../../models/response"; export class SendDeleteCommand { constructor(private sendService: SendService, private sendApiService: SendApiService) {} diff --git a/apps/cli/src/commands/send/edit.command.ts b/apps/cli/src/tools/send/commands/edit.command.ts similarity index 86% rename from apps/cli/src/commands/send/edit.command.ts rename to apps/cli/src/tools/send/commands/edit.command.ts index 94a8106bbed..2b4e6d23f9e 100644 --- a/apps/cli/src/commands/send/edit.command.ts +++ b/apps/cli/src/tools/send/commands/edit.command.ts @@ -1,11 +1,11 @@ -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SendType } from "@bitwarden/common/enums/sendType"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; -import { Response } from "../../models/response"; -import { SendResponse } from "../../models/response/send.response"; -import { CliUtils } from "../../utils"; +import { Response } from "../../../models/response"; +import { CliUtils } from "../../../utils"; +import { SendResponse } from "../models/send.response"; import { SendGetCommand } from "./get.command"; diff --git a/apps/cli/src/commands/send/get.command.ts b/apps/cli/src/tools/send/commands/get.command.ts similarity index 87% rename from apps/cli/src/commands/send/get.command.ts rename to apps/cli/src/tools/send/commands/get.command.ts index c6ae693dbbf..b92044ac4b1 100644 --- a/apps/cli/src/commands/send/get.command.ts +++ b/apps/cli/src/tools/send/commands/get.command.ts @@ -3,13 +3,13 @@ import * as program from "commander"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SendView } from "@bitwarden/common/models/view/send.view"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; -import { Response } from "../../models/response"; -import { SendResponse } from "../../models/response/send.response"; -import { DownloadCommand } from "../download.command"; +import { DownloadCommand } from "../../../commands/download.command"; +import { Response } from "../../../models/response"; +import { SendResponse } from "../models/send.response"; export class SendGetCommand extends DownloadCommand { constructor( diff --git a/apps/cli/src/tools/send/commands/index.ts b/apps/cli/src/tools/send/commands/index.ts new file mode 100644 index 00000000000..645f5c0d1db --- /dev/null +++ b/apps/cli/src/tools/send/commands/index.ts @@ -0,0 +1,7 @@ +export * from "./create.command"; +export * from "./delete.command"; +export * from "./edit.command"; +export * from "./get.command"; +export * from "./list.command"; +export * from "./receive.command"; +export * from "./remove-password.command"; diff --git a/apps/cli/src/commands/send/list.command.ts b/apps/cli/src/tools/send/commands/list.command.ts similarity index 78% rename from apps/cli/src/commands/send/list.command.ts rename to apps/cli/src/tools/send/commands/list.command.ts index 21349e521f3..d6fce941830 100644 --- a/apps/cli/src/commands/send/list.command.ts +++ b/apps/cli/src/tools/send/commands/list.command.ts @@ -1,10 +1,10 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; -import { Response } from "../../models/response"; -import { ListResponse } from "../../models/response/list.response"; -import { SendResponse } from "../../models/response/send.response"; +import { Response } from "../../../models/response"; +import { ListResponse } from "../../../models/response/list.response"; +import { SendResponse } from "../models/send.response"; export class SendListCommand { constructor( diff --git a/apps/cli/src/commands/send/receive.command.ts b/apps/cli/src/tools/send/commands/receive.command.ts similarity index 89% rename from apps/cli/src/commands/send/receive.command.ts rename to apps/cli/src/tools/send/commands/receive.command.ts index 20759fbd300..50024c3ff90 100644 --- a/apps/cli/src/commands/send/receive.command.ts +++ b/apps/cli/src/tools/send/commands/receive.command.ts @@ -6,19 +6,19 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendType } from "@bitwarden/common/enums/sendType"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SendAccess } from "@bitwarden/common/models/domain/send-access"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { SendAccessRequest } from "@bitwarden/common/models/request/send-access.request"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; -import { SendAccessView } from "@bitwarden/common/models/view/send-access.view"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendAccess } from "@bitwarden/common/tools/send/models/domain/send-access"; +import { SendAccessRequest } from "@bitwarden/common/tools/send/models/request/send-access.request"; +import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-access.view"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; -import { Response } from "../../models/response"; -import { SendAccessResponse } from "../../models/response/send-access.response"; -import { DownloadCommand } from "../download.command"; +import { DownloadCommand } from "../../../commands/download.command"; +import { Response } from "../../../models/response"; +import { SendAccessResponse } from "../models/send-access.response"; export class SendReceiveCommand extends DownloadCommand { private canInteract: boolean; diff --git a/apps/cli/src/commands/send/remove-password.command.ts b/apps/cli/src/tools/send/commands/remove-password.command.ts similarity index 60% rename from apps/cli/src/commands/send/remove-password.command.ts rename to apps/cli/src/tools/send/commands/remove-password.command.ts index 0c2e35ad253..fe1452b0368 100644 --- a/apps/cli/src/commands/send/remove-password.command.ts +++ b/apps/cli/src/tools/send/commands/remove-password.command.ts @@ -1,8 +1,8 @@ -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services//send.service.abstraction"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; -import { Response } from "../../models/response"; -import { SendResponse } from "../../models/response/send.response"; +import { Response } from "../../../models/response"; +import { SendResponse } from "../models/send.response"; export class SendRemovePasswordCommand { constructor(private sendService: SendService, private sendApiService: SendApiService) {} diff --git a/apps/cli/src/tools/send/index.ts b/apps/cli/src/tools/send/index.ts new file mode 100644 index 00000000000..62074d46d5a --- /dev/null +++ b/apps/cli/src/tools/send/index.ts @@ -0,0 +1 @@ +export * from "./commands"; diff --git a/apps/cli/src/models/response/send-access.response.ts b/apps/cli/src/tools/send/models/send-access.response.ts similarity index 78% rename from apps/cli/src/models/response/send-access.response.ts rename to apps/cli/src/tools/send/models/send-access.response.ts index 18644d67492..5e9b90e5a5f 100644 --- a/apps/cli/src/models/response/send-access.response.ts +++ b/apps/cli/src/tools/send/models/send-access.response.ts @@ -1,7 +1,8 @@ -import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendAccessView } from "@bitwarden/common/models/view/send-access.view"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-access.view"; + +import { BaseResponse } from "../../../models/response/base.response"; -import { BaseResponse } from "./base.response"; import { SendFileResponse } from "./send-file.response"; import { SendTextResponse } from "./send-text.response"; diff --git a/apps/cli/src/models/response/send-file.response.ts b/apps/cli/src/tools/send/models/send-file.response.ts similarity index 89% rename from apps/cli/src/models/response/send-file.response.ts rename to apps/cli/src/tools/send/models/send-file.response.ts index b99fac379c9..9c66e898066 100644 --- a/apps/cli/src/models/response/send-file.response.ts +++ b/apps/cli/src/tools/send/models/send-file.response.ts @@ -1,4 +1,4 @@ -import { SendFileView } from "@bitwarden/common/models/view/send-file.view"; +import { SendFileView } from "@bitwarden/common/tools/send/models/view/send-file.view"; export class SendFileResponse { static template(fileName = "file attachment location"): SendFileResponse { diff --git a/apps/cli/src/models/response/send-text.response.ts b/apps/cli/src/tools/send/models/send-text.response.ts similarity index 87% rename from apps/cli/src/models/response/send-text.response.ts rename to apps/cli/src/tools/send/models/send-text.response.ts index e234ed66793..a5ad7085ecc 100644 --- a/apps/cli/src/models/response/send-text.response.ts +++ b/apps/cli/src/tools/send/models/send-text.response.ts @@ -1,4 +1,4 @@ -import { SendTextView } from "@bitwarden/common/models/view/send-text.view"; +import { SendTextView } from "@bitwarden/common/tools/send/models/view/send-text.view"; export class SendTextResponse { static template(text = "Text contained in the send.", hidden = false): SendTextResponse { diff --git a/apps/cli/src/models/response/send.response.ts b/apps/cli/src/tools/send/models/send.response.ts similarity index 94% rename from apps/cli/src/models/response/send.response.ts rename to apps/cli/src/tools/send/models/send.response.ts index 6d9f555312e..0615a73289a 100644 --- a/apps/cli/src/models/response/send.response.ts +++ b/apps/cli/src/tools/send/models/send.response.ts @@ -1,8 +1,9 @@ -import { SendType } from "@bitwarden/common/enums/sendType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SendView } from "@bitwarden/common/models/view/send.view"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; + +import { BaseResponse } from "../../../models/response/base.response"; -import { BaseResponse } from "./base.response"; import { SendFileResponse } from "./send-file.response"; import { SendTextResponse } from "./send-text.response"; diff --git a/apps/cli/src/send.program.ts b/apps/cli/src/tools/send/send.program.ts similarity index 92% rename from apps/cli/src/send.program.ts rename to apps/cli/src/tools/send/send.program.ts index a9a0f292447..8d7921f8310 100644 --- a/apps/cli/src/send.program.ts +++ b/apps/cli/src/tools/send/send.program.ts @@ -4,24 +4,27 @@ import * as path from "path"; import * as chalk from "chalk"; import * as program from "commander"; -import { SendType } from "@bitwarden/common/enums/sendType"; import { Utils } from "@bitwarden/common/misc/utils"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; -import { Main } from "./bw"; -import { GetCommand } from "./commands/get.command"; -import { SendCreateCommand } from "./commands/send/create.command"; -import { SendDeleteCommand } from "./commands/send/delete.command"; -import { SendEditCommand } from "./commands/send/edit.command"; -import { SendGetCommand } from "./commands/send/get.command"; -import { SendListCommand } from "./commands/send/list.command"; -import { SendReceiveCommand } from "./commands/send/receive.command"; -import { SendRemovePasswordCommand } from "./commands/send/remove-password.command"; -import { Response } from "./models/response"; -import { SendFileResponse } from "./models/response/send-file.response"; -import { SendTextResponse } from "./models/response/send-text.response"; -import { SendResponse } from "./models/response/send.response"; -import { Program } from "./program"; -import { CliUtils } from "./utils"; +import { Main } from "../../bw"; +import { GetCommand } from "../../commands/get.command"; +import { Response } from "../../models/response"; +import { Program } from "../../program"; +import { CliUtils } from "../../utils"; + +import { + SendCreateCommand, + SendDeleteCommand, + SendEditCommand, + SendGetCommand, + SendListCommand, + SendReceiveCommand, + SendRemovePasswordCommand, +} from "./commands"; +import { SendFileResponse } from "./models/send-file.response"; +import { SendTextResponse } from "./models/send-text.response"; +import { SendResponse } from "./models/send.response"; const writeLn = CliUtils.writeLn; diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index d9b94fd0cba..6dd6b2142fb 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/apps/desktop/src/app/app-routing.module.ts @@ -18,7 +18,7 @@ import { TwoFactorComponent } from "../auth/two-factor.component"; import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component"; import { VaultComponent } from "../vault/app/vault/vault.component"; -import { SendComponent } from "./send/send.component"; +import { SendComponent } from "./tools/send/send.component"; const routes: Routes = [ { path: "", redirectTo: "/vault", pathMatch: "full" }, diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index af19de549a2..036ce8b7d80 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/apps/desktop/src/app/app.module.ts @@ -47,12 +47,12 @@ import { AccountSwitcherComponent } from "./layout/account-switcher.component"; import { HeaderComponent } from "./layout/header.component"; import { NavComponent } from "./layout/nav.component"; import { SearchComponent } from "./layout/search/search.component"; -import { AddEditComponent as SendAddEditComponent } from "./send/add-edit.component"; -import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component"; -import { SendComponent } from "./send/send.component"; import { SharedModule } from "./shared/shared.module"; import { GeneratorComponent } from "./tools/generator.component"; import { PasswordGeneratorHistoryComponent } from "./tools/password-generator-history.component"; +import { AddEditComponent as SendAddEditComponent } from "./tools/send/add-edit.component"; +import { EffluxDatesComponent as SendEffluxDatesComponent } from "./tools/send/efflux-dates.component"; +import { SendComponent } from "./tools/send/send.component"; import { ExportComponent } from "./vault/export.component"; @NgModule({ diff --git a/apps/desktop/src/app/send/add-edit.component.html b/apps/desktop/src/app/tools/send/add-edit.component.html similarity index 100% rename from apps/desktop/src/app/send/add-edit.component.html rename to apps/desktop/src/app/tools/send/add-edit.component.html diff --git a/apps/desktop/src/app/send/add-edit.component.ts b/apps/desktop/src/app/tools/send/add-edit.component.ts similarity index 89% rename from apps/desktop/src/app/send/add-edit.component.ts rename to apps/desktop/src/app/tools/send/add-edit.component.ts index d6b90f32a09..49d66799e66 100644 --- a/apps/desktop/src/app/send/add-edit.component.ts +++ b/apps/desktop/src/app/tools/send/add-edit.component.ts @@ -1,16 +1,16 @@ import { DatePipe } from "@angular/common"; import { Component } from "@angular/core"; -import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/send/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/tools/send/add-edit.component"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; @Component({ selector: "app-send-add-edit", diff --git a/apps/desktop/src/app/send/efflux-dates.component.html b/apps/desktop/src/app/tools/send/efflux-dates.component.html similarity index 100% rename from apps/desktop/src/app/send/efflux-dates.component.html rename to apps/desktop/src/app/tools/send/efflux-dates.component.html diff --git a/apps/desktop/src/app/send/efflux-dates.component.ts b/apps/desktop/src/app/tools/send/efflux-dates.component.ts similarity index 96% rename from apps/desktop/src/app/send/efflux-dates.component.ts rename to apps/desktop/src/app/tools/send/efflux-dates.component.ts index 9ec410aea62..c2bdfc744a6 100644 --- a/apps/desktop/src/app/send/efflux-dates.component.ts +++ b/apps/desktop/src/app/tools/send/efflux-dates.component.ts @@ -2,7 +2,7 @@ import { DatePipe } from "@angular/common"; import { Component, OnChanges } from "@angular/core"; import { ControlContainer, NgForm } from "@angular/forms"; -import { EffluxDatesComponent as BaseEffluxDatesComponent } from "@bitwarden/angular/components/send/efflux-dates.component"; +import { EffluxDatesComponent as BaseEffluxDatesComponent } from "@bitwarden/angular/tools/send/efflux-dates.component"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; diff --git a/apps/desktop/src/app/send/send.component.html b/apps/desktop/src/app/tools/send/send.component.html similarity index 100% rename from apps/desktop/src/app/send/send.component.html rename to apps/desktop/src/app/tools/send/send.component.html diff --git a/apps/desktop/src/app/send/send.component.ts b/apps/desktop/src/app/tools/send/send.component.ts similarity index 90% rename from apps/desktop/src/app/send/send.component.ts rename to apps/desktop/src/app/tools/send/send.component.ts index 85918bd5269..3999d7cd13a 100644 --- a/apps/desktop/src/app/send/send.component.ts +++ b/apps/desktop/src/app/tools/send/send.component.ts @@ -1,19 +1,19 @@ import { Component, NgZone, OnDestroy, OnInit, ViewChild } from "@angular/core"; -import { SendComponent as BaseSendComponent } from "@bitwarden/angular/components/send/send.component"; +import { SendComponent as BaseSendComponent } from "@bitwarden/angular/tools/send/send.component"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { SendView } from "@bitwarden/common/models/view/send.view"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; -import { invokeMenu, RendererMenuItem } from "../../utils"; -import { SearchBarService } from "../layout/search/search-bar.service"; +import { invokeMenu, RendererMenuItem } from "../../../utils"; +import { SearchBarService } from "../../layout/search/search-bar.service"; import { AddEditComponent } from "./add-edit.component"; diff --git a/apps/desktop/src/vault/app/vault/add-edit.component.ts b/apps/desktop/src/vault/app/vault/add-edit.component.ts index 169a35e59c4..1ee951b888b 100644 --- a/apps/desktop/src/vault/app/vault/add-edit.component.ts +++ b/apps/desktop/src/vault/app/vault/add-edit.component.ts @@ -9,11 +9,11 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/web/src/app/core/state/state.service.ts b/apps/web/src/app/core/state/state.service.ts index 1bf9fec7bb8..46102325a43 100644 --- a/apps/web/src/app/core/state/state.service.ts +++ b/apps/web/src/app/core/state/state.service.ts @@ -14,9 +14,9 @@ import { } from "@bitwarden/common/abstractions/storage.service"; import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { 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 { SendData } from "@bitwarden/common/tools/send/models/data/send.data"; import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; import { FolderData } from "@bitwarden/common/vault/models/data/folder.data"; diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index cba24a86c62..5deb10948c9 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -36,14 +36,14 @@ import { FrontendLayoutComponent } from "./layouts/frontend-layout.component"; import { UserLayoutComponent } from "./layouts/user-layout.component"; import { OrganizationModule } from "./organizations/organization.module"; import { ReportsModule } from "./reports"; -import { AccessComponent } from "./send/access.component"; -import { SendComponent } from "./send/send.component"; import { AccountComponent } from "./settings/account.component"; import { DomainRulesComponent } from "./settings/domain-rules.component"; import { PreferencesComponent } from "./settings/preferences.component"; import { SecurityRoutingModule } from "./settings/security-routing.module"; import { SettingsComponent } from "./settings/settings.component"; import { GeneratorComponent } from "./tools/generator.component"; +import { AccessComponent } from "./tools/send/access.component"; +import { SendComponent } from "./tools/send/send.component"; import { ToolsComponent } from "./tools/tools.component"; import { VaultModule } from "./vault/individual-vault/vault.module"; diff --git a/apps/web/src/app/settings/change-password.component.ts b/apps/web/src/app/settings/change-password.component.ts index a5e72e3ba15..7a0fc39cf49 100644 --- a/apps/web/src/app/settings/change-password.component.ts +++ b/apps/web/src/app/settings/change-password.component.ts @@ -11,7 +11,6 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; @@ -23,9 +22,10 @@ import { PasswordRequest } from "@bitwarden/common/auth/models/request/password. 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 { SendWithIdRequest } from "@bitwarden/common/models/request/send-with-id.request"; import { UpdateKeyRequest } from "@bitwarden/common/models/request/update-key.request"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; +import { SendWithIdRequest } from "@bitwarden/common/tools/send/models/request/send-with-id.request"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; 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"; diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index aea965082b3..29cef004aef 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -73,10 +73,6 @@ import { FrontendLayoutComponent } from "../layouts/frontend-layout.component"; import { NavbarComponent } from "../layouts/navbar.component"; import { ProductSwitcherModule } from "../layouts/product-switcher/product-switcher.module"; import { UserLayoutComponent } from "../layouts/user-layout.component"; -import { AccessComponent } from "../send/access.component"; -import { AddEditComponent as SendAddEditComponent } from "../send/add-edit.component"; -import { EffluxDatesComponent as SendEffluxDatesComponent } from "../send/efflux-dates.component"; -import { SendComponent } from "../send/send.component"; import { AccountComponent } from "../settings/account.component"; import { AdjustStorageComponent } from "../settings/adjust-storage.component"; import { ApiKeyComponent } from "../settings/api-key.component"; @@ -99,6 +95,10 @@ import { UpdateLicenseComponent } from "../settings/update-license.component"; import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component"; import { GeneratorComponent } from "../tools/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component"; +import { AccessComponent } from "../tools/send/access.component"; +import { AddEditComponent as SendAddEditComponent } from "../tools/send/add-edit.component"; +import { EffluxDatesComponent as SendEffluxDatesComponent } from "../tools/send/efflux-dates.component"; +import { SendComponent } from "../tools/send/send.component"; import { ToolsComponent } from "../tools/tools.component"; import { PasswordRepromptComponent } from "../vault/components/password-reprompt.component"; import { PremiumBadgeComponent } from "../vault/components/premium-badge.component"; diff --git a/apps/web/src/app/send/access.component.html b/apps/web/src/app/tools/send/access.component.html similarity index 100% rename from apps/web/src/app/send/access.component.html rename to apps/web/src/app/tools/send/access.component.html diff --git a/apps/web/src/app/send/access.component.ts b/apps/web/src/app/tools/send/access.component.ts similarity index 91% rename from apps/web/src/app/send/access.component.ts rename to apps/web/src/app/tools/send/access.component.ts index 3b8e1531ffa..ddd821cd2c1 100644 --- a/apps/web/src/app/send/access.component.ts +++ b/apps/web/src/app/tools/send/access.component.ts @@ -7,17 +7,17 @@ import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunc import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; import { SEND_KDF_ITERATIONS } from "@bitwarden/common/enums/kdfType"; -import { SendType } from "@bitwarden/common/enums/sendType"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; -import { SendAccess } from "@bitwarden/common/models/domain/send-access"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { SendAccessRequest } from "@bitwarden/common/models/request/send-access.request"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; -import { SendAccessResponse } from "@bitwarden/common/models/response/send-access.response"; -import { SendAccessView } from "@bitwarden/common/models/view/send-access.view"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendAccess } from "@bitwarden/common/tools/send/models/domain/send-access"; +import { SendAccessRequest } from "@bitwarden/common/tools/send/models/request/send-access.request"; +import { SendAccessResponse } from "@bitwarden/common/tools/send/models/response/send-access.response"; +import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-access.view"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; @Component({ selector: "app-send-access", diff --git a/apps/web/src/app/send/add-edit.component.html b/apps/web/src/app/tools/send/add-edit.component.html similarity index 100% rename from apps/web/src/app/send/add-edit.component.html rename to apps/web/src/app/tools/send/add-edit.component.html diff --git a/apps/web/src/app/send/add-edit.component.ts b/apps/web/src/app/tools/send/add-edit.component.ts similarity index 89% rename from apps/web/src/app/send/add-edit.component.ts rename to apps/web/src/app/tools/send/add-edit.component.ts index 167196c9b47..ff602b0bb58 100644 --- a/apps/web/src/app/send/add-edit.component.ts +++ b/apps/web/src/app/tools/send/add-edit.component.ts @@ -1,16 +1,16 @@ import { DatePipe } from "@angular/common"; import { Component } from "@angular/core"; -import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/send/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/tools/send/add-edit.component"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; @Component({ selector: "app-send-add-edit", diff --git a/apps/web/src/app/send/efflux-dates.component.html b/apps/web/src/app/tools/send/efflux-dates.component.html similarity index 100% rename from apps/web/src/app/send/efflux-dates.component.html rename to apps/web/src/app/tools/send/efflux-dates.component.html diff --git a/apps/web/src/app/send/efflux-dates.component.ts b/apps/web/src/app/tools/send/efflux-dates.component.ts similarity index 93% rename from apps/web/src/app/send/efflux-dates.component.ts rename to apps/web/src/app/tools/send/efflux-dates.component.ts index b89fd0c33a4..063c7137a49 100644 --- a/apps/web/src/app/send/efflux-dates.component.ts +++ b/apps/web/src/app/tools/send/efflux-dates.component.ts @@ -2,7 +2,7 @@ import { DatePipe } from "@angular/common"; import { Component } from "@angular/core"; import { ControlContainer, NgForm } from "@angular/forms"; -import { EffluxDatesComponent as BaseEffluxDatesComponent } from "@bitwarden/angular/components/send/efflux-dates.component"; +import { EffluxDatesComponent as BaseEffluxDatesComponent } from "@bitwarden/angular/tools/send/efflux-dates.component"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; diff --git a/apps/web/src/app/send/send.component.html b/apps/web/src/app/tools/send/send.component.html similarity index 100% rename from apps/web/src/app/send/send.component.html rename to apps/web/src/app/tools/send/send.component.html diff --git a/apps/web/src/app/send/send.component.ts b/apps/web/src/app/tools/send/send.component.ts similarity index 91% rename from apps/web/src/app/send/send.component.ts rename to apps/web/src/app/tools/send/send.component.ts index 13f9fcd0db8..725bd1d56f0 100644 --- a/apps/web/src/app/send/send.component.ts +++ b/apps/web/src/app/tools/send/send.component.ts @@ -1,17 +1,17 @@ import { Component, NgZone, ViewChild, ViewContainerRef } from "@angular/core"; -import { SendComponent as BaseSendComponent } from "@bitwarden/angular/components/send/send.component"; import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { SendComponent as BaseSendComponent } from "@bitwarden/angular/tools/send/send.component"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { SendView } from "@bitwarden/common/models/view/send.view"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; import { Icons } from "@bitwarden/components"; import { AddEditComponent } from "./add-edit.component"; diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts index 23d73f622f9..2054963e3e6 100644 --- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts @@ -7,7 +7,6 @@ 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 { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; @@ -16,6 +15,7 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli import { EventType } from "@bitwarden/common/enums/eventType"; import { ProductType } from "@bitwarden/common/enums/productType"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/web/src/app/vault/org-vault/add-edit.component.ts b/apps/web/src/app/vault/org-vault/add-edit.component.ts index 763ec0348d0..f97edd013bf 100644 --- a/apps/web/src/app/vault/org-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/org-vault/add-edit.component.ts @@ -7,13 +7,13 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts index 4edddea0d2c..48c6472b383 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts @@ -6,13 +6,13 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password/"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index dc8349599b3..46ce0353397 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -29,8 +29,6 @@ import { import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; -import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService as SendServiceAbstraction } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service"; import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service"; @@ -104,8 +102,6 @@ import { OrgDomainApiService } from "@bitwarden/common/services/organization-dom import { OrgDomainService } from "@bitwarden/common/services/organization-domain/org-domain.service"; import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation"; import { SearchService } from "@bitwarden/common/services/search.service"; -import { SendApiService } from "@bitwarden/common/services/send/send-api.service"; -import { SendService } from "@bitwarden/common/services/send/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"; @@ -122,6 +118,10 @@ import { UsernameGenerationService, UsernameGenerationServiceAbstraction, } from "@bitwarden/common/tools/generator/username"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service"; +import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service"; +import { SendService as SendServiceAbstraction } from "@bitwarden/common/tools/send/services/send.service.abstraction"; import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; diff --git a/libs/angular/src/components/send/add-edit.component.ts b/libs/angular/src/tools/send/add-edit.component.ts similarity index 94% rename from libs/angular/src/components/send/add-edit.component.ts rename to libs/angular/src/tools/send/add-edit.component.ts index 2aa0277be85..020322d8790 100644 --- a/libs/angular/src/components/send/add-edit.component.ts +++ b/libs/angular/src/tools/send/add-edit.component.ts @@ -7,17 +7,17 @@ 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 { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; -import { SendType } from "@bitwarden/common/enums/sendType"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; -import { Send } from "@bitwarden/common/models/domain/send"; -import { SendFileView } from "@bitwarden/common/models/view/send-file.view"; -import { SendTextView } from "@bitwarden/common/models/view/send-text.view"; -import { SendView } from "@bitwarden/common/models/view/send.view"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { Send } from "@bitwarden/common/tools/send/models/domain/send"; +import { SendFileView } from "@bitwarden/common/tools/send/models/view/send-file.view"; +import { SendTextView } from "@bitwarden/common/tools/send/models/view/send-text.view"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; @Directive() export class AddEditComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/send/efflux-dates.component.ts b/libs/angular/src/tools/send/efflux-dates.component.ts similarity index 100% rename from libs/angular/src/components/send/efflux-dates.component.ts rename to libs/angular/src/tools/send/efflux-dates.component.ts diff --git a/libs/angular/src/components/send/send.component.ts b/libs/angular/src/tools/send/send.component.ts similarity index 94% rename from libs/angular/src/components/send/send.component.ts rename to libs/angular/src/tools/send/send.component.ts index 5635e8a1564..c5728bc9955 100644 --- a/libs/angular/src/components/send/send.component.ts +++ b/libs/angular/src/tools/send/send.component.ts @@ -6,12 +6,12 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; -import { SendService } from "@bitwarden/common/abstractions/send/send.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; -import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendView } from "@bitwarden/common/models/view/send.view"; +import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; +import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; +import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; @Directive() export class SendComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts index bb3fd3b159c..dc5105e211c 100644 --- a/libs/angular/src/vault/components/add-edit.component.ts +++ b/libs/angular/src/vault/components/add-edit.component.ts @@ -7,7 +7,6 @@ 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 { SendApiService } from "@bitwarden/common/abstractions/send/send-api.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { @@ -23,6 +22,7 @@ import { EventType } from "@bitwarden/common/enums/eventType"; import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; import { Utils } from "@bitwarden/common/misc/utils"; +import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/libs/common/src/abstractions/search.service.ts b/libs/common/src/abstractions/search.service.ts index 3f37d4fe3a9..3e449e92366 100644 --- a/libs/common/src/abstractions/search.service.ts +++ b/libs/common/src/abstractions/search.service.ts @@ -1,4 +1,4 @@ -import { SendView } from "../models/view/send.view"; +import { SendView } from "../tools/send/models/view/send.view"; import { CipherView } from "../vault/models/view/cipher.view"; export abstract class SearchService { diff --git a/libs/common/src/abstractions/state.service.ts b/libs/common/src/abstractions/state.service.ts index 664c20e537f..c3bcc880394 100644 --- a/libs/common/src/abstractions/state.service.ts +++ b/libs/common/src/abstractions/state.service.ts @@ -13,15 +13,15 @@ import { KdfType } from "../enums/kdfType"; import { ThemeType } from "../enums/themeType"; import { UriMatchType } from "../enums/uriMatchType"; import { EventData } from "../models/data/event.data"; -import { SendData } from "../models/data/send.data"; import { ServerConfigData } from "../models/data/server-config.data"; import { Account, AccountSettingsSettings } from "../models/domain/account"; import { EncString } from "../models/domain/enc-string"; import { StorageOptions } from "../models/domain/storage-options"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { WindowState } from "../models/domain/window-state"; -import { SendView } from "../models/view/send.view"; import { GeneratedPasswordHistory } from "../tools/generator/password"; +import { SendData } from "../tools/send/models/data/send.data"; +import { SendView } from "../tools/send/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"; diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts index f8629899091..6f654f241c9 100644 --- a/libs/common/src/models/domain/account.ts +++ b/libs/common/src/models/domain/account.ts @@ -13,14 +13,14 @@ import { KdfType } from "../../enums/kdfType"; import { UriMatchType } from "../../enums/uriMatchType"; import { Utils } from "../../misc/utils"; import { GeneratedPasswordHistory } from "../../tools/generator/password"; +import { SendData } from "../../tools/send/models/data/send.data"; +import { SendView } from "../../tools/send/models/view/send.view"; import { DeepJsonify } from "../../types/deep-jsonify"; import { CipherData } from "../../vault/models/data/cipher.data"; import { FolderData } from "../../vault/models/data/folder.data"; import { CipherView } from "../../vault/models/view/cipher.view"; import { EventData } from "../data/event.data"; -import { SendData } from "../data/send.data"; import { ServerConfigData } from "../data/server-config.data"; -import { SendView } from "../view/send.view"; import { EncString } from "./enc-string"; import { SymmetricCryptoKey } from "./symmetric-crypto-key"; diff --git a/libs/common/src/models/request/update-key.request.ts b/libs/common/src/models/request/update-key.request.ts index 0679257a675..11d2dc46ff1 100644 --- a/libs/common/src/models/request/update-key.request.ts +++ b/libs/common/src/models/request/update-key.request.ts @@ -1,8 +1,7 @@ +import { SendWithIdRequest } from "../../tools/send/models/request/send-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 { ciphers: CipherWithIdRequest[] = []; folders: FolderWithIdRequest[] = []; diff --git a/libs/common/src/services/search.service.ts b/libs/common/src/services/search.service.ts index 8d147ae1e9f..52c4becb006 100644 --- a/libs/common/src/services/search.service.ts +++ b/libs/common/src/services/search.service.ts @@ -5,7 +5,7 @@ import { LogService } from "../abstractions/log.service"; import { SearchService as SearchServiceAbstraction } from "../abstractions/search.service"; import { FieldType } from "../enums/fieldType"; import { UriMatchType } from "../enums/uriMatchType"; -import { SendView } from "../models/view/send.view"; +import { SendView } from "../tools/send/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"; diff --git a/libs/common/src/services/state.service.ts b/libs/common/src/services/state.service.ts index f95d705e8dc..74a42d6d8ef 100644 --- a/libs/common/src/services/state.service.ts +++ b/libs/common/src/services/state.service.ts @@ -25,7 +25,6 @@ import { UriMatchType } from "../enums/uriMatchType"; import { StateFactory } from "../factories/stateFactory"; import { Utils } from "../misc/utils"; import { EventData } from "../models/data/event.data"; -import { SendData } from "../models/data/send.data"; import { ServerConfigData } from "../models/data/server-config.data"; import { Account, @@ -39,8 +38,9 @@ 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 { SendView } from "../models/view/send.view"; import { GeneratedPasswordHistory } from "../tools/generator/password"; +import { SendData } from "../tools/send/models/data/send.data"; +import { SendView } from "../tools/send/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"; diff --git a/libs/common/src/services/stateMigration.service.ts b/libs/common/src/services/stateMigration.service.ts index de624aef128..4dc9b107b9a 100644 --- a/libs/common/src/services/stateMigration.service.ts +++ b/libs/common/src/services/stateMigration.service.ts @@ -11,7 +11,6 @@ import { StateVersion } from "../enums/stateVersion"; import { ThemeType } from "../enums/themeType"; import { StateFactory } from "../factories/stateFactory"; import { EventData } from "../models/data/event.data"; -import { SendData } from "../models/data/send.data"; import { Account, AccountSettings, @@ -22,6 +21,7 @@ import { EncString } from "../models/domain/enc-string"; import { GlobalState } from "../models/domain/global-state"; import { StorageOptions } from "../models/domain/storage-options"; import { GeneratedPasswordHistory } from "../tools/generator/password"; +import { SendData } from "../tools/send/models/data/send.data"; import { CipherData } from "../vault/models/data/cipher.data"; import { FolderData } from "../vault/models/data/folder.data"; diff --git a/libs/common/src/enums/sendType.ts b/libs/common/src/tools/send/enums/send-type.ts similarity index 100% rename from libs/common/src/enums/sendType.ts rename to libs/common/src/tools/send/enums/send-type.ts diff --git a/libs/common/src/models/api/send-file.api.ts b/libs/common/src/tools/send/models/api/send-file.api.ts similarity index 85% rename from libs/common/src/models/api/send-file.api.ts rename to libs/common/src/tools/send/models/api/send-file.api.ts index 79317c8ecbd..87ac476b485 100644 --- a/libs/common/src/models/api/send-file.api.ts +++ b/libs/common/src/tools/send/models/api/send-file.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/base.response"; +import { BaseResponse } from "../../../../models/response/base.response"; export class SendFileApi extends BaseResponse { id: string; diff --git a/libs/common/src/models/api/send-text.api.ts b/libs/common/src/tools/send/models/api/send-text.api.ts similarity index 80% rename from libs/common/src/models/api/send-text.api.ts rename to libs/common/src/tools/send/models/api/send-text.api.ts index 9222861979d..ee318f29d84 100644 --- a/libs/common/src/models/api/send-text.api.ts +++ b/libs/common/src/tools/send/models/api/send-text.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/base.response"; +import { BaseResponse } from "../../../../models/response/base.response"; export class SendTextApi extends BaseResponse { text: string; diff --git a/libs/common/src/models/data/send-file.data.ts b/libs/common/src/tools/send/models/data/send-file.data.ts similarity index 100% rename from libs/common/src/models/data/send-file.data.ts rename to libs/common/src/tools/send/models/data/send-file.data.ts diff --git a/libs/common/src/models/data/send-text.data.ts b/libs/common/src/tools/send/models/data/send-text.data.ts similarity index 100% rename from libs/common/src/models/data/send-text.data.ts rename to libs/common/src/tools/send/models/data/send-text.data.ts diff --git a/libs/common/src/models/data/send.data.ts b/libs/common/src/tools/send/models/data/send.data.ts similarity index 96% rename from libs/common/src/models/data/send.data.ts rename to libs/common/src/tools/send/models/data/send.data.ts index ca783d33cbe..7cba7303396 100644 --- a/libs/common/src/models/data/send.data.ts +++ b/libs/common/src/tools/send/models/data/send.data.ts @@ -1,4 +1,4 @@ -import { SendType } from "../../enums/sendType"; +import { SendType } from "../../enums/send-type"; import { SendResponse } from "../response/send.response"; import { SendFileData } from "./send-file.data"; diff --git a/libs/common/spec/models/domain/sendAccess.spec.ts b/libs/common/src/tools/send/models/domain/send-access.spec.ts similarity index 85% rename from libs/common/spec/models/domain/sendAccess.spec.ts rename to libs/common/src/tools/send/models/domain/send-access.spec.ts index d0a8093ba29..3935cdf67aa 100644 --- a/libs/common/spec/models/domain/sendAccess.spec.ts +++ b/libs/common/src/tools/send/models/domain/send-access.spec.ts @@ -1,12 +1,12 @@ // eslint-disable-next-line no-restricted-imports import { Substitute, Arg } from "@fluffy-spoon/substitute"; -import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendAccess } from "@bitwarden/common/models/domain/send-access"; -import { SendText } from "@bitwarden/common/models/domain/send-text"; -import { SendAccessResponse } from "@bitwarden/common/models/response/send-access.response"; +import { mockEnc } from "../../../../../spec/utils"; +import { SendType } from "../../enums/send-type"; +import { SendAccessResponse } from "../response/send-access.response"; -import { mockEnc } from "../../utils"; +import { SendAccess } from "./send-access"; +import { SendText } from "./send-text"; describe("SendAccess", () => { let request: SendAccessResponse; diff --git a/libs/common/src/models/domain/send-access.ts b/libs/common/src/tools/send/models/domain/send-access.ts similarity index 84% rename from libs/common/src/models/domain/send-access.ts rename to libs/common/src/tools/send/models/domain/send-access.ts index f2847b3b478..ae83784da42 100644 --- a/libs/common/src/models/domain/send-access.ts +++ b/libs/common/src/tools/send/models/domain/send-access.ts @@ -1,12 +1,12 @@ -import { SendType } from "../../enums/sendType"; +import Domain from "../../../../models/domain/domain-base"; +import { EncString } from "../../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../../models/domain/symmetric-crypto-key"; +import { SendType } from "../../enums/send-type"; import { SendAccessResponse } from "../response/send-access.response"; import { SendAccessView } from "../view/send-access.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; import { SendFile } from "./send-file"; import { SendText } from "./send-text"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class SendAccess extends Domain { id: string; diff --git a/libs/common/spec/models/domain/sendFile.spec.ts b/libs/common/src/tools/send/models/domain/send-file.spec.ts similarity index 85% rename from libs/common/spec/models/domain/sendFile.spec.ts rename to libs/common/src/tools/send/models/domain/send-file.spec.ts index 5c648d7d064..8e0381434c6 100644 --- a/libs/common/spec/models/domain/sendFile.spec.ts +++ b/libs/common/src/tools/send/models/domain/send-file.spec.ts @@ -1,7 +1,7 @@ -import { SendFileData } from "@bitwarden/common/models/data/send-file.data"; -import { SendFile } from "@bitwarden/common/models/domain/send-file"; +import { mockEnc } from "../../../../../spec/utils"; +import { SendFileData } from "../data/send-file.data"; -import { mockEnc } from "../../utils"; +import { SendFile } from "./send-file"; describe("SendFile", () => { let data: SendFileData; diff --git a/libs/common/src/models/domain/send-file.ts b/libs/common/src/tools/send/models/domain/send-file.ts similarity index 82% rename from libs/common/src/models/domain/send-file.ts rename to libs/common/src/tools/send/models/domain/send-file.ts index 531db1b0a2b..a99ba222dff 100644 --- a/libs/common/src/models/domain/send-file.ts +++ b/libs/common/src/tools/send/models/domain/send-file.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 { SendFileData } from "../data/send-file.data"; import { SendFileView } from "../view/send-file.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export class SendFile extends Domain { id: string; size: string; diff --git a/libs/common/spec/models/domain/sendText.spec.ts b/libs/common/src/tools/send/models/domain/send-text.spec.ts similarity index 81% rename from libs/common/spec/models/domain/sendText.spec.ts rename to libs/common/src/tools/send/models/domain/send-text.spec.ts index 17ea76cc76b..7285447d8af 100644 --- a/libs/common/spec/models/domain/sendText.spec.ts +++ b/libs/common/src/tools/send/models/domain/send-text.spec.ts @@ -1,7 +1,7 @@ -import { SendTextData } from "@bitwarden/common/models/data/send-text.data"; -import { SendText } from "@bitwarden/common/models/domain/send-text"; +import { mockEnc } from "../../../../../spec/utils"; +import { SendTextData } from "../data/send-text.data"; -import { mockEnc } from "../../utils"; +import { SendText } from "./send-text"; describe("SendText", () => { let data: SendTextData; diff --git a/libs/common/src/models/domain/send-text.ts b/libs/common/src/tools/send/models/domain/send-text.ts similarity index 80% rename from libs/common/src/models/domain/send-text.ts rename to libs/common/src/tools/send/models/domain/send-text.ts index 083ef898c72..a404dd7502b 100644 --- a/libs/common/src/models/domain/send-text.ts +++ b/libs/common/src/tools/send/models/domain/send-text.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 { SendTextData } from "../data/send-text.data"; import { SendTextView } from "../view/send-text.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export class SendText extends Domain { text: EncString; hidden: boolean; diff --git a/libs/common/spec/models/domain/send.spec.ts b/libs/common/src/tools/send/models/domain/send.spec.ts similarity index 85% rename from libs/common/spec/models/domain/send.spec.ts rename to libs/common/src/tools/send/models/domain/send.spec.ts index b79cdee3d8d..4497551e04b 100644 --- a/libs/common/spec/models/domain/send.spec.ts +++ b/libs/common/src/tools/send/models/domain/send.spec.ts @@ -1,16 +1,16 @@ // eslint-disable-next-line no-restricted-imports import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendData } from "@bitwarden/common/models/data/send.data"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { Send } from "@bitwarden/common/models/domain/send"; -import { SendText } from "@bitwarden/common/models/domain/send-text"; -import { ContainerService } from "@bitwarden/common/services/container.service"; +import { makeStaticByteArray, mockEnc } from "../../../../../spec/utils"; +import { CryptoService } from "../../../../abstractions/crypto.service"; +import { EncryptService } from "../../../../abstractions/encrypt.service"; +import { EncString } from "../../../../models/domain/enc-string"; +import { ContainerService } from "../../../../services/container.service"; +import { SendType } from "../../enums/send-type"; +import { SendData } from "../data/send.data"; -import { makeStaticByteArray, mockEnc } from "../../utils"; +import { Send } from "./send"; +import { SendText } from "./send-text"; describe("Send", () => { let data: SendData; diff --git a/libs/common/src/models/domain/send.ts b/libs/common/src/tools/send/models/domain/send.ts similarity index 93% rename from libs/common/src/models/domain/send.ts rename to libs/common/src/tools/send/models/domain/send.ts index 678e5ce5ac5..a12952181aa 100644 --- a/libs/common/src/models/domain/send.ts +++ b/libs/common/src/tools/send/models/domain/send.ts @@ -1,12 +1,12 @@ import { Jsonify } from "type-fest"; -import { SendType } from "../../enums/sendType"; -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 { SendType } from "../../enums/send-type"; import { SendData } from "../data/send.data"; import { SendView } from "../view/send.view"; -import Domain from "./domain-base"; -import { EncString } from "./enc-string"; import { SendFile } from "./send-file"; import { SendText } from "./send-text"; diff --git a/libs/common/src/models/request/send-access.request.ts b/libs/common/src/tools/send/models/request/send-access.request.ts similarity index 100% rename from libs/common/src/models/request/send-access.request.ts rename to libs/common/src/tools/send/models/request/send-access.request.ts diff --git a/libs/common/src/models/request/send-with-id.request.ts b/libs/common/src/tools/send/models/request/send-with-id.request.ts similarity index 100% rename from libs/common/src/models/request/send-with-id.request.ts rename to libs/common/src/tools/send/models/request/send-with-id.request.ts diff --git a/libs/common/src/models/request/send.request.ts b/libs/common/src/tools/send/models/request/send.request.ts similarity index 96% rename from libs/common/src/models/request/send.request.ts rename to libs/common/src/tools/send/models/request/send.request.ts index ffb31b4d1f4..e6fd2bb8fa5 100644 --- a/libs/common/src/models/request/send.request.ts +++ b/libs/common/src/tools/send/models/request/send.request.ts @@ -1,4 +1,4 @@ -import { SendType } from "../../enums/sendType"; +import { SendType } from "../../enums/send-type"; import { SendFileApi } from "../api/send-file.api"; import { SendTextApi } from "../api/send-text.api"; import { Send } from "../domain/send"; diff --git a/libs/common/src/models/response/send-access.response.ts b/libs/common/src/tools/send/models/response/send-access.response.ts similarity index 87% rename from libs/common/src/models/response/send-access.response.ts rename to libs/common/src/tools/send/models/response/send-access.response.ts index f53ebaef318..dce857ca7d4 100644 --- a/libs/common/src/models/response/send-access.response.ts +++ b/libs/common/src/tools/send/models/response/send-access.response.ts @@ -1,9 +1,8 @@ -import { SendType } from "../../enums/sendType"; +import { BaseResponse } from "../../../../models/response/base.response"; +import { SendType } from "../../enums/send-type"; import { SendFileApi } from "../api/send-file.api"; import { SendTextApi } from "../api/send-text.api"; -import { BaseResponse } from "./base.response"; - export class SendAccessResponse extends BaseResponse { id: string; type: SendType; diff --git a/libs/common/src/models/response/send-file-download-data.response.ts b/libs/common/src/tools/send/models/response/send-file-download-data.response.ts similarity index 77% rename from libs/common/src/models/response/send-file-download-data.response.ts rename to libs/common/src/tools/send/models/response/send-file-download-data.response.ts index 982a7e39f75..971b4975781 100644 --- a/libs/common/src/models/response/send-file-download-data.response.ts +++ b/libs/common/src/tools/send/models/response/send-file-download-data.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../../models/response/base.response"; export class SendFileDownloadDataResponse extends BaseResponse { id: string = null; diff --git a/libs/common/src/models/response/send-file-upload-data.response.ts b/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts similarity index 78% rename from libs/common/src/models/response/send-file-upload-data.response.ts rename to libs/common/src/tools/send/models/response/send-file-upload-data.response.ts index f9d1ba9a601..34eca030143 100644 --- a/libs/common/src/models/response/send-file-upload-data.response.ts +++ b/libs/common/src/tools/send/models/response/send-file-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 { SendResponse } from "./send.response"; export class SendFileUploadDataResponse extends BaseResponse { diff --git a/libs/common/src/models/response/send.response.ts b/libs/common/src/tools/send/models/response/send.response.ts similarity index 92% rename from libs/common/src/models/response/send.response.ts rename to libs/common/src/tools/send/models/response/send.response.ts index 77554864c15..d4dbd39f4a9 100644 --- a/libs/common/src/models/response/send.response.ts +++ b/libs/common/src/tools/send/models/response/send.response.ts @@ -1,9 +1,8 @@ -import { SendType } from "../../enums/sendType"; +import { BaseResponse } from "../../../../models/response/base.response"; +import { SendType } from "../../enums/send-type"; import { SendFileApi } from "../api/send-file.api"; import { SendTextApi } from "../api/send-text.api"; -import { BaseResponse } from "./base.response"; - export class SendResponse extends BaseResponse { id: string; accessId: string; diff --git a/libs/common/src/models/view/send-access.view.ts b/libs/common/src/tools/send/models/view/send-access.view.ts similarity index 85% rename from libs/common/src/models/view/send-access.view.ts rename to libs/common/src/tools/send/models/view/send-access.view.ts index 782492f94ad..b99a689aa91 100644 --- a/libs/common/src/models/view/send-access.view.ts +++ b/libs/common/src/tools/send/models/view/send-access.view.ts @@ -1,9 +1,9 @@ -import { SendType } from "../../enums/sendType"; +import { View } from "../../../../models/view/view"; +import { SendType } from "../../enums/send-type"; import { SendAccess } from "../domain/send-access"; import { SendFileView } from "./send-file.view"; import { SendTextView } from "./send-text.view"; -import { View } from "./view"; export class SendAccessView implements View { id: string = null; diff --git a/libs/common/src/models/view/send-file.view.ts b/libs/common/src/tools/send/models/view/send-file.view.ts similarity index 85% rename from libs/common/src/models/view/send-file.view.ts rename to libs/common/src/tools/send/models/view/send-file.view.ts index 3ac12b8203d..643487acfcd 100644 --- a/libs/common/src/models/view/send-file.view.ts +++ b/libs/common/src/tools/send/models/view/send-file.view.ts @@ -1,8 +1,7 @@ -import { DeepJsonify } from "../../types/deep-jsonify"; +import { View } from "../../../../models/view/view"; +import { DeepJsonify } from "../../../../types/deep-jsonify"; import { SendFile } from "../domain/send-file"; -import { View } from "./view"; - export class SendFileView implements View { id: string = null; size: string = null; diff --git a/libs/common/src/models/view/send-text.view.ts b/libs/common/src/tools/send/models/view/send-text.view.ts similarity index 81% rename from libs/common/src/models/view/send-text.view.ts rename to libs/common/src/tools/send/models/view/send-text.view.ts index 638f66ad661..57b0de4ab0f 100644 --- a/libs/common/src/models/view/send-text.view.ts +++ b/libs/common/src/tools/send/models/view/send-text.view.ts @@ -1,8 +1,7 @@ -import { DeepJsonify } from "../../types/deep-jsonify"; +import { View } from "../../../../models/view/view"; +import { DeepJsonify } from "../../../../types/deep-jsonify"; import { SendText } from "../domain/send-text"; -import { View } from "./view"; - export class SendTextView implements View { text: string = null; hidden: boolean; diff --git a/libs/common/src/models/view/send.view.ts b/libs/common/src/tools/send/models/view/send.view.ts similarity index 88% rename from libs/common/src/models/view/send.view.ts rename to libs/common/src/tools/send/models/view/send.view.ts index 18846a4f1f6..df802e562a8 100644 --- a/libs/common/src/models/view/send.view.ts +++ b/libs/common/src/tools/send/models/view/send.view.ts @@ -1,12 +1,12 @@ -import { SendType } from "../../enums/sendType"; -import { Utils } from "../../misc/utils"; -import { DeepJsonify } from "../../types/deep-jsonify"; +import { Utils } from "../../../../misc/utils"; +import { SymmetricCryptoKey } from "../../../../models/domain/symmetric-crypto-key"; +import { View } from "../../../../models/view/view"; +import { DeepJsonify } from "../../../../types/deep-jsonify"; +import { SendType } from "../../enums/send-type"; import { Send } from "../domain/send"; -import { SymmetricCryptoKey } from "../domain/symmetric-crypto-key"; import { SendFileView } from "./send-file.view"; import { SendTextView } from "./send-text.view"; -import { View } from "./view"; export class SendView implements View { id: string = null; diff --git a/libs/common/src/abstractions/send/send-api.service.abstraction.ts b/libs/common/src/tools/send/services/send-api.service.abstraction.ts similarity index 63% rename from libs/common/src/abstractions/send/send-api.service.abstraction.ts rename to libs/common/src/tools/send/services/send-api.service.abstraction.ts index 462c7293ddd..0fac99d6a0f 100644 --- a/libs/common/src/abstractions/send/send-api.service.abstraction.ts +++ b/libs/common/src/tools/send/services/send-api.service.abstraction.ts @@ -1,13 +1,13 @@ -import { EncArrayBuffer } from "../../models/domain/enc-array-buffer"; -import { Send } from "../../models/domain/send"; -import { SendAccessRequest } from "../../models/request/send-access.request"; -import { SendRequest } from "../../models/request/send.request"; -import { ListResponse } from "../../models/response/list.response"; -import { SendAccessResponse } from "../../models/response/send-access.response"; -import { SendFileDownloadDataResponse } from "../../models/response/send-file-download-data.response"; -import { SendFileUploadDataResponse } from "../../models/response/send-file-upload-data.response"; -import { SendResponse } from "../../models/response/send.response"; -import { SendAccessView } from "../../models/view/send-access.view"; +import { EncArrayBuffer } from "../../../models/domain/enc-array-buffer"; +import { ListResponse } from "../../../models/response/list.response"; +import { Send } from "../models/domain/send"; +import { SendAccessRequest } from "../models/request/send-access.request"; +import { SendRequest } from "../models/request/send.request"; +import { SendAccessResponse } from "../models/response/send-access.response"; +import { SendFileDownloadDataResponse } from "../models/response/send-file-download-data.response"; +import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; +import { SendResponse } from "../models/response/send.response"; +import { SendAccessView } from "../models/view/send-access.view"; export abstract class SendApiService { getSend: (id: string) => Promise; diff --git a/libs/common/src/services/send/send-api.service.ts b/libs/common/src/tools/send/services/send-api.service.ts similarity index 84% rename from libs/common/src/services/send/send-api.service.ts rename to libs/common/src/tools/send/services/send-api.service.ts index 917899112a4..76ce0bae5e9 100644 --- a/libs/common/src/services/send/send-api.service.ts +++ b/libs/common/src/tools/send/services/send-api.service.ts @@ -1,24 +1,25 @@ -import { SendType } from "../../../../common/src/enums/sendType"; -import { Utils } from "../../../../common/src/misc/utils"; -import { ErrorResponse } from "../../../../common/src/models/response/error.response"; -import { ApiService } from "../../abstractions/api.service"; +import { ApiService } from "../../../abstractions/api.service"; import { FileUploadApiMethods, FileUploadService, -} from "../../abstractions/file-upload/file-upload.service"; -import { SendApiService as SendApiServiceAbstraction } from "../../abstractions/send/send-api.service.abstraction"; -import { InternalSendService } from "../../abstractions/send/send.service.abstraction"; -import { SendData } from "../../models/data/send.data"; -import { EncArrayBuffer } from "../../models/domain/enc-array-buffer"; -import { Send } from "../../models/domain/send"; -import { SendAccessRequest } from "../../models/request/send-access.request"; -import { SendRequest } from "../../models/request/send.request"; -import { ListResponse } from "../../models/response/list.response"; -import { SendAccessResponse } from "../../models/response/send-access.response"; -import { SendFileDownloadDataResponse } from "../../models/response/send-file-download-data.response"; -import { SendFileUploadDataResponse } from "../../models/response/send-file-upload-data.response"; -import { SendResponse } from "../../models/response/send.response"; -import { SendAccessView } from "../../models/view/send-access.view"; +} from "../../../abstractions/file-upload/file-upload.service"; +import { Utils } from "../../../misc/utils"; +import { EncArrayBuffer } from "../../../models/domain/enc-array-buffer"; +import { ErrorResponse } from "../../../models/response/error.response"; +import { ListResponse } from "../../../models/response/list.response"; +import { SendType } from "../enums/send-type"; +import { SendData } from "../models/data/send.data"; +import { Send } from "../models/domain/send"; +import { SendAccessRequest } from "../models/request/send-access.request"; +import { SendRequest } from "../models/request/send.request"; +import { SendAccessResponse } from "../models/response/send-access.response"; +import { SendFileDownloadDataResponse } from "../models/response/send-file-download-data.response"; +import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; +import { SendResponse } from "../models/response/send.response"; +import { SendAccessView } from "../models/view/send-access.view"; + +import { SendApiService as SendApiServiceAbstraction } from "./send-api.service.abstraction"; +import { InternalSendService } from "./send.service.abstraction"; export class SendApiService implements SendApiServiceAbstraction { constructor( diff --git a/libs/common/src/abstractions/send/send.service.abstraction.ts b/libs/common/src/tools/send/services/send.service.abstraction.ts similarity index 74% rename from libs/common/src/abstractions/send/send.service.abstraction.ts rename to libs/common/src/tools/send/services/send.service.abstraction.ts index eb099495740..9624ce02715 100644 --- a/libs/common/src/abstractions/send/send.service.abstraction.ts +++ b/libs/common/src/tools/send/services/send.service.abstraction.ts @@ -1,10 +1,10 @@ import { Observable } from "rxjs"; -import { SendData } from "../../models/data/send.data"; -import { EncArrayBuffer } from "../../models/domain/enc-array-buffer"; -import { Send } from "../../models/domain/send"; -import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; -import { SendView } from "../../models/view/send.view"; +import { EncArrayBuffer } from "../../../models/domain/enc-array-buffer"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; +import { SendData } from "../models/data/send.data"; +import { Send } from "../models/domain/send"; +import { SendView } from "../models/view/send.view"; export abstract class SendService { sends$: Observable; diff --git a/libs/common/spec/services/send.service.spec.ts b/libs/common/src/tools/send/services/send.service.spec.ts similarity index 84% rename from libs/common/spec/services/send.service.spec.ts rename to libs/common/src/tools/send/services/send.service.spec.ts index 32856cf61f9..bd185e030ba 100644 --- a/libs/common/spec/services/send.service.spec.ts +++ b/libs/common/src/tools/send/services/send.service.spec.ts @@ -1,17 +1,18 @@ import { any, mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, firstValueFrom } from "rxjs"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { SendData } from "@bitwarden/common/models/data/send.data"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { Send } from "@bitwarden/common/models/domain/send"; -import { SendView } from "@bitwarden/common/models/view/send.view"; -import { ContainerService } from "@bitwarden/common/services/container.service"; -import { SendService } from "@bitwarden/common/services/send/send.service"; +import { CryptoService } from "../../../abstractions/crypto.service"; +import { CryptoFunctionService } from "../../../abstractions/cryptoFunction.service"; +import { EncryptService } from "../../../abstractions/encrypt.service"; +import { I18nService } from "../../../abstractions/i18n.service"; +import { StateService } from "../../../abstractions/state.service"; +import { EncString } from "../../../models/domain/enc-string"; +import { ContainerService } from "../../../services/container.service"; +import { SendData } from "../models/data/send.data"; +import { Send } from "../models/domain/send"; +import { SendView } from "../models/view/send.view"; + +import { SendService } from "./send.service"; describe("SendService", () => { const cryptoService = mock(); diff --git a/libs/common/src/services/send/send.service.ts b/libs/common/src/tools/send/services/send.service.ts similarity index 88% rename from libs/common/src/services/send/send.service.ts rename to libs/common/src/tools/send/services/send.service.ts index c30b750b447..d30a3ae56bc 100644 --- a/libs/common/src/services/send/send.service.ts +++ b/libs/common/src/tools/send/services/send.service.ts @@ -1,21 +1,22 @@ import { BehaviorSubject, concatMap } from "rxjs"; -import { CryptoService } from "../../abstractions/crypto.service"; -import { CryptoFunctionService } from "../../abstractions/cryptoFunction.service"; -import { I18nService } from "../../abstractions/i18n.service"; -import { InternalSendService as InternalSendServiceAbstraction } from "../../abstractions/send/send.service.abstraction"; -import { StateService } from "../../abstractions/state.service"; -import { SEND_KDF_ITERATIONS } from "../../enums/kdfType"; -import { SendType } from "../../enums/sendType"; -import { Utils } from "../../misc/utils"; -import { SendData } from "../../models/data/send.data"; -import { EncArrayBuffer } from "../../models/domain/enc-array-buffer"; -import { EncString } from "../../models/domain/enc-string"; -import { Send } from "../../models/domain/send"; -import { SendFile } from "../../models/domain/send-file"; -import { SendText } from "../../models/domain/send-text"; -import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; -import { SendView } from "../../models/view/send.view"; +import { CryptoService } from "../../../abstractions/crypto.service"; +import { CryptoFunctionService } from "../../../abstractions/cryptoFunction.service"; +import { I18nService } from "../../../abstractions/i18n.service"; +import { StateService } from "../../../abstractions/state.service"; +import { SEND_KDF_ITERATIONS } from "../../../enums/kdfType"; +import { Utils } from "../../../misc/utils"; +import { EncArrayBuffer } from "../../../models/domain/enc-array-buffer"; +import { EncString } from "../../../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; +import { SendType } from "../enums/send-type"; +import { SendData } from "../models/data/send.data"; +import { Send } from "../models/domain/send"; +import { SendFile } from "../models/domain/send-file"; +import { SendText } from "../models/domain/send-text"; +import { SendView } from "../models/view/send.view"; + +import { InternalSendService as InternalSendServiceAbstraction } from "./send.service.abstraction"; export class SendService implements InternalSendServiceAbstraction { protected _sends: BehaviorSubject = new BehaviorSubject([]); diff --git a/libs/common/src/vault/models/response/sync.response.ts b/libs/common/src/vault/models/response/sync.response.ts index d2248c5e961..d042c4b5a76 100644 --- a/libs/common/src/vault/models/response/sync.response.ts +++ b/libs/common/src/vault/models/response/sync.response.ts @@ -3,7 +3,7 @@ import { PolicyResponse } from "../../../admin-console/models/response/policy.re import { BaseResponse } from "../../../models/response/base.response"; import { DomainsResponse } from "../../../models/response/domains.response"; import { ProfileResponse } from "../../../models/response/profile.response"; -import { SendResponse } from "../../../models/response/send.response"; +import { SendResponse } from "../../../tools/send/models/response/send.response"; import { CipherResponse } from "./cipher.response"; import { FolderResponse } from "./folder.response"; diff --git a/libs/common/src/vault/services/sync/sync.service.ts b/libs/common/src/vault/services/sync/sync.service.ts index 88ec0b8548e..b5a25390c5f 100644 --- a/libs/common/src/vault/services/sync/sync.service.ts +++ b/libs/common/src/vault/services/sync/sync.service.ts @@ -2,8 +2,6 @@ import { ApiService } from "../../../abstractions/api.service"; import { CryptoService } from "../../../abstractions/crypto.service"; import { LogService } from "../../../abstractions/log.service"; import { MessagingService } from "../../../abstractions/messaging.service"; -import { SendApiService } from "../../../abstractions/send/send-api.service.abstraction"; -import { InternalSendService } from "../../../abstractions/send/send.service.abstraction"; import { SettingsService } from "../../../abstractions/settings.service"; import { StateService } from "../../../abstractions/state.service"; import { CollectionService } from "../../../admin-console/abstractions/collection.service"; @@ -18,7 +16,6 @@ import { CollectionDetailsResponse } from "../../../admin-console/models/respons import { PolicyResponse } from "../../../admin-console/models/response/policy.response"; import { KeyConnectorService } from "../../../auth/abstractions/key-connector.service"; import { sequentialize } from "../../../misc/sequentialize"; -import { SendData } from "../../../models/data/send.data"; import { DomainsResponse } from "../../../models/response/domains.response"; import { SyncCipherNotification, @@ -26,7 +23,10 @@ import { SyncSendNotification, } from "../../../models/response/notification.response"; import { ProfileResponse } from "../../../models/response/profile.response"; -import { SendResponse } from "../../../models/response/send.response"; +import { SendData } from "../../../tools/send/models/data/send.data"; +import { SendResponse } from "../../../tools/send/models/response/send.response"; +import { SendApiService } from "../../../tools/send/services/send-api.service.abstraction"; +import { InternalSendService } from "../../../tools/send/services/send.service.abstraction"; 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";