Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PS-2320] Import API service refactor #4529

Merged
merged 9 commits into from
Jan 30, 2023
Merged

[PS-2320] Import API service refactor #4529

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2a79f65
Extract import methods from ApiService
djsmith85 Jan 20, 2023
04fe0b7
Fix import for tests
djsmith85 Jan 20, 2023
a978aeb
Fix imports for CLI
djsmith85 Jan 20, 2023
45c37d5
Fix imports for web
djsmith85 Jan 20, 2023
63054f2
Merge branch 'master' of https://github.com/bitwarden/bitwarden into …
djsmith85 Jan 24, 2023
f7599d8
Fix ModuleImports and dependencies
djsmith85 Jan 25, 2023
3cff93c
Mark ImportApiService methods as async
djsmith85 Jan 25, 2023
2953e2f
Merge branch 'master' of https://github.com/bitwarden/bitwarden into …
djsmith85 Jan 25, 2023
9535932
Merge branch 'master' of https://github.com/bitwarden/bitwarden into …
djsmith85 Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix imports for CLI
  • Loading branch information
@djsmith85
djsmith85 committed Jan 20, 2023
commit a978aeb750b92245795d541e8d60a116315598c2
9 changes: 7 additions & 2 deletions apps/cli/src/bw.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as program from "commander";
import * as jsdom from "jsdom";

import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction";
import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
import { ClientType } from "@bitwarden/common/enums/clientType";
Expand All @@ -27,7 +28,8 @@ import { ExportService } from "@bitwarden/common/services/export.service";
import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service";
import { FolderService } from "@bitwarden/common/services/folder/folder.service";
import { ImportService } from "@bitwarden/common/services/import.service";
import { ImportApiService } from "@bitwarden/common/services/import/import-api.service";
import { ImportService } from "@bitwarden/common/services/import/import.service";
import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service";
Expand Down Expand Up @@ -94,6 +96,7 @@ export class Main {
containerService: ContainerService;
auditService: AuditService;
importService: ImportService;
importApiService: ImportApiServiceAbstraction;
exportService: ExportService;
searchService: SearchService;
cryptoFunctionService: NodeCryptoFunctionService;
Expand Down Expand Up @@ -339,10 +342,12 @@ export class Main {

this.totpService = new TotpService(this.cryptoFunctionService, this.logService);

this.importApiService = new ImportApiService(this.apiService);

this.importService = new ImportService(
this.cipherService,
this.folderService,
this.apiService,
this.importApiService,
this.i18nService,
this.collectionService,
this.cryptoService
Expand Down
2 changes: 1 addition & 1 deletion apps/cli/src/commands/import.command.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as program from "commander";
import * as inquirer from "inquirer";

import { ImportService } from "@bitwarden/common/abstractions/import.service";
import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction";
import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
import { ImportType } from "@bitwarden/common/enums/importOptions";
import { Importer } from "@bitwarden/common/importers/importer";
Expand Down