diff --git a/.eslintrc.json b/.eslintrc.json index 8bbf78df51..39f292e530 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -98,6 +98,10 @@ { "target": "./libs/common/**/*", "from": "./libs/node/**/*" + }, + { + "target": "./libs/common/**/*", + "from": "./libs/importer/**/*" } ] } @@ -150,6 +154,12 @@ "rules": { "no-restricted-imports": ["error", { "patterns": ["@bitwarden/node/*", "src/**/*"] }] } + }, + { + "files": ["libs/importer/src/**/*.ts"], + "rules": { + "no-restricted-imports": ["error", { "patterns": ["@bitwarden/importer/*", "src/**/*"] }] + } } ] } diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4206b39079..798fced938 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -26,6 +26,7 @@ apps/desktop/src/app/tools @bitwarden/team-tools-dev apps/web/src/app/tools @bitwarden/team-tools-dev libs/angular/src/tools @bitwarden/team-tools-dev libs/common/src/tools @bitwarden/team-tools-dev +libs/importer @bitwarden/team-tools-dev ## Vault team files ## apps/browser/src/autofill @bitwarden/team-vault-dev diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index 221efe5438..5c0c56b289 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -47,7 +47,6 @@ ./libs/common/src/enums/encryptedExportType.ts ./libs/common/src/enums/linkedIdType.ts ./libs/common/src/enums/sendType.ts -./libs/common/src/enums/importOptions.ts ./libs/common/src/enums/encryptionType.ts ./libs/common/src/enums/htmlStorageLocation.ts ./libs/common/src/enums/notificationType.ts diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index efc6686014..314711ee94 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -4,7 +4,6 @@ import * as path from "path"; import * as program from "commander"; import * as jsdom from "jsdom"; -import { 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/admin-console/abstractions/organization/organization-api.service.abstraction"; import { CollectionService } from "@bitwarden/common/admin-console/services/collection.service"; @@ -33,8 +32,6 @@ import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptog import { EnvironmentService } from "@bitwarden/common/services/environment.service"; import { ExportService } from "@bitwarden/common/services/export.service"; import { FileUploadService } from "@bitwarden/common/services/fileUpload.service"; -import { ImportApiService } from "@bitwarden/common/services/import/import-api.service"; -import { ImportService } from "@bitwarden/common/services/import/import.service"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service"; import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation"; @@ -56,6 +53,12 @@ import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service"; import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service"; import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service"; +import { + ImportApiService, + ImportApiServiceAbstraction, + ImportService, + ImportServiceAbstraction, +} from "@bitwarden/importer"; import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service"; import { Program } from "./program"; @@ -98,7 +101,7 @@ export class Main { totpService: TotpService; containerService: ContainerService; auditService: AuditService; - importService: ImportService; + importService: ImportServiceAbstraction; importApiService: ImportApiServiceAbstraction; exportService: ExportService; searchService: SearchService; diff --git a/apps/cli/src/commands/import.command.ts b/apps/cli/src/tools/import.command.ts similarity index 93% rename from apps/cli/src/commands/import.command.ts rename to apps/cli/src/tools/import.command.ts index 6792086143..948077ff0e 100644 --- a/apps/cli/src/commands/import.command.ts +++ b/apps/cli/src/tools/import.command.ts @@ -1,10 +1,8 @@ import * as program from "commander"; import * as inquirer from "inquirer"; -import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { ImportType } from "@bitwarden/common/enums/importOptions"; -import { Importer } from "@bitwarden/common/importers/importer"; +import { ImportServiceAbstraction, Importer, ImportType } from "@bitwarden/importer"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/message.response"; @@ -12,7 +10,7 @@ import { CliUtils } from "../utils"; export class ImportCommand { constructor( - private importService: ImportService, + private importService: ImportServiceAbstraction, private organizationService: OrganizationService ) {} diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts index cf1b112112..307d3b552f 100644 --- a/apps/cli/src/vault.program.ts +++ b/apps/cli/src/vault.program.ts @@ -6,11 +6,11 @@ import { Main } from "./bw"; import { EditCommand } from "./commands/edit.command"; import { ExportCommand } from "./commands/export.command"; import { GetCommand } from "./commands/get.command"; -import { ImportCommand } from "./commands/import.command"; import { ListCommand } from "./commands/list.command"; import { RestoreCommand } from "./commands/restore.command"; import { Response } from "./models/response"; import { Program } from "./program"; +import { ImportCommand } from "./tools/import.command"; import { CliUtils } from "./utils"; import { CreateCommand } from "./vault/create.command"; import { DeleteCommand } from "./vault/delete.command"; diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json index 845c6b5afc..2517566d1d 100644 --- a/apps/cli/tsconfig.json +++ b/apps/cli/tsconfig.json @@ -14,6 +14,7 @@ "paths": { "@bitwarden/common/spec/*": ["../../libs/common/spec/*"], "@bitwarden/common/*": ["../../libs/common/src/*"], + "@bitwarden/importer": ["../../libs/importer/src"], "@bitwarden/node/*": ["../../libs/node/src/*"] } }, diff --git a/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts b/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts index c091294020..6b5ad81511 100644 --- a/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts +++ b/apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts @@ -3,13 +3,15 @@ import { NgModule } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction"; -import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import/import.service.abstraction"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; -import { ImportApiService } from "@bitwarden/common/services/import/import-api.service"; -import { ImportService } from "@bitwarden/common/services/import/import.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { + ImportService, + ImportServiceAbstraction, + ImportApiService, + ImportApiServiceAbstraction, +} from "@bitwarden/importer"; import { LooseComponentsModule, SharedModule } from "../../../../shared"; diff --git a/apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts b/apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts index 7a73d1b613..14b24eec61 100644 --- a/apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts @@ -3,12 +3,12 @@ import { ActivatedRoute, Router } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.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 { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { ImportServiceAbstraction } from "@bitwarden/importer"; import { ImportComponent } from "../../../../tools/import-export/import.component"; @@ -22,7 +22,7 @@ export class OrganizationImportComponent extends ImportComponent { constructor( i18nService: I18nService, - importService: ImportService, + importService: ImportServiceAbstraction, router: Router, private route: ActivatedRoute, platformUtilsService: PlatformUtilsService, diff --git a/apps/web/src/app/tools/import-export/import-export.module.ts b/apps/web/src/app/tools/import-export/import-export.module.ts index 67d9dbecf2..08200baa31 100644 --- a/apps/web/src/app/tools/import-export/import-export.module.ts +++ b/apps/web/src/app/tools/import-export/import-export.module.ts @@ -3,13 +3,15 @@ import { NgModule } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction"; -import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import/import.service.abstraction"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; -import { ImportApiService } from "@bitwarden/common/services/import/import-api.service"; -import { ImportService } from "@bitwarden/common/services/import/import.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { + ImportService, + ImportServiceAbstraction, + ImportApiService, + ImportApiServiceAbstraction, +} from "@bitwarden/importer"; import { LooseComponentsModule, SharedModule } from "../../shared"; diff --git a/apps/web/src/app/tools/import-export/import.component.ts b/apps/web/src/app/tools/import-export/import.component.ts index 14690df2db..a0354a5ab7 100644 --- a/apps/web/src/app/tools/import-export/import.component.ts +++ b/apps/web/src/app/tools/import-export/import.component.ts @@ -6,14 +6,17 @@ import Swal, { SweetAlertIcon } from "sweetalert2"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; -import { ImportOption, ImportType } from "@bitwarden/common/enums/importOptions"; -import { ImportError } from "@bitwarden/common/importers/import-error"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { + ImportOption, + ImportType, + ImportError, + ImportServiceAbstraction, +} from "@bitwarden/importer"; import { FilePasswordPromptComponent } from "./file-password-prompt.component"; @@ -36,7 +39,7 @@ export class ImportComponent implements OnInit { constructor( protected i18nService: I18nService, - protected importService: ImportService, + protected importService: ImportServiceAbstraction, protected router: Router, protected platformUtilsService: PlatformUtilsService, protected policyService: PolicyService, diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index 34d5798505..d60b55efe3 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -8,7 +8,8 @@ "@bitwarden/web-vault/*": ["src/*"], "@bitwarden/common/*": ["../../libs/common/src/*"], "@bitwarden/angular/*": ["../../libs/angular/src/*"], - "@bitwarden/components": ["../../libs/components/src"] + "@bitwarden/components": ["../../libs/components/src"], + "@bitwarden/importer": ["../../libs/importer/src"] } }, "angularCompilerOptions": { diff --git a/jest.config.js b/jest.config.js index ae9de057fb..2016478f00 100644 --- a/jest.config.js +++ b/jest.config.js @@ -21,6 +21,7 @@ module.exports = { "/libs/angular/jest.config.js", "/libs/common/jest.config.js", "/libs/components/jest.config.js", + "/libs/importer/jest.config.js", "/libs/node/jest.config.js", ], diff --git a/libs/importer/jest.config.js b/libs/importer/jest.config.js new file mode 100644 index 0000000000..2eeeefad62 --- /dev/null +++ b/libs/importer/jest.config.js @@ -0,0 +1,14 @@ +const { pathsToModuleNameMapper } = require("ts-jest"); + +const { compilerOptions } = require("../shared/tsconfig.libs"); + +const sharedConfig = require("../shared/jest.config.base"); + +module.exports = { + ...sharedConfig, + preset: "ts-jest", + testEnvironment: "jsdom", + moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, { + prefix: "/", + }), +}; diff --git a/libs/importer/package.json b/libs/importer/package.json new file mode 100644 index 0000000000..7817996b5a --- /dev/null +++ b/libs/importer/package.json @@ -0,0 +1,23 @@ +{ + "name": "@bitwarden/importer", + "version": "0.0.0", + "description": "Home for all Bitwarden importers.", + "keywords": [ + "bitwarden" + ], + "author": "Bitwarden Inc.", + "homepage": "https://bitwarden.com", + "repository": { + "type": "git", + "url": "https://github.com/bitwarden/clients" + }, + "license": "GPL-3.0", + "scripts": { + "clean": "rimraf dist/**/*", + "build": "npm run clean && tsc", + "build:watch": "npm run clean && tsc -watch" + }, + "dependencies": { + "@bitwarden/common": "file:../common" + } +} diff --git a/libs/common/spec/importers/bitwarden-json-importer.spec.ts b/libs/importer/spec/bitwarden-json-importer.spec.ts similarity index 92% rename from libs/common/spec/importers/bitwarden-json-importer.spec.ts rename to libs/importer/spec/bitwarden-json-importer.spec.ts index 8f2fbc5b1b..19384ed5c6 100644 --- a/libs/common/spec/importers/bitwarden-json-importer.spec.ts +++ b/libs/importer/spec/bitwarden-json-importer.spec.ts @@ -3,7 +3,8 @@ import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { BitwardenJsonImporter } from "@bitwarden/common/importers/bitwarden-json-importer"; + +import { BitwardenJsonImporter } from "../src/importers"; import { data as passwordProtectedData } from "./test-data/bitwarden-json/password-protected.json"; diff --git a/libs/common/spec/importers/bitwarden-password-protected-importer.spec.ts b/libs/importer/spec/bitwarden-password-protected-importer.spec.ts similarity index 95% rename from libs/common/spec/importers/bitwarden-password-protected-importer.spec.ts rename to libs/importer/spec/bitwarden-password-protected-importer.spec.ts index 0b1c3b7b2e..2dc12bdb84 100644 --- a/libs/common/spec/importers/bitwarden-password-protected-importer.spec.ts +++ b/libs/importer/spec/bitwarden-password-protected-importer.spec.ts @@ -4,9 +4,10 @@ import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { KdfType } from "@bitwarden/common/enums/kdfType"; -import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwarden-password-protected-importer"; import { Utils } from "@bitwarden/common/misc/utils"; -import { ImportResult } from "@bitwarden/common/models/domain/import-result"; + +import { BitwardenPasswordProtectedImporter } from "../src/importers"; +import { ImportResult } from "../src/models/import-result"; import { data as emptyDecryptedData } from "./test-data/bitwarden-json/empty.json"; diff --git a/libs/common/spec/importers/chrome-csv-importer.spec.ts b/libs/importer/spec/chrome-csv-importer.spec.ts similarity index 94% rename from libs/common/spec/importers/chrome-csv-importer.spec.ts rename to libs/importer/spec/chrome-csv-importer.spec.ts index 746c573c23..dcb39b657d 100644 --- a/libs/common/spec/importers/chrome-csv-importer.spec.ts +++ b/libs/importer/spec/chrome-csv-importer.spec.ts @@ -1,8 +1,9 @@ -import { ChromeCsvImporter as Importer } from "@bitwarden/common/importers/chrome-csv-importer"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; +import { ChromeCsvImporter } from "../src/importers"; + import { data as androidData } from "./test-data/chrome-csv/android-data.csv"; import { data as simplePasswordData } from "./test-data/chrome-csv/simple-password-data.csv"; @@ -54,7 +55,7 @@ const CipherData = [ describe("Chrome CSV Importer", () => { CipherData.forEach((data) => { it(data.title, async () => { - const importer = new Importer(); + const importer = new ChromeCsvImporter(); const result = await importer.parse(data.csv); expect(result != null).toBe(true); expect(result.ciphers.length).toBeGreaterThan(0); diff --git a/libs/common/spec/importers/dashlane-csv-importer.spec.ts b/libs/importer/spec/dashlane-csv-importer.spec.ts similarity index 98% rename from libs/common/spec/importers/dashlane-csv-importer.spec.ts rename to libs/importer/spec/dashlane-csv-importer.spec.ts index 80a3579041..bd957eaa87 100644 --- a/libs/common/spec/importers/dashlane-csv-importer.spec.ts +++ b/libs/importer/spec/dashlane-csv-importer.spec.ts @@ -1,6 +1,7 @@ -import { DashlaneCsvImporter as Importer } from "@bitwarden/common/importers/dashlane/dashlane-csv-importer"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { DashlaneCsvImporter } from "../src/importers"; + import { credentialsData } from "./test-data/dashlane-csv/credentials.csv"; import { identityData } from "./test-data/dashlane-csv/id.csv"; import { multiplePersonalInfoData } from "./test-data/dashlane-csv/multiple-personal-info.csv"; @@ -9,9 +10,9 @@ import { personalInfoData } from "./test-data/dashlane-csv/personal-info.csv"; import { secureNoteData } from "./test-data/dashlane-csv/securenotes.csv"; describe("Dashlane CSV Importer", () => { - let importer: Importer; + let importer: DashlaneCsvImporter; beforeEach(() => { - importer = new Importer(); + importer = new DashlaneCsvImporter(); }); it("should parse login records", async () => { diff --git a/libs/common/spec/importers/enpass/enpass-json-importer.spec.ts b/libs/importer/spec/enpass-json-importer.spec.ts similarity index 89% rename from libs/common/spec/importers/enpass/enpass-json-importer.spec.ts rename to libs/importer/spec/enpass-json-importer.spec.ts index bbbc2f7726..f23ace33e2 100644 --- a/libs/common/spec/importers/enpass/enpass-json-importer.spec.ts +++ b/libs/importer/spec/enpass-json-importer.spec.ts @@ -1,12 +1,13 @@ -import { EnpassJsonImporter as Importer } from "@bitwarden/common/importers/enpass/enpass-json-importer"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; -import { creditCard } from "./test-data/json/credit-card"; -import { folders } from "./test-data/json/folders"; -import { login } from "./test-data/json/login"; -import { loginAndroidUrl } from "./test-data/json/login-android-url"; -import { note } from "./test-data/json/note"; +import { EnpassJsonImporter } from "../src/importers"; + +import { creditCard } from "./test-data/enpass-json/credit-card"; +import { folders } from "./test-data/enpass-json/folders"; +import { login } from "./test-data/enpass-json/login"; +import { loginAndroidUrl } from "./test-data/enpass-json/login-android-url"; +import { note } from "./test-data/enpass-json/note"; function validateCustomField(fields: FieldView[], fieldName: string, expectedValue: any) { expect(fields).toBeDefined(); @@ -18,7 +19,7 @@ function validateCustomField(fields: FieldView[], fieldName: string, expectedVal describe("Enpass JSON Importer", () => { it("should create folders/ nested folder and assignment", async () => { - const importer = new Importer(); + const importer = new EnpassJsonImporter(); const testDataString = JSON.stringify(folders); const result = await importer.parse(testDataString); expect(result != null).toBe(true); @@ -37,7 +38,7 @@ describe("Enpass JSON Importer", () => { }); it("should parse login items", async () => { - const importer = new Importer(); + const importer = new EnpassJsonImporter(); const testDataString = JSON.stringify(login); const result = await importer.parse(testDataString); expect(result != null).toBe(true); @@ -64,7 +65,7 @@ describe("Enpass JSON Importer", () => { }); it("should parse login items with Android Autofill information", async () => { - const importer = new Importer(); + const importer = new EnpassJsonImporter(); const testDataString = JSON.stringify(loginAndroidUrl); const result = await importer.parse(testDataString); expect(result != null).toBe(true); @@ -82,7 +83,7 @@ describe("Enpass JSON Importer", () => { }); it("should parse credit card items", async () => { - const importer = new Importer(); + const importer = new EnpassJsonImporter(); const testDataString = JSON.stringify(creditCard); const result = await importer.parse(testDataString); expect(result != null).toBe(true); @@ -119,7 +120,7 @@ describe("Enpass JSON Importer", () => { }); it("should parse notes", async () => { - const importer = new Importer(); + const importer = new EnpassJsonImporter(); const testDataString = JSON.stringify(note); const result = await importer.parse(testDataString); expect(result != null).toBe(true); diff --git a/libs/common/spec/importers/firefox-csv-importer.spec.ts b/libs/importer/spec/firefox-csv-importer.spec.ts similarity index 93% rename from libs/common/spec/importers/firefox-csv-importer.spec.ts rename to libs/importer/spec/firefox-csv-importer.spec.ts index 0dbadd093f..0add655a68 100644 --- a/libs/common/spec/importers/firefox-csv-importer.spec.ts +++ b/libs/importer/spec/firefox-csv-importer.spec.ts @@ -1,8 +1,9 @@ -import { FirefoxCsvImporter as Importer } from "@bitwarden/common/importers/firefox-csv-importer"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; +import { FirefoxCsvImporter } from "../src/importers"; + import { data as firefoxAccountsData } from "./test-data/firefox-csv/firefox-accounts-data.csv"; import { data as simplePasswordData } from "./test-data/firefox-csv/simple-password-data.csv"; @@ -54,7 +55,7 @@ const CipherData = [ describe("Firefox CSV Importer", () => { CipherData.forEach((data) => { it(data.title, async () => { - const importer = new Importer(); + const importer = new FirefoxCsvImporter(); const result = await importer.parse(data.csv); expect(result != null).toBe(true); expect(result.ciphers.length).toBeGreaterThan(0); diff --git a/libs/common/spec/importers/keepass2-xml-importer.spec.ts b/libs/importer/spec/keepass2-xml-importer.spec.ts similarity index 74% rename from libs/common/spec/importers/keepass2-xml-importer.spec.ts rename to libs/importer/spec/keepass2-xml-importer.spec.ts index d335a8aca7..4f02bf9260 100644 --- a/libs/common/spec/importers/keepass2-xml-importer.spec.ts +++ b/libs/importer/spec/keepass2-xml-importer.spec.ts @@ -1,17 +1,22 @@ -import { KeePass2XmlImporter as Importer } from "@bitwarden/common/importers/keepass2-xml-importer"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { TestData, TestData1, TestData2 } from "./keepass2-xml-importer-testdata"; +import { KeePass2XmlImporter } from "../src/importers"; + +import { + TestData, + TestData1, + TestData2, +} from "./test-data/keepass2-xml/keepass2-xml-importer-testdata"; describe("KeePass2 Xml Importer", () => { it("should parse XML data", async () => { - const importer = new Importer(); + const importer = new KeePass2XmlImporter(); const result = await importer.parse(TestData); expect(result != null).toBe(true); }); it("parse XML should contains folders", async () => { - const importer = new Importer(); + const importer = new KeePass2XmlImporter(); const folder = new FolderView(); folder.name = "Folder2"; const actual = [folder]; @@ -21,7 +26,7 @@ describe("KeePass2 Xml Importer", () => { }); it("parse XML should contains login details", async () => { - const importer = new Importer(); + const importer = new KeePass2XmlImporter(); const result = await importer.parse(TestData); expect(result.ciphers[0].login.uri != null).toBe(true); expect(result.ciphers[0].login.username != null).toBe(true); @@ -29,13 +34,13 @@ describe("KeePass2 Xml Importer", () => { }); it("should return error with missing root tag", async () => { - const importer = new Importer(); + const importer = new KeePass2XmlImporter(); const result = await importer.parse(TestData1); expect(result.errorMessage).toBe("Missing `KeePassFile > Root` node."); }); it("should return error with missing KeePassFile tag", async () => { - const importer = new Importer(); + const importer = new KeePass2XmlImporter(); const result = await importer.parse(TestData2); expect(result.success).toBe(false); }); diff --git a/libs/common/spec/importers/keeper-csv-importer.spec.ts b/libs/importer/spec/keeper-csv-importer.spec.ts similarity index 96% rename from libs/common/spec/importers/keeper-csv-importer.spec.ts rename to libs/importer/spec/keeper-csv-importer.spec.ts index 7317b8177a..e3ca578de5 100644 --- a/libs/common/spec/importers/keeper-csv-importer.spec.ts +++ b/libs/importer/spec/keeper-csv-importer.spec.ts @@ -1,12 +1,13 @@ -import { KeeperCsvImporter as Importer } from "@bitwarden/common/importers/keeper/keeper-csv-importer"; import { Utils } from "@bitwarden/common/misc/utils"; +import { KeeperCsvImporter } from "../src/importers"; + import { testData as TestData } from "./test-data/keeper-csv/testdata.csv"; describe("Keeper CSV Importer", () => { - let importer: Importer; + let importer: KeeperCsvImporter; beforeEach(() => { - importer = new Importer(); + importer = new KeeperCsvImporter(); }); it("should parse login data", async () => { diff --git a/libs/common/spec/importers/keeper-json-importer.spec.ts b/libs/importer/spec/keeper-json-importer.spec.ts similarity index 96% rename from libs/common/spec/importers/keeper-json-importer.spec.ts rename to libs/importer/spec/keeper-json-importer.spec.ts index b32497a95b..2931de4ed0 100644 --- a/libs/common/spec/importers/keeper-json-importer.spec.ts +++ b/libs/importer/spec/keeper-json-importer.spec.ts @@ -1,14 +1,15 @@ -import { KeeperJsonImporter as Importer } from "@bitwarden/common/importers/keeper/keeper-json-importer"; import { Utils } from "@bitwarden/common/misc/utils"; +import { KeeperJsonImporter } from "../src/importers"; + import { testData as TestData } from "./test-data/keeper-json/testdata.json"; describe("Keeper Json Importer", () => { const testDataJson = JSON.stringify(TestData); - let importer: Importer; + let importer: KeeperJsonImporter; beforeEach(() => { - importer = new Importer(); + importer = new KeeperJsonImporter(); }); it("should parse login data", async () => { diff --git a/libs/common/spec/importers/lastpass-csv-importer.spec.ts b/libs/importer/spec/lastpass-csv-importer.spec.ts similarity index 95% rename from libs/common/spec/importers/lastpass-csv-importer.spec.ts rename to libs/importer/spec/lastpass-csv-importer.spec.ts index 36686aadc5..4e11ba4d78 100644 --- a/libs/common/spec/importers/lastpass-csv-importer.spec.ts +++ b/libs/importer/spec/lastpass-csv-importer.spec.ts @@ -1,10 +1,11 @@ import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { LastPassCsvImporter as Importer } from "@bitwarden/common/importers/lastpass-csv-importer"; -import { ImportResult } from "@bitwarden/common/models/domain/import-result"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; +import { LastPassCsvImporter } from "../src/importers"; +import { ImportResult } from "../src/models/import-result"; + function baseExcept(result: ImportResult) { expect(result).not.toBeNull(); expect(result.success).toBe(true); @@ -170,7 +171,7 @@ Notes:",nomonth,,0`, describe("Lastpass CSV Importer", () => { CipherData.forEach((data) => { it(data.title, async () => { - const importer = new Importer(); + const importer = new LastPassCsvImporter(); const result = await importer.parse(data.csv); expect(result != null).toBe(true); expect(result.ciphers.length).toBeGreaterThan(0); @@ -192,7 +193,7 @@ describe("Lastpass CSV Importer", () => { const input = `url,username,password,totp,extra,name,grouping,fav http://example.com,someUser,myPassword,Y64VEVMBTSXCYIWRSHRNDZW62MPGVU2G,super secure notes,example.com,,0`; - const importer = new Importer(); + const importer = new LastPassCsvImporter(); const result = await importer.parse(input); baseExcept(result); diff --git a/libs/common/spec/importers/myki-csv-importer.spec.ts b/libs/importer/spec/myki-csv-importer.spec.ts similarity index 99% rename from libs/common/spec/importers/myki-csv-importer.spec.ts rename to libs/importer/spec/myki-csv-importer.spec.ts index 6df40e7175..b20d610d96 100644 --- a/libs/common/spec/importers/myki-csv-importer.spec.ts +++ b/libs/importer/spec/myki-csv-importer.spec.ts @@ -1,7 +1,8 @@ -import { MykiCsvImporter as Importer } from "@bitwarden/common/importers/myki-csv-importer"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { MykiCsvImporter } from "../src/importers"; + import { userAccountData } from "./test-data/myki-csv/user-account.csv"; import { userCreditCardData } from "./test-data/myki-csv/user-credit-card.csv"; import { userIdCardData } from "./test-data/myki-csv/user-id-card.csv"; @@ -432,9 +433,9 @@ function expectTourVisa(cipher: CipherView) { } describe("Myki CSV Importer", () => { - let importer: Importer; + let importer: MykiCsvImporter; beforeEach(() => { - importer = new Importer(); + importer = new MykiCsvImporter(); }); it("should parse userAccount records", async () => { diff --git a/libs/common/spec/importers/nordpass-csv-importer.spec.ts b/libs/importer/spec/nordpass-csv-importer.spec.ts similarity index 97% rename from libs/common/spec/importers/nordpass-csv-importer.spec.ts rename to libs/importer/spec/nordpass-csv-importer.spec.ts index 6a368c7180..d9b0e9dbf2 100644 --- a/libs/common/spec/importers/nordpass-csv-importer.spec.ts +++ b/libs/importer/spec/nordpass-csv-importer.spec.ts @@ -1,9 +1,10 @@ import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; -import { NordPassCsvImporter as Importer } from "@bitwarden/common/importers/nordpass-csv-importer"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; +import { NordPassCsvImporter } from "../src/importers"; + import { data as creditCardData } from "./test-data/nordpass-csv/nordpass.card.csv"; import { data as identityData } from "./test-data/nordpass-csv/nordpass.identity.csv"; import { data as loginData } from "./test-data/nordpass-csv/nordpass.login.csv"; @@ -108,9 +109,9 @@ function expectSecureNote(cipher: CipherView) { } describe("NordPass CSV Importer", () => { - let importer: Importer; + let importer: NordPassCsvImporter; beforeEach(() => { - importer = new Importer(); + importer = new NordPassCsvImporter(); }); it("should parse login records", async () => { diff --git a/libs/common/spec/importers/onepassword-1pif-importer.spec.ts b/libs/importer/spec/onepassword-1pif-importer.spec.ts similarity index 97% rename from libs/common/spec/importers/onepassword-1pif-importer.spec.ts rename to libs/importer/spec/onepassword-1pif-importer.spec.ts index 6ba2edde65..9d74cb900f 100644 --- a/libs/common/spec/importers/onepassword-1pif-importer.spec.ts +++ b/libs/importer/spec/onepassword-1pif-importer.spec.ts @@ -1,5 +1,6 @@ import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { OnePassword1PifImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-1pif-importer"; + +import { OnePassword1PifImporter } from "../src/importers"; const TestData: string = "***aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee***\n" + @@ -425,7 +426,7 @@ const IdentityTestData = JSON.stringify({ describe("1Password 1Pif Importer", () => { it("should parse data", async () => { - const importer = new Importer(); + const importer = new OnePassword1PifImporter(); const result = await importer.parse(TestData); expect(result != null).toBe(true); @@ -438,7 +439,7 @@ describe("1Password 1Pif Importer", () => { }); it('should create concealed field as "hidden" type', async () => { - const importer = new Importer(); + const importer = new OnePassword1PifImporter(); const result = await importer.parse(TestData); expect(result != null).toBe(true); @@ -456,7 +457,7 @@ describe("1Password 1Pif Importer", () => { }); it("should create identity records", async () => { - const importer = new Importer(); + const importer = new OnePassword1PifImporter(); const result = await importer.parse(IdentityTestData); expect(result != null).toBe(true); const cipher = result.ciphers.shift(); @@ -492,7 +493,7 @@ describe("1Password 1Pif Importer", () => { }); it("should create password history", async () => { - const importer = new Importer(); + const importer = new OnePassword1PifImporter(); const result = await importer.parse(TestData); const cipher = result.ciphers.shift(); @@ -503,7 +504,7 @@ describe("1Password 1Pif Importer", () => { }); it("should create password history from windows opvault 1pif format", async () => { - const importer = new Importer(); + const importer = new OnePassword1PifImporter(); const result = await importer.parse(WindowsOpVaultTestData); const cipher = result.ciphers.shift(); diff --git a/libs/common/spec/importers/onepassword-1pux-importer.spec.ts b/libs/importer/spec/onepassword-1pux-importer.spec.ts similarity index 95% rename from libs/common/spec/importers/onepassword-1pux-importer.spec.ts rename to libs/importer/spec/onepassword-1pux-importer.spec.ts index 0287f4134f..75c58189f6 100644 --- a/libs/common/spec/importers/onepassword-1pux-importer.spec.ts +++ b/libs/importer/spec/onepassword-1pux-importer.spec.ts @@ -1,10 +1,11 @@ import { FieldType } from "@bitwarden/common/enums/fieldType"; import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; -import { OnePassword1PuxImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-1pux-importer"; import { Utils } from "@bitwarden/common/misc/utils"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; +import { OnePassword1PuxImporter } from "../src/importers"; + import { APICredentialsData } from "./test-data/onepassword-1pux/api-credentials"; import { BankAccountData } from "./test-data/onepassword-1pux/bank-account"; import { CreditCardData } from "./test-data/onepassword-1pux/credit-card"; @@ -47,7 +48,7 @@ describe("1Password 1Pux Importer", () => { const SanitizedExportJson = JSON.stringify(SanitizedExport); it("should parse login data", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const result = await importer.parse(LoginDataJson); expect(result != null).toBe(true); @@ -70,7 +71,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse notes", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const result = await importer.parse(OnePuxExampleFileJson); expect(result != null).toBe(true); @@ -79,7 +80,7 @@ describe("1Password 1Pux Importer", () => { }); it("should set favourite if favIndex equals 1", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const result = await importer.parse(OnePuxExampleFileJson); expect(result != null).toBe(true); @@ -88,7 +89,7 @@ describe("1Password 1Pux Importer", () => { }); it("should handle custom boolean fields", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const result = await importer.parse(LoginDataJson); expect(result != null).toBe(true); @@ -106,7 +107,7 @@ describe("1Password 1Pux Importer", () => { }); it("should add fields of type email as custom fields", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const EmailFieldDataJson = JSON.stringify(EmailFieldData); const result = await importer.parse(EmailFieldDataJson); expect(result != null).toBe(true); @@ -125,7 +126,7 @@ describe("1Password 1Pux Importer", () => { }); it('should create concealed field as "hidden" type', async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const result = await importer.parse(OnePuxExampleFileJson); expect(result != null).toBe(true); @@ -143,7 +144,7 @@ describe("1Password 1Pux Importer", () => { }); it("should create password history", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const result = await importer.parse(OnePuxExampleFileJson); const cipher = result.ciphers.shift(); @@ -154,7 +155,7 @@ describe("1Password 1Pux Importer", () => { }); it("should create credit card records", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const result = await importer.parse(CreditCardDataJson); expect(result != null).toBe(true); const cipher = result.ciphers.shift(); @@ -186,7 +187,7 @@ describe("1Password 1Pux Importer", () => { }); it("should create identity records", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const result = await importer.parse(IdentityDataJson); expect(result != null).toBe(true); const cipher = result.ciphers.shift(); @@ -228,7 +229,7 @@ describe("1Password 1Pux Importer", () => { }); it("emails fields on identity types should be added to the identity email field", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const EmailFieldOnIdentityDataJson = JSON.stringify(EmailFieldOnIdentityData); const result = await importer.parse(EmailFieldOnIdentityDataJson); expect(result != null).toBe(true); @@ -246,7 +247,7 @@ describe("1Password 1Pux Importer", () => { }); it("emails fields on identity types should be added to custom fields if identity.email has been filled", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const EmailFieldOnIdentityPrefilledDataJson = JSON.stringify(EmailFieldOnIdentityPrefilledData); const result = await importer.parse(EmailFieldOnIdentityPrefilledDataJson); expect(result != null).toBe(true); @@ -268,7 +269,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 005 - Password (Legacy)", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(PasswordData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -282,7 +283,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 100 - SoftwareLicense", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(SoftwareLicenseData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -312,7 +313,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 101 - BankAccount", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(BankAccountData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -336,7 +337,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 102 - Database", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(DatabaseData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -361,7 +362,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 103 - Drivers license", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(DriversLicenseData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -389,7 +390,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 104 - Outdoor License", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(OutdoorLicenseData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -415,7 +416,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 105 - Membership", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(MembershipData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -440,7 +441,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 106 - Passport", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(PassportData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -467,7 +468,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 107 - RewardsProgram", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(RewardsProgramData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -493,7 +494,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 108 - SSN", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(SSNData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -508,7 +509,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 109 - WirelessRouter", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(WirelessRouterData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -531,7 +532,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 110 - Server", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(ServerData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -564,7 +565,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 111 - EmailAccount", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(EmailAccountData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -595,7 +596,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 112 - API Credentials", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(APICredentialsData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -617,7 +618,7 @@ describe("1Password 1Pux Importer", () => { }); it("should create secure notes", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const result = await importer.parse(SecureNoteDataJson); expect(result != null).toBe(true); const cipher = result.ciphers.shift(); @@ -630,7 +631,7 @@ describe("1Password 1Pux Importer", () => { }); it("should parse category 113 - Medical Record", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const jsonString = JSON.stringify(MedicalRecordData); const result = await importer.parse(jsonString); expect(result != null).toBe(true); @@ -652,7 +653,7 @@ describe("1Password 1Pux Importer", () => { }); it("should create folders", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); const result = await importer.parse(SanitizedExportJson); expect(result != null).toBe(true); @@ -673,7 +674,7 @@ describe("1Password 1Pux Importer", () => { }); it("should create collections if part of an organization", async () => { - const importer = new Importer(); + const importer = new OnePassword1PuxImporter(); importer.organizationId = Utils.newGuid(); const result = await importer.parse(SanitizedExportJson); expect(result != null).toBe(true); diff --git a/libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts b/libs/importer/spec/onepassword-mac-csv-importer.spec.ts similarity index 90% rename from libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts rename to libs/importer/spec/onepassword-mac-csv-importer.spec.ts index 0b9ade2662..a865f1892f 100644 --- a/libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts +++ b/libs/importer/spec/onepassword-mac-csv-importer.spec.ts @@ -1,7 +1,8 @@ -import { OnePasswordMacCsvImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-mac-csv-importer"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { OnePasswordMacCsvImporter } from "../src/importers"; + import { data as creditCardData } from "./test-data/onepassword-csv/credit-card.mac.csv"; import { data as identityData } from "./test-data/onepassword-csv/identity.mac.csv"; import { data as multiTypeData } from "./test-data/onepassword-csv/multiple-items.mac.csv"; @@ -40,7 +41,7 @@ function expectCreditCard(cipher: CipherView) { describe("1Password mac CSV Importer", () => { it("should parse identity records", async () => { - const importer = new Importer(); + const importer = new OnePasswordMacCsvImporter(); const result = await importer.parse(identityData); expect(result).not.toBeNull(); @@ -51,7 +52,7 @@ describe("1Password mac CSV Importer", () => { }); it("should parse credit card records", async () => { - const importer = new Importer(); + const importer = new OnePasswordMacCsvImporter(); const result = await importer.parse(creditCardData); expect(result).not.toBeNull(); @@ -62,7 +63,7 @@ describe("1Password mac CSV Importer", () => { }); it("should parse csv's with multiple record type", async () => { - const importer = new Importer(); + const importer = new OnePasswordMacCsvImporter(); const result = await importer.parse(multiTypeData); expect(result).not.toBeNull(); diff --git a/libs/common/spec/importers/onepassword-win-csv-importer.spec.ts b/libs/importer/spec/onepassword-win-csv-importer.spec.ts similarity index 93% rename from libs/common/spec/importers/onepassword-win-csv-importer.spec.ts rename to libs/importer/spec/onepassword-win-csv-importer.spec.ts index d5c40c2d13..ddab4df562 100644 --- a/libs/common/spec/importers/onepassword-win-csv-importer.spec.ts +++ b/libs/importer/spec/onepassword-win-csv-importer.spec.ts @@ -1,9 +1,10 @@ import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { OnePasswordWinCsvImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-win-csv-importer"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; +import { OnePasswordWinCsvImporter } from "../src/importers"; + import { data as creditCardData } from "./test-data/onepassword-csv/credit-card.windows.csv"; import { data as identityData } from "./test-data/onepassword-csv/identity.windows.csv"; import { data as multiTypeData } from "./test-data/onepassword-csv/multiple-items.windows.csv"; @@ -49,9 +50,9 @@ function expectCreditCard(cipher: CipherView) { } describe("1Password windows CSV Importer", () => { - let importer: Importer; + let importer: OnePasswordWinCsvImporter; beforeEach(() => { - importer = new Importer(); + importer = new OnePasswordWinCsvImporter(); }); it("should parse identity records", async () => { diff --git a/libs/common/spec/importers/passky-json-importer.spec.ts b/libs/importer/spec/passky-json-importer.spec.ts similarity index 88% rename from libs/common/spec/importers/passky-json-importer.spec.ts rename to libs/importer/spec/passky-json-importer.spec.ts index a156046abf..ddec76876d 100644 --- a/libs/common/spec/importers/passky-json-importer.spec.ts +++ b/libs/importer/spec/passky-json-importer.spec.ts @@ -1,12 +1,12 @@ -import { PasskyJsonImporter as Importer } from "@bitwarden/common/importers/passky/passky-json-importer"; +import { PasskyJsonImporter } from "../src/importers"; import { testData as EncryptedData } from "./test-data/passky-json/passky-encrypted.json"; import { testData as UnencryptedData } from "./test-data/passky-json/passky-unencrypted.json"; describe("Passky Json Importer", () => { - let importer: Importer; + let importer: PasskyJsonImporter; beforeEach(() => { - importer = new Importer(); + importer = new PasskyJsonImporter(); }); it("should not import encrypted backups", async () => { diff --git a/libs/common/spec/importers/psono-json-importer.spec.ts b/libs/importer/spec/psono-json-importer.spec.ts similarity index 97% rename from libs/common/spec/importers/psono-json-importer.spec.ts rename to libs/importer/spec/psono-json-importer.spec.ts index 012df791e9..fc33a66c14 100644 --- a/libs/common/spec/importers/psono-json-importer.spec.ts +++ b/libs/importer/spec/psono-json-importer.spec.ts @@ -1,8 +1,9 @@ import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { PsonoJsonImporter as Importer } from "@bitwarden/common/importers/psono/psono-json-importer"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; +import { PsonoJsonImporter } from "../src/importers"; + import { ApplicationPasswordsData } from "./test-data/psono-json/application-passwords"; import { BookmarkData } from "./test-data/psono-json/bookmark.json"; import { EmptyTestFolderData } from "./test-data/psono-json/empty-folders"; @@ -39,7 +40,7 @@ describe("PSONO JSON Importer", () => { const EnvVariablesDataJson = JSON.stringify(EnvVariablesData); it("should parse Website/Password data", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); const result = await importer.parse(WebsiteLoginsDataJson); expect(result != null).toBe(true); @@ -65,7 +66,7 @@ describe("PSONO JSON Importer", () => { }); it("should parse Application Password data", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); const result = await importer.parse(ApplicationPasswordsDataJson); expect(result != null).toBe(true); @@ -84,7 +85,7 @@ describe("PSONO JSON Importer", () => { }); it("should parse bookmark data", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); const result = await importer.parse(BookmarkDataJson); expect(result != null).toBe(true); @@ -103,7 +104,7 @@ describe("PSONO JSON Importer", () => { }); it("should parse notes", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); const result = await importer.parse(NotesDataJson); expect(result != null).toBe(true); @@ -118,7 +119,7 @@ describe("PSONO JSON Importer", () => { }); it("should parse TOTP", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); const result = await importer.parse(TOTPDataJson); expect(result != null).toBe(true); @@ -139,7 +140,7 @@ describe("PSONO JSON Importer", () => { // Skipping this test until we can save GPG into notes/custom fields it.skip("should parse GPG data", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); const result = await importer.parse(GPGDataJson); expect(result != null).toBe(true); @@ -168,7 +169,7 @@ describe("PSONO JSON Importer", () => { }); it("should parse Environment variables data", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); const result = await importer.parse(EnvVariablesDataJson); expect(result != null).toBe(true); @@ -185,7 +186,7 @@ describe("PSONO JSON Importer", () => { }); it("should not create empty folders", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); const result = await importer.parse(EmptyTestFolderDataJson); expect(result != null).toBe(true); @@ -193,7 +194,7 @@ describe("PSONO JSON Importer", () => { }); it("should create folders", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); const result = await importer.parse(FoldersTestDataJson); expect(result != null).toBe(true); @@ -204,7 +205,7 @@ describe("PSONO JSON Importer", () => { }); it("should assign entries to folders", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); const result = await importer.parse(FoldersTestDataJson); expect(result != null).toBe(true); @@ -215,7 +216,7 @@ describe("PSONO JSON Importer", () => { }); it("should create collections if part of an organization", async () => { - const importer = new Importer(); + const importer = new PsonoJsonImporter(); importer.organizationId = "someOrg"; const result = await importer.parse(FoldersTestDataJson); expect(result != null).toBe(true); diff --git a/libs/common/spec/importers/safari-csv-importer.spec.ts b/libs/importer/spec/safari-csv-importer.spec.ts similarity index 94% rename from libs/common/spec/importers/safari-csv-importer.spec.ts rename to libs/importer/spec/safari-csv-importer.spec.ts index 89a9c469a7..4a22eb0bdc 100644 --- a/libs/common/spec/importers/safari-csv-importer.spec.ts +++ b/libs/importer/spec/safari-csv-importer.spec.ts @@ -1,8 +1,9 @@ -import { SafariCsvImporter as Importer } from "@bitwarden/common/importers/safari-csv-importer"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; +import { SafariCsvImporter } from "../src/importers"; + import { data as oldSimplePasswordData } from "./test-data/safari-csv/old-simple-password-data.csv"; import { data as simplePasswordData } from "./test-data/safari-csv/simple-password-data.csv"; @@ -54,7 +55,7 @@ const CipherData = [ describe("Safari CSV Importer", () => { CipherData.forEach((data) => { it(data.title, async () => { - const importer = new Importer(); + const importer = new SafariCsvImporter(); const result = await importer.parse(data.csv); expect(result != null).toBe(true); expect(result.ciphers.length).toBeGreaterThan(0); diff --git a/libs/common/spec/importers/test-data/bitwarden-json/empty.json.ts b/libs/importer/spec/test-data/bitwarden-json/empty.json.ts similarity index 100% rename from libs/common/spec/importers/test-data/bitwarden-json/empty.json.ts rename to libs/importer/spec/test-data/bitwarden-json/empty.json.ts diff --git a/libs/common/spec/importers/test-data/bitwarden-json/password-protected.json.ts b/libs/importer/spec/test-data/bitwarden-json/password-protected.json.ts similarity index 100% rename from libs/common/spec/importers/test-data/bitwarden-json/password-protected.json.ts rename to libs/importer/spec/test-data/bitwarden-json/password-protected.json.ts diff --git a/libs/common/spec/importers/test-data/chrome-csv/android-data.csv.ts b/libs/importer/spec/test-data/chrome-csv/android-data.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/chrome-csv/android-data.csv.ts rename to libs/importer/spec/test-data/chrome-csv/android-data.csv.ts diff --git a/libs/common/spec/importers/test-data/chrome-csv/simple-password-data.csv.ts b/libs/importer/spec/test-data/chrome-csv/simple-password-data.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/chrome-csv/simple-password-data.csv.ts rename to libs/importer/spec/test-data/chrome-csv/simple-password-data.csv.ts diff --git a/libs/common/spec/importers/test-data/dashlane-csv/credentials.csv.ts b/libs/importer/spec/test-data/dashlane-csv/credentials.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/dashlane-csv/credentials.csv.ts rename to libs/importer/spec/test-data/dashlane-csv/credentials.csv.ts diff --git a/libs/common/spec/importers/test-data/dashlane-csv/id.csv.ts b/libs/importer/spec/test-data/dashlane-csv/id.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/dashlane-csv/id.csv.ts rename to libs/importer/spec/test-data/dashlane-csv/id.csv.ts diff --git a/libs/common/spec/importers/test-data/dashlane-csv/multiple-personal-info.csv.ts b/libs/importer/spec/test-data/dashlane-csv/multiple-personal-info.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/dashlane-csv/multiple-personal-info.csv.ts rename to libs/importer/spec/test-data/dashlane-csv/multiple-personal-info.csv.ts diff --git a/libs/common/spec/importers/test-data/dashlane-csv/payments.csv.ts b/libs/importer/spec/test-data/dashlane-csv/payments.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/dashlane-csv/payments.csv.ts rename to libs/importer/spec/test-data/dashlane-csv/payments.csv.ts diff --git a/libs/common/spec/importers/test-data/dashlane-csv/personal-info.csv.ts b/libs/importer/spec/test-data/dashlane-csv/personal-info.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/dashlane-csv/personal-info.csv.ts rename to libs/importer/spec/test-data/dashlane-csv/personal-info.csv.ts diff --git a/libs/common/spec/importers/test-data/dashlane-csv/securenotes.csv.ts b/libs/importer/spec/test-data/dashlane-csv/securenotes.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/dashlane-csv/securenotes.csv.ts rename to libs/importer/spec/test-data/dashlane-csv/securenotes.csv.ts diff --git a/libs/common/spec/importers/enpass/test-data/json/credit-card.ts b/libs/importer/spec/test-data/enpass-json/credit-card.ts similarity index 98% rename from libs/common/spec/importers/enpass/test-data/json/credit-card.ts rename to libs/importer/spec/test-data/enpass-json/credit-card.ts index 5b9b07fe91..621190a735 100644 --- a/libs/common/spec/importers/enpass/test-data/json/credit-card.ts +++ b/libs/importer/spec/test-data/enpass-json/credit-card.ts @@ -1,4 +1,4 @@ -import { EnpassJsonFile } from "@bitwarden/common/importers/enpass/types/enpass-json-type"; +import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type"; export const creditCard: EnpassJsonFile = { folders: [], diff --git a/libs/common/spec/importers/enpass/test-data/json/folders.ts b/libs/importer/spec/test-data/enpass-json/folders.ts similarity index 91% rename from libs/common/spec/importers/enpass/test-data/json/folders.ts rename to libs/importer/spec/test-data/enpass-json/folders.ts index d12a9f6973..22ab26524b 100644 --- a/libs/common/spec/importers/enpass/test-data/json/folders.ts +++ b/libs/importer/spec/test-data/enpass-json/folders.ts @@ -1,4 +1,4 @@ -import { EnpassJsonFile } from "@bitwarden/common/importers/enpass/types/enpass-json-type"; +import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type"; export const folders: EnpassJsonFile = { folders: [ diff --git a/libs/common/spec/importers/enpass/test-data/json/login-android-url.ts b/libs/importer/spec/test-data/enpass-json/login-android-url.ts similarity index 95% rename from libs/common/spec/importers/enpass/test-data/json/login-android-url.ts rename to libs/importer/spec/test-data/enpass-json/login-android-url.ts index 10acec7846..6b0ac41ccd 100644 --- a/libs/common/spec/importers/enpass/test-data/json/login-android-url.ts +++ b/libs/importer/spec/test-data/enpass-json/login-android-url.ts @@ -1,4 +1,4 @@ -import { EnpassJsonFile } from "@bitwarden/common/importers/enpass/types/enpass-json-type"; +import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type"; import { login } from "./login"; diff --git a/libs/common/spec/importers/enpass/test-data/json/login.ts b/libs/importer/spec/test-data/enpass-json/login.ts similarity index 97% rename from libs/common/spec/importers/enpass/test-data/json/login.ts rename to libs/importer/spec/test-data/enpass-json/login.ts index 62625b7cd0..07707f2ca3 100644 --- a/libs/common/spec/importers/enpass/test-data/json/login.ts +++ b/libs/importer/spec/test-data/enpass-json/login.ts @@ -1,4 +1,4 @@ -import { EnpassJsonFile } from "@bitwarden/common/importers/enpass/types/enpass-json-type"; +import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type"; export const login: EnpassJsonFile = { folders: [], diff --git a/libs/common/spec/importers/enpass/test-data/json/note.ts b/libs/importer/spec/test-data/enpass-json/note.ts similarity index 86% rename from libs/common/spec/importers/enpass/test-data/json/note.ts rename to libs/importer/spec/test-data/enpass-json/note.ts index 2ca1e50927..58f54371ad 100644 --- a/libs/common/spec/importers/enpass/test-data/json/note.ts +++ b/libs/importer/spec/test-data/enpass-json/note.ts @@ -1,4 +1,4 @@ -import { EnpassJsonFile } from "@bitwarden/common/importers/enpass/types/enpass-json-type"; +import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type"; export const note: EnpassJsonFile = { folders: [], diff --git a/libs/common/spec/importers/test-data/firefox-csv/firefox-accounts-data.csv.ts b/libs/importer/spec/test-data/firefox-csv/firefox-accounts-data.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/firefox-csv/firefox-accounts-data.csv.ts rename to libs/importer/spec/test-data/firefox-csv/firefox-accounts-data.csv.ts diff --git a/libs/common/spec/importers/test-data/firefox-csv/simple-password-data.csv.ts b/libs/importer/spec/test-data/firefox-csv/simple-password-data.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/firefox-csv/simple-password-data.csv.ts rename to libs/importer/spec/test-data/firefox-csv/simple-password-data.csv.ts diff --git a/libs/common/spec/importers/keepass2-xml-importer-testdata.ts b/libs/importer/spec/test-data/keepass2-xml/keepass2-xml-importer-testdata.ts similarity index 100% rename from libs/common/spec/importers/keepass2-xml-importer-testdata.ts rename to libs/importer/spec/test-data/keepass2-xml/keepass2-xml-importer-testdata.ts diff --git a/libs/common/spec/importers/test-data/keeper-csv/testdata.csv.ts b/libs/importer/spec/test-data/keeper-csv/testdata.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/keeper-csv/testdata.csv.ts rename to libs/importer/spec/test-data/keeper-csv/testdata.csv.ts diff --git a/libs/common/spec/importers/test-data/keeper-json/testdata.json.ts b/libs/importer/spec/test-data/keeper-json/testdata.json.ts similarity index 95% rename from libs/common/spec/importers/test-data/keeper-json/testdata.json.ts rename to libs/importer/spec/test-data/keeper-json/testdata.json.ts index 0ead208251..952ced5027 100644 --- a/libs/common/spec/importers/test-data/keeper-json/testdata.json.ts +++ b/libs/importer/spec/test-data/keeper-json/testdata.json.ts @@ -1,4 +1,4 @@ -import { KeeperJsonExport } from "@bitwarden/common/importers/keeper/types/keeper-json-types"; +import { KeeperJsonExport } from "../../../src/importers/keeper/types/keeper-json-types"; export const testData: KeeperJsonExport = { shared_folders: [ diff --git a/libs/common/spec/importers/test-data/myki-csv/user-account.csv.ts b/libs/importer/spec/test-data/myki-csv/user-account.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/myki-csv/user-account.csv.ts rename to libs/importer/spec/test-data/myki-csv/user-account.csv.ts diff --git a/libs/common/spec/importers/test-data/myki-csv/user-credit-card.csv.ts b/libs/importer/spec/test-data/myki-csv/user-credit-card.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/myki-csv/user-credit-card.csv.ts rename to libs/importer/spec/test-data/myki-csv/user-credit-card.csv.ts diff --git a/libs/common/spec/importers/test-data/myki-csv/user-id-card.csv.ts b/libs/importer/spec/test-data/myki-csv/user-id-card.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/myki-csv/user-id-card.csv.ts rename to libs/importer/spec/test-data/myki-csv/user-id-card.csv.ts diff --git a/libs/common/spec/importers/test-data/myki-csv/user-identity.csv.ts b/libs/importer/spec/test-data/myki-csv/user-identity.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/myki-csv/user-identity.csv.ts rename to libs/importer/spec/test-data/myki-csv/user-identity.csv.ts diff --git a/libs/common/spec/importers/test-data/myki-csv/user-note.csv.ts b/libs/importer/spec/test-data/myki-csv/user-note.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/myki-csv/user-note.csv.ts rename to libs/importer/spec/test-data/myki-csv/user-note.csv.ts diff --git a/libs/common/spec/importers/test-data/myki-csv/user-twofa.csv.ts b/libs/importer/spec/test-data/myki-csv/user-twofa.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/myki-csv/user-twofa.csv.ts rename to libs/importer/spec/test-data/myki-csv/user-twofa.csv.ts diff --git a/libs/common/spec/importers/test-data/nordpass-csv/nordpass.card.csv.ts b/libs/importer/spec/test-data/nordpass-csv/nordpass.card.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/nordpass-csv/nordpass.card.csv.ts rename to libs/importer/spec/test-data/nordpass-csv/nordpass.card.csv.ts diff --git a/libs/common/spec/importers/test-data/nordpass-csv/nordpass.identity.csv.ts b/libs/importer/spec/test-data/nordpass-csv/nordpass.identity.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/nordpass-csv/nordpass.identity.csv.ts rename to libs/importer/spec/test-data/nordpass-csv/nordpass.identity.csv.ts diff --git a/libs/common/spec/importers/test-data/nordpass-csv/nordpass.login.csv.ts b/libs/importer/spec/test-data/nordpass-csv/nordpass.login.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/nordpass-csv/nordpass.login.csv.ts rename to libs/importer/spec/test-data/nordpass-csv/nordpass.login.csv.ts diff --git a/libs/common/spec/importers/test-data/nordpass-csv/nordpass.secure-note.csv.ts b/libs/importer/spec/test-data/nordpass-csv/nordpass.secure-note.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/nordpass-csv/nordpass.secure-note.csv.ts rename to libs/importer/spec/test-data/nordpass-csv/nordpass.secure-note.csv.ts diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/api-credentials.ts b/libs/importer/spec/test-data/onepassword-1pux/api-credentials.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/api-credentials.ts rename to libs/importer/spec/test-data/onepassword-1pux/api-credentials.ts index 762d57e91a..49269e72fa 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/api-credentials.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/api-credentials.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const APICredentialsData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/bank-account.ts b/libs/importer/spec/test-data/onepassword-1pux/bank-account.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/bank-account.ts rename to libs/importer/spec/test-data/onepassword-1pux/bank-account.ts index 2a88db0dab..7f3d8c080c 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/bank-account.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/bank-account.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const BankAccountData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/credit-card.ts b/libs/importer/spec/test-data/onepassword-1pux/credit-card.ts similarity index 99% rename from libs/common/spec/importers/test-data/onepassword-1pux/credit-card.ts rename to libs/importer/spec/test-data/onepassword-1pux/credit-card.ts index 208d374321..80258f13f0 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/credit-card.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/credit-card.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const CreditCardData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/database.ts b/libs/importer/spec/test-data/onepassword-1pux/database.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/database.ts rename to libs/importer/spec/test-data/onepassword-1pux/database.ts index 6eb6c92199..17b6700bf6 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/database.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/database.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const DatabaseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/drivers-license.ts b/libs/importer/spec/test-data/onepassword-1pux/drivers-license.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/drivers-license.ts rename to libs/importer/spec/test-data/onepassword-1pux/drivers-license.ts index ed52b3cd5d..9f7260d63d 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/drivers-license.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/drivers-license.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const DriversLicenseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/email-account.ts b/libs/importer/spec/test-data/onepassword-1pux/email-account.ts similarity index 99% rename from libs/common/spec/importers/test-data/onepassword-1pux/email-account.ts rename to libs/importer/spec/test-data/onepassword-1pux/email-account.ts index 374553825c..a6de6b55b2 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/email-account.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/email-account.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const EmailAccountData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity.ts b/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity.ts similarity index 95% rename from libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity.ts rename to libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity.ts index 4f9db420a0..932213c51f 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const EmailFieldOnIdentityData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts b/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts similarity index 96% rename from libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts rename to libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts index b33c14845e..fb4ef7935a 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const EmailFieldOnIdentityPrefilledData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/email-field.ts b/libs/importer/spec/test-data/onepassword-1pux/email-field.ts similarity index 96% rename from libs/common/spec/importers/test-data/onepassword-1pux/email-field.ts rename to libs/importer/spec/test-data/onepassword-1pux/email-field.ts index 766fc2a22c..97cca39d0a 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/email-field.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/email-field.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const EmailFieldData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/identity-data.ts b/libs/importer/spec/test-data/onepassword-1pux/identity-data.ts similarity index 99% rename from libs/common/spec/importers/test-data/onepassword-1pux/identity-data.ts rename to libs/importer/spec/test-data/onepassword-1pux/identity-data.ts index 2c4dbd95f3..acc10a403d 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/identity-data.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/identity-data.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const IdentityData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/login-data.ts b/libs/importer/spec/test-data/onepassword-1pux/login-data.ts similarity index 97% rename from libs/common/spec/importers/test-data/onepassword-1pux/login-data.ts rename to libs/importer/spec/test-data/onepassword-1pux/login-data.ts index afdf02be17..b7b2fe1586 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/login-data.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/login-data.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const LoginData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/medical-record.ts b/libs/importer/spec/test-data/onepassword-1pux/medical-record.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/medical-record.ts rename to libs/importer/spec/test-data/onepassword-1pux/medical-record.ts index 3e5d391049..df300560d9 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/medical-record.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/medical-record.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const MedicalRecordData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/membership.ts b/libs/importer/spec/test-data/onepassword-1pux/membership.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/membership.ts rename to libs/importer/spec/test-data/onepassword-1pux/membership.ts index 1e602e1eb1..fd1bf56ac7 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/membership.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/membership.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const MembershipData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/onepux_example.ts b/libs/importer/spec/test-data/onepassword-1pux/onepux_example.ts similarity index 96% rename from libs/common/spec/importers/test-data/onepassword-1pux/onepux_example.ts rename to libs/importer/spec/test-data/onepassword-1pux/onepux_example.ts index f636841200..0f07044061 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/onepux_example.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/onepux_example.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const OnePuxExampleFile: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/outdoor-license.ts b/libs/importer/spec/test-data/onepassword-1pux/outdoor-license.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/outdoor-license.ts rename to libs/importer/spec/test-data/onepassword-1pux/outdoor-license.ts index c4b686c34a..071be0fb54 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/outdoor-license.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/outdoor-license.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const OutdoorLicenseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/passport.ts b/libs/importer/spec/test-data/onepassword-1pux/passport.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/passport.ts rename to libs/importer/spec/test-data/onepassword-1pux/passport.ts index 3dcfed160e..a64c9d3d02 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/passport.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/passport.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const PassportData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/password.ts b/libs/importer/spec/test-data/onepassword-1pux/password.ts similarity index 93% rename from libs/common/spec/importers/test-data/onepassword-1pux/password.ts rename to libs/importer/spec/test-data/onepassword-1pux/password.ts index 5d6e5b7565..819a0546d6 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/password.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/password.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const PasswordData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/rewards-program.ts b/libs/importer/spec/test-data/onepassword-1pux/rewards-program.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/rewards-program.ts rename to libs/importer/spec/test-data/onepassword-1pux/rewards-program.ts index 237116ef19..5dcb98160b 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/rewards-program.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/rewards-program.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const RewardsProgramData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/sanitized-export.ts b/libs/importer/spec/test-data/onepassword-1pux/sanitized-export.ts similarity index 99% rename from libs/common/spec/importers/test-data/onepassword-1pux/sanitized-export.ts rename to libs/importer/spec/test-data/onepassword-1pux/sanitized-export.ts index efa398df0c..4e7dde9ab8 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/sanitized-export.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/sanitized-export.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const SanitizedExport: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/secure-note.ts b/libs/importer/spec/test-data/onepassword-1pux/secure-note.ts similarity index 92% rename from libs/common/spec/importers/test-data/onepassword-1pux/secure-note.ts rename to libs/importer/spec/test-data/onepassword-1pux/secure-note.ts index ea00d07dde..ae6693cc6f 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/secure-note.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/secure-note.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const SecureNoteData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/server.ts b/libs/importer/spec/test-data/onepassword-1pux/server.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/server.ts rename to libs/importer/spec/test-data/onepassword-1pux/server.ts index 883d296f9b..4edbd3fbda 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/server.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/server.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const ServerData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/software-license.ts b/libs/importer/spec/test-data/onepassword-1pux/software-license.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/software-license.ts rename to libs/importer/spec/test-data/onepassword-1pux/software-license.ts index e13c417373..f39747413b 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/software-license.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/software-license.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const SoftwareLicenseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/ssn.ts b/libs/importer/spec/test-data/onepassword-1pux/ssn.ts similarity index 96% rename from libs/common/spec/importers/test-data/onepassword-1pux/ssn.ts rename to libs/importer/spec/test-data/onepassword-1pux/ssn.ts index ec3e505b5c..c8f692e541 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/ssn.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/ssn.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const SSNData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-1pux/wireless-router.ts b/libs/importer/spec/test-data/onepassword-1pux/wireless-router.ts similarity index 98% rename from libs/common/spec/importers/test-data/onepassword-1pux/wireless-router.ts rename to libs/importer/spec/test-data/onepassword-1pux/wireless-router.ts index 7ce7237901..ad5a453a83 100644 --- a/libs/common/spec/importers/test-data/onepassword-1pux/wireless-router.ts +++ b/libs/importer/spec/test-data/onepassword-1pux/wireless-router.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; export const WirelessRouterData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/test-data/onepassword-csv/credit-card.mac.csv.ts b/libs/importer/spec/test-data/onepassword-csv/credit-card.mac.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/onepassword-csv/credit-card.mac.csv.ts rename to libs/importer/spec/test-data/onepassword-csv/credit-card.mac.csv.ts diff --git a/libs/common/spec/importers/test-data/onepassword-csv/credit-card.windows.csv.ts b/libs/importer/spec/test-data/onepassword-csv/credit-card.windows.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/onepassword-csv/credit-card.windows.csv.ts rename to libs/importer/spec/test-data/onepassword-csv/credit-card.windows.csv.ts diff --git a/libs/common/spec/importers/test-data/onepassword-csv/identity.mac.csv.ts b/libs/importer/spec/test-data/onepassword-csv/identity.mac.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/onepassword-csv/identity.mac.csv.ts rename to libs/importer/spec/test-data/onepassword-csv/identity.mac.csv.ts diff --git a/libs/common/spec/importers/test-data/onepassword-csv/identity.windows.csv.ts b/libs/importer/spec/test-data/onepassword-csv/identity.windows.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/onepassword-csv/identity.windows.csv.ts rename to libs/importer/spec/test-data/onepassword-csv/identity.windows.csv.ts diff --git a/libs/common/spec/importers/test-data/onepassword-csv/multiple-items.mac.csv.ts b/libs/importer/spec/test-data/onepassword-csv/multiple-items.mac.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/onepassword-csv/multiple-items.mac.csv.ts rename to libs/importer/spec/test-data/onepassword-csv/multiple-items.mac.csv.ts diff --git a/libs/common/spec/importers/test-data/onepassword-csv/multiple-items.windows.csv.ts b/libs/importer/spec/test-data/onepassword-csv/multiple-items.windows.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/onepassword-csv/multiple-items.windows.csv.ts rename to libs/importer/spec/test-data/onepassword-csv/multiple-items.windows.csv.ts diff --git a/libs/common/spec/importers/test-data/passky-json/passky-encrypted.json.ts b/libs/importer/spec/test-data/passky-json/passky-encrypted.json.ts similarity index 84% rename from libs/common/spec/importers/test-data/passky-json/passky-encrypted.json.ts rename to libs/importer/spec/test-data/passky-json/passky-encrypted.json.ts index 2d2ee3debd..6b9743be34 100644 --- a/libs/common/spec/importers/test-data/passky-json/passky-encrypted.json.ts +++ b/libs/importer/spec/test-data/passky-json/passky-encrypted.json.ts @@ -1,4 +1,4 @@ -import { PasskyJsonExport } from "@bitwarden/common/importers/passky/passky-json-types"; +import { PasskyJsonExport } from "../../../src/importers/passky/passky-json-types"; export const testData: PasskyJsonExport = { encrypted: true, diff --git a/libs/common/spec/importers/test-data/passky-json/passky-unencrypted.json.ts b/libs/importer/spec/test-data/passky-json/passky-unencrypted.json.ts similarity index 72% rename from libs/common/spec/importers/test-data/passky-json/passky-unencrypted.json.ts rename to libs/importer/spec/test-data/passky-json/passky-unencrypted.json.ts index f77bb09e11..c382136648 100644 --- a/libs/common/spec/importers/test-data/passky-json/passky-unencrypted.json.ts +++ b/libs/importer/spec/test-data/passky-json/passky-unencrypted.json.ts @@ -1,4 +1,4 @@ -import { PasskyJsonExport } from "@bitwarden/common/importers/passky/passky-json-types"; +import { PasskyJsonExport } from "../../../src/importers/passky/passky-json-types"; export const testData: PasskyJsonExport = { encrypted: false, diff --git a/libs/common/spec/importers/test-data/psono-json/application-passwords.ts b/libs/importer/spec/test-data/psono-json/application-passwords.ts similarity index 86% rename from libs/common/spec/importers/test-data/psono-json/application-passwords.ts rename to libs/importer/spec/test-data/psono-json/application-passwords.ts index df9416dd52..29c4a44e0c 100644 --- a/libs/common/spec/importers/test-data/psono-json/application-passwords.ts +++ b/libs/importer/spec/test-data/psono-json/application-passwords.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "@bitwarden/common/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; export const ApplicationPasswordsData: PsonoJsonExport = { folders: [], diff --git a/libs/common/spec/importers/test-data/psono-json/bookmark.json.ts b/libs/importer/spec/test-data/psono-json/bookmark.json.ts similarity index 86% rename from libs/common/spec/importers/test-data/psono-json/bookmark.json.ts rename to libs/importer/spec/test-data/psono-json/bookmark.json.ts index a4870b8d0a..fe0726fbe4 100644 --- a/libs/common/spec/importers/test-data/psono-json/bookmark.json.ts +++ b/libs/importer/spec/test-data/psono-json/bookmark.json.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "@bitwarden/common/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; export const BookmarkData: PsonoJsonExport = { folders: [], diff --git a/libs/common/spec/importers/test-data/psono-json/empty-folders.ts b/libs/importer/spec/test-data/psono-json/empty-folders.ts similarity index 60% rename from libs/common/spec/importers/test-data/psono-json/empty-folders.ts rename to libs/importer/spec/test-data/psono-json/empty-folders.ts index e775113be2..914cba585f 100644 --- a/libs/common/spec/importers/test-data/psono-json/empty-folders.ts +++ b/libs/importer/spec/test-data/psono-json/empty-folders.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "@bitwarden/common/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; export const EmptyTestFolderData: PsonoJsonExport = { folders: [ diff --git a/libs/common/spec/importers/test-data/psono-json/environment-variables.ts b/libs/importer/spec/test-data/psono-json/environment-variables.ts similarity index 87% rename from libs/common/spec/importers/test-data/psono-json/environment-variables.ts rename to libs/importer/spec/test-data/psono-json/environment-variables.ts index 3bc6de30bd..9a26776ebc 100644 --- a/libs/common/spec/importers/test-data/psono-json/environment-variables.ts +++ b/libs/importer/spec/test-data/psono-json/environment-variables.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "@bitwarden/common/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; export const EnvVariablesData: PsonoJsonExport = { folders: [], diff --git a/libs/common/spec/importers/test-data/psono-json/folders.ts b/libs/importer/spec/test-data/psono-json/folders.ts similarity index 95% rename from libs/common/spec/importers/test-data/psono-json/folders.ts rename to libs/importer/spec/test-data/psono-json/folders.ts index 3968f714d8..bcc61ea11f 100644 --- a/libs/common/spec/importers/test-data/psono-json/folders.ts +++ b/libs/importer/spec/test-data/psono-json/folders.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "@bitwarden/common/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; export const FoldersTestData: PsonoJsonExport = { folders: [ diff --git a/libs/common/spec/importers/test-data/psono-json/gpg.ts b/libs/importer/spec/test-data/psono-json/gpg.ts similarity index 99% rename from libs/common/spec/importers/test-data/psono-json/gpg.ts rename to libs/importer/spec/test-data/psono-json/gpg.ts index 177f4ef762..4015b53aa4 100644 --- a/libs/common/spec/importers/test-data/psono-json/gpg.ts +++ b/libs/importer/spec/test-data/psono-json/gpg.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "@bitwarden/common/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; export const GPGData: PsonoJsonExport = { folders: [], diff --git a/libs/common/spec/importers/test-data/psono-json/notes.ts b/libs/importer/spec/test-data/psono-json/notes.ts similarity index 81% rename from libs/common/spec/importers/test-data/psono-json/notes.ts rename to libs/importer/spec/test-data/psono-json/notes.ts index c5290afdad..0317371456 100644 --- a/libs/common/spec/importers/test-data/psono-json/notes.ts +++ b/libs/importer/spec/test-data/psono-json/notes.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "@bitwarden/common/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; export const NotesData: PsonoJsonExport = { folders: [], diff --git a/libs/common/spec/importers/test-data/psono-json/totp.ts b/libs/importer/spec/test-data/psono-json/totp.ts similarity index 84% rename from libs/common/spec/importers/test-data/psono-json/totp.ts rename to libs/importer/spec/test-data/psono-json/totp.ts index 8c90343799..62d3c43431 100644 --- a/libs/common/spec/importers/test-data/psono-json/totp.ts +++ b/libs/importer/spec/test-data/psono-json/totp.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "@bitwarden/common/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; export const TOTPData: PsonoJsonExport = { folders: [], diff --git a/libs/common/spec/importers/test-data/psono-json/website-logins.ts b/libs/importer/spec/test-data/psono-json/website-logins.ts similarity index 89% rename from libs/common/spec/importers/test-data/psono-json/website-logins.ts rename to libs/importer/spec/test-data/psono-json/website-logins.ts index 3dd2320b23..8515409049 100644 --- a/libs/common/spec/importers/test-data/psono-json/website-logins.ts +++ b/libs/importer/spec/test-data/psono-json/website-logins.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "@bitwarden/common/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; export const WebsiteLoginsData: PsonoJsonExport = { folders: [], diff --git a/libs/common/spec/importers/test-data/safari-csv/old-simple-password-data.csv.ts b/libs/importer/spec/test-data/safari-csv/old-simple-password-data.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/safari-csv/old-simple-password-data.csv.ts rename to libs/importer/spec/test-data/safari-csv/old-simple-password-data.csv.ts diff --git a/libs/common/spec/importers/test-data/safari-csv/simple-password-data.csv.ts b/libs/importer/spec/test-data/safari-csv/simple-password-data.csv.ts similarity index 100% rename from libs/common/spec/importers/test-data/safari-csv/simple-password-data.csv.ts rename to libs/importer/spec/test-data/safari-csv/simple-password-data.csv.ts diff --git a/libs/common/spec/importers/test-data/safeincloud/test-data.xml.ts b/libs/importer/spec/test-data/safeincloud/test-data.xml.ts similarity index 100% rename from libs/common/spec/importers/test-data/safeincloud/test-data.xml.ts rename to libs/importer/spec/test-data/safeincloud/test-data.xml.ts diff --git a/libs/common/src/importers/ascendo-csv-importer.ts b/libs/importer/src/importers/ascendo-csv-importer.ts similarity index 96% rename from libs/common/src/importers/ascendo-csv-importer.ts rename to libs/importer/src/importers/ascendo-csv-importer.ts index 832df10a55..a9be606b8e 100644 --- a/libs/common/src/importers/ascendo-csv-importer.ts +++ b/libs/importer/src/importers/ascendo-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/avast-csv-importer.ts b/libs/importer/src/importers/avast/avast-csv-importer.ts similarity index 83% rename from libs/common/src/importers/avast-csv-importer.ts rename to libs/importer/src/importers/avast/avast-csv-importer.ts index 5cac29e801..8fb3b730c1 100644 --- a/libs/common/src/importers/avast-csv-importer.ts +++ b/libs/importer/src/importers/avast/avast-csv-importer.ts @@ -1,7 +1,6 @@ -import { ImportResult } from "../models/domain/import-result"; - -import { BaseImporter } from "./base-importer"; -import { Importer } from "./importer"; +import { ImportResult } from "../../models/import-result"; +import { BaseImporter } from "../base-importer"; +import { Importer } from "../importer"; export class AvastCsvImporter extends BaseImporter implements Importer { parse(data: string): Promise { diff --git a/libs/common/src/importers/avast-json-importer.ts b/libs/importer/src/importers/avast/avast-json-importer.ts similarity index 88% rename from libs/common/src/importers/avast-json-importer.ts rename to libs/importer/src/importers/avast/avast-json-importer.ts index 203d98529f..fa11934ff4 100644 --- a/libs/common/src/importers/avast-json-importer.ts +++ b/libs/importer/src/importers/avast/avast-json-importer.ts @@ -1,9 +1,9 @@ -import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/import-result"; -import { CipherType } from "../vault/enums/cipher-type"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; -import { BaseImporter } from "./base-importer"; -import { Importer } from "./importer"; +import { ImportResult } from "../../models/import-result"; +import { BaseImporter } from "../base-importer"; +import { Importer } from "../importer"; export class AvastJsonImporter extends BaseImporter implements Importer { parse(data: string): Promise { diff --git a/libs/importer/src/importers/avast/index.ts b/libs/importer/src/importers/avast/index.ts new file mode 100644 index 0000000000..74824b6e16 --- /dev/null +++ b/libs/importer/src/importers/avast/index.ts @@ -0,0 +1,2 @@ +export { AvastCsvImporter } from "./avast-csv-importer"; +export { AvastJsonImporter } from "./avast-json-importer"; diff --git a/libs/common/src/importers/avira-csv-importer.ts b/libs/importer/src/importers/avira-csv-importer.ts similarity index 95% rename from libs/common/src/importers/avira-csv-importer.ts rename to libs/importer/src/importers/avira-csv-importer.ts index 5b9dfca8b1..6a68693023 100644 --- a/libs/common/src/importers/avira-csv-importer.ts +++ b/libs/importer/src/importers/avira-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/base-importer.ts b/libs/importer/src/importers/base-importer.ts similarity index 91% rename from libs/common/src/importers/base-importer.ts rename to libs/importer/src/importers/base-importer.ts index 3f0f548f1f..2ca2f1e982 100644 --- a/libs/common/src/importers/base-importer.ts +++ b/libs/importer/src/importers/base-importer.ts @@ -1,19 +1,20 @@ import * as papa from "papaparse"; -import { LogService } from "../abstractions/log.service"; -import { CollectionView } from "../admin-console/models/view/collection.view"; -import { FieldType } from "../enums/fieldType"; -import { SecureNoteType } from "../enums/secureNoteType"; -import { Utils } from "../misc/utils"; -import { ImportResult } from "../models/domain/import-result"; -import { ConsoleLogService } from "../services/consoleLog.service"; -import { CipherType } from "../vault/enums/cipher-type"; -import { CipherView } from "../vault/models/view/cipher.view"; -import { FieldView } from "../vault/models/view/field.view"; -import { FolderView } from "../vault/models/view/folder.view"; -import { LoginUriView } from "../vault/models/view/login-uri.view"; -import { LoginView } from "../vault/models/view/login.view"; -import { SecureNoteView } from "../vault/models/view/secure-note.view"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../models/import-result"; export abstract class BaseImporter { organizationId: string = null; diff --git a/libs/common/src/importers/bitwarden-csv-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts similarity index 81% rename from libs/common/src/importers/bitwarden-csv-importer.ts rename to libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts index c7d0d334b0..d761401d71 100644 --- a/libs/common/src/importers/bitwarden-csv-importer.ts +++ b/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts @@ -1,16 +1,16 @@ -import { CollectionView } from "../admin-console/models/view/collection.view"; -import { FieldType } from "../enums/fieldType"; -import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/import-result"; -import { CipherRepromptType } from "../vault/enums/cipher-reprompt-type"; -import { CipherType } from "../vault/enums/cipher-type"; -import { CipherView } from "../vault/models/view/cipher.view"; -import { FieldView } from "../vault/models/view/field.view"; -import { LoginView } from "../vault/models/view/login.view"; -import { SecureNoteView } from "../vault/models/view/secure-note.view"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; -import { BaseImporter } from "./base-importer"; -import { Importer } from "./importer"; +import { ImportResult } from "../../models/import-result"; +import { BaseImporter } from "../base-importer"; +import { Importer } from "../importer"; export class BitwardenCsvImporter extends BaseImporter implements Importer { parse(data: string): Promise { diff --git a/libs/common/src/importers/bitwarden-json-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts similarity index 89% rename from libs/common/src/importers/bitwarden-json-importer.ts rename to libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts index e17548fce2..567b4a3596 100644 --- a/libs/common/src/importers/bitwarden-json-importer.ts +++ b/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts @@ -1,13 +1,13 @@ -import { CryptoService } from "../abstractions/crypto.service"; -import { I18nService } from "../abstractions/i18n.service"; -import { EncString } from "../models/domain/enc-string"; -import { ImportResult } from "../models/domain/import-result"; -import { CipherWithIdExport } from "../models/export/cipher-with-ids.export"; -import { CollectionWithIdExport } from "../models/export/collection-with-id.export"; -import { FolderWithIdExport } from "../models/export/folder-with-id.export"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { CipherWithIdExport } from "@bitwarden/common/models/export/cipher-with-ids.export"; +import { CollectionWithIdExport } from "@bitwarden/common/models/export/collection-with-id.export"; +import { FolderWithIdExport } from "@bitwarden/common/models/export/folder-with-id.export"; -import { BaseImporter } from "./base-importer"; -import { Importer } from "./importer"; +import { ImportResult } from "../../models/import-result"; +import { BaseImporter } from "../base-importer"; +import { Importer } from "../importer"; export class BitwardenJsonImporter extends BaseImporter implements Importer { private results: any; diff --git a/libs/common/src/importers/bitwarden-password-protected-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts similarity index 79% rename from libs/common/src/importers/bitwarden-password-protected-importer.ts rename to libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts index 1ab8894145..183a08f3e4 100644 --- a/libs/common/src/importers/bitwarden-password-protected-importer.ts +++ b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts @@ -1,13 +1,14 @@ -import { CryptoService } from "../abstractions/crypto.service"; -import { I18nService } from "../abstractions/i18n.service"; -import { KdfConfig } from "../auth/models/domain/kdf-config"; -import { KdfType } from "../enums/kdfType"; -import { EncString } from "../models/domain/enc-string"; -import { ImportResult } from "../models/domain/import-result"; -import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; +import { KdfType } from "@bitwarden/common/enums/kdfType"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; + +import { ImportResult } from "../../models/import-result"; +import { Importer } from "../importer"; import { BitwardenJsonImporter } from "./bitwarden-json-importer"; -import { Importer } from "./importer"; interface BitwardenPasswordProtectedFileFormat { encrypted: boolean; diff --git a/libs/importer/src/importers/bitwarden/index.ts b/libs/importer/src/importers/bitwarden/index.ts new file mode 100644 index 0000000000..7c70fc210e --- /dev/null +++ b/libs/importer/src/importers/bitwarden/index.ts @@ -0,0 +1,3 @@ +export { BitwardenCsvImporter } from "./bitwarden-csv-importer"; +export { BitwardenJsonImporter } from "./bitwarden-json-importer"; +export { BitwardenPasswordProtectedImporter } from "./bitwarden-password-protected-importer"; diff --git a/libs/common/src/importers/blackberry-csv-importer.ts b/libs/importer/src/importers/blackberry-csv-importer.ts similarity index 94% rename from libs/common/src/importers/blackberry-csv-importer.ts rename to libs/importer/src/importers/blackberry-csv-importer.ts index 62df7f246c..3c1376c015 100644 --- a/libs/common/src/importers/blackberry-csv-importer.ts +++ b/libs/importer/src/importers/blackberry-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/blur-csv-importer.ts b/libs/importer/src/importers/blur-csv-importer.ts similarity index 95% rename from libs/common/src/importers/blur-csv-importer.ts rename to libs/importer/src/importers/blur-csv-importer.ts index 2276e932f9..1b2f29791b 100644 --- a/libs/common/src/importers/blur-csv-importer.ts +++ b/libs/importer/src/importers/blur-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/buttercup-csv-importer.ts b/libs/importer/src/importers/buttercup-csv-importer.ts similarity index 96% rename from libs/common/src/importers/buttercup-csv-importer.ts rename to libs/importer/src/importers/buttercup-csv-importer.ts index 22b6e33bad..ac3a4cd251 100644 --- a/libs/common/src/importers/buttercup-csv-importer.ts +++ b/libs/importer/src/importers/buttercup-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/chrome-csv-importer.ts b/libs/importer/src/importers/chrome-csv-importer.ts similarity index 94% rename from libs/common/src/importers/chrome-csv-importer.ts rename to libs/importer/src/importers/chrome-csv-importer.ts index 7df20e4a6c..445f0ad57a 100644 --- a/libs/common/src/importers/chrome-csv-importer.ts +++ b/libs/importer/src/importers/chrome-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/clipperz-html-importer.ts b/libs/importer/src/importers/clipperz-html-importer.ts similarity index 98% rename from libs/common/src/importers/clipperz-html-importer.ts rename to libs/importer/src/importers/clipperz-html-importer.ts index a9d969d263..75c39084bf 100644 --- a/libs/common/src/importers/clipperz-html-importer.ts +++ b/libs/importer/src/importers/clipperz-html-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/codebook-csv-importer.ts b/libs/importer/src/importers/codebook-csv-importer.ts similarity index 96% rename from libs/common/src/importers/codebook-csv-importer.ts rename to libs/importer/src/importers/codebook-csv-importer.ts index 302c533543..58cada3b75 100644 --- a/libs/common/src/importers/codebook-csv-importer.ts +++ b/libs/importer/src/importers/codebook-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/dashlane/dashlane-csv-importer.ts b/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts similarity index 93% rename from libs/common/src/importers/dashlane/dashlane-csv-importer.ts rename to libs/importer/src/importers/dashlane/dashlane-csv-importer.ts index 685b40042b..fa2b5bb6d8 100644 --- a/libs/common/src/importers/dashlane/dashlane-csv-importer.ts +++ b/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts @@ -1,10 +1,11 @@ -import { SecureNoteType } from "../../enums/secureNoteType"; -import { ImportResult } from "../../models/domain/import-result"; -import { CipherType } from "../../vault/enums/cipher-type"; -import { CardView } from "../../vault/models/view/card.view"; -import { CipherView } from "../../vault/models/view/cipher.view"; -import { IdentityView } from "../../vault/models/view/identity.view"; -import { LoginView } from "../../vault/models/view/login.view"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; + +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/dashlane/dashlane-json-importer.ts b/libs/importer/src/importers/dashlane/dashlane-json-importer.ts similarity index 91% rename from libs/common/src/importers/dashlane/dashlane-json-importer.ts rename to libs/importer/src/importers/dashlane/dashlane-json-importer.ts index b2595d485c..451fb35465 100644 --- a/libs/common/src/importers/dashlane/dashlane-json-importer.ts +++ b/libs/importer/src/importers/dashlane/dashlane-json-importer.ts @@ -1,10 +1,11 @@ -import { SecureNoteType } from "../../enums/secureNoteType"; -import { ImportResult } from "../../models/domain/import-result"; -import { CipherType } from "../../vault/enums/cipher-type"; -import { CardView } from "../../vault/models/view/card.view"; -import { CipherView } from "../../vault/models/view/cipher.view"; -import { IdentityView } from "../../vault/models/view/identity.view"; -import { SecureNoteView } from "../../vault/models/view/secure-note.view"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/importer/src/importers/dashlane/index.ts b/libs/importer/src/importers/dashlane/index.ts new file mode 100644 index 0000000000..a37ae5aeb1 --- /dev/null +++ b/libs/importer/src/importers/dashlane/index.ts @@ -0,0 +1,2 @@ +export { DashlaneCsvImporter } from "./dashlane-csv-importer"; +export { DashlaneJsonImporter } from "./dashlane-json-importer"; diff --git a/libs/common/src/importers/dashlane/types/dashlane-csv-types.ts b/libs/importer/src/importers/dashlane/types/dashlane-csv-types.ts similarity index 100% rename from libs/common/src/importers/dashlane/types/dashlane-csv-types.ts rename to libs/importer/src/importers/dashlane/types/dashlane-csv-types.ts diff --git a/libs/common/src/importers/encryptr-csv-importer.ts b/libs/importer/src/importers/encryptr-csv-importer.ts similarity index 91% rename from libs/common/src/importers/encryptr-csv-importer.ts rename to libs/importer/src/importers/encryptr-csv-importer.ts index b5d6fb9669..73796cf1e3 100644 --- a/libs/common/src/importers/encryptr-csv-importer.ts +++ b/libs/importer/src/importers/encryptr-csv-importer.ts @@ -1,6 +1,7 @@ -import { ImportResult } from "../models/domain/import-result"; -import { CipherType } from "../vault/enums/cipher-type"; -import { CardView } from "../vault/models/view/card.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/enpass/enpass-csv-importer.ts b/libs/importer/src/importers/enpass/enpass-csv-importer.ts similarity index 92% rename from libs/common/src/importers/enpass/enpass-csv-importer.ts rename to libs/importer/src/importers/enpass/enpass-csv-importer.ts index 24c9196318..9d3907b2a2 100644 --- a/libs/common/src/importers/enpass/enpass-csv-importer.ts +++ b/libs/importer/src/importers/enpass/enpass-csv-importer.ts @@ -1,8 +1,9 @@ -import { SecureNoteType } from "../../enums/secureNoteType"; -import { ImportResult } from "../../models/domain/import-result"; -import { CipherType } from "../../vault/enums/cipher-type"; -import { CardView } from "../../vault/models/view/card.view"; -import { SecureNoteView } from "../../vault/models/view/secure-note.view"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/enpass/enpass-json-importer.ts b/libs/importer/src/importers/enpass/enpass-json-importer.ts similarity index 94% rename from libs/common/src/importers/enpass/enpass-json-importer.ts rename to libs/importer/src/importers/enpass/enpass-json-importer.ts index d74f0e2ec9..efd4075ff3 100644 --- a/libs/common/src/importers/enpass/enpass-json-importer.ts +++ b/libs/importer/src/importers/enpass/enpass-json-importer.ts @@ -1,9 +1,10 @@ -import { FieldType } from "../../enums/fieldType"; -import { ImportResult } from "../../models/domain/import-result"; -import { CipherType } from "../../vault/enums/cipher-type"; -import { CardView } from "../../vault/models/view/card.view"; -import { CipherView } from "../../vault/models/view/cipher.view"; -import { FolderView } from "../../vault/models/view/folder.view"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; + +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/importer/src/importers/enpass/index.ts b/libs/importer/src/importers/enpass/index.ts new file mode 100644 index 0000000000..f6113af320 --- /dev/null +++ b/libs/importer/src/importers/enpass/index.ts @@ -0,0 +1,2 @@ +export { EnpassCsvImporter } from "./enpass-csv-importer"; +export { EnpassJsonImporter } from "./enpass-json-importer"; diff --git a/libs/common/src/importers/enpass/types/enpass-item-templates.ts b/libs/importer/src/importers/enpass/types/enpass-item-templates.ts similarity index 100% rename from libs/common/src/importers/enpass/types/enpass-item-templates.ts rename to libs/importer/src/importers/enpass/types/enpass-item-templates.ts diff --git a/libs/common/src/importers/enpass/types/enpass-json-type.ts b/libs/importer/src/importers/enpass/types/enpass-json-type.ts similarity index 100% rename from libs/common/src/importers/enpass/types/enpass-json-type.ts rename to libs/importer/src/importers/enpass/types/enpass-json-type.ts diff --git a/libs/common/src/importers/firefox-csv-importer.ts b/libs/importer/src/importers/firefox-csv-importer.ts similarity index 94% rename from libs/common/src/importers/firefox-csv-importer.ts rename to libs/importer/src/importers/firefox-csv-importer.ts index e6c0c7030c..0835454d4b 100644 --- a/libs/common/src/importers/firefox-csv-importer.ts +++ b/libs/importer/src/importers/firefox-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/fsecure/fsecure-fsk-importer.spec.ts b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts similarity index 96% rename from libs/common/src/importers/fsecure/fsecure-fsk-importer.spec.ts rename to libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts index 1eadb5c147..ff19113430 100644 --- a/libs/common/src/importers/fsecure/fsecure-fsk-importer.spec.ts +++ b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts @@ -1,4 +1,4 @@ -import { CipherType } from "../../vault/enums/cipher-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { FSecureFskImporter as Importer } from "./fsecure-fsk-importer"; import { CreditCardTestEntry, LoginTestEntry } from "./fsk-test-data"; diff --git a/libs/common/src/importers/fsecure/fsecure-fsk-importer.ts b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts similarity index 89% rename from libs/common/src/importers/fsecure/fsecure-fsk-importer.ts rename to libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts index fcecf7a0a2..ba66aa8dad 100644 --- a/libs/common/src/importers/fsecure/fsecure-fsk-importer.ts +++ b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts @@ -1,7 +1,8 @@ -import { ImportResult } from "../../models/domain/import-result"; -import { CipherType } from "../../vault/enums/cipher-type"; -import { CardView } from "../../vault/models/view/card.view"; -import { CipherView } from "../../vault/models/view/cipher.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; + +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/fsecure/fsecure-fsk-types.ts b/libs/importer/src/importers/fsecure/fsecure-fsk-types.ts similarity index 100% rename from libs/common/src/importers/fsecure/fsecure-fsk-types.ts rename to libs/importer/src/importers/fsecure/fsecure-fsk-types.ts diff --git a/libs/common/src/importers/fsecure/fsk-test-data.ts b/libs/importer/src/importers/fsecure/fsk-test-data.ts similarity index 100% rename from libs/common/src/importers/fsecure/fsk-test-data.ts rename to libs/importer/src/importers/fsecure/fsk-test-data.ts diff --git a/libs/common/src/importers/gnome-json-importer.ts b/libs/importer/src/importers/gnome-json-importer.ts similarity index 97% rename from libs/common/src/importers/gnome-json-importer.ts rename to libs/importer/src/importers/gnome-json-importer.ts index a4e1f67fe0..029bae3825 100644 --- a/libs/common/src/importers/gnome-json-importer.ts +++ b/libs/importer/src/importers/gnome-json-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/importer.ts b/libs/importer/src/importers/importer.ts similarity index 62% rename from libs/common/src/importers/importer.ts rename to libs/importer/src/importers/importer.ts index 0835f667eb..a2adff0b0d 100644 --- a/libs/common/src/importers/importer.ts +++ b/libs/importer/src/importers/importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; export interface Importer { organizationId: string; diff --git a/libs/importer/src/importers/index.ts b/libs/importer/src/importers/index.ts new file mode 100644 index 0000000000..1a479a4cf5 --- /dev/null +++ b/libs/importer/src/importers/index.ts @@ -0,0 +1,59 @@ +export { AscendoCsvImporter } from "./ascendo-csv-importer"; +export { AvastCsvImporter, AvastJsonImporter } from "./avast"; +export { AviraCsvImporter } from "./avira-csv-importer"; +export { BlackBerryCsvImporter } from "./blackberry-csv-importer"; +export { ChromeCsvImporter } from "./chrome-csv-importer"; +export { + BitwardenCsvImporter, + BitwardenJsonImporter, + BitwardenPasswordProtectedImporter, +} from "./bitwarden"; +export { BlurCsvImporter } from "./blur-csv-importer"; +export { ButtercupCsvImporter } from "./buttercup-csv-importer"; +export { ClipperzHtmlImporter } from "./clipperz-html-importer"; +export { CodebookCsvImporter } from "./codebook-csv-importer"; +export { DashlaneCsvImporter, DashlaneJsonImporter } from "./dashlane"; +export { EncryptrCsvImporter } from "./encryptr-csv-importer"; +export { EnpassCsvImporter, EnpassJsonImporter } from "./enpass"; +export { FirefoxCsvImporter } from "./firefox-csv-importer"; +export { FSecureFskImporter } from "./fsecure/fsecure-fsk-importer"; +export { GnomeJsonImporter } from "./gnome-json-importer"; +export { KasperskyTxtImporter } from "./kaspersky-txt-importer"; +export { KeePass2XmlImporter } from "./keepass2-xml-importer"; +export { KeePassXCsvImporter } from "./keepassx-csv-importer"; +export { KeeperCsvImporter, KeeperJsonImporter } from "./keeper"; +export { LastPassCsvImporter } from "./lastpass-csv-importer"; +export { LogMeOnceCsvImporter } from "./logmeonce-csv-importer"; +export { MeldiumCsvImporter } from "./meldium-csv-importer"; +export { MSecureCsvImporter } from "./msecure-csv-importer"; +export { MykiCsvImporter } from "./myki-csv-importer"; +export { NordPassCsvImporter } from "./nordpass-csv-importer"; +export { + OnePassword1PifImporter, + OnePassword1PuxImporter, + OnePasswordMacCsvImporter, + OnePasswordWinCsvImporter, +} from "./onepassword"; +export { PadlockCsvImporter } from "./padlock-csv-importer"; +export { PassKeepCsvImporter } from "./passkeep-csv-importer"; +export { PasskyJsonImporter } from "./passky/passky-json-importer"; +export { PassmanJsonImporter } from "./passman-json-importer"; +export { PasspackCsvImporter } from "./passpack-csv-importer"; +export { PasswordAgentCsvImporter } from "./passwordagent-csv-importer"; +export { PasswordBossJsonImporter } from "./passwordboss-json-importer"; +export { PasswordDragonXmlImporter } from "./passworddragon-xml-importer"; +export { PasswordSafeXmlImporter } from "./passwordsafe-xml-importer"; +export { PasswordWalletTxtImporter } from "./passwordwallet-txt-importer"; +export { PsonoJsonImporter } from "./psono/psono-json-importer"; +export { RememBearCsvImporter } from "./remembear-csv-importer"; +export { RoboFormCsvImporter } from "./roboform-csv-importer"; +export { SafariCsvImporter } from "./safari-csv-importer"; +export { SafeInCloudXmlImporter } from "./safeincloud-xml-importer"; +export { SaferPassCsvImporter } from "./saferpass-csv-importer"; +export { SecureSafeCsvImporter } from "./securesafe-csv-importer"; +export { SplashIdCsvImporter } from "./splashid-csv-importer"; +export { StickyPasswordXmlImporter } from "./stickypassword-xml-importer"; +export { TrueKeyCsvImporter } from "./truekey-csv-importer"; +export { UpmCsvImporter } from "./upm-csv-importer"; +export { YotiCsvImporter } from "./yoti-csv-importer"; +export { ZohoVaultCsvImporter } from "./zohovault-csv-importer"; diff --git a/libs/common/src/importers/kaspersky-txt-importer.ts b/libs/importer/src/importers/kaspersky-txt-importer.ts similarity index 98% rename from libs/common/src/importers/kaspersky-txt-importer.ts rename to libs/importer/src/importers/kaspersky-txt-importer.ts index 34f5018835..874ad976cc 100644 --- a/libs/common/src/importers/kaspersky-txt-importer.ts +++ b/libs/importer/src/importers/kaspersky-txt-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/keepass2-xml-importer.ts b/libs/importer/src/importers/keepass2-xml-importer.ts similarity index 95% rename from libs/common/src/importers/keepass2-xml-importer.ts rename to libs/importer/src/importers/keepass2-xml-importer.ts index 5017340679..73c10ee79c 100644 --- a/libs/common/src/importers/keepass2-xml-importer.ts +++ b/libs/importer/src/importers/keepass2-xml-importer.ts @@ -1,6 +1,7 @@ -import { FieldType } from "../enums/fieldType"; -import { ImportResult } from "../models/domain/import-result"; -import { FolderView } from "../vault/models/view/folder.view"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/keepassx-csv-importer.ts b/libs/importer/src/importers/keepassx-csv-importer.ts similarity index 95% rename from libs/common/src/importers/keepassx-csv-importer.ts rename to libs/importer/src/importers/keepassx-csv-importer.ts index 6bbdd73a08..4047a49d57 100644 --- a/libs/common/src/importers/keepassx-csv-importer.ts +++ b/libs/importer/src/importers/keepassx-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/importer/src/importers/keeper/index.ts b/libs/importer/src/importers/keeper/index.ts new file mode 100644 index 0000000000..7fcd342187 --- /dev/null +++ b/libs/importer/src/importers/keeper/index.ts @@ -0,0 +1,2 @@ +export { KeeperCsvImporter } from "./keeper-csv-importer"; +export { KeeperJsonImporter } from "./keeper-json-importer"; diff --git a/libs/common/src/importers/keeper/keeper-csv-importer.ts b/libs/importer/src/importers/keeper/keeper-csv-importer.ts similarity index 95% rename from libs/common/src/importers/keeper/keeper-csv-importer.ts rename to libs/importer/src/importers/keeper/keeper-csv-importer.ts index ea082b9909..6c265ac31f 100644 --- a/libs/common/src/importers/keeper/keeper-csv-importer.ts +++ b/libs/importer/src/importers/keeper/keeper-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../../models/domain/import-result"; +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/keeper/keeper-json-importer.ts b/libs/importer/src/importers/keeper/keeper-json-importer.ts similarity index 96% rename from libs/common/src/importers/keeper/keeper-json-importer.ts rename to libs/importer/src/importers/keeper/keeper-json-importer.ts index 0011044dde..00c40e9693 100644 --- a/libs/common/src/importers/keeper/keeper-json-importer.ts +++ b/libs/importer/src/importers/keeper/keeper-json-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../../models/domain/import-result"; +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/keeper/types/keeper-json-types.ts b/libs/importer/src/importers/keeper/types/keeper-json-types.ts similarity index 100% rename from libs/common/src/importers/keeper/types/keeper-json-types.ts rename to libs/importer/src/importers/keeper/types/keeper-json-types.ts diff --git a/libs/common/src/importers/lastpass-csv-importer.ts b/libs/importer/src/importers/lastpass-csv-importer.ts similarity index 93% rename from libs/common/src/importers/lastpass-csv-importer.ts rename to libs/importer/src/importers/lastpass-csv-importer.ts index a846a7d560..3346b82cf7 100644 --- a/libs/common/src/importers/lastpass-csv-importer.ts +++ b/libs/importer/src/importers/lastpass-csv-importer.ts @@ -1,12 +1,13 @@ -import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/import-result"; -import { CipherType } from "../vault/enums/cipher-type"; -import { CardView } from "../vault/models/view/card.view"; -import { CipherView } from "../vault/models/view/cipher.view"; -import { FolderView } from "../vault/models/view/folder.view"; -import { IdentityView } from "../vault/models/view/identity.view"; -import { LoginView } from "../vault/models/view/login.view"; -import { SecureNoteView } from "../vault/models/view/secure-note.view"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/logmeonce-csv-importer.ts b/libs/importer/src/importers/logmeonce-csv-importer.ts similarity index 93% rename from libs/common/src/importers/logmeonce-csv-importer.ts rename to libs/importer/src/importers/logmeonce-csv-importer.ts index d1ff293e02..a8a9e7bcad 100644 --- a/libs/common/src/importers/logmeonce-csv-importer.ts +++ b/libs/importer/src/importers/logmeonce-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/meldium-csv-importer.ts b/libs/importer/src/importers/meldium-csv-importer.ts similarity index 93% rename from libs/common/src/importers/meldium-csv-importer.ts rename to libs/importer/src/importers/meldium-csv-importer.ts index af460c71e1..2ba73624e6 100644 --- a/libs/common/src/importers/meldium-csv-importer.ts +++ b/libs/importer/src/importers/meldium-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/msecure-csv-importer.ts b/libs/importer/src/importers/msecure-csv-importer.ts similarity index 86% rename from libs/common/src/importers/msecure-csv-importer.ts rename to libs/importer/src/importers/msecure-csv-importer.ts index 52c397beaf..9063ba5eda 100644 --- a/libs/common/src/importers/msecure-csv-importer.ts +++ b/libs/importer/src/importers/msecure-csv-importer.ts @@ -1,7 +1,8 @@ -import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/import-result"; -import { CipherType } from "../vault/enums/cipher-type"; -import { SecureNoteView } from "../vault/models/view/secure-note.view"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/myki-csv-importer.ts b/libs/importer/src/importers/myki-csv-importer.ts similarity index 91% rename from libs/common/src/importers/myki-csv-importer.ts rename to libs/importer/src/importers/myki-csv-importer.ts index e419a2921b..cea29a6e16 100644 --- a/libs/common/src/importers/myki-csv-importer.ts +++ b/libs/importer/src/importers/myki-csv-importer.ts @@ -1,10 +1,11 @@ -import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/import-result"; -import { CipherType } from "../vault/enums/cipher-type"; -import { CardView } from "../vault/models/view/card.view"; -import { CipherView } from "../vault/models/view/cipher.view"; -import { IdentityView } from "../vault/models/view/identity.view"; -import { SecureNoteView } from "../vault/models/view/secure-note.view"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/nordpass-csv-importer.ts b/libs/importer/src/importers/nordpass-csv-importer.ts similarity index 91% rename from libs/common/src/importers/nordpass-csv-importer.ts rename to libs/importer/src/importers/nordpass-csv-importer.ts index bea4b8685f..895f095de7 100644 --- a/libs/common/src/importers/nordpass-csv-importer.ts +++ b/libs/importer/src/importers/nordpass-csv-importer.ts @@ -1,8 +1,9 @@ -import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/import-result"; -import { CipherType } from "../vault/enums/cipher-type"; -import { CipherView } from "../vault/models/view/cipher.view"; -import { LoginView } from "../vault/models/view/login.view"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/onepassword/cipher-import-context.ts b/libs/importer/src/importers/onepassword/cipher-import-context.ts similarity index 72% rename from libs/common/src/importers/onepassword/cipher-import-context.ts rename to libs/importer/src/importers/onepassword/cipher-import-context.ts index d8eb22caad..db52d969bc 100644 --- a/libs/common/src/importers/onepassword/cipher-import-context.ts +++ b/libs/importer/src/importers/onepassword/cipher-import-context.ts @@ -1,4 +1,4 @@ -import { CipherView } from "../../vault/models/view/cipher.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; export class CipherImportContext { lowerProperty: string; diff --git a/libs/importer/src/importers/onepassword/index.ts b/libs/importer/src/importers/onepassword/index.ts new file mode 100644 index 0000000000..e930933643 --- /dev/null +++ b/libs/importer/src/importers/onepassword/index.ts @@ -0,0 +1,5 @@ +export { OnePassword1PifImporter } from "./onepassword-1pif-importer"; +export { OnePassword1PuxImporter } from "./onepassword-1pux-importer"; +export { OnePasswordCsvImporter } from "./onepassword-csv-importer"; +export { OnePasswordMacCsvImporter } from "./onepassword-mac-csv-importer"; +export { OnePasswordWinCsvImporter } from "./onepassword-win-csv-importer"; diff --git a/libs/common/src/importers/onepassword/onepassword-1pif-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts similarity index 93% rename from libs/common/src/importers/onepassword/onepassword-1pif-importer.ts rename to libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts index f2e8c66222..c675a20d30 100644 --- a/libs/common/src/importers/onepassword/onepassword-1pif-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts @@ -1,12 +1,13 @@ -import { FieldType } from "../../enums/fieldType"; -import { SecureNoteType } from "../../enums/secureNoteType"; -import { ImportResult } from "../../models/domain/import-result"; -import { CipherType } from "../../vault/enums/cipher-type"; -import { CardView } from "../../vault/models/view/card.view"; -import { CipherView } from "../../vault/models/view/cipher.view"; -import { IdentityView } from "../../vault/models/view/identity.view"; -import { PasswordHistoryView } from "../../vault/models/view/password-history.view"; -import { SecureNoteView } from "../../vault/models/view/secure-note.view"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; +import { PasswordHistoryView } from "@bitwarden/common/vault/models/view/password-history.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/onepassword/onepassword-1pux-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts similarity index 95% rename from libs/common/src/importers/onepassword/onepassword-1pux-importer.ts rename to libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts index 9e516e53e3..dcafa1e33d 100644 --- a/libs/common/src/importers/onepassword/onepassword-1pux-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts @@ -1,14 +1,15 @@ -import { FieldType } from "../../enums/fieldType"; -import { SecureNoteType } from "../../enums/secureNoteType"; -import { ImportResult } from "../../models/domain/import-result"; -import { CipherRepromptType } from "../../vault/enums/cipher-reprompt-type"; -import { CipherType } from "../../vault/enums/cipher-type"; -import { CardView } from "../../vault/models/view/card.view"; -import { CipherView } from "../../vault/models/view/cipher.view"; -import { IdentityView } from "../../vault/models/view/identity.view"; -import { LoginView } from "../../vault/models/view/login.view"; -import { PasswordHistoryView } from "../../vault/models/view/password-history.view"; -import { SecureNoteView } from "../../vault/models/view/secure-note.view"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; +import { PasswordHistoryView } from "@bitwarden/common/vault/models/view/password-history.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/onepassword/onepassword-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts similarity index 97% rename from libs/common/src/importers/onepassword/onepassword-csv-importer.ts rename to libs/importer/src/importers/onepassword/onepassword-csv-importer.ts index 31ba984db7..8104407e46 100644 --- a/libs/common/src/importers/onepassword/onepassword-csv-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts @@ -1,7 +1,8 @@ -import { FieldType } from "../../enums/fieldType"; -import { ImportResult } from "../../models/domain/import-result"; -import { CipherType } from "../../vault/enums/cipher-type"; -import { CipherView } from "../../vault/models/view/cipher.view"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; + +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts similarity index 73% rename from libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts rename to libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts index 8a6388c374..601ba77d83 100644 --- a/libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts @@ -1,7 +1,8 @@ -import { CipherType } from "../../vault/enums/cipher-type"; -import { CardView } from "../../vault/models/view/card.view"; -import { CipherView } from "../../vault/models/view/cipher.view"; -import { IdentityView } from "../../vault/models/view/identity.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; + import { Importer } from "../importer"; import { IgnoredProperties, OnePasswordCsvImporter } from "./onepassword-csv-importer"; diff --git a/libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts similarity index 84% rename from libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts rename to libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts index b46d162aa9..f2ae98cd45 100644 --- a/libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts @@ -1,8 +1,9 @@ -import { CipherType } from "../../vault/enums/cipher-type"; -import { CardView } from "../../vault/models/view/card.view"; -import { CipherView } from "../../vault/models/view/cipher.view"; -import { IdentityView } from "../../vault/models/view/identity.view"; -import { LoginView } from "../../vault/models/view/login.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; +import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; + import { Importer } from "../importer"; import { CipherImportContext } from "./cipher-import-context"; diff --git a/libs/common/src/importers/onepassword/types/onepassword-1pux-importer-types.ts b/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts similarity index 100% rename from libs/common/src/importers/onepassword/types/onepassword-1pux-importer-types.ts rename to libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts diff --git a/libs/common/src/importers/padlock-csv-importer.ts b/libs/importer/src/importers/padlock-csv-importer.ts similarity index 94% rename from libs/common/src/importers/padlock-csv-importer.ts rename to libs/importer/src/importers/padlock-csv-importer.ts index 0cca4dec82..7b81041f9f 100644 --- a/libs/common/src/importers/padlock-csv-importer.ts +++ b/libs/importer/src/importers/padlock-csv-importer.ts @@ -1,5 +1,6 @@ -import { CollectionView } from "../admin-console/models/view/collection.view"; -import { ImportResult } from "../models/domain/import-result"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passkeep-csv-importer.ts b/libs/importer/src/importers/passkeep-csv-importer.ts similarity index 95% rename from libs/common/src/importers/passkeep-csv-importer.ts rename to libs/importer/src/importers/passkeep-csv-importer.ts index c7269fa4ec..96ee475e6c 100644 --- a/libs/common/src/importers/passkeep-csv-importer.ts +++ b/libs/importer/src/importers/passkeep-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passky/passky-json-importer.ts b/libs/importer/src/importers/passky/passky-json-importer.ts similarity index 95% rename from libs/common/src/importers/passky/passky-json-importer.ts rename to libs/importer/src/importers/passky/passky-json-importer.ts index 01a7f0d1cd..a074bac2a0 100644 --- a/libs/common/src/importers/passky/passky-json-importer.ts +++ b/libs/importer/src/importers/passky/passky-json-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../../models/domain/import-result"; +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/passky/passky-json-types.ts b/libs/importer/src/importers/passky/passky-json-types.ts similarity index 100% rename from libs/common/src/importers/passky/passky-json-types.ts rename to libs/importer/src/importers/passky/passky-json-types.ts diff --git a/libs/common/src/importers/passman-json-importer.ts b/libs/importer/src/importers/passman-json-importer.ts similarity index 96% rename from libs/common/src/importers/passman-json-importer.ts rename to libs/importer/src/importers/passman-json-importer.ts index 6cc1e22522..9f210d7f5d 100644 --- a/libs/common/src/importers/passman-json-importer.ts +++ b/libs/importer/src/importers/passman-json-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passpack-csv-importer.ts b/libs/importer/src/importers/passpack-csv-importer.ts similarity index 95% rename from libs/common/src/importers/passpack-csv-importer.ts rename to libs/importer/src/importers/passpack-csv-importer.ts index 628cdcf2b6..f08de898eb 100644 --- a/libs/common/src/importers/passpack-csv-importer.ts +++ b/libs/importer/src/importers/passpack-csv-importer.ts @@ -1,5 +1,6 @@ -import { CollectionView } from "../admin-console/models/view/collection.view"; -import { ImportResult } from "../models/domain/import-result"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passwordagent-csv-importer.ts b/libs/importer/src/importers/passwordagent-csv-importer.ts similarity index 96% rename from libs/common/src/importers/passwordagent-csv-importer.ts rename to libs/importer/src/importers/passwordagent-csv-importer.ts index 358ee09c84..ed75779271 100644 --- a/libs/common/src/importers/passwordagent-csv-importer.ts +++ b/libs/importer/src/importers/passwordagent-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passwordboss-json-importer.ts b/libs/importer/src/importers/passwordboss-json-importer.ts similarity index 93% rename from libs/common/src/importers/passwordboss-json-importer.ts rename to libs/importer/src/importers/passwordboss-json-importer.ts index a9c25e21cf..f819408d22 100644 --- a/libs/common/src/importers/passwordboss-json-importer.ts +++ b/libs/importer/src/importers/passwordboss-json-importer.ts @@ -1,7 +1,8 @@ -import { ImportResult } from "../models/domain/import-result"; -import { CipherType } from "../vault/enums/cipher-type"; -import { CardView } from "../vault/models/view/card.view"; -import { FolderView } from "../vault/models/view/folder.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passworddragon-xml-importer.ts b/libs/importer/src/importers/passworddragon-xml-importer.ts similarity index 97% rename from libs/common/src/importers/passworddragon-xml-importer.ts rename to libs/importer/src/importers/passworddragon-xml-importer.ts index 17e1775247..40cf8983a4 100644 --- a/libs/common/src/importers/passworddragon-xml-importer.ts +++ b/libs/importer/src/importers/passworddragon-xml-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passwordsafe-xml-importer.ts b/libs/importer/src/importers/passwordsafe-xml-importer.ts similarity index 97% rename from libs/common/src/importers/passwordsafe-xml-importer.ts rename to libs/importer/src/importers/passwordsafe-xml-importer.ts index 49b6cb64f6..feefafec15 100644 --- a/libs/common/src/importers/passwordsafe-xml-importer.ts +++ b/libs/importer/src/importers/passwordsafe-xml-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passwordwallet-txt-importer.ts b/libs/importer/src/importers/passwordwallet-txt-importer.ts similarity index 95% rename from libs/common/src/importers/passwordwallet-txt-importer.ts rename to libs/importer/src/importers/passwordwallet-txt-importer.ts index 2756c99949..f775db3280 100644 --- a/libs/common/src/importers/passwordwallet-txt-importer.ts +++ b/libs/importer/src/importers/passwordwallet-txt-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/psono/psono-json-importer.ts b/libs/importer/src/importers/psono/psono-json-importer.ts similarity index 94% rename from libs/common/src/importers/psono/psono-json-importer.ts rename to libs/importer/src/importers/psono/psono-json-importer.ts index 517a3a5a5f..6bafef75c4 100644 --- a/libs/common/src/importers/psono/psono-json-importer.ts +++ b/libs/importer/src/importers/psono/psono-json-importer.ts @@ -1,9 +1,10 @@ -import { FieldType } from "../../enums/fieldType"; -import { SecureNoteType } from "../../enums/secureNoteType"; -import { ImportResult } from "../../models/domain/import-result"; -import { CipherType } from "../../vault/enums/cipher-type"; -import { CipherView } from "../../vault/models/view/cipher.view"; -import { SecureNoteView } from "../../vault/models/view/secure-note.view"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../../models/import-result"; import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/psono/psono-json-types.ts b/libs/importer/src/importers/psono/psono-json-types.ts similarity index 100% rename from libs/common/src/importers/psono/psono-json-types.ts rename to libs/importer/src/importers/psono/psono-json-types.ts diff --git a/libs/common/src/importers/remembear-csv-importer.ts b/libs/importer/src/importers/remembear-csv-importer.ts similarity index 92% rename from libs/common/src/importers/remembear-csv-importer.ts rename to libs/importer/src/importers/remembear-csv-importer.ts index 7720fc79b8..236245f230 100644 --- a/libs/common/src/importers/remembear-csv-importer.ts +++ b/libs/importer/src/importers/remembear-csv-importer.ts @@ -1,6 +1,7 @@ -import { ImportResult } from "../models/domain/import-result"; -import { CipherType } from "../vault/enums/cipher-type"; -import { CardView } from "../vault/models/view/card.view"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/roboform-csv-importer.ts b/libs/importer/src/importers/roboform-csv-importer.ts similarity index 97% rename from libs/common/src/importers/roboform-csv-importer.ts rename to libs/importer/src/importers/roboform-csv-importer.ts index 01d3d8dc7c..84f2cdd376 100644 --- a/libs/common/src/importers/roboform-csv-importer.ts +++ b/libs/importer/src/importers/roboform-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/safari-csv-importer.ts b/libs/importer/src/importers/safari-csv-importer.ts similarity index 94% rename from libs/common/src/importers/safari-csv-importer.ts rename to libs/importer/src/importers/safari-csv-importer.ts index 09f5dacbe2..e959b41666 100644 --- a/libs/common/src/importers/safari-csv-importer.ts +++ b/libs/importer/src/importers/safari-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/safeincloud-xml-importer.ts b/libs/importer/src/importers/safeincloud-xml-importer.ts similarity index 88% rename from libs/common/src/importers/safeincloud-xml-importer.ts rename to libs/importer/src/importers/safeincloud-xml-importer.ts index 39a48df348..df73267122 100644 --- a/libs/common/src/importers/safeincloud-xml-importer.ts +++ b/libs/importer/src/importers/safeincloud-xml-importer.ts @@ -1,11 +1,12 @@ -import { FieldType } from "../enums/fieldType"; -import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/import-result"; -import { CipherType } from "../vault/enums/cipher-type"; -import { CipherView } from "../vault/models/view/cipher.view"; -import { FieldView } from "../vault/models/view/field.view"; -import { FolderView } from "../vault/models/view/folder.view"; -import { SecureNoteView } from "../vault/models/view/secure-note.view"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/saferpass-csv-importer.ts b/libs/importer/src/importers/saferpass-csv-importer.ts similarity index 93% rename from libs/common/src/importers/saferpass-csv-importer.ts rename to libs/importer/src/importers/saferpass-csv-importer.ts index 2da953ea6f..721d52a927 100644 --- a/libs/common/src/importers/saferpass-csv-importer.ts +++ b/libs/importer/src/importers/saferpass-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/securesafe-csv-importer.ts b/libs/importer/src/importers/securesafe-csv-importer.ts similarity index 93% rename from libs/common/src/importers/securesafe-csv-importer.ts rename to libs/importer/src/importers/securesafe-csv-importer.ts index 062c9dafa7..cb5aab503d 100644 --- a/libs/common/src/importers/securesafe-csv-importer.ts +++ b/libs/importer/src/importers/securesafe-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/splashid-csv-importer.ts b/libs/importer/src/importers/splashid-csv-importer.ts similarity index 92% rename from libs/common/src/importers/splashid-csv-importer.ts rename to libs/importer/src/importers/splashid-csv-importer.ts index 8708b56c34..f74f4d0fac 100644 --- a/libs/common/src/importers/splashid-csv-importer.ts +++ b/libs/importer/src/importers/splashid-csv-importer.ts @@ -1,5 +1,6 @@ -import { ImportResult } from "../models/domain/import-result"; -import { CipherView } from "../vault/models/view/cipher.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/stickypassword-xml-importer.ts b/libs/importer/src/importers/stickypassword-xml-importer.ts similarity index 97% rename from libs/common/src/importers/stickypassword-xml-importer.ts rename to libs/importer/src/importers/stickypassword-xml-importer.ts index a9bbd22ec5..c8a81a6fe8 100644 --- a/libs/common/src/importers/stickypassword-xml-importer.ts +++ b/libs/importer/src/importers/stickypassword-xml-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/truekey-csv-importer.ts b/libs/importer/src/importers/truekey-csv-importer.ts similarity index 88% rename from libs/common/src/importers/truekey-csv-importer.ts rename to libs/importer/src/importers/truekey-csv-importer.ts index 4b1bb4cbd4..2028882d3d 100644 --- a/libs/common/src/importers/truekey-csv-importer.ts +++ b/libs/importer/src/importers/truekey-csv-importer.ts @@ -1,8 +1,9 @@ -import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/import-result"; -import { CipherType } from "../vault/enums/cipher-type"; -import { CardView } from "../vault/models/view/card.view"; -import { SecureNoteView } from "../vault/models/view/secure-note.view"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; +import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/upm-csv-importer.ts b/libs/importer/src/importers/upm-csv-importer.ts similarity index 93% rename from libs/common/src/importers/upm-csv-importer.ts rename to libs/importer/src/importers/upm-csv-importer.ts index b326ddbac1..7cfaa91254 100644 --- a/libs/common/src/importers/upm-csv-importer.ts +++ b/libs/importer/src/importers/upm-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/yoti-csv-importer.ts b/libs/importer/src/importers/yoti-csv-importer.ts similarity index 93% rename from libs/common/src/importers/yoti-csv-importer.ts rename to libs/importer/src/importers/yoti-csv-importer.ts index 868b804baf..42c4d5a8df 100644 --- a/libs/common/src/importers/yoti-csv-importer.ts +++ b/libs/importer/src/importers/yoti-csv-importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/import-result"; +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/zohovault-csv-importer.ts b/libs/importer/src/importers/zohovault-csv-importer.ts similarity index 94% rename from libs/common/src/importers/zohovault-csv-importer.ts rename to libs/importer/src/importers/zohovault-csv-importer.ts index 3387016a67..cfbd851e61 100644 --- a/libs/common/src/importers/zohovault-csv-importer.ts +++ b/libs/importer/src/importers/zohovault-csv-importer.ts @@ -1,5 +1,6 @@ -import { ImportResult } from "../models/domain/import-result"; -import { CipherView } from "../vault/models/view/cipher.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; + +import { ImportResult } from "../models/import-result"; import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; diff --git a/libs/importer/src/index.ts b/libs/importer/src/index.ts new file mode 100644 index 0000000000..685cb5e626 --- /dev/null +++ b/libs/importer/src/index.ts @@ -0,0 +1,11 @@ +export { ImportType, ImportOption } from "./models/import-options"; + +export { ImportError } from "./models/import-error"; + +export { ImportApiServiceAbstraction } from "./services/import-api.service.abstraction"; +export { ImportApiService } from "./services/import-api.service"; + +export { ImportServiceAbstraction } from "./services/import.service.abstraction"; +export { ImportService } from "./services/import.service"; + +export { Importer } from "./importers/importer"; diff --git a/libs/common/src/importers/import-error.ts b/libs/importer/src/models/import-error.ts similarity index 100% rename from libs/common/src/importers/import-error.ts rename to libs/importer/src/models/import-error.ts diff --git a/libs/common/src/enums/importOptions.ts b/libs/importer/src/models/import-options.ts similarity index 100% rename from libs/common/src/enums/importOptions.ts rename to libs/importer/src/models/import-options.ts diff --git a/libs/common/src/models/domain/import-result.ts b/libs/importer/src/models/import-result.ts similarity index 54% rename from libs/common/src/models/domain/import-result.ts rename to libs/importer/src/models/import-result.ts index cb731d2eb5..6169117635 100644 --- a/libs/common/src/models/domain/import-result.ts +++ b/libs/importer/src/models/import-result.ts @@ -1,6 +1,6 @@ -import { CollectionView } from "../../admin-console/models/view/collection.view"; -import { CipherView } from "../../vault/models/view/cipher.view"; -import { FolderView } from "../../vault/models/view/folder.view"; +import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; export class ImportResult { success = false; diff --git a/libs/common/src/abstractions/import/import-api.service.abstraction.ts b/libs/importer/src/services/import-api.service.abstraction.ts similarity index 54% rename from libs/common/src/abstractions/import/import-api.service.abstraction.ts rename to libs/importer/src/services/import-api.service.abstraction.ts index 041284d57a..45142b3091 100644 --- a/libs/common/src/abstractions/import/import-api.service.abstraction.ts +++ b/libs/importer/src/services/import-api.service.abstraction.ts @@ -1,5 +1,5 @@ -import { ImportCiphersRequest } from "../../models/request/import-ciphers.request"; -import { ImportOrganizationCiphersRequest } from "../../models/request/import-organization-ciphers.request"; +import { ImportCiphersRequest } from "@bitwarden/common/models/request/import-ciphers.request"; +import { ImportOrganizationCiphersRequest } from "@bitwarden/common/models/request/import-organization-ciphers.request"; export abstract class ImportApiServiceAbstraction { postImportCiphers: (request: ImportCiphersRequest) => Promise; diff --git a/libs/common/src/services/import/import-api.service.ts b/libs/importer/src/services/import-api.service.ts similarity index 61% rename from libs/common/src/services/import/import-api.service.ts rename to libs/importer/src/services/import-api.service.ts index 80342b1d1f..da95061107 100644 --- a/libs/common/src/services/import/import-api.service.ts +++ b/libs/importer/src/services/import-api.service.ts @@ -1,7 +1,8 @@ -import { ApiService } from "../../abstractions/api.service"; -import { ImportApiServiceAbstraction } from "../../abstractions/import/import-api.service.abstraction"; -import { ImportCiphersRequest } from "../../models/request/import-ciphers.request"; -import { ImportOrganizationCiphersRequest } from "../../models/request/import-organization-ciphers.request"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { ImportCiphersRequest } from "@bitwarden/common/models/request/import-ciphers.request"; +import { ImportOrganizationCiphersRequest } from "@bitwarden/common/models/request/import-organization-ciphers.request"; + +import { ImportApiServiceAbstraction } from "./import-api.service.abstraction"; export class ImportApiService implements ImportApiServiceAbstraction { constructor(private apiService: ApiService) {} diff --git a/libs/common/src/abstractions/import/import.service.abstraction.ts b/libs/importer/src/services/import.service.abstraction.ts similarity index 64% rename from libs/common/src/abstractions/import/import.service.abstraction.ts rename to libs/importer/src/services/import.service.abstraction.ts index 1c301856b5..c4b9d39356 100644 --- a/libs/common/src/abstractions/import/import.service.abstraction.ts +++ b/libs/importer/src/services/import.service.abstraction.ts @@ -1,8 +1,8 @@ -import { ImportOption, ImportType } from "../../enums/importOptions"; -import { ImportError } from "../../importers/import-error"; -import { Importer } from "../../importers/importer"; +import { Importer } from "../importers/importer"; +import { ImportError } from "../models/import-error"; +import { ImportOption, ImportType } from "../models/import-options"; -export abstract class ImportService { +export abstract class ImportServiceAbstraction { featuredImportOptions: readonly ImportOption[]; regularImportOptions: readonly ImportOption[]; getImportOptions: () => ImportOption[]; diff --git a/libs/common/spec/services/import.service.spec.ts b/libs/importer/src/services/import.service.spec.ts similarity index 86% rename from libs/common/spec/services/import.service.spec.ts rename to libs/importer/src/services/import.service.spec.ts index 98620d1064..2ba0f960ca 100644 --- a/libs/common/spec/services/import.service.spec.ts +++ b/libs/importer/src/services/import.service.spec.ts @@ -3,15 +3,17 @@ import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; -import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwarden-password-protected-importer"; -import { Importer } from "@bitwarden/common/importers/importer"; import { Utils } from "@bitwarden/common/misc/utils"; -import { ImportService } from "@bitwarden/common/services/import/import.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { BitwardenPasswordProtectedImporter } from "../importers/bitwarden/bitwarden-password-protected-importer"; +import { Importer } from "../importers/importer"; + +import { ImportApiServiceAbstraction } from "./import-api.service.abstraction"; +import { ImportService } from "./import.service"; + describe("ImportService", () => { let importService: ImportService; let cipherService: SubstituteOf; diff --git a/libs/common/src/services/import/import.service.ts b/libs/importer/src/services/import.service.ts similarity index 62% rename from libs/common/src/services/import/import.service.ts rename to libs/importer/src/services/import.service.ts index e05e585749..7a8b570976 100644 --- a/libs/common/src/services/import/import.service.ts +++ b/libs/importer/src/services/import.service.ts @@ -1,87 +1,91 @@ -import { CryptoService } from "../../abstractions/crypto.service"; -import { I18nService } from "../../abstractions/i18n.service"; -import { ImportApiServiceAbstraction } from "../../abstractions/import/import-api.service.abstraction"; -import { ImportService as ImportServiceAbstraction } from "../../abstractions/import/import.service.abstraction"; -import { CollectionService } from "../../admin-console/abstractions/collection.service"; -import { CollectionRequest } from "../../admin-console/models/request/collection.request"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { CollectionRequest } from "@bitwarden/common/admin-console/models/request/collection.request"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { ImportCiphersRequest } from "@bitwarden/common/models/request/import-ciphers.request"; +import { ImportOrganizationCiphersRequest } from "@bitwarden/common/models/request/import-organization-ciphers.request"; +import { KvpRequest } from "@bitwarden/common/models/request/kvp.request"; +import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; +import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; +import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; +import { CipherRequest } from "@bitwarden/common/vault/models/request/cipher.request"; +import { FolderRequest } from "@bitwarden/common/vault/models/request/folder.request"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; + +import { + AscendoCsvImporter, + AvastCsvImporter, + AvastJsonImporter, + AviraCsvImporter, + BitwardenCsvImporter, + BitwardenJsonImporter, + BitwardenPasswordProtectedImporter, + BlackBerryCsvImporter, + BlurCsvImporter, + ButtercupCsvImporter, + ChromeCsvImporter, + ClipperzHtmlImporter, + CodebookCsvImporter, + DashlaneCsvImporter, + DashlaneJsonImporter, + EncryptrCsvImporter, + EnpassCsvImporter, + EnpassJsonImporter, + FirefoxCsvImporter, + FSecureFskImporter, + GnomeJsonImporter, + KasperskyTxtImporter, + KeePass2XmlImporter, + KeePassXCsvImporter, + KeeperCsvImporter, + // KeeperJsonImporter, + LastPassCsvImporter, + LogMeOnceCsvImporter, + MSecureCsvImporter, + MeldiumCsvImporter, + MykiCsvImporter, + NordPassCsvImporter, + OnePassword1PifImporter, + OnePassword1PuxImporter, + OnePasswordMacCsvImporter, + OnePasswordWinCsvImporter, + PadlockCsvImporter, + PassKeepCsvImporter, + PasskyJsonImporter, + PassmanJsonImporter, + PasspackCsvImporter, + PasswordAgentCsvImporter, + PasswordBossJsonImporter, + PasswordDragonXmlImporter, + PasswordSafeXmlImporter, + PasswordWalletTxtImporter, + PsonoJsonImporter, + RememBearCsvImporter, + RoboFormCsvImporter, + SafariCsvImporter, + SafeInCloudXmlImporter, + SaferPassCsvImporter, + SecureSafeCsvImporter, + SplashIdCsvImporter, + StickyPasswordXmlImporter, + TrueKeyCsvImporter, + UpmCsvImporter, + YotiCsvImporter, + ZohoVaultCsvImporter, +} from "../importers"; +import { Importer } from "../importers/importer"; +import { ImportError } from "../models/import-error"; import { featuredImportOptions, ImportOption, ImportType, regularImportOptions, -} from "../../enums/importOptions"; -import { AscendoCsvImporter } from "../../importers/ascendo-csv-importer"; -import { AvastCsvImporter } from "../../importers/avast-csv-importer"; -import { AvastJsonImporter } from "../../importers/avast-json-importer"; -import { AviraCsvImporter } from "../../importers/avira-csv-importer"; -import { BitwardenCsvImporter } from "../../importers/bitwarden-csv-importer"; -import { BitwardenJsonImporter } from "../../importers/bitwarden-json-importer"; -import { BitwardenPasswordProtectedImporter } from "../../importers/bitwarden-password-protected-importer"; -import { BlackBerryCsvImporter } from "../../importers/blackberry-csv-importer"; -import { BlurCsvImporter } from "../../importers/blur-csv-importer"; -import { ButtercupCsvImporter } from "../../importers/buttercup-csv-importer"; -import { ChromeCsvImporter } from "../../importers/chrome-csv-importer"; -import { ClipperzHtmlImporter } from "../../importers/clipperz-html-importer"; -import { CodebookCsvImporter } from "../../importers/codebook-csv-importer"; -import { DashlaneCsvImporter } from "../../importers/dashlane/dashlane-csv-importer"; -import { DashlaneJsonImporter } from "../../importers/dashlane/dashlane-json-importer"; -import { EncryptrCsvImporter } from "../../importers/encryptr-csv-importer"; -import { EnpassCsvImporter } from "../../importers/enpass/enpass-csv-importer"; -import { EnpassJsonImporter } from "../../importers/enpass/enpass-json-importer"; -import { FirefoxCsvImporter } from "../../importers/firefox-csv-importer"; -import { FSecureFskImporter } from "../../importers/fsecure/fsecure-fsk-importer"; -import { GnomeJsonImporter } from "../../importers/gnome-json-importer"; -import { ImportError } from "../../importers/import-error"; -import { Importer } from "../../importers/importer"; -import { KasperskyTxtImporter } from "../../importers/kaspersky-txt-importer"; -import { KeePass2XmlImporter } from "../../importers/keepass2-xml-importer"; -import { KeePassXCsvImporter } from "../../importers/keepassx-csv-importer"; -import { KeeperCsvImporter } from "../../importers/keeper/keeper-csv-importer"; -import { LastPassCsvImporter } from "../../importers/lastpass-csv-importer"; -import { LogMeOnceCsvImporter } from "../../importers/logmeonce-csv-importer"; -import { MeldiumCsvImporter } from "../../importers/meldium-csv-importer"; -import { MSecureCsvImporter } from "../../importers/msecure-csv-importer"; -import { MykiCsvImporter } from "../../importers/myki-csv-importer"; -import { NordPassCsvImporter } from "../../importers/nordpass-csv-importer"; -import { OnePassword1PifImporter } from "../../importers/onepassword/onepassword-1pif-importer"; -import { OnePassword1PuxImporter } from "../../importers/onepassword/onepassword-1pux-importer"; -import { OnePasswordMacCsvImporter } from "../../importers/onepassword/onepassword-mac-csv-importer"; -import { OnePasswordWinCsvImporter } from "../../importers/onepassword/onepassword-win-csv-importer"; -import { PadlockCsvImporter } from "../../importers/padlock-csv-importer"; -import { PassKeepCsvImporter } from "../../importers/passkeep-csv-importer"; -import { PasskyJsonImporter } from "../../importers/passky/passky-json-importer"; -import { PassmanJsonImporter } from "../../importers/passman-json-importer"; -import { PasspackCsvImporter } from "../../importers/passpack-csv-importer"; -import { PasswordAgentCsvImporter } from "../../importers/passwordagent-csv-importer"; -import { PasswordBossJsonImporter } from "../../importers/passwordboss-json-importer"; -import { PasswordDragonXmlImporter } from "../../importers/passworddragon-xml-importer"; -import { PasswordSafeXmlImporter } from "../../importers/passwordsafe-xml-importer"; -import { PasswordWalletTxtImporter } from "../../importers/passwordwallet-txt-importer"; -import { PsonoJsonImporter } from "../../importers/psono/psono-json-importer"; -import { RememBearCsvImporter } from "../../importers/remembear-csv-importer"; -import { RoboFormCsvImporter } from "../../importers/roboform-csv-importer"; -import { SafariCsvImporter } from "../../importers/safari-csv-importer"; -import { SafeInCloudXmlImporter } from "../../importers/safeincloud-xml-importer"; -import { SaferPassCsvImporter } from "../../importers/saferpass-csv-importer"; -import { SecureSafeCsvImporter } from "../../importers/securesafe-csv-importer"; -import { SplashIdCsvImporter } from "../../importers/splashid-csv-importer"; -import { StickyPasswordXmlImporter } from "../../importers/stickypassword-xml-importer"; -import { TrueKeyCsvImporter } from "../../importers/truekey-csv-importer"; -import { UpmCsvImporter } from "../../importers/upm-csv-importer"; -import { YotiCsvImporter } from "../../importers/yoti-csv-importer"; -import { ZohoVaultCsvImporter } from "../../importers/zohovault-csv-importer"; -import { Utils } from "../../misc/utils"; -import { ImportResult } from "../../models/domain/import-result"; -import { ImportCiphersRequest } from "../../models/request/import-ciphers.request"; -import { ImportOrganizationCiphersRequest } from "../../models/request/import-organization-ciphers.request"; -import { KvpRequest } from "../../models/request/kvp.request"; -import { ErrorResponse } from "../../models/response/error.response"; -import { CipherService } from "../../vault/abstractions/cipher.service"; -import { FolderService } from "../../vault/abstractions/folder/folder.service.abstraction"; -import { CipherType } from "../../vault/enums/cipher-type"; -import { CipherRequest } from "../../vault/models/request/cipher.request"; -import { FolderRequest } from "../../vault/models/request/folder.request"; -import { CipherView } from "../../vault/models/view/cipher.view"; +} from "../models/import-options"; +import { ImportResult } from "../models/import-result"; +import { ImportApiServiceAbstraction } from "../services/import-api.service.abstraction"; +import { ImportServiceAbstraction } from "../services/import.service.abstraction"; export class ImportService implements ImportServiceAbstraction { featuredImportOptions = featuredImportOptions as readonly ImportOption[]; diff --git a/libs/importer/tsconfig.json b/libs/importer/tsconfig.json new file mode 100644 index 0000000000..6004a56fb5 --- /dev/null +++ b/libs/importer/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../shared/tsconfig.libs", + "include": ["src", "spec"], + "exclude": ["node_modules", "dist"] +} diff --git a/libs/importer/tsconfig.spec.json b/libs/importer/tsconfig.spec.json new file mode 100644 index 0000000000..fc8520e737 --- /dev/null +++ b/libs/importer/tsconfig.spec.json @@ -0,0 +1,3 @@ +{ + "extends": "./tsconfig.json" +} diff --git a/libs/shared/tsconfig.libs.json b/libs/shared/tsconfig.libs.json index bb739dcfa2..8bcb1bcf06 100644 --- a/libs/shared/tsconfig.libs.json +++ b/libs/shared/tsconfig.libs.json @@ -4,7 +4,8 @@ "paths": { "@bitwarden/common/*": ["../common/src/*"], "@bitwarden/angular/*": ["../angular/src/*"], - "@bitwarden/node/*": ["../node/src/*"] + "@bitwarden/node/*": ["../node/src/*"], + "@bitwarden/importer": ["../importer/src"] } } } diff --git a/package-lock.json b/package-lock.json index 39759dc386..365ebd5535 100644 --- a/package-lock.json +++ b/package-lock.json @@ -256,6 +256,14 @@ "name": "@bitwarden/components", "version": "0.0.0" }, + "libs/importer": { + "name": "@bitwarden/importer", + "version": "0.0.0", + "license": "GPL-3.0", + "dependencies": { + "@bitwarden/common": "file:../common" + } + }, "libs/node": { "name": "@bitwarden/node", "version": "0.0.0", @@ -3310,6 +3318,10 @@ "resolved": "apps/desktop/desktop_native", "link": true }, + "node_modules/@bitwarden/importer": { + "resolved": "libs/importer", + "link": true + }, "node_modules/@bitwarden/node": { "resolved": "libs/node", "link": true @@ -46981,6 +46993,12 @@ "@napi-rs/cli": "^2.6.2" } }, + "@bitwarden/importer": { + "version": "file:libs/importer", + "requires": { + "@bitwarden/common": "file:../common" + } + }, "@bitwarden/node": { "version": "file:libs/node", "requires": { diff --git a/tsconfig.json b/tsconfig.json index d0de75ce57..09805a4012 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,6 +19,7 @@ "@bitwarden/angular/*": ["./libs/angular/src/*"], "@bitwarden/node/*": ["./libs/node/src/*"], "@bitwarden/components": ["./libs/components/src"], + "@bitwarden/importer": ["./libs/importer/src"], "@bitwarden/web-vault/*": ["./apps/web/src/*"] }, "plugins": [