diff --git a/libs/importer/spec/base-importer.spec.ts b/libs/importer/src/importers/base-importer.spec.ts similarity index 98% rename from libs/importer/spec/base-importer.spec.ts rename to libs/importer/src/importers/base-importer.spec.ts index f72ceccb538..309bb7ca8c4 100644 --- a/libs/importer/spec/base-importer.spec.ts +++ b/libs/importer/src/importers/base-importer.spec.ts @@ -2,7 +2,7 @@ import { CipherType } from "@bitwarden/common/vault/enums"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { BaseImporter } from "../src/importers/base-importer"; +import { BaseImporter } from "./base-importer"; class FakeBaseImporter extends BaseImporter { initLoginCipher(): CipherView { diff --git a/libs/importer/spec/bitwarden-password-protected-importer.spec.ts b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.spec.ts similarity index 93% rename from libs/importer/spec/bitwarden-password-protected-importer.spec.ts rename to libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.spec.ts index b355cf9a5d3..66deabf0634 100644 --- a/libs/importer/spec/bitwarden-password-protected-importer.spec.ts +++ b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.spec.ts @@ -8,13 +8,11 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { KdfType, KeyService } from "@bitwarden/key-management"; -import { - BitwardenPasswordProtectedImporter, - BitwardenJsonImporter, -} from "../src/importers/bitwarden"; +import { emptyAccountEncrypted } from "../spec-data/bitwarden-json/account-encrypted.json"; +import { emptyUnencryptedExport } from "../spec-data/bitwarden-json/unencrypted.json"; -import { emptyAccountEncrypted } from "./test-data/bitwarden-json/account-encrypted.json"; -import { emptyUnencryptedExport } from "./test-data/bitwarden-json/unencrypted.json"; +import { BitwardenJsonImporter } from "./bitwarden-json-importer"; +import { BitwardenPasswordProtectedImporter } from "./bitwarden-password-protected-importer"; describe("BitwardenPasswordProtectedImporter", () => { let importer: BitwardenPasswordProtectedImporter; diff --git a/libs/importer/spec/chrome-csv-importer.spec.ts b/libs/importer/src/importers/chrome-csv-importer.spec.ts similarity index 92% rename from libs/importer/spec/chrome-csv-importer.spec.ts rename to libs/importer/src/importers/chrome-csv-importer.spec.ts index dcb39b657d5..d0e82cf44ac 100644 --- a/libs/importer/spec/chrome-csv-importer.spec.ts +++ b/libs/importer/src/importers/chrome-csv-importer.spec.ts @@ -2,10 +2,9 @@ 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"; +import { ChromeCsvImporter } from "./chrome-csv-importer"; +import { data as androidData } from "./spec-data/chrome-csv/android-data.csv"; +import { data as simplePasswordData } from "./spec-data/chrome-csv/simple-password-data.csv"; const CipherData = [ { diff --git a/libs/importer/spec/dashlane-csv-importer.spec.ts b/libs/importer/src/importers/dashlane/dashlane-csv-importer.spec.ts similarity index 96% rename from libs/importer/spec/dashlane-csv-importer.spec.ts rename to libs/importer/src/importers/dashlane/dashlane-csv-importer.spec.ts index 1d76396022c..b8d84a9378a 100644 --- a/libs/importer/spec/dashlane-csv-importer.spec.ts +++ b/libs/importer/src/importers/dashlane/dashlane-csv-importer.spec.ts @@ -1,14 +1,13 @@ import { CipherType } from "@bitwarden/common/vault/enums"; -import { DashlaneCsvImporter } from "../src/importers"; - -import { credentialsData_otpUrl } from "./test-data/dashlane-csv/credentials-otpurl.csv"; -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"; -import { paymentsData } from "./test-data/dashlane-csv/payments.csv"; -import { personalInfoData } from "./test-data/dashlane-csv/personal-info.csv"; -import { secureNoteData } from "./test-data/dashlane-csv/securenotes.csv"; +import { DashlaneCsvImporter } from ".."; +import { credentialsData_otpUrl } from "../spec-data/dashlane-csv/credentials-otpurl.csv"; +import { credentialsData } from "../spec-data/dashlane-csv/credentials.csv"; +import { identityData } from "../spec-data/dashlane-csv/id.csv"; +import { multiplePersonalInfoData } from "../spec-data/dashlane-csv/multiple-personal-info.csv"; +import { paymentsData } from "../spec-data/dashlane-csv/payments.csv"; +import { personalInfoData } from "../spec-data/dashlane-csv/personal-info.csv"; +import { secureNoteData } from "../spec-data/dashlane-csv/securenotes.csv"; describe("Dashlane CSV Importer", () => { let importer: DashlaneCsvImporter; diff --git a/libs/importer/spec/enpass-json-importer.spec.ts b/libs/importer/src/importers/enpass/enpass-json-importer.spec.ts similarity index 93% rename from libs/importer/spec/enpass-json-importer.spec.ts rename to libs/importer/src/importers/enpass/enpass-json-importer.spec.ts index 75e668f28be..b0cb5f71524 100644 --- a/libs/importer/spec/enpass-json-importer.spec.ts +++ b/libs/importer/src/importers/enpass/enpass-json-importer.spec.ts @@ -1,13 +1,13 @@ import { CipherType } from "@bitwarden/common/vault/enums"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; -import { EnpassJsonImporter } from "../src/importers"; +import { creditCard } from "../spec-data/enpass-json/credit-card"; +import { folders } from "../spec-data/enpass-json/folders"; +import { login } from "../spec-data/enpass-json/login"; +import { loginAndroidUrl } from "../spec-data/enpass-json/login-android-url"; +import { note } from "../spec-data/enpass-json/note"; -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"; +import { EnpassJsonImporter } from "./enpass-json-importer"; function validateCustomField(fields: FieldView[], fieldName: string, expectedValue: any) { expect(fields).toBeDefined(); diff --git a/libs/importer/spec/firefox-csv-importer.spec.ts b/libs/importer/src/importers/firefox-csv-importer.spec.ts similarity index 91% rename from libs/importer/spec/firefox-csv-importer.spec.ts rename to libs/importer/src/importers/firefox-csv-importer.spec.ts index 0add655a684..78bca0599b5 100644 --- a/libs/importer/spec/firefox-csv-importer.spec.ts +++ b/libs/importer/src/importers/firefox-csv-importer.spec.ts @@ -2,10 +2,9 @@ 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"; +import { FirefoxCsvImporter } from "./firefox-csv-importer"; +import { data as firefoxAccountsData } from "./spec-data/firefox-csv/firefox-accounts-data.csv"; +import { data as simplePasswordData } from "./spec-data/firefox-csv/simple-password-data.csv"; const CipherData = [ { diff --git a/libs/importer/src/importers/index.ts b/libs/importer/src/importers/index.ts index 1ba3a0d9eb8..c9b4c4c9c19 100644 --- a/libs/importer/src/importers/index.ts +++ b/libs/importer/src/importers/index.ts @@ -22,7 +22,7 @@ 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 { LastPassCsvImporter } from "./lastpass"; export { LogMeOnceCsvImporter } from "./logmeonce-csv-importer"; export { MeldiumCsvImporter } from "./meldium-csv-importer"; export { MSecureCsvImporter } from "./msecure-csv-importer"; diff --git a/libs/importer/spec/keepass2-xml-importer.spec.ts b/libs/importer/src/importers/keepass2-xml-importer.spec.ts similarity index 92% rename from libs/importer/spec/keepass2-xml-importer.spec.ts rename to libs/importer/src/importers/keepass2-xml-importer.spec.ts index 4f02bf9260b..8fbb021883c 100644 --- a/libs/importer/spec/keepass2-xml-importer.spec.ts +++ b/libs/importer/src/importers/keepass2-xml-importer.spec.ts @@ -1,12 +1,11 @@ import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { KeePass2XmlImporter } from "../src/importers"; - +import { KeePass2XmlImporter } from "./keepass2-xml-importer"; import { TestData, TestData1, TestData2, -} from "./test-data/keepass2-xml/keepass2-xml-importer-testdata"; +} from "./spec-data/keepass2-xml/keepass2-xml-importer-testdata"; describe("KeePass2 Xml Importer", () => { it("should parse XML data", async () => { diff --git a/libs/importer/spec/keepassx-csv-importer.spec.ts b/libs/importer/src/importers/keepassx-csv-importer.spec.ts similarity index 92% rename from libs/importer/spec/keepassx-csv-importer.spec.ts rename to libs/importer/src/importers/keepassx-csv-importer.spec.ts index 0b3d729d9de..e0b8a6cff5d 100644 --- a/libs/importer/spec/keepassx-csv-importer.spec.ts +++ b/libs/importer/src/importers/keepassx-csv-importer.spec.ts @@ -1,6 +1,5 @@ -import { KeePassXCsvImporter } from "../src/importers"; - -import { keepassxTestData } from "./test-data/keepassx-csv/testdata.csv"; +import { KeePassXCsvImporter } from "./keepassx-csv-importer"; +import { keepassxTestData } from "./spec-data/keepassx-csv/testdata.csv"; describe("KeePassX CSV Importer", () => { let importer: KeePassXCsvImporter; diff --git a/libs/importer/spec/keeper-csv-importer.spec.ts b/libs/importer/src/importers/keeper/keeper-csv-importer.spec.ts similarity index 97% rename from libs/importer/spec/keeper-csv-importer.spec.ts rename to libs/importer/src/importers/keeper/keeper-csv-importer.spec.ts index f466a766ccb..69655eb9177 100644 --- a/libs/importer/spec/keeper-csv-importer.spec.ts +++ b/libs/importer/src/importers/keeper/keeper-csv-importer.spec.ts @@ -1,8 +1,8 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { KeeperCsvImporter } from "../src/importers"; +import { testData as TestData } from "../spec-data/keeper-csv/testdata.csv"; -import { testData as TestData } from "./test-data/keeper-csv/testdata.csv"; +import { KeeperCsvImporter } from "./keeper-csv-importer"; describe("Keeper CSV Importer", () => { let importer: KeeperCsvImporter; diff --git a/libs/importer/spec/keeper-json-importer.spec.ts b/libs/importer/src/importers/keeper/keeper-json-importer.spec.ts similarity index 96% rename from libs/importer/spec/keeper-json-importer.spec.ts rename to libs/importer/src/importers/keeper/keeper-json-importer.spec.ts index 37dfadc304b..31169021e0c 100644 --- a/libs/importer/spec/keeper-json-importer.spec.ts +++ b/libs/importer/src/importers/keeper/keeper-json-importer.spec.ts @@ -1,8 +1,8 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { KeeperJsonImporter } from "../src/importers"; +import { testData as TestData } from "../spec-data/keeper-json/testdata.json"; -import { testData as TestData } from "./test-data/keeper-json/testdata.json"; +import { KeeperJsonImporter } from "./keeper-json-importer"; describe("Keeper Json Importer", () => { const testDataJson = JSON.stringify(TestData); diff --git a/libs/importer/src/importers/lastpass/index.ts b/libs/importer/src/importers/lastpass/index.ts new file mode 100644 index 00000000000..0949fdea1b6 --- /dev/null +++ b/libs/importer/src/importers/lastpass/index.ts @@ -0,0 +1 @@ +export { LastPassCsvImporter } from "./lastpass-csv-importer"; diff --git a/libs/importer/spec/lastpass-csv-importer.spec.ts b/libs/importer/src/importers/lastpass/lastpass-csv-importer.spec.ts similarity index 97% rename from libs/importer/spec/lastpass-csv-importer.spec.ts rename to libs/importer/src/importers/lastpass/lastpass-csv-importer.spec.ts index de43c4aa473..cabd246fa7e 100644 --- a/libs/importer/spec/lastpass-csv-importer.spec.ts +++ b/libs/importer/src/importers/lastpass/lastpass-csv-importer.spec.ts @@ -2,8 +2,9 @@ import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; 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"; +import { ImportResult } from "../../models/import-result"; + +import { LastPassCsvImporter } from "./lastpass-csv-importer"; function baseExcept(result: ImportResult) { expect(result).not.toBeNull(); diff --git a/libs/importer/src/importers/lastpass-csv-importer.ts b/libs/importer/src/importers/lastpass/lastpass-csv-importer.ts similarity index 98% rename from libs/importer/src/importers/lastpass-csv-importer.ts rename to libs/importer/src/importers/lastpass/lastpass-csv-importer.ts index 50a5b46239d..8f239ec6830 100644 --- a/libs/importer/src/importers/lastpass-csv-importer.ts +++ b/libs/importer/src/importers/lastpass/lastpass-csv-importer.ts @@ -8,10 +8,9 @@ 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"; +import { ImportResult } from "../../models/import-result"; +import { BaseImporter } from "../base-importer"; +import { Importer } from "../importer"; export class LastPassCsvImporter extends BaseImporter implements Importer { parse(data: string): Promise { diff --git a/libs/importer/spec/msecure-csv-importer.spec.ts b/libs/importer/src/importers/msecure-csv-importer.spec.ts similarity index 98% rename from libs/importer/spec/msecure-csv-importer.spec.ts rename to libs/importer/src/importers/msecure-csv-importer.spec.ts index 903be3bcb18..83e35802fac 100644 --- a/libs/importer/spec/msecure-csv-importer.spec.ts +++ b/libs/importer/src/importers/msecure-csv-importer.spec.ts @@ -1,6 +1,6 @@ import { CipherType } from "@bitwarden/common/vault/enums"; -import { MSecureCsvImporter } from "../src/importers/msecure-csv-importer"; +import { MSecureCsvImporter } from "./msecure-csv-importer"; describe("MSecureCsvImporter.parse", () => { let importer: MSecureCsvImporter; diff --git a/libs/importer/spec/myki-csv-importer.spec.ts b/libs/importer/src/importers/myki-csv-importer.spec.ts similarity index 98% rename from libs/importer/spec/myki-csv-importer.spec.ts rename to libs/importer/src/importers/myki-csv-importer.spec.ts index e1e36478a6a..6f804523ef0 100644 --- a/libs/importer/spec/myki-csv-importer.spec.ts +++ b/libs/importer/src/importers/myki-csv-importer.spec.ts @@ -1,14 +1,13 @@ import { CipherType } from "@bitwarden/common/vault/enums"; 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"; -import { userIdentityData } from "./test-data/myki-csv/user-identity.csv"; -import { userNoteData } from "./test-data/myki-csv/user-note.csv"; -import { userTwoFaData } from "./test-data/myki-csv/user-twofa.csv"; +import { MykiCsvImporter } from "./myki-csv-importer"; +import { userAccountData } from "./spec-data/myki-csv/user-account.csv"; +import { userCreditCardData } from "./spec-data/myki-csv/user-credit-card.csv"; +import { userIdCardData } from "./spec-data/myki-csv/user-id-card.csv"; +import { userIdentityData } from "./spec-data/myki-csv/user-identity.csv"; +import { userNoteData } from "./spec-data/myki-csv/user-note.csv"; +import { userTwoFaData } from "./spec-data/myki-csv/user-twofa.csv"; function expectDriversLicense(cipher: CipherView) { expect(cipher.type).toBe(CipherType.Identity); diff --git a/libs/importer/spec/netwrix-passwordsecure-csv-importer.spec.ts b/libs/importer/src/importers/netwrix/netwrix-passwordsecure-csv-importer.spec.ts similarity index 95% rename from libs/importer/spec/netwrix-passwordsecure-csv-importer.spec.ts rename to libs/importer/src/importers/netwrix/netwrix-passwordsecure-csv-importer.spec.ts index ab893dbc56c..ff327daf04d 100644 --- a/libs/importer/spec/netwrix-passwordsecure-csv-importer.spec.ts +++ b/libs/importer/src/importers/netwrix/netwrix-passwordsecure-csv-importer.spec.ts @@ -1,8 +1,8 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { NetwrixPasswordSecureCsvImporter } from "../src/importers"; +import { credentialsData } from "../spec-data/netwrix-csv/login-export.csv"; -import { credentialsData } from "./test-data/netwrix-csv/login-export.csv"; +import { NetwrixPasswordSecureCsvImporter } from "./netwrix-passwordsecure-csv-importer"; describe("Netwrix Password Secure CSV Importer", () => { let importer: NetwrixPasswordSecureCsvImporter; diff --git a/libs/importer/spec/nordpass-csv-importer.spec.ts b/libs/importer/src/importers/nordpass-csv-importer.spec.ts similarity index 95% rename from libs/importer/spec/nordpass-csv-importer.spec.ts rename to libs/importer/src/importers/nordpass-csv-importer.spec.ts index a7bbf0fc79c..cadc7bca28c 100644 --- a/libs/importer/spec/nordpass-csv-importer.spec.ts +++ b/libs/importer/src/importers/nordpass-csv-importer.spec.ts @@ -3,13 +3,12 @@ import { SecureNoteType, CipherType, FieldType } from "@bitwarden/common/vault/e 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 loginDataWithAdditionalUrls } from "./test-data/nordpass-csv/nordpass.login-with-additinal-urls.csv"; -import { data as loginData } from "./test-data/nordpass-csv/nordpass.login.csv"; -import { data as secureNoteData } from "./test-data/nordpass-csv/nordpass.secure-note.csv"; +import { NordPassCsvImporter } from "./nordpass-csv-importer"; +import { data as creditCardData } from "./spec-data/nordpass-csv/nordpass.card.csv"; +import { data as identityData } from "./spec-data/nordpass-csv/nordpass.identity.csv"; +import { data as loginDataWithAdditionalUrls } from "./spec-data/nordpass-csv/nordpass.login-with-additinal-urls.csv"; +import { data as loginData } from "./spec-data/nordpass-csv/nordpass.login.csv"; +import { data as secureNoteData } from "./spec-data/nordpass-csv/nordpass.secure-note.csv"; const namesTestData = [ { diff --git a/libs/importer/spec/onepassword-1pif-importer.spec.ts b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.spec.ts similarity index 99% rename from libs/importer/spec/onepassword-1pif-importer.spec.ts rename to libs/importer/src/importers/onepassword/onepassword-1pif-importer.spec.ts index fbf79ec8e0b..deaf2c904b2 100644 --- a/libs/importer/spec/onepassword-1pif-importer.spec.ts +++ b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.spec.ts @@ -1,6 +1,6 @@ import { FieldType } from "@bitwarden/common/vault/enums"; -import { OnePassword1PifImporter } from "../src/importers"; +import { OnePassword1PifImporter } from "./onepassword-1pif-importer"; const TestData: string = "***aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee***\n" + diff --git a/libs/importer/spec/onepassword-1pux-importer.spec.ts b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.spec.ts similarity index 93% rename from libs/importer/spec/onepassword-1pux-importer.spec.ts rename to libs/importer/src/importers/onepassword/onepassword-1pux-importer.spec.ts index 93de4be606b..d4976f7a198 100644 --- a/libs/importer/spec/onepassword-1pux-importer.spec.ts +++ b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.spec.ts @@ -2,32 +2,32 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; -import { OnePassword1PuxImporter } from "../src/importers"; +import { APICredentialsData } from "../spec-data/onepassword-1pux/api-credentials"; +import { BankAccountData } from "../spec-data/onepassword-1pux/bank-account"; +import { CreditCardData } from "../spec-data/onepassword-1pux/credit-card"; +import { DatabaseData } from "../spec-data/onepassword-1pux/database"; +import { DriversLicenseData } from "../spec-data/onepassword-1pux/drivers-license"; +import { EmailAccountData } from "../spec-data/onepassword-1pux/email-account"; +import { EmailFieldData } from "../spec-data/onepassword-1pux/email-field"; +import { EmailFieldOnIdentityData } from "../spec-data/onepassword-1pux/email-field-on-identity"; +import { EmailFieldOnIdentityPrefilledData } from "../spec-data/onepassword-1pux/email-field-on-identity_prefilled"; +import { IdentityData } from "../spec-data/onepassword-1pux/identity-data"; +import { LoginData } from "../spec-data/onepassword-1pux/login-data"; +import { MedicalRecordData } from "../spec-data/onepassword-1pux/medical-record"; +import { MembershipData } from "../spec-data/onepassword-1pux/membership"; +import { OnePuxExampleFile } from "../spec-data/onepassword-1pux/onepux_example"; +import { OutdoorLicenseData } from "../spec-data/onepassword-1pux/outdoor-license"; +import { PassportData } from "../spec-data/onepassword-1pux/passport"; +import { PasswordData } from "../spec-data/onepassword-1pux/password"; +import { RewardsProgramData } from "../spec-data/onepassword-1pux/rewards-program"; +import { SanitizedExport } from "../spec-data/onepassword-1pux/sanitized-export"; +import { SecureNoteData } from "../spec-data/onepassword-1pux/secure-note"; +import { ServerData } from "../spec-data/onepassword-1pux/server"; +import { SoftwareLicenseData } from "../spec-data/onepassword-1pux/software-license"; +import { SSNData } from "../spec-data/onepassword-1pux/ssn"; +import { WirelessRouterData } from "../spec-data/onepassword-1pux/wireless-router"; -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"; -import { DatabaseData } from "./test-data/onepassword-1pux/database"; -import { DriversLicenseData } from "./test-data/onepassword-1pux/drivers-license"; -import { EmailAccountData } from "./test-data/onepassword-1pux/email-account"; -import { EmailFieldData } from "./test-data/onepassword-1pux/email-field"; -import { EmailFieldOnIdentityData } from "./test-data/onepassword-1pux/email-field-on-identity"; -import { EmailFieldOnIdentityPrefilledData } from "./test-data/onepassword-1pux/email-field-on-identity_prefilled"; -import { IdentityData } from "./test-data/onepassword-1pux/identity-data"; -import { LoginData } from "./test-data/onepassword-1pux/login-data"; -import { MedicalRecordData } from "./test-data/onepassword-1pux/medical-record"; -import { MembershipData } from "./test-data/onepassword-1pux/membership"; -import { OnePuxExampleFile } from "./test-data/onepassword-1pux/onepux_example"; -import { OutdoorLicenseData } from "./test-data/onepassword-1pux/outdoor-license"; -import { PassportData } from "./test-data/onepassword-1pux/passport"; -import { PasswordData } from "./test-data/onepassword-1pux/password"; -import { RewardsProgramData } from "./test-data/onepassword-1pux/rewards-program"; -import { SanitizedExport } from "./test-data/onepassword-1pux/sanitized-export"; -import { SecureNoteData } from "./test-data/onepassword-1pux/secure-note"; -import { ServerData } from "./test-data/onepassword-1pux/server"; -import { SoftwareLicenseData } from "./test-data/onepassword-1pux/software-license"; -import { SSNData } from "./test-data/onepassword-1pux/ssn"; -import { WirelessRouterData } from "./test-data/onepassword-1pux/wireless-router"; +import { OnePassword1PuxImporter } from "./onepassword-1pux-importer"; function validateCustomField(fields: FieldView[], fieldName: string, expectedValue: any) { expect(fields).toBeDefined(); diff --git a/libs/importer/spec/onepassword-mac-csv-importer.spec.ts b/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.spec.ts similarity index 85% rename from libs/importer/spec/onepassword-mac-csv-importer.spec.ts rename to libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.spec.ts index f96d254f4b9..8a4eeae158a 100644 --- a/libs/importer/spec/onepassword-mac-csv-importer.spec.ts +++ b/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.spec.ts @@ -1,11 +1,11 @@ import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { OnePasswordMacCsvImporter } from "../src/importers"; +import { data as creditCardData } from "../spec-data/onepassword-csv/credit-card.mac.csv"; +import { data as identityData } from "../spec-data/onepassword-csv/identity.mac.csv"; +import { data as multiTypeData } from "../spec-data/onepassword-csv/multiple-items.mac.csv"; -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"; +import { OnePasswordMacCsvImporter } from "./onepassword-mac-csv-importer"; function expectIdentity(cipher: CipherView) { expect(cipher.type).toBe(CipherType.Identity); diff --git a/libs/importer/spec/onepassword-win-csv-importer.spec.ts b/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.spec.ts similarity index 86% rename from libs/importer/spec/onepassword-win-csv-importer.spec.ts rename to libs/importer/src/importers/onepassword/onepassword-win-csv-importer.spec.ts index 0e7fac351e7..0e63fe69831 100644 --- a/libs/importer/spec/onepassword-win-csv-importer.spec.ts +++ b/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.spec.ts @@ -2,11 +2,11 @@ import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; 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 "../spec-data/onepassword-csv/credit-card.windows.csv"; +import { data as identityData } from "../spec-data/onepassword-csv/identity.windows.csv"; +import { data as multiTypeData } from "../spec-data/onepassword-csv/multiple-items.windows.csv"; -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"; +import { OnePasswordWinCsvImporter } from "./onepassword-win-csv-importer"; function expectIdentity(cipher: CipherView) { expect(cipher.type).toBe(CipherType.Identity); diff --git a/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts b/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts index 353fcf1337e..63a0427b2c7 100644 --- a/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts +++ b/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts @@ -120,7 +120,7 @@ export interface Value { export interface Email { email_address: string; - provider: string; + provider: string | null; } export interface Address { diff --git a/libs/importer/spec/passky-json-importer.spec.ts b/libs/importer/src/importers/passky/passky-json-importer.spec.ts similarity index 81% rename from libs/importer/spec/passky-json-importer.spec.ts rename to libs/importer/src/importers/passky/passky-json-importer.spec.ts index ddec76876d8..33be2dfac87 100644 --- a/libs/importer/spec/passky-json-importer.spec.ts +++ b/libs/importer/src/importers/passky/passky-json-importer.spec.ts @@ -1,7 +1,7 @@ -import { PasskyJsonImporter } from "../src/importers"; +import { testData as EncryptedData } from "../spec-data/passky-json/passky-encrypted.json"; +import { testData as UnencryptedData } from "../spec-data/passky-json/passky-unencrypted.json"; -import { testData as EncryptedData } from "./test-data/passky-json/passky-encrypted.json"; -import { testData as UnencryptedData } from "./test-data/passky-json/passky-unencrypted.json"; +import { PasskyJsonImporter } from "./passky-json-importer"; describe("Passky Json Importer", () => { let importer: PasskyJsonImporter; diff --git a/libs/importer/spec/passwordxp-csv-importer.spec.ts b/libs/importer/src/importers/passsordxp/passwordxp-csv-importer.spec.ts similarity index 92% rename from libs/importer/spec/passwordxp-csv-importer.spec.ts rename to libs/importer/src/importers/passsordxp/passwordxp-csv-importer.spec.ts index fda323450c6..1bcc79723ab 100644 --- a/libs/importer/spec/passwordxp-csv-importer.spec.ts +++ b/libs/importer/src/importers/passsordxp/passwordxp-csv-importer.spec.ts @@ -1,13 +1,13 @@ import { CipherType } from "@bitwarden/common/vault/enums"; -import { PasswordXPCsvImporter } from "../src/importers"; -import { ImportResult } from "../src/models/import-result"; +import { ImportResult } from "../../models/import-result"; +import { dutchHeaders } from "../spec-data/passwordxp-csv/dutch-headers"; +import { germanHeaders } from "../spec-data/passwordxp-csv/german-headers"; +import { noFolder } from "../spec-data/passwordxp-csv/no-folder.csv"; +import { withFolders } from "../spec-data/passwordxp-csv/passwordxp-with-folders.csv"; +import { withoutFolders } from "../spec-data/passwordxp-csv/passwordxp-without-folders.csv"; -import { dutchHeaders } from "./test-data/passwordxp-csv/dutch-headers"; -import { germanHeaders } from "./test-data/passwordxp-csv/german-headers"; -import { noFolder } from "./test-data/passwordxp-csv/no-folder.csv"; -import { withFolders } from "./test-data/passwordxp-csv/passwordxp-with-folders.csv"; -import { withoutFolders } from "./test-data/passwordxp-csv/passwordxp-without-folders.csv"; +import { PasswordXPCsvImporter } from "./passwordxp-csv-importer"; async function importLoginWithCustomFields(importer: PasswordXPCsvImporter, csvData: string) { const result: ImportResult = await importer.parse(csvData); diff --git a/libs/importer/spec/protonpass-json-importer.spec.ts b/libs/importer/src/importers/protonpass/protonpass-json-importer.spec.ts similarity index 98% rename from libs/importer/spec/protonpass-json-importer.spec.ts rename to libs/importer/src/importers/protonpass/protonpass-json-importer.spec.ts index 39a09127c27..b8550bcb191 100644 --- a/libs/importer/spec/protonpass-json-importer.spec.ts +++ b/libs/importer/src/importers/protonpass/protonpass-json-importer.spec.ts @@ -4,9 +4,9 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { Utils } from "@bitwarden/common/platform/misc/utils"; import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; -import { ProtonPassJsonImporter } from "../src/importers"; +import { testData } from "../spec-data/protonpass-json/protonpass.json"; -import { testData } from "./test-data/protonpass-json/protonpass.json"; +import { ProtonPassJsonImporter } from "./protonpass-json-importer"; describe("Protonpass Json Importer", () => { let importer: ProtonPassJsonImporter; diff --git a/libs/importer/spec/psono-json-importer.spec.ts b/libs/importer/src/importers/psono/psono-json-importer.spec.ts similarity index 96% rename from libs/importer/spec/psono-json-importer.spec.ts rename to libs/importer/src/importers/psono/psono-json-importer.spec.ts index 82795e5ea5d..3b4fcf67a30 100644 --- a/libs/importer/spec/psono-json-importer.spec.ts +++ b/libs/importer/src/importers/psono/psono-json-importer.spec.ts @@ -1,19 +1,19 @@ import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; -import { PsonoJsonImporter } from "../src/importers"; +import { ApplicationPasswordsData } from "../spec-data/psono-json/application-passwords"; +import { BookmarkData } from "../spec-data/psono-json/bookmark.json"; +import { EmptyTestFolderData } from "../spec-data/psono-json/empty-folders"; +import { EnvVariablesData } from "../spec-data/psono-json/environment-variables"; +import { FoldersTestData } from "../spec-data/psono-json/folders"; +import { GPGData } from "../spec-data/psono-json/gpg"; +import { NotesData } from "../spec-data/psono-json/notes"; +import { ReducedWebsiteLoginsData } from "../spec-data/psono-json/reduced-website-logins"; +import { SubFoldersTestData } from "../spec-data/psono-json/subfolders"; +import { TOTPData } from "../spec-data/psono-json/totp"; +import { WebsiteLoginsData } from "../spec-data/psono-json/website-logins"; -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"; -import { EnvVariablesData } from "./test-data/psono-json/environment-variables"; -import { FoldersTestData } from "./test-data/psono-json/folders"; -import { GPGData } from "./test-data/psono-json/gpg"; -import { NotesData } from "./test-data/psono-json/notes"; -import { ReducedWebsiteLoginsData } from "./test-data/psono-json/reduced-website-logins"; -import { SubFoldersTestData } from "./test-data/psono-json/subfolders"; -import { TOTPData } from "./test-data/psono-json/totp"; -import { WebsiteLoginsData } from "./test-data/psono-json/website-logins"; +import { PsonoJsonImporter } from "./psono-json-importer"; function validateCustomField( fields: FieldView[], diff --git a/libs/importer/spec/roboform-csv-importer.spec.ts b/libs/importer/src/importers/roboform-csv-importer.spec.ts similarity index 82% rename from libs/importer/spec/roboform-csv-importer.spec.ts rename to libs/importer/src/importers/roboform-csv-importer.spec.ts index 9ec63aadfbc..2779a9ddb64 100644 --- a/libs/importer/spec/roboform-csv-importer.spec.ts +++ b/libs/importer/src/importers/roboform-csv-importer.spec.ts @@ -1,8 +1,8 @@ -import { CipherType } from "../../common/src/vault/enums/cipher-type"; -import { RoboFormCsvImporter } from "../src/importers"; +import { CipherType } from "@bitwarden/common/vault/enums"; -import { data as dataNoFolder } from "./test-data/roboform-csv/empty-folders"; -import { data as dataFolder } from "./test-data/roboform-csv/with-folders"; +import { RoboFormCsvImporter } from "./roboform-csv-importer"; +import { data as dataNoFolder } from "./spec-data/roboform-csv/empty-folders"; +import { data as dataFolder } from "./spec-data/roboform-csv/with-folders"; describe("Roboform CSV Importer", () => { it("should parse CSV data", async () => { diff --git a/libs/importer/spec/safari-csv-importer.spec.ts b/libs/importer/src/importers/safari-csv-importer.spec.ts similarity index 92% rename from libs/importer/spec/safari-csv-importer.spec.ts rename to libs/importer/src/importers/safari-csv-importer.spec.ts index 4a22eb0bdc4..4ca8df23f34 100644 --- a/libs/importer/spec/safari-csv-importer.spec.ts +++ b/libs/importer/src/importers/safari-csv-importer.spec.ts @@ -2,10 +2,9 @@ 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"; +import { SafariCsvImporter } from "./safari-csv-importer"; +import { data as oldSimplePasswordData } from "./spec-data/safari-csv/old-simple-password-data.csv"; +import { data as simplePasswordData } from "./spec-data/safari-csv/simple-password-data.csv"; const CipherData = [ { diff --git a/libs/importer/spec/securesafe-csv-importer.spec.ts b/libs/importer/src/importers/securesafe-csv-importer.spec.ts similarity index 93% rename from libs/importer/spec/securesafe-csv-importer.spec.ts rename to libs/importer/src/importers/securesafe-csv-importer.spec.ts index 8d12ae12d94..799c3c6e9d5 100644 --- a/libs/importer/spec/securesafe-csv-importer.spec.ts +++ b/libs/importer/src/importers/securesafe-csv-importer.spec.ts @@ -2,9 +2,8 @@ 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 { SecureSafeCsvImporter } from "../src/importers"; - -import { data_upperUrl, data_lowerUrl } from "./test-data/securesafe-csv/securesafe-example.csv"; +import { SecureSafeCsvImporter } from "./securesafe-csv-importer"; +import { data_upperUrl, data_lowerUrl } from "./spec-data/securesafe-csv/securesafe-example.csv"; const CipherData = [ { diff --git a/libs/importer/spec/test-data/bitwarden-json/account-encrypted.json.ts b/libs/importer/src/importers/spec-data/bitwarden-json/account-encrypted.json.ts similarity index 100% rename from libs/importer/spec/test-data/bitwarden-json/account-encrypted.json.ts rename to libs/importer/src/importers/spec-data/bitwarden-json/account-encrypted.json.ts diff --git a/libs/importer/spec/test-data/bitwarden-json/cipher-with-collections.json.ts b/libs/importer/src/importers/spec-data/bitwarden-json/cipher-with-collections.json.ts similarity index 100% rename from libs/importer/spec/test-data/bitwarden-json/cipher-with-collections.json.ts rename to libs/importer/src/importers/spec-data/bitwarden-json/cipher-with-collections.json.ts diff --git a/libs/importer/spec/test-data/bitwarden-json/password-protected.json.ts b/libs/importer/src/importers/spec-data/bitwarden-json/password-protected.json.ts similarity index 100% rename from libs/importer/spec/test-data/bitwarden-json/password-protected.json.ts rename to libs/importer/src/importers/spec-data/bitwarden-json/password-protected.json.ts diff --git a/libs/importer/spec/test-data/bitwarden-json/unencrypted.json.ts b/libs/importer/src/importers/spec-data/bitwarden-json/unencrypted.json.ts similarity index 100% rename from libs/importer/spec/test-data/bitwarden-json/unencrypted.json.ts rename to libs/importer/src/importers/spec-data/bitwarden-json/unencrypted.json.ts diff --git a/libs/importer/spec/test-data/chrome-csv/android-data.csv.ts b/libs/importer/src/importers/spec-data/chrome-csv/android-data.csv.ts similarity index 100% rename from libs/importer/spec/test-data/chrome-csv/android-data.csv.ts rename to libs/importer/src/importers/spec-data/chrome-csv/android-data.csv.ts diff --git a/libs/importer/spec/test-data/chrome-csv/simple-password-data.csv.ts b/libs/importer/src/importers/spec-data/chrome-csv/simple-password-data.csv.ts similarity index 100% rename from libs/importer/spec/test-data/chrome-csv/simple-password-data.csv.ts rename to libs/importer/src/importers/spec-data/chrome-csv/simple-password-data.csv.ts diff --git a/libs/importer/spec/test-data/dashlane-csv/credentials-otpurl.csv.ts b/libs/importer/src/importers/spec-data/dashlane-csv/credentials-otpurl.csv.ts similarity index 100% rename from libs/importer/spec/test-data/dashlane-csv/credentials-otpurl.csv.ts rename to libs/importer/src/importers/spec-data/dashlane-csv/credentials-otpurl.csv.ts diff --git a/libs/importer/spec/test-data/dashlane-csv/credentials.csv.ts b/libs/importer/src/importers/spec-data/dashlane-csv/credentials.csv.ts similarity index 100% rename from libs/importer/spec/test-data/dashlane-csv/credentials.csv.ts rename to libs/importer/src/importers/spec-data/dashlane-csv/credentials.csv.ts diff --git a/libs/importer/spec/test-data/dashlane-csv/id.csv.ts b/libs/importer/src/importers/spec-data/dashlane-csv/id.csv.ts similarity index 100% rename from libs/importer/spec/test-data/dashlane-csv/id.csv.ts rename to libs/importer/src/importers/spec-data/dashlane-csv/id.csv.ts diff --git a/libs/importer/spec/test-data/dashlane-csv/multiple-personal-info.csv.ts b/libs/importer/src/importers/spec-data/dashlane-csv/multiple-personal-info.csv.ts similarity index 100% rename from libs/importer/spec/test-data/dashlane-csv/multiple-personal-info.csv.ts rename to libs/importer/src/importers/spec-data/dashlane-csv/multiple-personal-info.csv.ts diff --git a/libs/importer/spec/test-data/dashlane-csv/payments.csv.ts b/libs/importer/src/importers/spec-data/dashlane-csv/payments.csv.ts similarity index 100% rename from libs/importer/spec/test-data/dashlane-csv/payments.csv.ts rename to libs/importer/src/importers/spec-data/dashlane-csv/payments.csv.ts diff --git a/libs/importer/spec/test-data/dashlane-csv/personal-info.csv.ts b/libs/importer/src/importers/spec-data/dashlane-csv/personal-info.csv.ts similarity index 100% rename from libs/importer/spec/test-data/dashlane-csv/personal-info.csv.ts rename to libs/importer/src/importers/spec-data/dashlane-csv/personal-info.csv.ts diff --git a/libs/importer/spec/test-data/dashlane-csv/securenotes.csv.ts b/libs/importer/src/importers/spec-data/dashlane-csv/securenotes.csv.ts similarity index 100% rename from libs/importer/spec/test-data/dashlane-csv/securenotes.csv.ts rename to libs/importer/src/importers/spec-data/dashlane-csv/securenotes.csv.ts diff --git a/libs/importer/spec/test-data/enpass-json/credit-card.ts b/libs/importer/src/importers/spec-data/enpass-json/credit-card.ts similarity index 98% rename from libs/importer/spec/test-data/enpass-json/credit-card.ts rename to libs/importer/src/importers/spec-data/enpass-json/credit-card.ts index 621190a735f..207e934903f 100644 --- a/libs/importer/spec/test-data/enpass-json/credit-card.ts +++ b/libs/importer/src/importers/spec-data/enpass-json/credit-card.ts @@ -1,4 +1,4 @@ -import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type"; +import { EnpassJsonFile } from "../../enpass/types/enpass-json-type"; export const creditCard: EnpassJsonFile = { folders: [], diff --git a/libs/importer/spec/test-data/enpass-json/folders.ts b/libs/importer/src/importers/spec-data/enpass-json/folders.ts similarity index 91% rename from libs/importer/spec/test-data/enpass-json/folders.ts rename to libs/importer/src/importers/spec-data/enpass-json/folders.ts index 22ab26524b0..9af44f057bf 100644 --- a/libs/importer/spec/test-data/enpass-json/folders.ts +++ b/libs/importer/src/importers/spec-data/enpass-json/folders.ts @@ -1,4 +1,4 @@ -import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type"; +import { EnpassJsonFile } from "../../enpass/types/enpass-json-type"; export const folders: EnpassJsonFile = { folders: [ diff --git a/libs/importer/spec/test-data/enpass-json/login-android-url.ts b/libs/importer/src/importers/spec-data/enpass-json/login-android-url.ts similarity index 95% rename from libs/importer/spec/test-data/enpass-json/login-android-url.ts rename to libs/importer/src/importers/spec-data/enpass-json/login-android-url.ts index 6b0ac41ccde..91dca5fe99a 100644 --- a/libs/importer/spec/test-data/enpass-json/login-android-url.ts +++ b/libs/importer/src/importers/spec-data/enpass-json/login-android-url.ts @@ -1,4 +1,5 @@ -import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type"; +// @ts-strict-ignore +import { EnpassJsonFile } from "../../enpass/types/enpass-json-type"; import { login } from "./login"; diff --git a/libs/importer/spec/test-data/enpass-json/login.ts b/libs/importer/src/importers/spec-data/enpass-json/login.ts similarity index 97% rename from libs/importer/spec/test-data/enpass-json/login.ts rename to libs/importer/src/importers/spec-data/enpass-json/login.ts index 07707f2ca3e..6626b8c9e4b 100644 --- a/libs/importer/spec/test-data/enpass-json/login.ts +++ b/libs/importer/src/importers/spec-data/enpass-json/login.ts @@ -1,4 +1,4 @@ -import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type"; +import { EnpassJsonFile } from "../../enpass/types/enpass-json-type"; export const login: EnpassJsonFile = { folders: [], diff --git a/libs/importer/spec/test-data/enpass-json/note.ts b/libs/importer/src/importers/spec-data/enpass-json/note.ts similarity index 86% rename from libs/importer/spec/test-data/enpass-json/note.ts rename to libs/importer/src/importers/spec-data/enpass-json/note.ts index 58f54371ad0..37c1658b517 100644 --- a/libs/importer/spec/test-data/enpass-json/note.ts +++ b/libs/importer/src/importers/spec-data/enpass-json/note.ts @@ -1,4 +1,4 @@ -import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type"; +import { EnpassJsonFile } from "../../enpass/types/enpass-json-type"; export const note: EnpassJsonFile = { folders: [], diff --git a/libs/importer/spec/test-data/firefox-csv/firefox-accounts-data.csv.ts b/libs/importer/src/importers/spec-data/firefox-csv/firefox-accounts-data.csv.ts similarity index 100% rename from libs/importer/spec/test-data/firefox-csv/firefox-accounts-data.csv.ts rename to libs/importer/src/importers/spec-data/firefox-csv/firefox-accounts-data.csv.ts diff --git a/libs/importer/spec/test-data/firefox-csv/simple-password-data.csv.ts b/libs/importer/src/importers/spec-data/firefox-csv/simple-password-data.csv.ts similarity index 100% rename from libs/importer/spec/test-data/firefox-csv/simple-password-data.csv.ts rename to libs/importer/src/importers/spec-data/firefox-csv/simple-password-data.csv.ts diff --git a/libs/importer/spec/test-data/keepass2-xml/keepass2-xml-importer-testdata.ts b/libs/importer/src/importers/spec-data/keepass2-xml/keepass2-xml-importer-testdata.ts similarity index 100% rename from libs/importer/spec/test-data/keepass2-xml/keepass2-xml-importer-testdata.ts rename to libs/importer/src/importers/spec-data/keepass2-xml/keepass2-xml-importer-testdata.ts diff --git a/libs/importer/spec/test-data/keepassx-csv/testdata.csv.ts b/libs/importer/src/importers/spec-data/keepassx-csv/testdata.csv.ts similarity index 100% rename from libs/importer/spec/test-data/keepassx-csv/testdata.csv.ts rename to libs/importer/src/importers/spec-data/keepassx-csv/testdata.csv.ts diff --git a/libs/importer/spec/test-data/keeper-csv/testdata.csv.ts b/libs/importer/src/importers/spec-data/keeper-csv/testdata.csv.ts similarity index 100% rename from libs/importer/spec/test-data/keeper-csv/testdata.csv.ts rename to libs/importer/src/importers/spec-data/keeper-csv/testdata.csv.ts diff --git a/libs/importer/spec/test-data/keeper-json/testdata.json.ts b/libs/importer/src/importers/spec-data/keeper-json/testdata.json.ts similarity index 95% rename from libs/importer/spec/test-data/keeper-json/testdata.json.ts rename to libs/importer/src/importers/spec-data/keeper-json/testdata.json.ts index 952ced5027f..e18789adcb5 100644 --- a/libs/importer/spec/test-data/keeper-json/testdata.json.ts +++ b/libs/importer/src/importers/spec-data/keeper-json/testdata.json.ts @@ -1,4 +1,4 @@ -import { KeeperJsonExport } from "../../../src/importers/keeper/types/keeper-json-types"; +import { KeeperJsonExport } from "../../keeper/types/keeper-json-types"; export const testData: KeeperJsonExport = { shared_folders: [ diff --git a/libs/importer/spec/test-data/myki-csv/user-account.csv.ts b/libs/importer/src/importers/spec-data/myki-csv/user-account.csv.ts similarity index 100% rename from libs/importer/spec/test-data/myki-csv/user-account.csv.ts rename to libs/importer/src/importers/spec-data/myki-csv/user-account.csv.ts diff --git a/libs/importer/spec/test-data/myki-csv/user-credit-card.csv.ts b/libs/importer/src/importers/spec-data/myki-csv/user-credit-card.csv.ts similarity index 100% rename from libs/importer/spec/test-data/myki-csv/user-credit-card.csv.ts rename to libs/importer/src/importers/spec-data/myki-csv/user-credit-card.csv.ts diff --git a/libs/importer/spec/test-data/myki-csv/user-id-card.csv.ts b/libs/importer/src/importers/spec-data/myki-csv/user-id-card.csv.ts similarity index 100% rename from libs/importer/spec/test-data/myki-csv/user-id-card.csv.ts rename to libs/importer/src/importers/spec-data/myki-csv/user-id-card.csv.ts diff --git a/libs/importer/spec/test-data/myki-csv/user-identity.csv.ts b/libs/importer/src/importers/spec-data/myki-csv/user-identity.csv.ts similarity index 100% rename from libs/importer/spec/test-data/myki-csv/user-identity.csv.ts rename to libs/importer/src/importers/spec-data/myki-csv/user-identity.csv.ts diff --git a/libs/importer/spec/test-data/myki-csv/user-note.csv.ts b/libs/importer/src/importers/spec-data/myki-csv/user-note.csv.ts similarity index 100% rename from libs/importer/spec/test-data/myki-csv/user-note.csv.ts rename to libs/importer/src/importers/spec-data/myki-csv/user-note.csv.ts diff --git a/libs/importer/spec/test-data/myki-csv/user-twofa.csv.ts b/libs/importer/src/importers/spec-data/myki-csv/user-twofa.csv.ts similarity index 100% rename from libs/importer/spec/test-data/myki-csv/user-twofa.csv.ts rename to libs/importer/src/importers/spec-data/myki-csv/user-twofa.csv.ts diff --git a/libs/importer/spec/test-data/netwrix-csv/login-export.csv.ts b/libs/importer/src/importers/spec-data/netwrix-csv/login-export.csv.ts similarity index 100% rename from libs/importer/spec/test-data/netwrix-csv/login-export.csv.ts rename to libs/importer/src/importers/spec-data/netwrix-csv/login-export.csv.ts diff --git a/libs/importer/spec/test-data/nordpass-csv/nordpass.card.csv.ts b/libs/importer/src/importers/spec-data/nordpass-csv/nordpass.card.csv.ts similarity index 100% rename from libs/importer/spec/test-data/nordpass-csv/nordpass.card.csv.ts rename to libs/importer/src/importers/spec-data/nordpass-csv/nordpass.card.csv.ts diff --git a/libs/importer/spec/test-data/nordpass-csv/nordpass.identity.csv.ts b/libs/importer/src/importers/spec-data/nordpass-csv/nordpass.identity.csv.ts similarity index 100% rename from libs/importer/spec/test-data/nordpass-csv/nordpass.identity.csv.ts rename to libs/importer/src/importers/spec-data/nordpass-csv/nordpass.identity.csv.ts diff --git a/libs/importer/spec/test-data/nordpass-csv/nordpass.login-with-additinal-urls.csv.ts b/libs/importer/src/importers/spec-data/nordpass-csv/nordpass.login-with-additinal-urls.csv.ts similarity index 100% rename from libs/importer/spec/test-data/nordpass-csv/nordpass.login-with-additinal-urls.csv.ts rename to libs/importer/src/importers/spec-data/nordpass-csv/nordpass.login-with-additinal-urls.csv.ts diff --git a/libs/importer/spec/test-data/nordpass-csv/nordpass.login.csv.ts b/libs/importer/src/importers/spec-data/nordpass-csv/nordpass.login.csv.ts similarity index 100% rename from libs/importer/spec/test-data/nordpass-csv/nordpass.login.csv.ts rename to libs/importer/src/importers/spec-data/nordpass-csv/nordpass.login.csv.ts diff --git a/libs/importer/spec/test-data/nordpass-csv/nordpass.secure-note.csv.ts b/libs/importer/src/importers/spec-data/nordpass-csv/nordpass.secure-note.csv.ts similarity index 100% rename from libs/importer/spec/test-data/nordpass-csv/nordpass.secure-note.csv.ts rename to libs/importer/src/importers/spec-data/nordpass-csv/nordpass.secure-note.csv.ts diff --git a/libs/importer/spec/test-data/onepassword-1pux/api-credentials.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/api-credentials.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/api-credentials.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/api-credentials.ts index 7a830194b8c..f8047ad8d84 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/api-credentials.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/api-credentials.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const APICredentialsData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/bank-account.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/bank-account.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/bank-account.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/bank-account.ts index 6ffccafe514..f98e205624b 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/bank-account.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/bank-account.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const BankAccountData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/credit-card.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/credit-card.ts similarity index 99% rename from libs/importer/spec/test-data/onepassword-1pux/credit-card.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/credit-card.ts index 74af97a4c2b..5ed4cd8ef1b 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/credit-card.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/credit-card.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const CreditCardData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/database.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/database.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/database.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/database.ts index 58631a2f98b..316107e54fc 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/database.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/database.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const DatabaseData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/drivers-license.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/drivers-license.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/drivers-license.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/drivers-license.ts index 54a52f36999..2c50cd2c42e 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/drivers-license.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/drivers-license.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const DriversLicenseData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/email-account.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/email-account.ts similarity index 99% rename from libs/importer/spec/test-data/onepassword-1pux/email-account.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/email-account.ts index 0d94973ec29..a164f4bc504 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/email-account.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/email-account.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const EmailAccountData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/email-field-on-identity.ts similarity index 96% rename from libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/email-field-on-identity.ts index 009743dfd08..8e72088e170 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/email-field-on-identity.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const EmailFieldOnIdentityData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/email-field-on-identity_prefilled.ts similarity index 96% rename from libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/email-field-on-identity_prefilled.ts index 591d27bd227..79a306faf2c 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/email-field-on-identity_prefilled.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const EmailFieldOnIdentityPrefilledData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/email-field.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/email-field.ts similarity index 96% rename from libs/importer/spec/test-data/onepassword-1pux/email-field.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/email-field.ts index f6258bda7fa..5360c9484ee 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/email-field.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/email-field.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const EmailFieldData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/identity-data.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/identity-data.ts similarity index 99% rename from libs/importer/spec/test-data/onepassword-1pux/identity-data.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/identity-data.ts index c97a2bbaf45..eb0a5555201 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/identity-data.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/identity-data.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const IdentityData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/login-data.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/login-data.ts similarity index 97% rename from libs/importer/spec/test-data/onepassword-1pux/login-data.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/login-data.ts index dc6a026d835..6d0515cb8cb 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/login-data.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/login-data.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const LoginData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/medical-record.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/medical-record.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/medical-record.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/medical-record.ts index 67a929b13b1..5746ca99956 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/medical-record.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/medical-record.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const MedicalRecordData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/membership.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/membership.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/membership.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/membership.ts index 5e36e8e6c9f..1801f0a4f92 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/membership.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/membership.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const MembershipData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/onepux_example.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/onepux_example.ts similarity index 96% rename from libs/importer/spec/test-data/onepassword-1pux/onepux_example.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/onepux_example.ts index 38f81783671..dc7c59c589b 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/onepux_example.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/onepux_example.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const OnePuxExampleFile: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/outdoor-license.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/outdoor-license.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/outdoor-license.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/outdoor-license.ts index aa8df12948e..b31bc0300a1 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/outdoor-license.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/outdoor-license.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const OutdoorLicenseData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/passport.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/passport.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/passport.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/passport.ts index 00336aa70cd..1a22601a3c2 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/passport.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/passport.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const PassportData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/password.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/password.ts similarity index 93% rename from libs/importer/spec/test-data/onepassword-1pux/password.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/password.ts index e416ab9c715..d9169ab3cab 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/password.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/password.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const PasswordData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/rewards-program.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/rewards-program.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/rewards-program.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/rewards-program.ts index 75333086435..223bae6f39d 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/rewards-program.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/rewards-program.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const RewardsProgramData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/sanitized-export.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/sanitized-export.ts similarity index 99% rename from libs/importer/spec/test-data/onepassword-1pux/sanitized-export.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/sanitized-export.ts index 284921eb80e..bf1e87c9c1d 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/sanitized-export.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/sanitized-export.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const SanitizedExport: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/secure-note.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/secure-note.ts similarity index 93% rename from libs/importer/spec/test-data/onepassword-1pux/secure-note.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/secure-note.ts index d7f93c9895c..0e02b2533be 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/secure-note.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/secure-note.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const SecureNoteData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/server.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/server.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/server.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/server.ts index 59e7a841f9c..c74deceb6f9 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/server.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/server.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const ServerData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/software-license.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/software-license.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/software-license.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/software-license.ts index a6ccea53059..0fdf683a426 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/software-license.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/software-license.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const SoftwareLicenseData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/ssn.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/ssn.ts similarity index 96% rename from libs/importer/spec/test-data/onepassword-1pux/ssn.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/ssn.ts index 4b1c5e13739..1514094e095 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/ssn.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/ssn.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const SSNData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-1pux/wireless-router.ts b/libs/importer/src/importers/spec-data/onepassword-1pux/wireless-router.ts similarity index 98% rename from libs/importer/spec/test-data/onepassword-1pux/wireless-router.ts rename to libs/importer/src/importers/spec-data/onepassword-1pux/wireless-router.ts index cef06abe612..b3193484363 100644 --- a/libs/importer/spec/test-data/onepassword-1pux/wireless-router.ts +++ b/libs/importer/src/importers/spec-data/onepassword-1pux/wireless-router.ts @@ -1,4 +1,4 @@ -import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types"; +import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types"; export const WirelessRouterData: ExportData = { accounts: [ diff --git a/libs/importer/spec/test-data/onepassword-csv/credit-card.mac.csv.ts b/libs/importer/src/importers/spec-data/onepassword-csv/credit-card.mac.csv.ts similarity index 100% rename from libs/importer/spec/test-data/onepassword-csv/credit-card.mac.csv.ts rename to libs/importer/src/importers/spec-data/onepassword-csv/credit-card.mac.csv.ts diff --git a/libs/importer/spec/test-data/onepassword-csv/credit-card.windows.csv.ts b/libs/importer/src/importers/spec-data/onepassword-csv/credit-card.windows.csv.ts similarity index 100% rename from libs/importer/spec/test-data/onepassword-csv/credit-card.windows.csv.ts rename to libs/importer/src/importers/spec-data/onepassword-csv/credit-card.windows.csv.ts diff --git a/libs/importer/spec/test-data/onepassword-csv/identity.mac.csv.ts b/libs/importer/src/importers/spec-data/onepassword-csv/identity.mac.csv.ts similarity index 100% rename from libs/importer/spec/test-data/onepassword-csv/identity.mac.csv.ts rename to libs/importer/src/importers/spec-data/onepassword-csv/identity.mac.csv.ts diff --git a/libs/importer/spec/test-data/onepassword-csv/identity.windows.csv.ts b/libs/importer/src/importers/spec-data/onepassword-csv/identity.windows.csv.ts similarity index 100% rename from libs/importer/spec/test-data/onepassword-csv/identity.windows.csv.ts rename to libs/importer/src/importers/spec-data/onepassword-csv/identity.windows.csv.ts diff --git a/libs/importer/spec/test-data/onepassword-csv/multiple-items.mac.csv.ts b/libs/importer/src/importers/spec-data/onepassword-csv/multiple-items.mac.csv.ts similarity index 100% rename from libs/importer/spec/test-data/onepassword-csv/multiple-items.mac.csv.ts rename to libs/importer/src/importers/spec-data/onepassword-csv/multiple-items.mac.csv.ts diff --git a/libs/importer/spec/test-data/onepassword-csv/multiple-items.windows.csv.ts b/libs/importer/src/importers/spec-data/onepassword-csv/multiple-items.windows.csv.ts similarity index 100% rename from libs/importer/spec/test-data/onepassword-csv/multiple-items.windows.csv.ts rename to libs/importer/src/importers/spec-data/onepassword-csv/multiple-items.windows.csv.ts diff --git a/libs/importer/spec/test-data/passky-json/passky-encrypted.json.ts b/libs/importer/src/importers/spec-data/passky-json/passky-encrypted.json.ts similarity index 85% rename from libs/importer/spec/test-data/passky-json/passky-encrypted.json.ts rename to libs/importer/src/importers/spec-data/passky-json/passky-encrypted.json.ts index 6b9743be343..a73894ce0c2 100644 --- a/libs/importer/spec/test-data/passky-json/passky-encrypted.json.ts +++ b/libs/importer/src/importers/spec-data/passky-json/passky-encrypted.json.ts @@ -1,4 +1,4 @@ -import { PasskyJsonExport } from "../../../src/importers/passky/passky-json-types"; +import { PasskyJsonExport } from "../../passky/passky-json-types"; export const testData: PasskyJsonExport = { encrypted: true, diff --git a/libs/importer/spec/test-data/passky-json/passky-unencrypted.json.ts b/libs/importer/src/importers/spec-data/passky-json/passky-unencrypted.json.ts similarity index 73% rename from libs/importer/spec/test-data/passky-json/passky-unencrypted.json.ts rename to libs/importer/src/importers/spec-data/passky-json/passky-unencrypted.json.ts index c382136648a..738595a6d25 100644 --- a/libs/importer/spec/test-data/passky-json/passky-unencrypted.json.ts +++ b/libs/importer/src/importers/spec-data/passky-json/passky-unencrypted.json.ts @@ -1,4 +1,4 @@ -import { PasskyJsonExport } from "../../../src/importers/passky/passky-json-types"; +import { PasskyJsonExport } from "../../passky/passky-json-types"; export const testData: PasskyJsonExport = { encrypted: false, diff --git a/libs/importer/spec/test-data/passwordxp-csv/dutch-headers.ts b/libs/importer/src/importers/spec-data/passwordxp-csv/dutch-headers.ts similarity index 100% rename from libs/importer/spec/test-data/passwordxp-csv/dutch-headers.ts rename to libs/importer/src/importers/spec-data/passwordxp-csv/dutch-headers.ts diff --git a/libs/importer/spec/test-data/passwordxp-csv/german-headers.ts b/libs/importer/src/importers/spec-data/passwordxp-csv/german-headers.ts similarity index 100% rename from libs/importer/spec/test-data/passwordxp-csv/german-headers.ts rename to libs/importer/src/importers/spec-data/passwordxp-csv/german-headers.ts diff --git a/libs/importer/spec/test-data/passwordxp-csv/no-folder.csv.ts b/libs/importer/src/importers/spec-data/passwordxp-csv/no-folder.csv.ts similarity index 100% rename from libs/importer/spec/test-data/passwordxp-csv/no-folder.csv.ts rename to libs/importer/src/importers/spec-data/passwordxp-csv/no-folder.csv.ts diff --git a/libs/importer/spec/test-data/passwordxp-csv/passwordxp-with-folders.csv.ts b/libs/importer/src/importers/spec-data/passwordxp-csv/passwordxp-with-folders.csv.ts similarity index 100% rename from libs/importer/spec/test-data/passwordxp-csv/passwordxp-with-folders.csv.ts rename to libs/importer/src/importers/spec-data/passwordxp-csv/passwordxp-with-folders.csv.ts diff --git a/libs/importer/spec/test-data/passwordxp-csv/passwordxp-without-folders.csv.ts b/libs/importer/src/importers/spec-data/passwordxp-csv/passwordxp-without-folders.csv.ts similarity index 100% rename from libs/importer/spec/test-data/passwordxp-csv/passwordxp-without-folders.csv.ts rename to libs/importer/src/importers/spec-data/passwordxp-csv/passwordxp-without-folders.csv.ts diff --git a/libs/importer/spec/test-data/protonpass-json/protonpass.json.ts b/libs/importer/src/importers/spec-data/protonpass-json/protonpass.json.ts similarity index 99% rename from libs/importer/spec/test-data/protonpass-json/protonpass.json.ts rename to libs/importer/src/importers/spec-data/protonpass-json/protonpass.json.ts index 367c2b37e14..d01cfa0d8f8 100644 --- a/libs/importer/spec/test-data/protonpass-json/protonpass.json.ts +++ b/libs/importer/src/importers/spec-data/protonpass-json/protonpass.json.ts @@ -1,4 +1,4 @@ -import { ProtonPassJsonFile } from "../../../src/importers/protonpass/types/protonpass-json-type"; +import { ProtonPassJsonFile } from "../../protonpass/types/protonpass-json-type"; export const testData: ProtonPassJsonFile = { version: "1.21.2", diff --git a/libs/importer/spec/test-data/psono-json/application-passwords.ts b/libs/importer/src/importers/spec-data/psono-json/application-passwords.ts similarity index 87% rename from libs/importer/spec/test-data/psono-json/application-passwords.ts rename to libs/importer/src/importers/spec-data/psono-json/application-passwords.ts index 29c4a44e0c9..c224c593d97 100644 --- a/libs/importer/spec/test-data/psono-json/application-passwords.ts +++ b/libs/importer/src/importers/spec-data/psono-json/application-passwords.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const ApplicationPasswordsData: PsonoJsonExport = { folders: [], diff --git a/libs/importer/spec/test-data/psono-json/bookmark.json.ts b/libs/importer/src/importers/spec-data/psono-json/bookmark.json.ts similarity index 86% rename from libs/importer/spec/test-data/psono-json/bookmark.json.ts rename to libs/importer/src/importers/spec-data/psono-json/bookmark.json.ts index fe0726fbe40..b50928cfe7b 100644 --- a/libs/importer/spec/test-data/psono-json/bookmark.json.ts +++ b/libs/importer/src/importers/spec-data/psono-json/bookmark.json.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const BookmarkData: PsonoJsonExport = { folders: [], diff --git a/libs/importer/spec/test-data/psono-json/empty-folders.ts b/libs/importer/src/importers/spec-data/psono-json/empty-folders.ts similarity index 62% rename from libs/importer/spec/test-data/psono-json/empty-folders.ts rename to libs/importer/src/importers/spec-data/psono-json/empty-folders.ts index 914cba585fe..28e1d697094 100644 --- a/libs/importer/spec/test-data/psono-json/empty-folders.ts +++ b/libs/importer/src/importers/spec-data/psono-json/empty-folders.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const EmptyTestFolderData: PsonoJsonExport = { folders: [ diff --git a/libs/importer/spec/test-data/psono-json/environment-variables.ts b/libs/importer/src/importers/spec-data/psono-json/environment-variables.ts similarity index 88% rename from libs/importer/spec/test-data/psono-json/environment-variables.ts rename to libs/importer/src/importers/spec-data/psono-json/environment-variables.ts index 9a26776ebc8..7ab411d2216 100644 --- a/libs/importer/spec/test-data/psono-json/environment-variables.ts +++ b/libs/importer/src/importers/spec-data/psono-json/environment-variables.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const EnvVariablesData: PsonoJsonExport = { folders: [], diff --git a/libs/importer/spec/test-data/psono-json/folders.ts b/libs/importer/src/importers/spec-data/psono-json/folders.ts similarity index 96% rename from libs/importer/spec/test-data/psono-json/folders.ts rename to libs/importer/src/importers/spec-data/psono-json/folders.ts index d6e64b7cddb..5e2c9481515 100644 --- a/libs/importer/spec/test-data/psono-json/folders.ts +++ b/libs/importer/src/importers/spec-data/psono-json/folders.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const FoldersTestData: PsonoJsonExport = { folders: [ diff --git a/libs/importer/spec/test-data/psono-json/gpg.ts b/libs/importer/src/importers/spec-data/psono-json/gpg.ts similarity index 99% rename from libs/importer/spec/test-data/psono-json/gpg.ts rename to libs/importer/src/importers/spec-data/psono-json/gpg.ts index 4015b53aa4e..57494f4d761 100644 --- a/libs/importer/spec/test-data/psono-json/gpg.ts +++ b/libs/importer/src/importers/spec-data/psono-json/gpg.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const GPGData: PsonoJsonExport = { folders: [], diff --git a/libs/importer/spec/test-data/psono-json/notes.ts b/libs/importer/src/importers/spec-data/psono-json/notes.ts similarity index 82% rename from libs/importer/spec/test-data/psono-json/notes.ts rename to libs/importer/src/importers/spec-data/psono-json/notes.ts index 0317371456d..0e9859ee1ed 100644 --- a/libs/importer/spec/test-data/psono-json/notes.ts +++ b/libs/importer/src/importers/spec-data/psono-json/notes.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const NotesData: PsonoJsonExport = { folders: [], diff --git a/libs/importer/spec/test-data/psono-json/reduced-website-logins.ts b/libs/importer/src/importers/spec-data/psono-json/reduced-website-logins.ts similarity index 87% rename from libs/importer/spec/test-data/psono-json/reduced-website-logins.ts rename to libs/importer/src/importers/spec-data/psono-json/reduced-website-logins.ts index 4477c9d5240..9c286f59b52 100644 --- a/libs/importer/spec/test-data/psono-json/reduced-website-logins.ts +++ b/libs/importer/src/importers/spec-data/psono-json/reduced-website-logins.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const ReducedWebsiteLoginsData: PsonoJsonExport = { folders: [], diff --git a/libs/importer/spec/test-data/psono-json/subfolders.ts b/libs/importer/src/importers/spec-data/psono-json/subfolders.ts similarity index 97% rename from libs/importer/spec/test-data/psono-json/subfolders.ts rename to libs/importer/src/importers/spec-data/psono-json/subfolders.ts index eff55581da7..2aff686aa17 100644 --- a/libs/importer/spec/test-data/psono-json/subfolders.ts +++ b/libs/importer/src/importers/spec-data/psono-json/subfolders.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const SubFoldersTestData: PsonoJsonExport = { folders: [ diff --git a/libs/importer/spec/test-data/psono-json/totp.ts b/libs/importer/src/importers/spec-data/psono-json/totp.ts similarity index 85% rename from libs/importer/spec/test-data/psono-json/totp.ts rename to libs/importer/src/importers/spec-data/psono-json/totp.ts index 62d3c43431c..ec7cabf7ec9 100644 --- a/libs/importer/spec/test-data/psono-json/totp.ts +++ b/libs/importer/src/importers/spec-data/psono-json/totp.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const TOTPData: PsonoJsonExport = { folders: [], diff --git a/libs/importer/spec/test-data/psono-json/website-logins.ts b/libs/importer/src/importers/spec-data/psono-json/website-logins.ts similarity index 90% rename from libs/importer/spec/test-data/psono-json/website-logins.ts rename to libs/importer/src/importers/spec-data/psono-json/website-logins.ts index 85154090492..28a2f35328e 100644 --- a/libs/importer/spec/test-data/psono-json/website-logins.ts +++ b/libs/importer/src/importers/spec-data/psono-json/website-logins.ts @@ -1,4 +1,4 @@ -import { PsonoJsonExport } from "../../../src/importers/psono/psono-json-types"; +import { PsonoJsonExport } from "../../psono/psono-json-types"; export const WebsiteLoginsData: PsonoJsonExport = { folders: [], diff --git a/libs/importer/spec/test-data/roboform-csv/empty-folders.ts b/libs/importer/src/importers/spec-data/roboform-csv/empty-folders.ts similarity index 100% rename from libs/importer/spec/test-data/roboform-csv/empty-folders.ts rename to libs/importer/src/importers/spec-data/roboform-csv/empty-folders.ts diff --git a/libs/importer/spec/test-data/roboform-csv/with-folders.ts b/libs/importer/src/importers/spec-data/roboform-csv/with-folders.ts similarity index 100% rename from libs/importer/spec/test-data/roboform-csv/with-folders.ts rename to libs/importer/src/importers/spec-data/roboform-csv/with-folders.ts diff --git a/libs/importer/spec/test-data/safari-csv/old-simple-password-data.csv.ts b/libs/importer/src/importers/spec-data/safari-csv/old-simple-password-data.csv.ts similarity index 100% rename from libs/importer/spec/test-data/safari-csv/old-simple-password-data.csv.ts rename to libs/importer/src/importers/spec-data/safari-csv/old-simple-password-data.csv.ts diff --git a/libs/importer/spec/test-data/safari-csv/simple-password-data.csv.ts b/libs/importer/src/importers/spec-data/safari-csv/simple-password-data.csv.ts similarity index 100% rename from libs/importer/spec/test-data/safari-csv/simple-password-data.csv.ts rename to libs/importer/src/importers/spec-data/safari-csv/simple-password-data.csv.ts diff --git a/libs/importer/spec/test-data/safeincloud/test-data.xml.ts b/libs/importer/src/importers/spec-data/safeincloud/test-data.xml.ts similarity index 100% rename from libs/importer/spec/test-data/safeincloud/test-data.xml.ts rename to libs/importer/src/importers/spec-data/safeincloud/test-data.xml.ts diff --git a/libs/importer/spec/test-data/securesafe-csv/securesafe-example.csv.ts b/libs/importer/src/importers/spec-data/securesafe-csv/securesafe-example.csv.ts similarity index 100% rename from libs/importer/spec/test-data/securesafe-csv/securesafe-example.csv.ts rename to libs/importer/src/importers/spec-data/securesafe-csv/securesafe-example.csv.ts diff --git a/libs/importer/spec/test-data/zohovault/sample-zohovault-data.csv.ts b/libs/importer/src/importers/spec-data/zohovault/sample-zohovault-data.csv.ts similarity index 100% rename from libs/importer/spec/test-data/zohovault/sample-zohovault-data.csv.ts rename to libs/importer/src/importers/spec-data/zohovault/sample-zohovault-data.csv.ts diff --git a/libs/importer/spec/zohovault-csv-importer.spec.ts b/libs/importer/src/importers/zohovault-csv-importer.spec.ts similarity index 95% rename from libs/importer/spec/zohovault-csv-importer.spec.ts rename to libs/importer/src/importers/zohovault-csv-importer.spec.ts index 28318945291..e49b527cbbf 100644 --- a/libs/importer/spec/zohovault-csv-importer.spec.ts +++ b/libs/importer/src/importers/zohovault-csv-importer.spec.ts @@ -2,9 +2,8 @@ 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 { ZohoVaultCsvImporter } from "../src/importers"; - -import { data as samplezohovaultcsvdata } from "./test-data/zohovault/sample-zohovault-data.csv"; +import { data as samplezohovaultcsvdata } from "./spec-data/zohovault/sample-zohovault-data.csv"; +import { ZohoVaultCsvImporter } from "./zohovault-csv-importer"; const CipherData = [ { diff --git a/libs/importer/tsconfig.json b/libs/importer/tsconfig.json index 09eb33e2884..e16a16a0337 100644 --- a/libs/importer/tsconfig.json +++ b/libs/importer/tsconfig.json @@ -17,6 +17,6 @@ "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"] } }, - "include": ["src", "spec"], + "include": ["src"], "exclude": ["node_modules", "dist"] }