Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

[PM-17628] Move all files from libs/importer/spec into libs/importer/src #13202

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+176 −186
Open

[PM-17628] Move all files from libs/importer/spec into libs/importer/src #13202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abca04e
Move all files from libs/importer/spec into libs/importer/src
djsmith85 Feb 1, 2025
883b918
Ignore ts-strict on spec-data
djsmith85 Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/importer/spec/base-importer.spec.ts → ...orter/src/importers/base-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 4 additions & 6 deletions ...arden-password-protected-importer.spec.ts → ...arden-password-protected-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions ...importer/spec/chrome-csv-importer.spec.ts → ...src/importers/chrome-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
{
Expand Down
17 changes: 8 additions & 9 deletions ...porter/spec/dashlane-csv-importer.spec.ts → ...rs/dashlane/dashlane-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions ...mporter/spec/enpass-json-importer.spec.ts → ...rters/enpass/enpass-json-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
7 changes: 3 additions & 4 deletions ...mporter/spec/firefox-csv-importer.spec.ts → ...rc/importers/firefox-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
{
Expand Down
2 changes: 1 addition & 1 deletion libs/importer/src/importers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
5 changes: 2 additions & 3 deletions ...porter/spec/keepass2-xml-importer.spec.ts → ...c/importers/keepass2-xml-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 () => {
Expand Down
5 changes: 2 additions & 3 deletions ...porter/spec/keepassx-csv-importer.spec.ts → ...c/importers/keepassx-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...importer/spec/keeper-csv-importer.spec.ts → ...orters/keeper/keeper-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...mporter/spec/keeper-json-importer.spec.ts → ...rters/keeper/keeper-json-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
1 change: 1 addition & 0 deletions libs/importer/src/importers/lastpass/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { LastPassCsvImporter } from "./lastpass-csv-importer";
5 changes: 3 additions & 2 deletions ...porter/spec/lastpass-csv-importer.spec.ts → ...rs/lastpass/lastpass-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 3 additions & 4 deletions ...er/src/importers/lastpass-csv-importer.ts → ...porters/lastpass/lastpass-csv-importer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ImportResult> {
Expand Down
2 changes: 1 addition & 1 deletion ...mporter/spec/msecure-csv-importer.spec.ts → ...rc/importers/msecure-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
15 changes: 7 additions & 8 deletions libs/importer/spec/myki-csv-importer.spec.ts → ...r/src/importers/myki-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...twrix-passwordsecure-csv-importer.spec.ts → ...twrix-passwordsecure-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
13 changes: 6 additions & 7 deletions ...porter/spec/nordpass-csv-importer.spec.ts → ...c/importers/nordpass-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
{
Expand Down
2 changes: 1 addition & 1 deletion ...er/spec/onepassword-1pif-importer.spec.ts → ...assword/onepassword-1pif-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" +
Expand Down
52 changes: 26 additions & 26 deletions ...er/spec/onepassword-1pux-importer.spec.ts → ...assword/onepassword-1pux-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "./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 { 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 { OnePassword1PuxImporter } from "./onepassword-1pux-importer";

function validateCustomField(fields: FieldView[], fieldName: string, expectedValue: any) {
expect(fields).toBeDefined();
Expand Down
8 changes: 4 additions & 4 deletions ...spec/onepassword-mac-csv-importer.spec.ts → ...word/onepassword-mac-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
8 changes: 4 additions & 4 deletions ...spec/onepassword-win-csv-importer.spec.ts → ...word/onepassword-win-csv-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export interface Value {

export interface Email {
email_address: string;
provider: string;
provider: string | null;
}

export interface Address {
Expand Down
6 changes: 3 additions & 3 deletions ...mporter/spec/passky-json-importer.spec.ts → ...rters/passky/passky-json-importer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading
Loading