From 0e78910582d842bd4cb855d1f1508265a843719c Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Fri, 11 Nov 2022 16:20:03 +0100 Subject: [PATCH] [PS-1805] BEEEP: Renamed importers based on agreed naming-convention (#3978) * Rename all importer related files Renamed all files based on our naming convention which we decided on with https://github.com/bitwarden/adr/blob/master/decisions/0012-angular-filename-convention.md * Removed entries from whitelist-capital-letters.txt * Rename missing safeInCloud test data * Fix broken import * Renamed folders (removed capital letters) * Fix filename of BitwardenCsvImporter * Fix imports of onepassword mac/win importer tests * Remove already renamed folders from whitelist * Rename dashlaneImporters to dashlane Rename the folder Fix all the imports Remove dashlaneImporters from white-list * Rename keeperImporters to keeper Rename the folder Fix all the imports Remove keeperImporters from white-list * Rename onepasswordImporters to onepassword Rename the folder Fix all the imports Remove onepasswordImporters from white-list * Rename safeinCloud test data folder * Fix onepassword importer type imports --- .github/whitelist-capital-letters.txt | 137 ------------------ .../tools/import-export/import.component.ts | 2 +- ...pec.ts => bitwarden-json-importer.spec.ts} | 4 +- ...arden-password-protected-importer.spec.ts} | 4 +- .../importers/chrome-csv-importer.spec.ts | 4 +- ....spec.ts => dashlane-csv-importer.spec.ts} | 16 +- ...r.spec.ts => firefox-csv-importer.spec.ts} | 6 +- ...r.spec.ts => fsecure-fsk-importer.spec.ts} | 2 +- ....spec.ts => keepass2-xml-importer.spec.ts} | 2 +- ...r.spec.ts => keeper-json-importer.spec.ts} | 4 +- ....spec.ts => lastpass-csv-importer.spec.ts} | 2 +- ...rter.spec.ts => myki-csv-importer.spec.ts} | 14 +- ....spec.ts => nordpass-csv-importer.spec.ts} | 10 +- ...c.ts => onepassword-1pif-importer.spec.ts} | 2 +- ...c.ts => onepassword-1pux-importer.spec.ts} | 50 +++---- ...s => onepassword-mac-csv-importer.spec.ts} | 8 +- ...s => onepassword-win-csv-importer.spec.ts} | 8 +- ...er.spec.ts => safari-csv-importer.spec.ts} | 6 +- .../bitwarden-json}/empty.json.ts | 0 .../password-protected.json.ts} | 0 .../chrome-csv}/android-data.csv.ts | 0 .../chrome-csv}/simple-password-data.csv.ts | 0 .../dashlane-csv}/credentials.csv.ts | 0 .../dashlane-csv}/id.csv.ts | 0 .../multiple-personal-info.csv.ts} | 0 .../dashlane-csv}/payments.csv.ts | 0 .../dashlane-csv/personal-info.csv.ts} | 0 .../dashlane-csv}/securenotes.csv.ts | 0 .../firefox-csv/firefox-accounts-data.csv.ts} | 0 .../firefox-csv/simple-password-data.csv.ts} | 0 .../keeper-json/testdata.json.ts} | 2 +- .../myki-csv/user-account.csv.ts} | 0 .../myki-csv/user-credit-card.csv.ts} | 0 .../myki-csv/user-id-card.csv.ts} | 0 .../myki-csv/user-identity.csv.ts} | 0 .../myki-csv/user-note.csv.ts} | 0 .../myki-csv/user-twofa.csv.ts} | 0 .../nordpass-csv}/nordpass.card.csv.ts | 0 .../nordpass-csv}/nordpass.identity.csv.ts | 0 .../nordpass-csv}/nordpass.login.csv.ts | 0 .../nordpass-csv/nordpass.secure-note.csv.ts} | 0 .../onepassword-1pux/api-credentials.ts} | 2 +- .../onepassword-1pux/bank-account.ts} | 2 +- .../onepassword-1pux/credit-card.ts} | 2 +- .../onepassword-1pux/database.ts} | 2 +- .../onepassword-1pux/drivers-license.ts} | 2 +- .../onepassword-1pux/email-account.ts} | 2 +- .../email-field-on-identity.ts} | 2 +- .../email-field-on-identity_prefilled.ts} | 2 +- .../onepassword-1pux/email-field.ts} | 2 +- .../onepassword-1pux/identity-data.ts} | 2 +- .../onepassword-1pux/login-data.ts} | 2 +- .../onepassword-1pux/medical-record.ts} | 2 +- .../onepassword-1pux/membership.ts} | 2 +- .../onepassword-1pux/onepux_example.ts} | 2 +- .../onepassword-1pux/outdoor-license.ts} | 2 +- .../onepassword-1pux/passport.ts} | 2 +- .../onepassword-1pux/password.ts} | 2 +- .../onepassword-1pux/rewards-program.ts} | 2 +- .../onepassword-1pux/sanitized-export.ts} | 2 +- .../onepassword-1pux/secure-note.ts} | 2 +- .../onepassword-1pux/server.ts} | 2 +- .../onepassword-1pux/software-license.ts} | 2 +- .../onepassword-1pux/ssn.ts} | 2 +- .../onepassword-1pux/wireless-router.ts} | 2 +- .../onepassword-csv/credit-card.mac.csv.ts} | 0 .../credit-card.windows.csv.ts} | 0 .../onepassword-csv}/identity.mac.csv.ts | 0 .../onepassword-csv}/identity.windows.csv.ts | 0 .../multiple-items.mac.csv.ts} | 0 .../multiple-items.windows.csv.ts} | 0 .../old-simple-password-data.csv.ts} | 0 .../safari-csv/simple-password-data.csv.ts} | 0 .../safeincloud/test-data.xml.ts} | 0 .../spec/services/import.service.spec.ts | 2 +- .../common/src/abstractions/import.service.ts | 2 +- ...CsvImporter.ts => ascendo-csv-importer.ts} | 2 +- ...stCsvImporter.ts => avast-csv-importer.ts} | 2 +- ...JsonImporter.ts => avast-json-importer.ts} | 2 +- ...raCsvImporter.ts => avira-csv-importer.ts} | 2 +- .../{baseImporter.ts => base-importer.ts} | 0 ...vImporter.ts => bitwarden-csv-importer.ts} | 2 +- ...Importer.ts => bitwarden-json-importer.ts} | 2 +- ... bitwarden-password-protected-importer.ts} | 2 +- ...Importer.ts => blackberry-csv-importer.ts} | 2 +- ...lurCsvImporter.ts => blur-csv-importer.ts} | 2 +- ...vImporter.ts => buttercup-csv-importer.ts} | 2 +- .../src/importers/chrome-csv-importer.ts | 2 +- ...lImporter.ts => clipperz-html-importer.ts} | 2 +- ...svImporter.ts => codebook-csv-importer.ts} | 2 +- .../dashlane-csv-importer.ts} | 4 +- .../dashlane-json-importer.ts} | 2 +- .../types/dashlane-csv-types.ts} | 0 ...svImporter.ts => encryptr-csv-importer.ts} | 2 +- ...sCsvImporter.ts => enpass-csv-importer.ts} | 2 +- ...sonImporter.ts => enpass-json-importer.ts} | 2 +- ...CsvImporter.ts => firefox-csv-importer.ts} | 2 +- ...FskImporter.ts => fsecure-fsk-importer.ts} | 2 +- ...JsonImporter.ts => gnome-json-importer.ts} | 2 +- .../{importError.ts => import-error.ts} | 0 ...tImporter.ts => kaspersky-txt-importer.ts} | 2 +- ...mlImporter.ts => keepass2-xml-importer.ts} | 2 +- ...svImporter.ts => keepassx-csv-importer.ts} | 2 +- .../keeper-csv-importer.ts} | 2 +- .../keeper-json-importer.ts} | 4 +- .../types/keeper-json-types.ts} | 0 ...svImporter.ts => lastpass-csv-importer.ts} | 2 +- ...vImporter.ts => logmeonce-csv-importer.ts} | 2 +- ...CsvImporter.ts => meldium-csv-importer.ts} | 2 +- ...CsvImporter.ts => msecure-csv-importer.ts} | 2 +- ...ykiCsvImporter.ts => myki-csv-importer.ts} | 2 +- ...svImporter.ts => nordpass-csv-importer.ts} | 2 +- .../cipher-import-context.ts} | 0 .../onepassword-1pif-importer.ts} | 2 +- .../onepassword-1pux-importer.ts} | 4 +- .../onepassword-csv-importer.ts} | 4 +- .../onepassword-mac-csv-importer.ts} | 2 +- .../onepassword-win-csv-importer.ts} | 4 +- .../types/onepassword-1pux-importer-types.ts} | 0 ...CsvImporter.ts => padlock-csv-importer.ts} | 2 +- ...svImporter.ts => passkeep-csv-importer.ts} | 2 +- ...onImporter.ts => passman-json-importer.ts} | 2 +- ...svImporter.ts => passpack-csv-importer.ts} | 2 +- ...orter.ts => passwordagent-csv-importer.ts} | 2 +- ...orter.ts => passwordboss-json-importer.ts} | 2 +- ...rter.ts => passworddragon-xml-importer.ts} | 2 +- ...porter.ts => passwordsafe-xml-importer.ts} | 2 +- ...rter.ts => passwordwallet-txt-importer.ts} | 2 +- ...vImporter.ts => remembear-csv-importer.ts} | 2 +- ...svImporter.ts => roboform-csv-importer.ts} | 2 +- ...iCsvImporter.ts => safari-csv-importer.ts} | 2 +- ...mporter.ts => safeincloud-xml-importer.ts} | 2 +- ...CsvImport.ts => saferpass-csv-importer.ts} | 2 +- ...Importer.ts => securesafe-csv-importer.ts} | 2 +- ...svImporter.ts => splashid-csv-importer.ts} | 2 +- ...rter.ts => stickypassword-xml-importer.ts} | 2 +- ...CsvImporter.ts => truekey-csv-importer.ts} | 2 +- ...{upmCsvImporter.ts => upm-csv-importer.ts} | 2 +- ...otiCsvImporter.ts => yoti-csv-importer.ts} | 2 +- ...vImporter.ts => zohovault-csv-importer.ts} | 2 +- libs/common/src/services/import.service.ts | 112 +++++++------- 141 files changed, 218 insertions(+), 355 deletions(-) rename libs/common/spec/importers/{bitwardenJsonImporter.spec.ts => bitwarden-json-importer.spec.ts} (89%) rename libs/common/spec/importers/{bitwardenPasswordProtectedImporter.spec.ts => bitwarden-password-protected-importer.spec.ts} (96%) rename libs/common/spec/importers/{dashlaneCsvImporter.spec.ts => dashlane-csv-importer.spec.ts} (96%) rename libs/common/spec/importers/{firefoxCsvImporter.spec.ts => firefox-csv-importer.spec.ts} (89%) rename libs/common/spec/importers/{fsecureFskImporter.spec.ts => fsecure-fsk-importer.spec.ts} (98%) rename libs/common/spec/importers/{keepass2XmlImporter.spec.ts => keepass2-xml-importer.spec.ts} (99%) rename libs/common/spec/importers/{keeperJsonImporter.spec.ts => keeper-json-importer.spec.ts} (97%) rename libs/common/spec/importers/{lastpassCsvImporter.spec.ts => lastpass-csv-importer.spec.ts} (99%) rename libs/common/spec/importers/{mykiCsvImporter.spec.ts => myki-csv-importer.spec.ts} (97%) rename libs/common/spec/importers/{nordpassCsvImporter.spec.ts => nordpass-csv-importer.spec.ts} (94%) rename libs/common/spec/importers/{onepassword1PifImporter.spec.ts => onepassword-1pif-importer.spec.ts} (99%) rename libs/common/spec/importers/{onepassword1PuxImporter.spec.ts => onepassword-1pux-importer.spec.ts} (93%) rename libs/common/spec/importers/{onepasswordMacCsvImporter.spec.ts => onepassword-mac-csv-importer.spec.ts} (86%) rename libs/common/spec/importers/{onepasswordWinCsvImporter.spec.ts => onepassword-win-csv-importer.spec.ts} (87%) rename libs/common/spec/importers/{safariCsvImporter.spec.ts => safari-csv-importer.spec.ts} (90%) rename libs/common/spec/importers/{testData/bitwardenJson => test-data/bitwarden-json}/empty.json.ts (100%) rename libs/common/spec/importers/{testData/bitwardenJson/passwordProtected.json.ts => test-data/bitwarden-json/password-protected.json.ts} (100%) rename libs/common/spec/importers/{testData/chromeCsv => test-data/chrome-csv}/android-data.csv.ts (100%) rename libs/common/spec/importers/{testData/chromeCsv => test-data/chrome-csv}/simple-password-data.csv.ts (100%) rename libs/common/spec/importers/{testData/dashlaneCsv => test-data/dashlane-csv}/credentials.csv.ts (100%) rename libs/common/spec/importers/{testData/dashlaneCsv => test-data/dashlane-csv}/id.csv.ts (100%) rename libs/common/spec/importers/{testData/dashlaneCsv/multiplePersonalInfo.csv.ts => test-data/dashlane-csv/multiple-personal-info.csv.ts} (100%) rename libs/common/spec/importers/{testData/dashlaneCsv => test-data/dashlane-csv}/payments.csv.ts (100%) rename libs/common/spec/importers/{testData/dashlaneCsv/personalInfo.csv.ts => test-data/dashlane-csv/personal-info.csv.ts} (100%) rename libs/common/spec/importers/{testData/dashlaneCsv => test-data/dashlane-csv}/securenotes.csv.ts (100%) rename libs/common/spec/importers/{testData/firefoxCsv/firefoxAccountsData.csv.ts => test-data/firefox-csv/firefox-accounts-data.csv.ts} (100%) rename libs/common/spec/importers/{testData/firefoxCsv/simplePasswordData.csv.ts => test-data/firefox-csv/simple-password-data.csv.ts} (100%) rename libs/common/spec/importers/{testData/keeperJson/testData.ts => test-data/keeper-json/testdata.json.ts} (98%) rename libs/common/spec/importers/{testData/mykiCsv/UserAccount.csv.ts => test-data/myki-csv/user-account.csv.ts} (100%) rename libs/common/spec/importers/{testData/mykiCsv/UserCreditCard.csv.ts => test-data/myki-csv/user-credit-card.csv.ts} (100%) rename libs/common/spec/importers/{testData/mykiCsv/UserIdCard.csv.ts => test-data/myki-csv/user-id-card.csv.ts} (100%) rename libs/common/spec/importers/{testData/mykiCsv/UserIdentity.csv.ts => test-data/myki-csv/user-identity.csv.ts} (100%) rename libs/common/spec/importers/{testData/mykiCsv/UserNote.csv.ts => test-data/myki-csv/user-note.csv.ts} (100%) rename libs/common/spec/importers/{testData/mykiCsv/UserTwofa.csv.ts => test-data/myki-csv/user-twofa.csv.ts} (100%) rename libs/common/spec/importers/{testData/nordpassCsv => test-data/nordpass-csv}/nordpass.card.csv.ts (100%) rename libs/common/spec/importers/{testData/nordpassCsv => test-data/nordpass-csv}/nordpass.identity.csv.ts (100%) rename libs/common/spec/importers/{testData/nordpassCsv => test-data/nordpass-csv}/nordpass.login.csv.ts (100%) rename libs/common/spec/importers/{testData/nordpassCsv/nordpass.secureNote.csv.ts => test-data/nordpass-csv/nordpass.secure-note.csv.ts} (100%) rename libs/common/spec/importers/{testData/onePassword1Pux/APICredentials.ts => test-data/onepassword-1pux/api-credentials.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/BankAccount.ts => test-data/onepassword-1pux/bank-account.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/CreditCard.ts => test-data/onepassword-1pux/credit-card.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/Database.ts => test-data/onepassword-1pux/database.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/DriversLicense.ts => test-data/onepassword-1pux/drivers-license.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/EmailAccount.ts => test-data/onepassword-1pux/email-account.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/EmailfieldOnIdentity.ts => test-data/onepassword-1pux/email-field-on-identity.ts} (98%) rename libs/common/spec/importers/{testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts => test-data/onepassword-1pux/email-field-on-identity_prefilled.ts} (98%) rename libs/common/spec/importers/{testData/onePassword1Pux/Emailfield.ts => test-data/onepassword-1pux/email-field.ts} (98%) rename libs/common/spec/importers/{testData/onePassword1Pux/IdentityData.ts => test-data/onepassword-1pux/identity-data.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/LoginData.ts => test-data/onepassword-1pux/login-data.ts} (98%) rename libs/common/spec/importers/{testData/onePassword1Pux/MedicalRecord.ts => test-data/onepassword-1pux/medical-record.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/Membership.ts => test-data/onepassword-1pux/membership.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/Onepux_example.ts => test-data/onepassword-1pux/onepux_example.ts} (98%) rename libs/common/spec/importers/{testData/onePassword1Pux/OutdoorLicense.ts => test-data/onepassword-1pux/outdoor-license.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/Passport.ts => test-data/onepassword-1pux/passport.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/Password.ts => test-data/onepassword-1pux/password.ts} (97%) rename libs/common/spec/importers/{testData/onePassword1Pux/RewardsProgram.ts => test-data/onepassword-1pux/rewards-program.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/SanitizedExport.ts => test-data/onepassword-1pux/sanitized-export.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/SecureNote.ts => test-data/onepassword-1pux/secure-note.ts} (96%) rename libs/common/spec/importers/{testData/onePassword1Pux/Server.ts => test-data/onepassword-1pux/server.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/SoftwareLicense.ts => test-data/onepassword-1pux/software-license.ts} (99%) rename libs/common/spec/importers/{testData/onePassword1Pux/SSN.ts => test-data/onepassword-1pux/ssn.ts} (98%) rename libs/common/spec/importers/{testData/onePassword1Pux/WirelessRouter.ts => test-data/onepassword-1pux/wireless-router.ts} (99%) rename libs/common/spec/importers/{testData/onePasswordCsv/creditCard.mac.csv.ts => test-data/onepassword-csv/credit-card.mac.csv.ts} (100%) rename libs/common/spec/importers/{testData/onePasswordCsv/creditCard.windows.csv.ts => test-data/onepassword-csv/credit-card.windows.csv.ts} (100%) rename libs/common/spec/importers/{testData/onePasswordCsv => test-data/onepassword-csv}/identity.mac.csv.ts (100%) rename libs/common/spec/importers/{testData/onePasswordCsv => test-data/onepassword-csv}/identity.windows.csv.ts (100%) rename libs/common/spec/importers/{testData/onePasswordCsv/multipleItems.mac.csv.ts => test-data/onepassword-csv/multiple-items.mac.csv.ts} (100%) rename libs/common/spec/importers/{testData/onePasswordCsv/multipleItems.windows.csv.ts => test-data/onepassword-csv/multiple-items.windows.csv.ts} (100%) rename libs/common/spec/importers/{testData/safariCsv/oldSimplePasswordData.csv.ts => test-data/safari-csv/old-simple-password-data.csv.ts} (100%) rename libs/common/spec/importers/{testData/safariCsv/simplePasswordData.csv.ts => test-data/safari-csv/simple-password-data.csv.ts} (100%) rename libs/common/spec/importers/{testData/safeInCloud/testData.xml.ts => test-data/safeincloud/test-data.xml.ts} (100%) rename libs/common/src/importers/{ascendoCsvImporter.ts => ascendo-csv-importer.ts} (97%) rename libs/common/src/importers/{avastCsvImporter.ts => avast-csv-importer.ts} (94%) rename libs/common/src/importers/{avastJsonImporter.ts => avast-json-importer.ts} (98%) rename libs/common/src/importers/{aviraCsvImporter.ts => avira-csv-importer.ts} (96%) rename libs/common/src/importers/{baseImporter.ts => base-importer.ts} (100%) rename libs/common/src/importers/{bitwardenCsvImporter.ts => bitwarden-csv-importer.ts} (98%) rename libs/common/src/importers/{bitwardenJsonImporter.ts => bitwarden-json-importer.ts} (99%) rename libs/common/src/importers/{bitwardenPasswordProtectedImporter.ts => bitwarden-password-protected-importer.ts} (97%) rename libs/common/src/importers/{blackBerryCsvImporter.ts => blackberry-csv-importer.ts} (96%) rename libs/common/src/importers/{blurCsvImporter.ts => blur-csv-importer.ts} (96%) rename libs/common/src/importers/{buttercupCsvImporter.ts => buttercup-csv-importer.ts} (97%) rename libs/common/src/importers/{clipperzHtmlImporter.ts => clipperz-html-importer.ts} (98%) rename libs/common/src/importers/{codebookCsvImporter.ts => codebook-csv-importer.ts} (97%) rename libs/common/src/importers/{dashlaneImporters/dashlaneCsvImporter.ts => dashlane/dashlane-csv-importer.ts} (98%) rename libs/common/src/importers/{dashlaneImporters/dashlaneJsonImporter.ts => dashlane/dashlane-json-importer.ts} (99%) rename libs/common/src/importers/{dashlaneImporters/types/dashlaneCsvTypes.ts => dashlane/types/dashlane-csv-types.ts} (100%) rename libs/common/src/importers/{encryptrCsvImporter.ts => encryptr-csv-importer.ts} (97%) rename libs/common/src/importers/{enpassCsvImporter.ts => enpass-csv-importer.ts} (98%) rename libs/common/src/importers/{enpassJsonImporter.ts => enpass-json-importer.ts} (99%) rename libs/common/src/importers/{firefoxCsvImporter.ts => firefox-csv-importer.ts} (95%) rename libs/common/src/importers/{fsecureFskImporter.ts => fsecure-fsk-importer.ts} (97%) rename libs/common/src/importers/{gnomeJsonImporter.ts => gnome-json-importer.ts} (97%) rename libs/common/src/importers/{importError.ts => import-error.ts} (100%) rename libs/common/src/importers/{kasperskyTxtImporter.ts => kaspersky-txt-importer.ts} (98%) rename libs/common/src/importers/{keepass2XmlImporter.ts => keepass2-xml-importer.ts} (98%) rename libs/common/src/importers/{keepassxCsvImporter.ts => keepassx-csv-importer.ts} (96%) rename libs/common/src/importers/{keeperImporters/keeperCsvImporter.ts => keeper/keeper-csv-importer.ts} (96%) rename libs/common/src/importers/{keeperImporters/keeperJsonImporter.ts => keeper/keeper-json-importer.ts} (94%) rename libs/common/src/importers/{keeperImporters/types/keeperJsonTypes.ts => keeper/types/keeper-json-types.ts} (100%) rename libs/common/src/importers/{lastpassCsvImporter.ts => lastpass-csv-importer.ts} (99%) rename libs/common/src/importers/{logMeOnceCsvImporter.ts => logmeonce-csv-importer.ts} (95%) rename libs/common/src/importers/{meldiumCsvImporter.ts => meldium-csv-importer.ts} (95%) rename libs/common/src/importers/{msecureCsvImporter.ts => msecure-csv-importer.ts} (97%) rename libs/common/src/importers/{mykiCsvImporter.ts => myki-csv-importer.ts} (99%) rename libs/common/src/importers/{nordpassCsvImporter.ts => nordpass-csv-importer.ts} (98%) rename libs/common/src/importers/{onepasswordImporters/cipherImportContext.ts => onepassword/cipher-import-context.ts} (100%) rename libs/common/src/importers/{onepasswordImporters/onepassword1PifImporter.ts => onepassword/onepassword-1pif-importer.ts} (99%) rename libs/common/src/importers/{onepasswordImporters/onepassword1PuxImporter.ts => onepassword/onepassword-1pux-importer.ts} (99%) rename libs/common/src/importers/{onepasswordImporters/onepasswordCsvImporter.ts => onepassword/onepassword-csv-importer.ts} (99%) rename libs/common/src/importers/{onepasswordImporters/onepasswordMacCsvImporter.ts => onepassword/onepassword-mac-csv-importer.ts} (97%) rename libs/common/src/importers/{onepasswordImporters/onepasswordWinCsvImporter.ts => onepassword/onepassword-win-csv-importer.ts} (94%) rename libs/common/src/importers/{onepasswordImporters/types/onepassword1PuxImporterTypes.ts => onepassword/types/onepassword-1pux-importer-types.ts} (100%) rename libs/common/src/importers/{padlockCsvImporter.ts => padlock-csv-importer.ts} (98%) rename libs/common/src/importers/{passkeepCsvImporter.ts => passkeep-csv-importer.ts} (96%) rename libs/common/src/importers/{passmanJsonImporter.ts => passman-json-importer.ts} (97%) rename libs/common/src/importers/{passpackCsvImporter.ts => passpack-csv-importer.ts} (98%) rename libs/common/src/importers/{passwordAgentCsvImporter.ts => passwordagent-csv-importer.ts} (97%) rename libs/common/src/importers/{passwordBossJsonImporter.ts => passwordboss-json-importer.ts} (98%) rename libs/common/src/importers/{passwordDragonXmlImporter.ts => passworddragon-xml-importer.ts} (98%) rename libs/common/src/importers/{passwordSafeXmlImporter.ts => passwordsafe-xml-importer.ts} (98%) rename libs/common/src/importers/{passwordWalletTxtImporter.ts => passwordwallet-txt-importer.ts} (96%) rename libs/common/src/importers/{rememBearCsvImporter.ts => remembear-csv-importer.ts} (98%) rename libs/common/src/importers/{roboformCsvImporter.ts => roboform-csv-importer.ts} (97%) rename libs/common/src/importers/{safariCsvImporter.ts => safari-csv-importer.ts} (95%) rename libs/common/src/importers/{safeInCloudXmlImporter.ts => safeincloud-xml-importer.ts} (99%) rename libs/common/src/importers/{saferpassCsvImport.ts => saferpass-csv-importer.ts} (95%) rename libs/common/src/importers/{secureSafeCsvImporter.ts => securesafe-csv-importer.ts} (95%) rename libs/common/src/importers/{splashIdCsvImporter.ts => splashid-csv-importer.ts} (97%) rename libs/common/src/importers/{stickyPasswordXmlImporter.ts => stickypassword-xml-importer.ts} (98%) rename libs/common/src/importers/{truekeyCsvImporter.ts => truekey-csv-importer.ts} (98%) rename libs/common/src/importers/{upmCsvImporter.ts => upm-csv-importer.ts} (95%) rename libs/common/src/importers/{yotiCsvImporter.ts => yoti-csv-importer.ts} (94%) rename libs/common/src/importers/{zohoVaultCsvImporter.ts => zohovault-csv-importer.ts} (98%) diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index 461b7a81da28..a8ce05f180ed 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -7,26 +7,11 @@ ./apps/desktop/src/models/nativeMessaging ./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads ./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses -./libs/common/spec/importers/testData -./libs/common/spec/importers/testData/bitwardenJson -./libs/common/spec/importers/testData/chromeCsv -./libs/common/spec/importers/testData/dashlaneCsv -./libs/common/spec/importers/testData/firefoxCsv -./libs/common/spec/importers/testData/keeperJson -./libs/common/spec/importers/testData/mykiCsv -./libs/common/spec/importers/testData/nordpassCsv -./libs/common/spec/importers/testData/onePassword1Pux -./libs/common/spec/importers/testData/onePasswordCsv -./libs/common/spec/importers/testData/safariCsv -./libs/common/spec/importers/testData/safeInCloud ./libs/common/spec/misc/logInStrategies ./libs/common/src/abstractions/fileDownload ./libs/common/src/abstractions/userVerification ./libs/common/src/abstractions/vaultTimeout ./libs/common/src/emailForwarders -./libs/common/src/importers/dashlaneImporters -./libs/common/src/importers/keeperImporters -./libs/common/src/importers/onepasswordImporters ./libs/common/src/misc/logInStrategies ./libs/common/src/services/userVerification ./libs/common/src/services/vaultTimeout @@ -54,65 +39,6 @@ ./libs/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts ./libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts ./libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts -./libs/common/spec/importers/testData/safeInCloud/testData.xml.ts -./libs/common/spec/importers/testData/safariCsv/oldSimplePasswordData.csv.ts -./libs/common/spec/importers/testData/safariCsv/simplePasswordData.csv.ts -./libs/common/spec/importers/testData/keeperJson/testData.ts -./libs/common/spec/importers/testData/bitwardenJson/passwordProtected.json.ts -./libs/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts -./libs/common/spec/importers/testData/onePassword1Pux/SecureNote.ts -./libs/common/spec/importers/testData/onePassword1Pux/Emailfield.ts -./libs/common/spec/importers/testData/onePassword1Pux/CreditCard.ts -./libs/common/spec/importers/testData/onePassword1Pux/LoginData.ts -./libs/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts -./libs/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts -./libs/common/spec/importers/testData/onePassword1Pux/Membership.ts -./libs/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts -./libs/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts -./libs/common/spec/importers/testData/onePassword1Pux/Password.ts -./libs/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts -./libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts -./libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts -./libs/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts -./libs/common/spec/importers/testData/onePassword1Pux/Database.ts -./libs/common/spec/importers/testData/onePassword1Pux/Passport.ts -./libs/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts -./libs/common/spec/importers/testData/onePassword1Pux/BankAccount.ts -./libs/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts -./libs/common/spec/importers/testData/onePassword1Pux/IdentityData.ts -./libs/common/spec/importers/testData/onePassword1Pux/Server.ts -./libs/common/spec/importers/testData/onePassword1Pux/APICredentials.ts -./libs/common/spec/importers/testData/onePassword1Pux/SSN.ts -./libs/common/spec/importers/testData/onePasswordCsv/creditCard.windows.csv.ts -./libs/common/spec/importers/testData/onePasswordCsv/creditCard.mac.csv.ts -./libs/common/spec/importers/testData/onePasswordCsv/multipleItems.windows.csv.ts -./libs/common/spec/importers/testData/onePasswordCsv/multipleItems.mac.csv.ts -./libs/common/spec/importers/testData/nordpassCsv/nordpass.secureNote.csv.ts -./libs/common/spec/importers/testData/dashlaneCsv/multiplePersonalInfo.csv.ts -./libs/common/spec/importers/testData/dashlaneCsv/personalInfo.csv.ts -./libs/common/spec/importers/testData/mykiCsv/UserIdCard.csv.ts -./libs/common/spec/importers/testData/mykiCsv/UserTwofa.csv.ts -./libs/common/spec/importers/testData/mykiCsv/UserNote.csv.ts -./libs/common/spec/importers/testData/mykiCsv/UserAccount.csv.ts -./libs/common/spec/importers/testData/mykiCsv/UserIdentity.csv.ts -./libs/common/spec/importers/testData/mykiCsv/UserCreditCard.csv.ts -./libs/common/spec/importers/testData/firefoxCsv/firefoxAccountsData.csv.ts -./libs/common/spec/importers/testData/firefoxCsv/simplePasswordData.csv.ts -./libs/common/spec/importers/fsecureFskImporter.spec.ts -./libs/common/spec/importers/safariCsvImporter.spec.ts -./libs/common/spec/importers/keeperJsonImporter.spec.ts -./libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts -./libs/common/spec/importers/dashlaneCsvImporter.spec.ts -./libs/common/spec/importers/nordpassCsvImporter.spec.ts -./libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts -./libs/common/spec/importers/firefoxCsvImporter.spec.ts -./libs/common/spec/importers/onepassword1PuxImporter.spec.ts -./libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts -./libs/common/spec/importers/lastpassCsvImporter.spec.ts -./libs/common/spec/importers/onepassword1PifImporter.spec.ts -./libs/common/spec/importers/keepass2XmlImporter.spec.ts -./libs/common/spec/importers/bitwardenJsonImporter.spec.ts -./libs/common/spec/importers/mykiCsvImporter.spec.ts ./libs/common/spec/web/services/webCryptoFunction.service.spec.ts ./libs/common/spec/shared/interceptConsole.ts ./libs/common/spec/models/view/passwordHistoryView.spec.ts @@ -143,69 +69,6 @@ ./libs/common/src/types/twoFactorResponse.ts ./libs/common/src/types/authResponse.ts ./libs/common/src/types/syncEventArgs.ts -./libs/common/src/importers/enpassJsonImporter.ts -./libs/common/src/importers/firefoxCsvImporter.ts -./libs/common/src/importers/rememBearCsvImporter.ts -./libs/common/src/importers/ascendoCsvImporter.ts -./libs/common/src/importers/passwordDragonXmlImporter.ts -./libs/common/src/importers/passkeepCsvImporter.ts -./libs/common/src/importers/gnomeJsonImporter.ts -./libs/common/src/importers/secureSafeCsvImporter.ts -./libs/common/src/importers/zohoVaultCsvImporter.ts -./libs/common/src/importers/dashlaneImporters/dashlaneCsvImporter.ts -./libs/common/src/importers/dashlaneImporters/types/dashlaneCsvTypes.ts -./libs/common/src/importers/dashlaneImporters/dashlaneJsonImporter.ts -./libs/common/src/importers/meldiumCsvImporter.ts -./libs/common/src/importers/safariCsvImporter.ts -./libs/common/src/importers/msecureCsvImporter.ts -./libs/common/src/importers/buttercupCsvImporter.ts -./libs/common/src/importers/kasperskyTxtImporter.ts -./libs/common/src/importers/baseImporter.ts -./libs/common/src/importers/keepassxCsvImporter.ts -./libs/common/src/importers/encryptrCsvImporter.ts -./libs/common/src/importers/passwordWalletTxtImporter.ts -./libs/common/src/importers/codebookCsvImporter.ts -./libs/common/src/importers/nordpassCsvImporter.ts -./libs/common/src/importers/avastJsonImporter.ts -./libs/common/src/importers/blurCsvImporter.ts -./libs/common/src/importers/safeInCloudXmlImporter.ts -./libs/common/src/importers/enpassCsvImporter.ts -./libs/common/src/importers/saferpassCsvImport.ts -./libs/common/src/importers/keeperImporters/types/keeperJsonTypes.ts -./libs/common/src/importers/keeperImporters/keeperCsvImporter.ts -./libs/common/src/importers/keeperImporters/keeperJsonImporter.ts -./libs/common/src/importers/fsecureFskImporter.ts -./libs/common/src/importers/clipperzHtmlImporter.ts -./libs/common/src/importers/keepass2XmlImporter.ts -./libs/common/src/importers/stickyPasswordXmlImporter.ts -./libs/common/src/importers/aviraCsvImporter.ts -./libs/common/src/importers/bitwardenPasswordProtectedImporter.ts -./libs/common/src/importers/avastCsvImporter.ts -./libs/common/src/importers/mykiCsvImporter.ts -./libs/common/src/importers/logMeOnceCsvImporter.ts -./libs/common/src/importers/upmCsvImporter.ts -./libs/common/src/importers/yotiCsvImporter.ts -./libs/common/src/importers/roboformCsvImporter.ts -./libs/common/src/importers/passwordBossJsonImporter.ts -./libs/common/src/importers/splashIdCsvImporter.ts -./libs/common/src/importers/passmanJsonImporter.ts -./libs/common/src/importers/bitwardenCsvImporter.ts -./libs/common/src/importers/lastpassCsvImporter.ts -./libs/common/src/importers/bitwardenJsonImporter.ts -./libs/common/src/importers/passwordAgentCsvImporter.ts -./libs/common/src/importers/passpackCsvImporter.ts -./libs/common/src/importers/truekeyCsvImporter.ts -./libs/common/src/importers/blackBerryCsvImporter.ts -./libs/common/src/importers/importError.ts -./libs/common/src/importers/padlockCsvImporter.ts -./libs/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes.ts -./libs/common/src/importers/onepasswordImporters/onepasswordMacCsvImporter.ts -./libs/common/src/importers/onepasswordImporters/cipherImportContext.ts -./libs/common/src/importers/onepasswordImporters/onepasswordWinCsvImporter.ts -./libs/common/src/importers/onepasswordImporters/onepasswordCsvImporter.ts -./libs/common/src/importers/onepasswordImporters/onepassword1PuxImporter.ts -./libs/common/src/importers/onepasswordImporters/onepassword1PifImporter.ts -./libs/common/src/importers/passwordSafeXmlImporter.ts ./libs/common/src/enums/kdfType.ts ./libs/common/src/enums/fileUploadType.ts ./libs/common/src/enums/cipherType.ts diff --git a/apps/web/src/app/tools/import-export/import.component.ts b/apps/web/src/app/tools/import-export/import.component.ts index 39a15a0afeb1..f20b62517cb4 100644 --- a/apps/web/src/app/tools/import-export/import.component.ts +++ b/apps/web/src/app/tools/import-export/import.component.ts @@ -12,7 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { ImportOption, ImportType } from "@bitwarden/common/enums/importOptions"; import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { ImportError } from "@bitwarden/common/importers/importError"; +import { ImportError } from "@bitwarden/common/importers/import-error"; import { FilePasswordPromptComponent } from "./file-password-prompt.component"; diff --git a/libs/common/spec/importers/bitwardenJsonImporter.spec.ts b/libs/common/spec/importers/bitwarden-json-importer.spec.ts similarity index 89% rename from libs/common/spec/importers/bitwardenJsonImporter.spec.ts rename to libs/common/spec/importers/bitwarden-json-importer.spec.ts index 2184162ee134..8f2fbc5b1b76 100644 --- a/libs/common/spec/importers/bitwardenJsonImporter.spec.ts +++ b/libs/common/spec/importers/bitwarden-json-importer.spec.ts @@ -3,9 +3,9 @@ import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { BitwardenJsonImporter } from "@bitwarden/common/importers/bitwardenJsonImporter"; +import { BitwardenJsonImporter } from "@bitwarden/common/importers/bitwarden-json-importer"; -import { data as passwordProtectedData } from "./testData/bitwardenJson/passwordProtected.json"; +import { data as passwordProtectedData } from "./test-data/bitwarden-json/password-protected.json"; describe("bitwarden json importer", () => { let sut: BitwardenJsonImporter; diff --git a/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts b/libs/common/spec/importers/bitwarden-password-protected-importer.spec.ts similarity index 96% rename from libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts rename to libs/common/spec/importers/bitwarden-password-protected-importer.spec.ts index cddf325a4b34..0b1c3b7b2e2f 100644 --- a/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts +++ b/libs/common/spec/importers/bitwarden-password-protected-importer.spec.ts @@ -4,11 +4,11 @@ import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { KdfType } from "@bitwarden/common/enums/kdfType"; -import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwardenPasswordProtectedImporter"; +import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwarden-password-protected-importer"; import { Utils } from "@bitwarden/common/misc/utils"; import { ImportResult } from "@bitwarden/common/models/domain/import-result"; -import { data as emptyDecryptedData } from "./testData/bitwardenJson/empty.json"; +import { data as emptyDecryptedData } from "./test-data/bitwarden-json/empty.json"; describe("BitwardenPasswordProtectedImporter", () => { let importer: BitwardenPasswordProtectedImporter; diff --git a/libs/common/spec/importers/chrome-csv-importer.spec.ts b/libs/common/spec/importers/chrome-csv-importer.spec.ts index 6b44aacc833a..8e57965d6d9f 100644 --- a/libs/common/spec/importers/chrome-csv-importer.spec.ts +++ b/libs/common/spec/importers/chrome-csv-importer.spec.ts @@ -3,8 +3,8 @@ import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/models/view/login.view"; -import { data as androidData } from "./testData/chromeCsv/android-data.csv"; -import { data as simplePasswordData } from "./testData/chromeCsv/simple-password-data.csv"; +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"; const CipherData = [ { diff --git a/libs/common/spec/importers/dashlaneCsvImporter.spec.ts b/libs/common/spec/importers/dashlane-csv-importer.spec.ts similarity index 96% rename from libs/common/spec/importers/dashlaneCsvImporter.spec.ts rename to libs/common/spec/importers/dashlane-csv-importer.spec.ts index 5fdd9a95a69b..50ae06a434c6 100644 --- a/libs/common/spec/importers/dashlaneCsvImporter.spec.ts +++ b/libs/common/spec/importers/dashlane-csv-importer.spec.ts @@ -1,12 +1,12 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { DashlaneCsvImporter as Importer } from "@bitwarden/common/importers/dashlaneImporters/dashlaneCsvImporter"; - -import { credentialsData } from "./testData/dashlaneCsv/credentials.csv"; -import { identityData } from "./testData/dashlaneCsv/id.csv"; -import { multiplePersonalInfoData } from "./testData/dashlaneCsv/multiplePersonalInfo.csv"; -import { paymentsData } from "./testData/dashlaneCsv/payments.csv"; -import { personalInfoData } from "./testData/dashlaneCsv/personalInfo.csv"; -import { secureNoteData } from "./testData/dashlaneCsv/securenotes.csv"; +import { DashlaneCsvImporter as Importer } from "@bitwarden/common/importers/dashlane/dashlane-csv-importer"; + +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"; describe("Dashlane CSV Importer", () => { let importer: Importer; diff --git a/libs/common/spec/importers/firefoxCsvImporter.spec.ts b/libs/common/spec/importers/firefox-csv-importer.spec.ts similarity index 89% rename from libs/common/spec/importers/firefoxCsvImporter.spec.ts rename to libs/common/spec/importers/firefox-csv-importer.spec.ts index 7b3415df1a8d..e25535c5a2b0 100644 --- a/libs/common/spec/importers/firefoxCsvImporter.spec.ts +++ b/libs/common/spec/importers/firefox-csv-importer.spec.ts @@ -1,10 +1,10 @@ -import { FirefoxCsvImporter as Importer } from "@bitwarden/common/importers/firefoxCsvImporter"; +import { FirefoxCsvImporter as Importer } from "@bitwarden/common/importers/firefox-csv-importer"; import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/models/view/login.view"; -import { data as firefoxAccountsData } from "./testData/firefoxCsv/firefoxAccountsData.csv"; -import { data as simplePasswordData } from "./testData/firefoxCsv/simplePasswordData.csv"; +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"; const CipherData = [ { diff --git a/libs/common/spec/importers/fsecureFskImporter.spec.ts b/libs/common/spec/importers/fsecure-fsk-importer.spec.ts similarity index 98% rename from libs/common/spec/importers/fsecureFskImporter.spec.ts rename to libs/common/spec/importers/fsecure-fsk-importer.spec.ts index f0aa03bb1ca9..a49fdcc47a4b 100644 --- a/libs/common/spec/importers/fsecureFskImporter.spec.ts +++ b/libs/common/spec/importers/fsecure-fsk-importer.spec.ts @@ -1,4 +1,4 @@ -import { FSecureFskImporter as Importer } from "@bitwarden/common/importers/fsecureFskImporter"; +import { FSecureFskImporter as Importer } from "@bitwarden/common/importers/fsecure-fsk-importer"; const TestDataWithStyleSetToWebsite: string = JSON.stringify({ data: { diff --git a/libs/common/spec/importers/keepass2XmlImporter.spec.ts b/libs/common/spec/importers/keepass2-xml-importer.spec.ts similarity index 99% rename from libs/common/spec/importers/keepass2XmlImporter.spec.ts rename to libs/common/spec/importers/keepass2-xml-importer.spec.ts index 6364acca4ecf..e6f22ed85028 100644 --- a/libs/common/spec/importers/keepass2XmlImporter.spec.ts +++ b/libs/common/spec/importers/keepass2-xml-importer.spec.ts @@ -1,4 +1,4 @@ -import { KeePass2XmlImporter as Importer } from "@bitwarden/common/importers/keepass2XmlImporter"; +import { KeePass2XmlImporter as Importer } from "@bitwarden/common/importers/keepass2-xml-importer"; const TestData = ` diff --git a/libs/common/spec/importers/keeperJsonImporter.spec.ts b/libs/common/spec/importers/keeper-json-importer.spec.ts similarity index 97% rename from libs/common/spec/importers/keeperJsonImporter.spec.ts rename to libs/common/spec/importers/keeper-json-importer.spec.ts index ef9283964555..b32497a95b10 100644 --- a/libs/common/spec/importers/keeperJsonImporter.spec.ts +++ b/libs/common/spec/importers/keeper-json-importer.spec.ts @@ -1,7 +1,7 @@ -import { KeeperJsonImporter as Importer } from "@bitwarden/common/importers/keeperImporters/keeperJsonImporter"; +import { KeeperJsonImporter as Importer } from "@bitwarden/common/importers/keeper/keeper-json-importer"; import { Utils } from "@bitwarden/common/misc/utils"; -import { testData as TestData } from "./testData/keeperJson/testData"; +import { testData as TestData } from "./test-data/keeper-json/testdata.json"; describe("Keeper Json Importer", () => { const testDataJson = JSON.stringify(TestData); diff --git a/libs/common/spec/importers/lastpassCsvImporter.spec.ts b/libs/common/spec/importers/lastpass-csv-importer.spec.ts similarity index 99% rename from libs/common/spec/importers/lastpassCsvImporter.spec.ts rename to libs/common/spec/importers/lastpass-csv-importer.spec.ts index a18192cf915a..8e5f5d8a55dc 100644 --- a/libs/common/spec/importers/lastpassCsvImporter.spec.ts +++ b/libs/common/spec/importers/lastpass-csv-importer.spec.ts @@ -1,6 +1,6 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { LastPassCsvImporter as Importer } from "@bitwarden/common/importers/lastpassCsvImporter"; +import { LastPassCsvImporter as Importer } from "@bitwarden/common/importers/lastpass-csv-importer"; import { ImportResult } from "@bitwarden/common/models/domain/import-result"; import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/models/view/field.view"; diff --git a/libs/common/spec/importers/mykiCsvImporter.spec.ts b/libs/common/spec/importers/myki-csv-importer.spec.ts similarity index 97% rename from libs/common/spec/importers/mykiCsvImporter.spec.ts rename to libs/common/spec/importers/myki-csv-importer.spec.ts index a65bdc450ac0..b28e495cf8b1 100644 --- a/libs/common/spec/importers/mykiCsvImporter.spec.ts +++ b/libs/common/spec/importers/myki-csv-importer.spec.ts @@ -1,13 +1,13 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { MykiCsvImporter as Importer } from "@bitwarden/common/importers/mykiCsvImporter"; +import { MykiCsvImporter as Importer } from "@bitwarden/common/importers/myki-csv-importer"; import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { userAccountData } from "./testData/mykiCsv/UserAccount.csv"; -import { userCreditCardData } from "./testData/mykiCsv/UserCreditCard.csv"; -import { userIdCardData } from "./testData/mykiCsv/UserIdCard.csv"; -import { userIdentityData } from "./testData/mykiCsv/UserIdentity.csv"; -import { userNoteData } from "./testData/mykiCsv/UserNote.csv"; -import { userTwoFaData } from "./testData/mykiCsv/UserTwofa.csv"; +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"; function expectDriversLicense(cipher: CipherView) { expect(cipher.type).toBe(CipherType.Identity); diff --git a/libs/common/spec/importers/nordpassCsvImporter.spec.ts b/libs/common/spec/importers/nordpass-csv-importer.spec.ts similarity index 94% rename from libs/common/spec/importers/nordpassCsvImporter.spec.ts rename to libs/common/spec/importers/nordpass-csv-importer.spec.ts index ada087bca933..b9ef3c32a5df 100644 --- a/libs/common/spec/importers/nordpassCsvImporter.spec.ts +++ b/libs/common/spec/importers/nordpass-csv-importer.spec.ts @@ -1,13 +1,13 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; -import { NordPassCsvImporter as Importer } from "@bitwarden/common/importers/nordpassCsvImporter"; +import { NordPassCsvImporter as Importer } from "@bitwarden/common/importers/nordpass-csv-importer"; import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/models/view/identity.view"; -import { data as creditCardData } from "./testData/nordpassCsv/nordpass.card.csv"; -import { data as identityData } from "./testData/nordpassCsv/nordpass.identity.csv"; -import { data as loginData } from "./testData/nordpassCsv/nordpass.login.csv"; -import { data as secureNoteData } from "./testData/nordpassCsv/nordpass.secureNote.csv"; +import { data as creditCardData } from "./test-data/nordpass-csv/nordpass.card.csv"; +import { data as identityData } from "./test-data/nordpass-csv/nordpass.identity.csv"; +import { data as loginData } from "./test-data/nordpass-csv/nordpass.login.csv"; +import { data as secureNoteData } from "./test-data/nordpass-csv/nordpass.secure-note.csv"; const namesTestData = [ { diff --git a/libs/common/spec/importers/onepassword1PifImporter.spec.ts b/libs/common/spec/importers/onepassword-1pif-importer.spec.ts similarity index 99% rename from libs/common/spec/importers/onepassword1PifImporter.spec.ts rename to libs/common/spec/importers/onepassword-1pif-importer.spec.ts index 85080377defa..6ba2edde65ed 100644 --- a/libs/common/spec/importers/onepassword1PifImporter.spec.ts +++ b/libs/common/spec/importers/onepassword-1pif-importer.spec.ts @@ -1,5 +1,5 @@ import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { OnePassword1PifImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepassword1PifImporter"; +import { OnePassword1PifImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-1pif-importer"; const TestData: string = "***aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee***\n" + diff --git a/libs/common/spec/importers/onepassword1PuxImporter.spec.ts b/libs/common/spec/importers/onepassword-1pux-importer.spec.ts similarity index 93% rename from libs/common/spec/importers/onepassword1PuxImporter.spec.ts rename to libs/common/spec/importers/onepassword-1pux-importer.spec.ts index 50d211da994a..98b9d6f1ddce 100644 --- a/libs/common/spec/importers/onepassword1PuxImporter.spec.ts +++ b/libs/common/spec/importers/onepassword-1pux-importer.spec.ts @@ -1,34 +1,34 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; -import { OnePassword1PuxImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepassword1PuxImporter"; +import { OnePassword1PuxImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-1pux-importer"; import { Utils } from "@bitwarden/common/misc/utils"; import { FieldView } from "@bitwarden/common/models/view/field.view"; -import { APICredentialsData } from "./testData/onePassword1Pux/APICredentials"; -import { BankAccountData } from "./testData/onePassword1Pux/BankAccount"; -import { CreditCardData } from "./testData/onePassword1Pux/CreditCard"; -import { DatabaseData } from "./testData/onePassword1Pux/Database"; -import { DriversLicenseData } from "./testData/onePassword1Pux/DriversLicense"; -import { EmailAccountData } from "./testData/onePassword1Pux/EmailAccount"; -import { EmailFieldData } from "./testData/onePassword1Pux/Emailfield"; -import { EmailFieldOnIdentityData } from "./testData/onePassword1Pux/EmailfieldOnIdentity"; -import { EmailFieldOnIdentityPrefilledData } from "./testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled"; -import { IdentityData } from "./testData/onePassword1Pux/IdentityData"; -import { LoginData } from "./testData/onePassword1Pux/LoginData"; -import { MedicalRecordData } from "./testData/onePassword1Pux/MedicalRecord"; -import { MembershipData } from "./testData/onePassword1Pux/Membership"; -import { OnePuxExampleFile } from "./testData/onePassword1Pux/Onepux_example"; -import { OutdoorLicenseData } from "./testData/onePassword1Pux/OutdoorLicense"; -import { PassportData } from "./testData/onePassword1Pux/Passport"; -import { PasswordData } from "./testData/onePassword1Pux/Password"; -import { RewardsProgramData } from "./testData/onePassword1Pux/RewardsProgram"; -import { SSNData } from "./testData/onePassword1Pux/SSN"; -import { SanitizedExport } from "./testData/onePassword1Pux/SanitizedExport"; -import { SecureNoteData } from "./testData/onePassword1Pux/SecureNote"; -import { ServerData } from "./testData/onePassword1Pux/Server"; -import { SoftwareLicenseData } from "./testData/onePassword1Pux/SoftwareLicense"; -import { WirelessRouterData } from "./testData/onePassword1Pux/WirelessRouter"; +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"; function validateCustomField(fields: FieldView[], fieldName: string, expectedValue: any) { expect(fields).toBeDefined(); diff --git a/libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts b/libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts similarity index 86% rename from libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts rename to libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts index 0965a11d4814..fc61d9760c95 100644 --- a/libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts +++ b/libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts @@ -1,10 +1,10 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { OnePasswordMacCsvImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepasswordMacCsvImporter"; +import { OnePasswordMacCsvImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-mac-csv-importer"; import { CipherView } from "@bitwarden/common/models/view/cipher.view"; -import { data as creditCardData } from "./testData/onePasswordCsv/creditCard.mac.csv"; -import { data as identityData } from "./testData/onePasswordCsv/identity.mac.csv"; -import { data as multiTypeData } from "./testData/onePasswordCsv/multipleItems.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"; function expectIdentity(cipher: CipherView) { expect(cipher.type).toBe(CipherType.Identity); diff --git a/libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts b/libs/common/spec/importers/onepassword-win-csv-importer.spec.ts similarity index 87% rename from libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts rename to libs/common/spec/importers/onepassword-win-csv-importer.spec.ts index 666886c3f401..5398f823ff03 100644 --- a/libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts +++ b/libs/common/spec/importers/onepassword-win-csv-importer.spec.ts @@ -1,12 +1,12 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { OnePasswordWinCsvImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepasswordWinCsvImporter"; +import { OnePasswordWinCsvImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-win-csv-importer"; import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/models/view/field.view"; -import { data as creditCardData } from "./testData/onePasswordCsv/creditCard.windows.csv"; -import { data as identityData } from "./testData/onePasswordCsv/identity.windows.csv"; -import { data as multiTypeData } from "./testData/onePasswordCsv/multipleItems.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"; function expectIdentity(cipher: CipherView) { expect(cipher.type).toBe(CipherType.Identity); diff --git a/libs/common/spec/importers/safariCsvImporter.spec.ts b/libs/common/spec/importers/safari-csv-importer.spec.ts similarity index 90% rename from libs/common/spec/importers/safariCsvImporter.spec.ts rename to libs/common/spec/importers/safari-csv-importer.spec.ts index 36d1e076a203..3bb0f614cec5 100644 --- a/libs/common/spec/importers/safariCsvImporter.spec.ts +++ b/libs/common/spec/importers/safari-csv-importer.spec.ts @@ -1,10 +1,10 @@ -import { SafariCsvImporter as Importer } from "@bitwarden/common/importers/safariCsvImporter"; +import { SafariCsvImporter as Importer } from "@bitwarden/common/importers/safari-csv-importer"; import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/models/view/login.view"; -import { data as oldSimplePasswordData } from "./testData/safariCsv/oldSimplePasswordData.csv"; -import { data as simplePasswordData } from "./testData/safariCsv/simplePasswordData.csv"; +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"; const CipherData = [ { diff --git a/libs/common/spec/importers/testData/bitwardenJson/empty.json.ts b/libs/common/spec/importers/test-data/bitwarden-json/empty.json.ts similarity index 100% rename from libs/common/spec/importers/testData/bitwardenJson/empty.json.ts rename to libs/common/spec/importers/test-data/bitwarden-json/empty.json.ts diff --git a/libs/common/spec/importers/testData/bitwardenJson/passwordProtected.json.ts b/libs/common/spec/importers/test-data/bitwarden-json/password-protected.json.ts similarity index 100% rename from libs/common/spec/importers/testData/bitwardenJson/passwordProtected.json.ts rename to libs/common/spec/importers/test-data/bitwarden-json/password-protected.json.ts diff --git a/libs/common/spec/importers/testData/chromeCsv/android-data.csv.ts b/libs/common/spec/importers/test-data/chrome-csv/android-data.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/chromeCsv/android-data.csv.ts rename to libs/common/spec/importers/test-data/chrome-csv/android-data.csv.ts diff --git a/libs/common/spec/importers/testData/chromeCsv/simple-password-data.csv.ts b/libs/common/spec/importers/test-data/chrome-csv/simple-password-data.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/chromeCsv/simple-password-data.csv.ts rename to libs/common/spec/importers/test-data/chrome-csv/simple-password-data.csv.ts diff --git a/libs/common/spec/importers/testData/dashlaneCsv/credentials.csv.ts b/libs/common/spec/importers/test-data/dashlane-csv/credentials.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/dashlaneCsv/credentials.csv.ts rename to libs/common/spec/importers/test-data/dashlane-csv/credentials.csv.ts diff --git a/libs/common/spec/importers/testData/dashlaneCsv/id.csv.ts b/libs/common/spec/importers/test-data/dashlane-csv/id.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/dashlaneCsv/id.csv.ts rename to libs/common/spec/importers/test-data/dashlane-csv/id.csv.ts diff --git a/libs/common/spec/importers/testData/dashlaneCsv/multiplePersonalInfo.csv.ts b/libs/common/spec/importers/test-data/dashlane-csv/multiple-personal-info.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/dashlaneCsv/multiplePersonalInfo.csv.ts rename to libs/common/spec/importers/test-data/dashlane-csv/multiple-personal-info.csv.ts diff --git a/libs/common/spec/importers/testData/dashlaneCsv/payments.csv.ts b/libs/common/spec/importers/test-data/dashlane-csv/payments.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/dashlaneCsv/payments.csv.ts rename to libs/common/spec/importers/test-data/dashlane-csv/payments.csv.ts diff --git a/libs/common/spec/importers/testData/dashlaneCsv/personalInfo.csv.ts b/libs/common/spec/importers/test-data/dashlane-csv/personal-info.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/dashlaneCsv/personalInfo.csv.ts rename to libs/common/spec/importers/test-data/dashlane-csv/personal-info.csv.ts diff --git a/libs/common/spec/importers/testData/dashlaneCsv/securenotes.csv.ts b/libs/common/spec/importers/test-data/dashlane-csv/securenotes.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/dashlaneCsv/securenotes.csv.ts rename to libs/common/spec/importers/test-data/dashlane-csv/securenotes.csv.ts diff --git a/libs/common/spec/importers/testData/firefoxCsv/firefoxAccountsData.csv.ts b/libs/common/spec/importers/test-data/firefox-csv/firefox-accounts-data.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/firefoxCsv/firefoxAccountsData.csv.ts rename to libs/common/spec/importers/test-data/firefox-csv/firefox-accounts-data.csv.ts diff --git a/libs/common/spec/importers/testData/firefoxCsv/simplePasswordData.csv.ts b/libs/common/spec/importers/test-data/firefox-csv/simple-password-data.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/firefoxCsv/simplePasswordData.csv.ts rename to libs/common/spec/importers/test-data/firefox-csv/simple-password-data.csv.ts diff --git a/libs/common/spec/importers/testData/keeperJson/testData.ts b/libs/common/spec/importers/test-data/keeper-json/testdata.json.ts similarity index 98% rename from libs/common/spec/importers/testData/keeperJson/testData.ts rename to libs/common/spec/importers/test-data/keeper-json/testdata.json.ts index c7868658a4e7..0ead208251ba 100644 --- a/libs/common/spec/importers/testData/keeperJson/testData.ts +++ b/libs/common/spec/importers/test-data/keeper-json/testdata.json.ts @@ -1,4 +1,4 @@ -import { KeeperJsonExport } from "@bitwarden/common/importers/keeperImporters/types/keeperJsonTypes"; +import { KeeperJsonExport } from "@bitwarden/common/importers/keeper/types/keeper-json-types"; export const testData: KeeperJsonExport = { shared_folders: [ diff --git a/libs/common/spec/importers/testData/mykiCsv/UserAccount.csv.ts b/libs/common/spec/importers/test-data/myki-csv/user-account.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/mykiCsv/UserAccount.csv.ts rename to libs/common/spec/importers/test-data/myki-csv/user-account.csv.ts diff --git a/libs/common/spec/importers/testData/mykiCsv/UserCreditCard.csv.ts b/libs/common/spec/importers/test-data/myki-csv/user-credit-card.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/mykiCsv/UserCreditCard.csv.ts rename to libs/common/spec/importers/test-data/myki-csv/user-credit-card.csv.ts diff --git a/libs/common/spec/importers/testData/mykiCsv/UserIdCard.csv.ts b/libs/common/spec/importers/test-data/myki-csv/user-id-card.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/mykiCsv/UserIdCard.csv.ts rename to libs/common/spec/importers/test-data/myki-csv/user-id-card.csv.ts diff --git a/libs/common/spec/importers/testData/mykiCsv/UserIdentity.csv.ts b/libs/common/spec/importers/test-data/myki-csv/user-identity.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/mykiCsv/UserIdentity.csv.ts rename to libs/common/spec/importers/test-data/myki-csv/user-identity.csv.ts diff --git a/libs/common/spec/importers/testData/mykiCsv/UserNote.csv.ts b/libs/common/spec/importers/test-data/myki-csv/user-note.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/mykiCsv/UserNote.csv.ts rename to libs/common/spec/importers/test-data/myki-csv/user-note.csv.ts diff --git a/libs/common/spec/importers/testData/mykiCsv/UserTwofa.csv.ts b/libs/common/spec/importers/test-data/myki-csv/user-twofa.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/mykiCsv/UserTwofa.csv.ts rename to libs/common/spec/importers/test-data/myki-csv/user-twofa.csv.ts diff --git a/libs/common/spec/importers/testData/nordpassCsv/nordpass.card.csv.ts b/libs/common/spec/importers/test-data/nordpass-csv/nordpass.card.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/nordpassCsv/nordpass.card.csv.ts rename to libs/common/spec/importers/test-data/nordpass-csv/nordpass.card.csv.ts diff --git a/libs/common/spec/importers/testData/nordpassCsv/nordpass.identity.csv.ts b/libs/common/spec/importers/test-data/nordpass-csv/nordpass.identity.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/nordpassCsv/nordpass.identity.csv.ts rename to libs/common/spec/importers/test-data/nordpass-csv/nordpass.identity.csv.ts diff --git a/libs/common/spec/importers/testData/nordpassCsv/nordpass.login.csv.ts b/libs/common/spec/importers/test-data/nordpass-csv/nordpass.login.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/nordpassCsv/nordpass.login.csv.ts rename to libs/common/spec/importers/test-data/nordpass-csv/nordpass.login.csv.ts diff --git a/libs/common/spec/importers/testData/nordpassCsv/nordpass.secureNote.csv.ts b/libs/common/spec/importers/test-data/nordpass-csv/nordpass.secure-note.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/nordpassCsv/nordpass.secureNote.csv.ts rename to libs/common/spec/importers/test-data/nordpass-csv/nordpass.secure-note.csv.ts diff --git a/libs/common/spec/importers/testData/onePassword1Pux/APICredentials.ts b/libs/common/spec/importers/test-data/onepassword-1pux/api-credentials.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/APICredentials.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/api-credentials.ts index d9f91cc6e9d3..762d57e91add 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/APICredentials.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/api-credentials.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const APICredentialsData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/BankAccount.ts b/libs/common/spec/importers/test-data/onepassword-1pux/bank-account.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/BankAccount.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/bank-account.ts index e5718988f289..2a88db0dabda 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/BankAccount.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/bank-account.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const BankAccountData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/CreditCard.ts b/libs/common/spec/importers/test-data/onepassword-1pux/credit-card.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/CreditCard.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/credit-card.ts index c05052c1f2fc..208d374321a4 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/CreditCard.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/credit-card.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const CreditCardData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Database.ts b/libs/common/spec/importers/test-data/onepassword-1pux/database.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/Database.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/database.ts index 2bbd6c2e2305..6eb6c921994c 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Database.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/database.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const DatabaseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts b/libs/common/spec/importers/test-data/onepassword-1pux/drivers-license.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/drivers-license.ts index e6e81bf83a37..ed52b3cd5db6 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/drivers-license.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const DriversLicenseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts b/libs/common/spec/importers/test-data/onepassword-1pux/email-account.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/email-account.ts index 5f8950173cbd..374553825c93 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/email-account.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const EmailAccountData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts b/libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity.ts similarity index 98% rename from libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity.ts index ebd8abd4e00d..4f9db420a075 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const EmailFieldOnIdentityData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts b/libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts similarity index 98% rename from libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts index afa7e16d6c5b..b33c14845e75 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const EmailFieldOnIdentityPrefilledData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Emailfield.ts b/libs/common/spec/importers/test-data/onepassword-1pux/email-field.ts similarity index 98% rename from libs/common/spec/importers/testData/onePassword1Pux/Emailfield.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/email-field.ts index ca282a171691..766fc2a22c45 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Emailfield.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/email-field.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const EmailFieldData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/IdentityData.ts b/libs/common/spec/importers/test-data/onepassword-1pux/identity-data.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/IdentityData.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/identity-data.ts index 41291bac60e9..2c4dbd95f35a 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/IdentityData.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/identity-data.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const IdentityData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/LoginData.ts b/libs/common/spec/importers/test-data/onepassword-1pux/login-data.ts similarity index 98% rename from libs/common/spec/importers/testData/onePassword1Pux/LoginData.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/login-data.ts index 34a32baf1fb1..afdf02be17e9 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/LoginData.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/login-data.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const LoginData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts b/libs/common/spec/importers/test-data/onepassword-1pux/medical-record.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/medical-record.ts index 5c47761b5838..3e5d39104927 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/medical-record.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const MedicalRecordData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Membership.ts b/libs/common/spec/importers/test-data/onepassword-1pux/membership.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/Membership.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/membership.ts index 24488352fe6e..1e602e1eb1da 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Membership.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/membership.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const MembershipData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts b/libs/common/spec/importers/test-data/onepassword-1pux/onepux_example.ts similarity index 98% rename from libs/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/onepux_example.ts index 3278362e01d5..f63684120054 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/onepux_example.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const OnePuxExampleFile: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts b/libs/common/spec/importers/test-data/onepassword-1pux/outdoor-license.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/outdoor-license.ts index 3f6f31643d44..c4b686c34a20 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/outdoor-license.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const OutdoorLicenseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Passport.ts b/libs/common/spec/importers/test-data/onepassword-1pux/passport.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/Passport.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/passport.ts index 86551d4a5171..3dcfed160e57 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Passport.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/passport.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const PassportData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Password.ts b/libs/common/spec/importers/test-data/onepassword-1pux/password.ts similarity index 97% rename from libs/common/spec/importers/testData/onePassword1Pux/Password.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/password.ts index d71d856a6d72..5d6e5b75652b 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Password.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/password.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const PasswordData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts b/libs/common/spec/importers/test-data/onepassword-1pux/rewards-program.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/rewards-program.ts index fa4e17315096..237116ef194c 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/rewards-program.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const RewardsProgramData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts b/libs/common/spec/importers/test-data/onepassword-1pux/sanitized-export.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/sanitized-export.ts index d98500202e85..efa398df0c2b 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/sanitized-export.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const SanitizedExport: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/SecureNote.ts b/libs/common/spec/importers/test-data/onepassword-1pux/secure-note.ts similarity index 96% rename from libs/common/spec/importers/testData/onePassword1Pux/SecureNote.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/secure-note.ts index fd690a8dd708..ea00d07dde50 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/SecureNote.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/secure-note.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const SecureNoteData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Server.ts b/libs/common/spec/importers/test-data/onepassword-1pux/server.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/Server.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/server.ts index dbbd2031c64e..883d296f9bfd 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Server.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/server.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const ServerData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts b/libs/common/spec/importers/test-data/onepassword-1pux/software-license.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/software-license.ts index 2b901977f095..e13c417373ae 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/software-license.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const SoftwareLicenseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/SSN.ts b/libs/common/spec/importers/test-data/onepassword-1pux/ssn.ts similarity index 98% rename from libs/common/spec/importers/testData/onePassword1Pux/SSN.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/ssn.ts index 721409a89643..ec3e505b5c2a 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/SSN.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/ssn.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const SSNData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts b/libs/common/spec/importers/test-data/onepassword-1pux/wireless-router.ts similarity index 99% rename from libs/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts rename to libs/common/spec/importers/test-data/onepassword-1pux/wireless-router.ts index 8c3bb254240f..7ce7237901cb 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts +++ b/libs/common/spec/importers/test-data/onepassword-1pux/wireless-router.ts @@ -1,4 +1,4 @@ -import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepassword/types/onepassword-1pux-importer-types"; export const WirelessRouterData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePasswordCsv/creditCard.mac.csv.ts b/libs/common/spec/importers/test-data/onepassword-csv/credit-card.mac.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/onePasswordCsv/creditCard.mac.csv.ts rename to libs/common/spec/importers/test-data/onepassword-csv/credit-card.mac.csv.ts diff --git a/libs/common/spec/importers/testData/onePasswordCsv/creditCard.windows.csv.ts b/libs/common/spec/importers/test-data/onepassword-csv/credit-card.windows.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/onePasswordCsv/creditCard.windows.csv.ts rename to libs/common/spec/importers/test-data/onepassword-csv/credit-card.windows.csv.ts diff --git a/libs/common/spec/importers/testData/onePasswordCsv/identity.mac.csv.ts b/libs/common/spec/importers/test-data/onepassword-csv/identity.mac.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/onePasswordCsv/identity.mac.csv.ts rename to libs/common/spec/importers/test-data/onepassword-csv/identity.mac.csv.ts diff --git a/libs/common/spec/importers/testData/onePasswordCsv/identity.windows.csv.ts b/libs/common/spec/importers/test-data/onepassword-csv/identity.windows.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/onePasswordCsv/identity.windows.csv.ts rename to libs/common/spec/importers/test-data/onepassword-csv/identity.windows.csv.ts diff --git a/libs/common/spec/importers/testData/onePasswordCsv/multipleItems.mac.csv.ts b/libs/common/spec/importers/test-data/onepassword-csv/multiple-items.mac.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/onePasswordCsv/multipleItems.mac.csv.ts rename to libs/common/spec/importers/test-data/onepassword-csv/multiple-items.mac.csv.ts diff --git a/libs/common/spec/importers/testData/onePasswordCsv/multipleItems.windows.csv.ts b/libs/common/spec/importers/test-data/onepassword-csv/multiple-items.windows.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/onePasswordCsv/multipleItems.windows.csv.ts rename to libs/common/spec/importers/test-data/onepassword-csv/multiple-items.windows.csv.ts diff --git a/libs/common/spec/importers/testData/safariCsv/oldSimplePasswordData.csv.ts b/libs/common/spec/importers/test-data/safari-csv/old-simple-password-data.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/safariCsv/oldSimplePasswordData.csv.ts rename to libs/common/spec/importers/test-data/safari-csv/old-simple-password-data.csv.ts diff --git a/libs/common/spec/importers/testData/safariCsv/simplePasswordData.csv.ts b/libs/common/spec/importers/test-data/safari-csv/simple-password-data.csv.ts similarity index 100% rename from libs/common/spec/importers/testData/safariCsv/simplePasswordData.csv.ts rename to libs/common/spec/importers/test-data/safari-csv/simple-password-data.csv.ts diff --git a/libs/common/spec/importers/testData/safeInCloud/testData.xml.ts b/libs/common/spec/importers/test-data/safeincloud/test-data.xml.ts similarity index 100% rename from libs/common/spec/importers/testData/safeInCloud/testData.xml.ts rename to libs/common/spec/importers/test-data/safeincloud/test-data.xml.ts diff --git a/libs/common/spec/services/import.service.spec.ts b/libs/common/spec/services/import.service.spec.ts index f2ae48a09ee3..c0ce1d0f4f9a 100644 --- a/libs/common/spec/services/import.service.spec.ts +++ b/libs/common/spec/services/import.service.spec.ts @@ -7,7 +7,7 @@ import { CollectionService } from "@bitwarden/common/abstractions/collection.ser import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwardenPasswordProtectedImporter"; +import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwarden-password-protected-importer"; import { Importer } from "@bitwarden/common/importers/importer"; import { Utils } from "@bitwarden/common/misc/utils"; import { ImportService } from "@bitwarden/common/services/import.service"; diff --git a/libs/common/src/abstractions/import.service.ts b/libs/common/src/abstractions/import.service.ts index 01f099b3186e..e0acb0beccca 100644 --- a/libs/common/src/abstractions/import.service.ts +++ b/libs/common/src/abstractions/import.service.ts @@ -1,5 +1,5 @@ import { ImportOption, ImportType } from "../enums/importOptions"; -import { ImportError } from "../importers/importError"; +import { ImportError } from "../importers/import-error"; import { Importer } from "../importers/importer"; export abstract class ImportService { diff --git a/libs/common/src/importers/ascendoCsvImporter.ts b/libs/common/src/importers/ascendo-csv-importer.ts similarity index 97% rename from libs/common/src/importers/ascendoCsvImporter.ts rename to libs/common/src/importers/ascendo-csv-importer.ts index 68c3ae5db740..832df10a55ab 100644 --- a/libs/common/src/importers/ascendoCsvImporter.ts +++ b/libs/common/src/importers/ascendo-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class AscendoCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/avastCsvImporter.ts b/libs/common/src/importers/avast-csv-importer.ts similarity index 94% rename from libs/common/src/importers/avastCsvImporter.ts rename to libs/common/src/importers/avast-csv-importer.ts index 14cfa722da9c..5cac29e801d2 100644 --- a/libs/common/src/importers/avastCsvImporter.ts +++ b/libs/common/src/importers/avast-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class AvastCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/avastJsonImporter.ts b/libs/common/src/importers/avast-json-importer.ts similarity index 98% rename from libs/common/src/importers/avastJsonImporter.ts rename to libs/common/src/importers/avast-json-importer.ts index 178f0a47e325..1c7a0e4a5d6b 100644 --- a/libs/common/src/importers/avastJsonImporter.ts +++ b/libs/common/src/importers/avast-json-importer.ts @@ -2,7 +2,7 @@ import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class AvastJsonImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/aviraCsvImporter.ts b/libs/common/src/importers/avira-csv-importer.ts similarity index 96% rename from libs/common/src/importers/aviraCsvImporter.ts rename to libs/common/src/importers/avira-csv-importer.ts index ceb4979aa149..5b9dfca8b19f 100644 --- a/libs/common/src/importers/aviraCsvImporter.ts +++ b/libs/common/src/importers/avira-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class AviraCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/baseImporter.ts b/libs/common/src/importers/base-importer.ts similarity index 100% rename from libs/common/src/importers/baseImporter.ts rename to libs/common/src/importers/base-importer.ts diff --git a/libs/common/src/importers/bitwardenCsvImporter.ts b/libs/common/src/importers/bitwarden-csv-importer.ts similarity index 98% rename from libs/common/src/importers/bitwardenCsvImporter.ts rename to libs/common/src/importers/bitwarden-csv-importer.ts index 01b87b8cbd2d..f5f2554789df 100644 --- a/libs/common/src/importers/bitwardenCsvImporter.ts +++ b/libs/common/src/importers/bitwarden-csv-importer.ts @@ -9,7 +9,7 @@ import { FieldView } from "../models/view/field.view"; import { LoginView } from "../models/view/login.view"; import { SecureNoteView } from "../models/view/secure-note.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class BitwardenCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/bitwardenJsonImporter.ts b/libs/common/src/importers/bitwarden-json-importer.ts similarity index 99% rename from libs/common/src/importers/bitwardenJsonImporter.ts rename to libs/common/src/importers/bitwarden-json-importer.ts index cf763c79048d..e17548fce2bc 100644 --- a/libs/common/src/importers/bitwardenJsonImporter.ts +++ b/libs/common/src/importers/bitwarden-json-importer.ts @@ -6,7 +6,7 @@ import { CipherWithIdExport } from "../models/export/cipher-with-ids.export"; import { CollectionWithIdExport } from "../models/export/collection-with-id.export"; import { FolderWithIdExport } from "../models/export/folder-with-id.export"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class BitwardenJsonImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/bitwardenPasswordProtectedImporter.ts b/libs/common/src/importers/bitwarden-password-protected-importer.ts similarity index 97% rename from libs/common/src/importers/bitwardenPasswordProtectedImporter.ts rename to libs/common/src/importers/bitwarden-password-protected-importer.ts index 064c09fa8f54..19e1aac0aecb 100644 --- a/libs/common/src/importers/bitwardenPasswordProtectedImporter.ts +++ b/libs/common/src/importers/bitwarden-password-protected-importer.ts @@ -5,7 +5,7 @@ import { EncString } from "../models/domain/enc-string"; import { ImportResult } from "../models/domain/import-result"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; -import { BitwardenJsonImporter } from "./bitwardenJsonImporter"; +import { BitwardenJsonImporter } from "./bitwarden-json-importer"; import { Importer } from "./importer"; interface BitwardenPasswordProtectedFileFormat { diff --git a/libs/common/src/importers/blackBerryCsvImporter.ts b/libs/common/src/importers/blackberry-csv-importer.ts similarity index 96% rename from libs/common/src/importers/blackBerryCsvImporter.ts rename to libs/common/src/importers/blackberry-csv-importer.ts index b458f341bab1..62df7f246c2a 100644 --- a/libs/common/src/importers/blackBerryCsvImporter.ts +++ b/libs/common/src/importers/blackberry-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class BlackBerryCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/blurCsvImporter.ts b/libs/common/src/importers/blur-csv-importer.ts similarity index 96% rename from libs/common/src/importers/blurCsvImporter.ts rename to libs/common/src/importers/blur-csv-importer.ts index fd058c31bb8d..2276e932f9aa 100644 --- a/libs/common/src/importers/blurCsvImporter.ts +++ b/libs/common/src/importers/blur-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class BlurCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/buttercupCsvImporter.ts b/libs/common/src/importers/buttercup-csv-importer.ts similarity index 97% rename from libs/common/src/importers/buttercupCsvImporter.ts rename to libs/common/src/importers/buttercup-csv-importer.ts index b9e7302ddb6e..22b6e33bad5c 100644 --- a/libs/common/src/importers/buttercupCsvImporter.ts +++ b/libs/common/src/importers/buttercup-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; const OfficialProps = ["!group_id", "!group_name", "title", "username", "password", "URL", "id"]; diff --git a/libs/common/src/importers/chrome-csv-importer.ts b/libs/common/src/importers/chrome-csv-importer.ts index 0208a29b73b5..7df20e4a6c43 100644 --- a/libs/common/src/importers/chrome-csv-importer.ts +++ b/libs/common/src/importers/chrome-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class ChromeCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/clipperzHtmlImporter.ts b/libs/common/src/importers/clipperz-html-importer.ts similarity index 98% rename from libs/common/src/importers/clipperzHtmlImporter.ts rename to libs/common/src/importers/clipperz-html-importer.ts index b7e7abc0bddf..a9d969d26383 100644 --- a/libs/common/src/importers/clipperzHtmlImporter.ts +++ b/libs/common/src/importers/clipperz-html-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class ClipperzHtmlImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/codebookCsvImporter.ts b/libs/common/src/importers/codebook-csv-importer.ts similarity index 97% rename from libs/common/src/importers/codebookCsvImporter.ts rename to libs/common/src/importers/codebook-csv-importer.ts index ec9848c23a7a..302c5335430b 100644 --- a/libs/common/src/importers/codebookCsvImporter.ts +++ b/libs/common/src/importers/codebook-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class CodebookCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/dashlaneImporters/dashlaneCsvImporter.ts b/libs/common/src/importers/dashlane/dashlane-csv-importer.ts similarity index 98% rename from libs/common/src/importers/dashlaneImporters/dashlaneCsvImporter.ts rename to libs/common/src/importers/dashlane/dashlane-csv-importer.ts index 8e7d5a682ab3..46860fd4a8dc 100644 --- a/libs/common/src/importers/dashlaneImporters/dashlaneCsvImporter.ts +++ b/libs/common/src/importers/dashlane/dashlane-csv-importer.ts @@ -5,7 +5,7 @@ import { CardView } from "../../models/view/card.view"; import { CipherView } from "../../models/view/cipher.view"; import { IdentityView } from "../../models/view/identity.view"; import { LoginView } from "../../models/view/login.view"; -import { BaseImporter } from "../baseImporter"; +import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; import { @@ -14,7 +14,7 @@ import { PaymentsRecord, PersonalInformationRecord, SecureNoteRecord, -} from "./types/dashlaneCsvTypes"; +} from "./types/dashlane-csv-types"; const _mappedCredentialsColums = new Set([ "title", diff --git a/libs/common/src/importers/dashlaneImporters/dashlaneJsonImporter.ts b/libs/common/src/importers/dashlane/dashlane-json-importer.ts similarity index 99% rename from libs/common/src/importers/dashlaneImporters/dashlaneJsonImporter.ts rename to libs/common/src/importers/dashlane/dashlane-json-importer.ts index 4c5afc175bcc..d6812fe283d9 100644 --- a/libs/common/src/importers/dashlaneImporters/dashlaneJsonImporter.ts +++ b/libs/common/src/importers/dashlane/dashlane-json-importer.ts @@ -5,7 +5,7 @@ import { CardView } from "../../models/view/card.view"; import { CipherView } from "../../models/view/cipher.view"; import { IdentityView } from "../../models/view/identity.view"; import { SecureNoteView } from "../../models/view/secure-note.view"; -import { BaseImporter } from "../baseImporter"; +import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; const HandledResults = new Set([ diff --git a/libs/common/src/importers/dashlaneImporters/types/dashlaneCsvTypes.ts b/libs/common/src/importers/dashlane/types/dashlane-csv-types.ts similarity index 100% rename from libs/common/src/importers/dashlaneImporters/types/dashlaneCsvTypes.ts rename to libs/common/src/importers/dashlane/types/dashlane-csv-types.ts diff --git a/libs/common/src/importers/encryptrCsvImporter.ts b/libs/common/src/importers/encryptr-csv-importer.ts similarity index 97% rename from libs/common/src/importers/encryptrCsvImporter.ts rename to libs/common/src/importers/encryptr-csv-importer.ts index fb5541b82ef8..68449d6c979e 100644 --- a/libs/common/src/importers/encryptrCsvImporter.ts +++ b/libs/common/src/importers/encryptr-csv-importer.ts @@ -2,7 +2,7 @@ import { CipherType } from "../enums/cipherType"; import { ImportResult } from "../models/domain/import-result"; import { CardView } from "../models/view/card.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class EncryptrCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/enpassCsvImporter.ts b/libs/common/src/importers/enpass-csv-importer.ts similarity index 98% rename from libs/common/src/importers/enpassCsvImporter.ts rename to libs/common/src/importers/enpass-csv-importer.ts index dada932ba225..d913c439eeea 100644 --- a/libs/common/src/importers/enpassCsvImporter.ts +++ b/libs/common/src/importers/enpass-csv-importer.ts @@ -4,7 +4,7 @@ import { ImportResult } from "../models/domain/import-result"; import { CardView } from "../models/view/card.view"; import { SecureNoteView } from "../models/view/secure-note.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class EnpassCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/enpassJsonImporter.ts b/libs/common/src/importers/enpass-json-importer.ts similarity index 99% rename from libs/common/src/importers/enpassJsonImporter.ts rename to libs/common/src/importers/enpass-json-importer.ts index 29e46b73e3a9..88778c8adef7 100644 --- a/libs/common/src/importers/enpassJsonImporter.ts +++ b/libs/common/src/importers/enpass-json-importer.ts @@ -5,7 +5,7 @@ import { CardView } from "../models/view/card.view"; import { CipherView } from "../models/view/cipher.view"; import { FolderView } from "../models/view/folder.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class EnpassJsonImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/firefoxCsvImporter.ts b/libs/common/src/importers/firefox-csv-importer.ts similarity index 95% rename from libs/common/src/importers/firefoxCsvImporter.ts rename to libs/common/src/importers/firefox-csv-importer.ts index 4b3dc597ec94..e6c0c7030cbe 100644 --- a/libs/common/src/importers/firefoxCsvImporter.ts +++ b/libs/common/src/importers/firefox-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class FirefoxCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/fsecureFskImporter.ts b/libs/common/src/importers/fsecure-fsk-importer.ts similarity index 97% rename from libs/common/src/importers/fsecureFskImporter.ts rename to libs/common/src/importers/fsecure-fsk-importer.ts index bf9ceb950d10..26cca341ac03 100644 --- a/libs/common/src/importers/fsecureFskImporter.ts +++ b/libs/common/src/importers/fsecure-fsk-importer.ts @@ -2,7 +2,7 @@ import { CipherType } from "../enums/cipherType"; import { ImportResult } from "../models/domain/import-result"; import { CardView } from "../models/view/card.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class FSecureFskImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/gnomeJsonImporter.ts b/libs/common/src/importers/gnome-json-importer.ts similarity index 97% rename from libs/common/src/importers/gnomeJsonImporter.ts rename to libs/common/src/importers/gnome-json-importer.ts index 1dd5f118dcd5..a4e1f67fe0f1 100644 --- a/libs/common/src/importers/gnomeJsonImporter.ts +++ b/libs/common/src/importers/gnome-json-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class GnomeJsonImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/importError.ts b/libs/common/src/importers/import-error.ts similarity index 100% rename from libs/common/src/importers/importError.ts rename to libs/common/src/importers/import-error.ts diff --git a/libs/common/src/importers/kasperskyTxtImporter.ts b/libs/common/src/importers/kaspersky-txt-importer.ts similarity index 98% rename from libs/common/src/importers/kasperskyTxtImporter.ts rename to libs/common/src/importers/kaspersky-txt-importer.ts index 75322946e2c9..34f501883579 100644 --- a/libs/common/src/importers/kasperskyTxtImporter.ts +++ b/libs/common/src/importers/kaspersky-txt-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; const NotesHeader = "Notes\n\n"; diff --git a/libs/common/src/importers/keepass2XmlImporter.ts b/libs/common/src/importers/keepass2-xml-importer.ts similarity index 98% rename from libs/common/src/importers/keepass2XmlImporter.ts rename to libs/common/src/importers/keepass2-xml-importer.ts index b2ca00146022..2da304a3babd 100644 --- a/libs/common/src/importers/keepass2XmlImporter.ts +++ b/libs/common/src/importers/keepass2-xml-importer.ts @@ -2,7 +2,7 @@ import { FieldType } from "../enums/fieldType"; import { ImportResult } from "../models/domain/import-result"; import { FolderView } from "../models/view/folder.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class KeePass2XmlImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/keepassxCsvImporter.ts b/libs/common/src/importers/keepassx-csv-importer.ts similarity index 96% rename from libs/common/src/importers/keepassxCsvImporter.ts rename to libs/common/src/importers/keepassx-csv-importer.ts index 22d118b22722..6bbdd73a0846 100644 --- a/libs/common/src/importers/keepassxCsvImporter.ts +++ b/libs/common/src/importers/keepassx-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class KeePassXCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/keeperImporters/keeperCsvImporter.ts b/libs/common/src/importers/keeper/keeper-csv-importer.ts similarity index 96% rename from libs/common/src/importers/keeperImporters/keeperCsvImporter.ts rename to libs/common/src/importers/keeper/keeper-csv-importer.ts index c87925216f15..54ff4a3d4d95 100644 --- a/libs/common/src/importers/keeperImporters/keeperCsvImporter.ts +++ b/libs/common/src/importers/keeper/keeper-csv-importer.ts @@ -1,5 +1,5 @@ import { ImportResult } from "../../models/domain/import-result"; -import { BaseImporter } from "../baseImporter"; +import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; export class KeeperCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/keeperImporters/keeperJsonImporter.ts b/libs/common/src/importers/keeper/keeper-json-importer.ts similarity index 94% rename from libs/common/src/importers/keeperImporters/keeperJsonImporter.ts rename to libs/common/src/importers/keeper/keeper-json-importer.ts index 0aed14824f8e..0011044dde6a 100644 --- a/libs/common/src/importers/keeperImporters/keeperJsonImporter.ts +++ b/libs/common/src/importers/keeper/keeper-json-importer.ts @@ -1,8 +1,8 @@ import { ImportResult } from "../../models/domain/import-result"; -import { BaseImporter } from "../baseImporter"; +import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; -import { KeeperJsonExport, RecordsEntity } from "./types/keeperJsonTypes"; +import { KeeperJsonExport, RecordsEntity } from "./types/keeper-json-types"; export class KeeperJsonImporter extends BaseImporter implements Importer { parse(data: string): Promise { diff --git a/libs/common/src/importers/keeperImporters/types/keeperJsonTypes.ts b/libs/common/src/importers/keeper/types/keeper-json-types.ts similarity index 100% rename from libs/common/src/importers/keeperImporters/types/keeperJsonTypes.ts rename to libs/common/src/importers/keeper/types/keeper-json-types.ts diff --git a/libs/common/src/importers/lastpassCsvImporter.ts b/libs/common/src/importers/lastpass-csv-importer.ts similarity index 99% rename from libs/common/src/importers/lastpassCsvImporter.ts rename to libs/common/src/importers/lastpass-csv-importer.ts index 6212837198ce..e75be31f5466 100644 --- a/libs/common/src/importers/lastpassCsvImporter.ts +++ b/libs/common/src/importers/lastpass-csv-importer.ts @@ -8,7 +8,7 @@ import { IdentityView } from "../models/view/identity.view"; import { LoginView } from "../models/view/login.view"; import { SecureNoteView } from "../models/view/secure-note.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class LastPassCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/logMeOnceCsvImporter.ts b/libs/common/src/importers/logmeonce-csv-importer.ts similarity index 95% rename from libs/common/src/importers/logMeOnceCsvImporter.ts rename to libs/common/src/importers/logmeonce-csv-importer.ts index 5fdc0a388b77..d1ff293e0212 100644 --- a/libs/common/src/importers/logMeOnceCsvImporter.ts +++ b/libs/common/src/importers/logmeonce-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class LogMeOnceCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/meldiumCsvImporter.ts b/libs/common/src/importers/meldium-csv-importer.ts similarity index 95% rename from libs/common/src/importers/meldiumCsvImporter.ts rename to libs/common/src/importers/meldium-csv-importer.ts index 1a30ca5cfe8e..af460c71e16d 100644 --- a/libs/common/src/importers/meldiumCsvImporter.ts +++ b/libs/common/src/importers/meldium-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class MeldiumCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/msecureCsvImporter.ts b/libs/common/src/importers/msecure-csv-importer.ts similarity index 97% rename from libs/common/src/importers/msecureCsvImporter.ts rename to libs/common/src/importers/msecure-csv-importer.ts index a1bb40349324..cb17da5c17d9 100644 --- a/libs/common/src/importers/msecureCsvImporter.ts +++ b/libs/common/src/importers/msecure-csv-importer.ts @@ -3,7 +3,7 @@ import { SecureNoteType } from "../enums/secureNoteType"; import { ImportResult } from "../models/domain/import-result"; import { SecureNoteView } from "../models/view/secure-note.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class MSecureCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/mykiCsvImporter.ts b/libs/common/src/importers/myki-csv-importer.ts similarity index 99% rename from libs/common/src/importers/mykiCsvImporter.ts rename to libs/common/src/importers/myki-csv-importer.ts index ec326b06f863..a56b0de4d3b7 100644 --- a/libs/common/src/importers/mykiCsvImporter.ts +++ b/libs/common/src/importers/myki-csv-importer.ts @@ -6,7 +6,7 @@ import { CipherView } from "../models/view/cipher.view"; import { IdentityView } from "../models/view/identity.view"; import { SecureNoteView } from "../models/view/secure-note.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; const mappedBaseColumns = ["nickname", "additionalInfo"]; diff --git a/libs/common/src/importers/nordpassCsvImporter.ts b/libs/common/src/importers/nordpass-csv-importer.ts similarity index 98% rename from libs/common/src/importers/nordpassCsvImporter.ts rename to libs/common/src/importers/nordpass-csv-importer.ts index b41a2ea035cd..cf6b73e13f33 100644 --- a/libs/common/src/importers/nordpassCsvImporter.ts +++ b/libs/common/src/importers/nordpass-csv-importer.ts @@ -4,7 +4,7 @@ import { ImportResult } from "../models/domain/import-result"; import { CipherView } from "../models/view/cipher.view"; import { LoginView } from "../models/view/login.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; type nodePassCsvParsed = { diff --git a/libs/common/src/importers/onepasswordImporters/cipherImportContext.ts b/libs/common/src/importers/onepassword/cipher-import-context.ts similarity index 100% rename from libs/common/src/importers/onepasswordImporters/cipherImportContext.ts rename to libs/common/src/importers/onepassword/cipher-import-context.ts diff --git a/libs/common/src/importers/onepasswordImporters/onepassword1PifImporter.ts b/libs/common/src/importers/onepassword/onepassword-1pif-importer.ts similarity index 99% rename from libs/common/src/importers/onepasswordImporters/onepassword1PifImporter.ts rename to libs/common/src/importers/onepassword/onepassword-1pif-importer.ts index 298f14bd28ad..a0b6bb84bf87 100644 --- a/libs/common/src/importers/onepasswordImporters/onepassword1PifImporter.ts +++ b/libs/common/src/importers/onepassword/onepassword-1pif-importer.ts @@ -7,7 +7,7 @@ import { CipherView } from "../../models/view/cipher.view"; import { IdentityView } from "../../models/view/identity.view"; import { PasswordHistoryView } from "../../models/view/password-history.view"; import { SecureNoteView } from "../../models/view/secure-note.view"; -import { BaseImporter } from "../baseImporter"; +import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; export class OnePassword1PifImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/onepasswordImporters/onepassword1PuxImporter.ts b/libs/common/src/importers/onepassword/onepassword-1pux-importer.ts similarity index 99% rename from libs/common/src/importers/onepasswordImporters/onepassword1PuxImporter.ts rename to libs/common/src/importers/onepassword/onepassword-1pux-importer.ts index 5c1f48696679..35027a1e90c7 100644 --- a/libs/common/src/importers/onepasswordImporters/onepassword1PuxImporter.ts +++ b/libs/common/src/importers/onepassword/onepassword-1pux-importer.ts @@ -9,7 +9,7 @@ import { IdentityView } from "../../models/view/identity.view"; import { LoginView } from "../../models/view/login.view"; import { PasswordHistoryView } from "../../models/view/password-history.view"; import { SecureNoteView } from "../../models/view/secure-note.view"; -import { BaseImporter } from "../baseImporter"; +import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; import { @@ -25,7 +25,7 @@ import { UrlsEntity, Value, VaultsEntity, -} from "./types/onepassword1PuxImporterTypes"; +} from "./types/onepassword-1pux-importer-types"; export class OnePassword1PuxImporter extends BaseImporter implements Importer { result = new ImportResult(); diff --git a/libs/common/src/importers/onepasswordImporters/onepasswordCsvImporter.ts b/libs/common/src/importers/onepassword/onepassword-csv-importer.ts similarity index 99% rename from libs/common/src/importers/onepasswordImporters/onepasswordCsvImporter.ts rename to libs/common/src/importers/onepassword/onepassword-csv-importer.ts index 44e7a3c3d4ef..12433c135f4d 100644 --- a/libs/common/src/importers/onepasswordImporters/onepasswordCsvImporter.ts +++ b/libs/common/src/importers/onepassword/onepassword-csv-importer.ts @@ -2,10 +2,10 @@ import { CipherType } from "../../enums/cipherType"; import { FieldType } from "../../enums/fieldType"; import { ImportResult } from "../../models/domain/import-result"; import { CipherView } from "../../models/view/cipher.view"; -import { BaseImporter } from "../baseImporter"; +import { BaseImporter } from "../base-importer"; import { Importer } from "../importer"; -import { CipherImportContext } from "./cipherImportContext"; +import { CipherImportContext } from "./cipher-import-context"; export const IgnoredProperties = [ "ainfo", diff --git a/libs/common/src/importers/onepasswordImporters/onepasswordMacCsvImporter.ts b/libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts similarity index 97% rename from libs/common/src/importers/onepasswordImporters/onepasswordMacCsvImporter.ts rename to libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts index ffd6284c14a0..522e6b0ef45f 100644 --- a/libs/common/src/importers/onepasswordImporters/onepasswordMacCsvImporter.ts +++ b/libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts @@ -4,7 +4,7 @@ import { CipherView } from "../../models/view/cipher.view"; import { IdentityView } from "../../models/view/identity.view"; import { Importer } from "../importer"; -import { IgnoredProperties, OnePasswordCsvImporter } from "./onepasswordCsvImporter"; +import { IgnoredProperties, OnePasswordCsvImporter } from "./onepassword-csv-importer"; export class OnePasswordMacCsvImporter extends OnePasswordCsvImporter implements Importer { setCipherType(value: any, cipher: CipherView) { diff --git a/libs/common/src/importers/onepasswordImporters/onepasswordWinCsvImporter.ts b/libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts similarity index 94% rename from libs/common/src/importers/onepasswordImporters/onepasswordWinCsvImporter.ts rename to libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts index 3097c6587a6f..5f0bca1c8a24 100644 --- a/libs/common/src/importers/onepasswordImporters/onepasswordWinCsvImporter.ts +++ b/libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts @@ -5,8 +5,8 @@ import { IdentityView } from "../../models/view/identity.view"; import { LoginView } from "../../models/view/login.view"; import { Importer } from "../importer"; -import { CipherImportContext } from "./cipherImportContext"; -import { OnePasswordCsvImporter } from "./onepasswordCsvImporter"; +import { CipherImportContext } from "./cipher-import-context"; +import { OnePasswordCsvImporter } from "./onepassword-csv-importer"; export class OnePasswordWinCsvImporter extends OnePasswordCsvImporter implements Importer { constructor() { diff --git a/libs/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes.ts b/libs/common/src/importers/onepassword/types/onepassword-1pux-importer-types.ts similarity index 100% rename from libs/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes.ts rename to libs/common/src/importers/onepassword/types/onepassword-1pux-importer-types.ts diff --git a/libs/common/src/importers/padlockCsvImporter.ts b/libs/common/src/importers/padlock-csv-importer.ts similarity index 98% rename from libs/common/src/importers/padlockCsvImporter.ts rename to libs/common/src/importers/padlock-csv-importer.ts index d9d1b2971152..7976e0ea3a8f 100644 --- a/libs/common/src/importers/padlockCsvImporter.ts +++ b/libs/common/src/importers/padlock-csv-importer.ts @@ -1,7 +1,7 @@ import { ImportResult } from "../models/domain/import-result"; import { CollectionView } from "../models/view/collection.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class PadlockCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/passkeepCsvImporter.ts b/libs/common/src/importers/passkeep-csv-importer.ts similarity index 96% rename from libs/common/src/importers/passkeepCsvImporter.ts rename to libs/common/src/importers/passkeep-csv-importer.ts index 9ba05246ad42..c7269fa4ec0c 100644 --- a/libs/common/src/importers/passkeepCsvImporter.ts +++ b/libs/common/src/importers/passkeep-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class PassKeepCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/passmanJsonImporter.ts b/libs/common/src/importers/passman-json-importer.ts similarity index 97% rename from libs/common/src/importers/passmanJsonImporter.ts rename to libs/common/src/importers/passman-json-importer.ts index bf5904bc5c37..6cc1e225224e 100644 --- a/libs/common/src/importers/passmanJsonImporter.ts +++ b/libs/common/src/importers/passman-json-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class PassmanJsonImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/passpackCsvImporter.ts b/libs/common/src/importers/passpack-csv-importer.ts similarity index 98% rename from libs/common/src/importers/passpackCsvImporter.ts rename to libs/common/src/importers/passpack-csv-importer.ts index fb5282594fd2..5f9f708c8add 100644 --- a/libs/common/src/importers/passpackCsvImporter.ts +++ b/libs/common/src/importers/passpack-csv-importer.ts @@ -1,7 +1,7 @@ import { ImportResult } from "../models/domain/import-result"; import { CollectionView } from "../models/view/collection.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class PasspackCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/passwordAgentCsvImporter.ts b/libs/common/src/importers/passwordagent-csv-importer.ts similarity index 97% rename from libs/common/src/importers/passwordAgentCsvImporter.ts rename to libs/common/src/importers/passwordagent-csv-importer.ts index 9ac68e04ed7d..358ee09c8413 100644 --- a/libs/common/src/importers/passwordAgentCsvImporter.ts +++ b/libs/common/src/importers/passwordagent-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class PasswordAgentCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/passwordBossJsonImporter.ts b/libs/common/src/importers/passwordboss-json-importer.ts similarity index 98% rename from libs/common/src/importers/passwordBossJsonImporter.ts rename to libs/common/src/importers/passwordboss-json-importer.ts index 3ec00c25437c..dc29edf117bb 100644 --- a/libs/common/src/importers/passwordBossJsonImporter.ts +++ b/libs/common/src/importers/passwordboss-json-importer.ts @@ -3,7 +3,7 @@ import { ImportResult } from "../models/domain/import-result"; import { CardView } from "../models/view/card.view"; import { FolderView } from "../models/view/folder.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class PasswordBossJsonImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/passwordDragonXmlImporter.ts b/libs/common/src/importers/passworddragon-xml-importer.ts similarity index 98% rename from libs/common/src/importers/passwordDragonXmlImporter.ts rename to libs/common/src/importers/passworddragon-xml-importer.ts index 1fa3dd60d057..17e177524744 100644 --- a/libs/common/src/importers/passwordDragonXmlImporter.ts +++ b/libs/common/src/importers/passworddragon-xml-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class PasswordDragonXmlImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/passwordSafeXmlImporter.ts b/libs/common/src/importers/passwordsafe-xml-importer.ts similarity index 98% rename from libs/common/src/importers/passwordSafeXmlImporter.ts rename to libs/common/src/importers/passwordsafe-xml-importer.ts index ccbc05932504..49b6cb64f640 100644 --- a/libs/common/src/importers/passwordSafeXmlImporter.ts +++ b/libs/common/src/importers/passwordsafe-xml-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class PasswordSafeXmlImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/passwordWalletTxtImporter.ts b/libs/common/src/importers/passwordwallet-txt-importer.ts similarity index 96% rename from libs/common/src/importers/passwordWalletTxtImporter.ts rename to libs/common/src/importers/passwordwallet-txt-importer.ts index 55902b9ebf86..2756c99949fc 100644 --- a/libs/common/src/importers/passwordWalletTxtImporter.ts +++ b/libs/common/src/importers/passwordwallet-txt-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class PasswordWalletTxtImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/rememBearCsvImporter.ts b/libs/common/src/importers/remembear-csv-importer.ts similarity index 98% rename from libs/common/src/importers/rememBearCsvImporter.ts rename to libs/common/src/importers/remembear-csv-importer.ts index 4fe3e9a0a523..3ddb32714078 100644 --- a/libs/common/src/importers/rememBearCsvImporter.ts +++ b/libs/common/src/importers/remembear-csv-importer.ts @@ -2,7 +2,7 @@ import { CipherType } from "../enums/cipherType"; import { ImportResult } from "../models/domain/import-result"; import { CardView } from "../models/view/card.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class RememBearCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/roboformCsvImporter.ts b/libs/common/src/importers/roboform-csv-importer.ts similarity index 97% rename from libs/common/src/importers/roboformCsvImporter.ts rename to libs/common/src/importers/roboform-csv-importer.ts index cfc0022a12cc..01d3d8dc7c32 100644 --- a/libs/common/src/importers/roboformCsvImporter.ts +++ b/libs/common/src/importers/roboform-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class RoboFormCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/safariCsvImporter.ts b/libs/common/src/importers/safari-csv-importer.ts similarity index 95% rename from libs/common/src/importers/safariCsvImporter.ts rename to libs/common/src/importers/safari-csv-importer.ts index 41d67f3b17ab..09f5dacbe2ba 100644 --- a/libs/common/src/importers/safariCsvImporter.ts +++ b/libs/common/src/importers/safari-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class SafariCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/safeInCloudXmlImporter.ts b/libs/common/src/importers/safeincloud-xml-importer.ts similarity index 99% rename from libs/common/src/importers/safeInCloudXmlImporter.ts rename to libs/common/src/importers/safeincloud-xml-importer.ts index 800162c218c6..5d81a001aaa6 100644 --- a/libs/common/src/importers/safeInCloudXmlImporter.ts +++ b/libs/common/src/importers/safeincloud-xml-importer.ts @@ -7,7 +7,7 @@ import { FieldView } from "../models/view/field.view"; import { FolderView } from "../models/view/folder.view"; import { SecureNoteView } from "../models/view/secure-note.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class SafeInCloudXmlImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/saferpassCsvImport.ts b/libs/common/src/importers/saferpass-csv-importer.ts similarity index 95% rename from libs/common/src/importers/saferpassCsvImport.ts rename to libs/common/src/importers/saferpass-csv-importer.ts index 1de578ee0861..2da953ea6f73 100644 --- a/libs/common/src/importers/saferpassCsvImport.ts +++ b/libs/common/src/importers/saferpass-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class SaferPassCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/secureSafeCsvImporter.ts b/libs/common/src/importers/securesafe-csv-importer.ts similarity index 95% rename from libs/common/src/importers/secureSafeCsvImporter.ts rename to libs/common/src/importers/securesafe-csv-importer.ts index b072b9878438..062c9dafa7cf 100644 --- a/libs/common/src/importers/secureSafeCsvImporter.ts +++ b/libs/common/src/importers/securesafe-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class SecureSafeCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/splashIdCsvImporter.ts b/libs/common/src/importers/splashid-csv-importer.ts similarity index 97% rename from libs/common/src/importers/splashIdCsvImporter.ts rename to libs/common/src/importers/splashid-csv-importer.ts index 241175b0794f..0270d91d1395 100644 --- a/libs/common/src/importers/splashIdCsvImporter.ts +++ b/libs/common/src/importers/splashid-csv-importer.ts @@ -1,7 +1,7 @@ import { ImportResult } from "../models/domain/import-result"; import { CipherView } from "../models/view/cipher.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class SplashIdCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/stickyPasswordXmlImporter.ts b/libs/common/src/importers/stickypassword-xml-importer.ts similarity index 98% rename from libs/common/src/importers/stickyPasswordXmlImporter.ts rename to libs/common/src/importers/stickypassword-xml-importer.ts index c2ce1836558e..a9bbd22ec583 100644 --- a/libs/common/src/importers/stickyPasswordXmlImporter.ts +++ b/libs/common/src/importers/stickypassword-xml-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class StickyPasswordXmlImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/truekeyCsvImporter.ts b/libs/common/src/importers/truekey-csv-importer.ts similarity index 98% rename from libs/common/src/importers/truekeyCsvImporter.ts rename to libs/common/src/importers/truekey-csv-importer.ts index dabfa4d3a487..8b65dbd5d9f6 100644 --- a/libs/common/src/importers/truekeyCsvImporter.ts +++ b/libs/common/src/importers/truekey-csv-importer.ts @@ -4,7 +4,7 @@ import { ImportResult } from "../models/domain/import-result"; import { CardView } from "../models/view/card.view"; import { SecureNoteView } from "../models/view/secure-note.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; const PropertiesToIgnore = [ diff --git a/libs/common/src/importers/upmCsvImporter.ts b/libs/common/src/importers/upm-csv-importer.ts similarity index 95% rename from libs/common/src/importers/upmCsvImporter.ts rename to libs/common/src/importers/upm-csv-importer.ts index 4a11bee69ecb..b326ddbac104 100644 --- a/libs/common/src/importers/upmCsvImporter.ts +++ b/libs/common/src/importers/upm-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class UpmCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/yotiCsvImporter.ts b/libs/common/src/importers/yoti-csv-importer.ts similarity index 94% rename from libs/common/src/importers/yotiCsvImporter.ts rename to libs/common/src/importers/yoti-csv-importer.ts index ba74fb98c0f4..868b804baf60 100644 --- a/libs/common/src/importers/yotiCsvImporter.ts +++ b/libs/common/src/importers/yoti-csv-importer.ts @@ -1,6 +1,6 @@ import { ImportResult } from "../models/domain/import-result"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class YotiCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/importers/zohoVaultCsvImporter.ts b/libs/common/src/importers/zohovault-csv-importer.ts similarity index 98% rename from libs/common/src/importers/zohoVaultCsvImporter.ts rename to libs/common/src/importers/zohovault-csv-importer.ts index 0484353edf95..2d4def098ac0 100644 --- a/libs/common/src/importers/zohoVaultCsvImporter.ts +++ b/libs/common/src/importers/zohovault-csv-importer.ts @@ -1,7 +1,7 @@ import { ImportResult } from "../models/domain/import-result"; import { CipherView } from "../models/view/cipher.view"; -import { BaseImporter } from "./baseImporter"; +import { BaseImporter } from "./base-importer"; import { Importer } from "./importer"; export class ZohoVaultCsvImporter extends BaseImporter implements Importer { diff --git a/libs/common/src/services/import.service.ts b/libs/common/src/services/import.service.ts index e719673bda78..202a899794ba 100644 --- a/libs/common/src/services/import.service.ts +++ b/libs/common/src/services/import.service.ts @@ -12,64 +12,64 @@ import { ImportType, regularImportOptions, } from "../enums/importOptions"; -import { AscendoCsvImporter } from "../importers/ascendoCsvImporter"; -import { AvastCsvImporter } from "../importers/avastCsvImporter"; -import { AvastJsonImporter } from "../importers/avastJsonImporter"; -import { AviraCsvImporter } from "../importers/aviraCsvImporter"; -import { BitwardenCsvImporter } from "../importers/bitwardenCsvImporter"; -import { BitwardenJsonImporter } from "../importers/bitwardenJsonImporter"; -import { BitwardenPasswordProtectedImporter } from "../importers/bitwardenPasswordProtectedImporter"; -import { BlackBerryCsvImporter } from "../importers/blackBerryCsvImporter"; -import { BlurCsvImporter } from "../importers/blurCsvImporter"; -import { ButtercupCsvImporter } from "../importers/buttercupCsvImporter"; +import { AscendoCsvImporter } from "../importers/ascendo-csv-importer"; +import { AvastCsvImporter } from "../importers/avast-csv-importer"; +import { AvastJsonImporter } from "../importers/avast-json-importer"; +import { AviraCsvImporter } from "../importers/avira-csv-importer"; +import { BitwardenCsvImporter } from "../importers/bitwarden-csv-importer"; +import { BitwardenJsonImporter } from "../importers/bitwarden-json-importer"; +import { BitwardenPasswordProtectedImporter } from "../importers/bitwarden-password-protected-importer"; +import { BlackBerryCsvImporter } from "../importers/blackberry-csv-importer"; +import { BlurCsvImporter } from "../importers/blur-csv-importer"; +import { ButtercupCsvImporter } from "../importers/buttercup-csv-importer"; import { ChromeCsvImporter } from "../importers/chrome-csv-importer"; -import { ClipperzHtmlImporter } from "../importers/clipperzHtmlImporter"; -import { CodebookCsvImporter } from "../importers/codebookCsvImporter"; -import { DashlaneCsvImporter } from "../importers/dashlaneImporters/dashlaneCsvImporter"; -import { DashlaneJsonImporter } from "../importers/dashlaneImporters/dashlaneJsonImporter"; -import { EncryptrCsvImporter } from "../importers/encryptrCsvImporter"; -import { EnpassCsvImporter } from "../importers/enpassCsvImporter"; -import { EnpassJsonImporter } from "../importers/enpassJsonImporter"; -import { FirefoxCsvImporter } from "../importers/firefoxCsvImporter"; -import { FSecureFskImporter } from "../importers/fsecureFskImporter"; -import { GnomeJsonImporter } from "../importers/gnomeJsonImporter"; -import { ImportError } from "../importers/importError"; +import { ClipperzHtmlImporter } from "../importers/clipperz-html-importer"; +import { CodebookCsvImporter } from "../importers/codebook-csv-importer"; +import { DashlaneCsvImporter } from "../importers/dashlane/dashlane-csv-importer"; +import { DashlaneJsonImporter } from "../importers/dashlane/dashlane-json-importer"; +import { EncryptrCsvImporter } from "../importers/encryptr-csv-importer"; +import { EnpassCsvImporter } from "../importers/enpass-csv-importer"; +import { EnpassJsonImporter } from "../importers/enpass-json-importer"; +import { FirefoxCsvImporter } from "../importers/firefox-csv-importer"; +import { FSecureFskImporter } from "../importers/fsecure-fsk-importer"; +import { GnomeJsonImporter } from "../importers/gnome-json-importer"; +import { ImportError } from "../importers/import-error"; import { Importer } from "../importers/importer"; -import { KasperskyTxtImporter } from "../importers/kasperskyTxtImporter"; -import { KeePass2XmlImporter } from "../importers/keepass2XmlImporter"; -import { KeePassXCsvImporter } from "../importers/keepassxCsvImporter"; -import { KeeperCsvImporter } from "../importers/keeperImporters/keeperCsvImporter"; -import { LastPassCsvImporter } from "../importers/lastpassCsvImporter"; -import { LogMeOnceCsvImporter } from "../importers/logMeOnceCsvImporter"; -import { MeldiumCsvImporter } from "../importers/meldiumCsvImporter"; -import { MSecureCsvImporter } from "../importers/msecureCsvImporter"; -import { MykiCsvImporter } from "../importers/mykiCsvImporter"; -import { NordPassCsvImporter } from "../importers/nordpassCsvImporter"; -import { OnePassword1PifImporter } from "../importers/onepasswordImporters/onepassword1PifImporter"; -import { OnePassword1PuxImporter } from "../importers/onepasswordImporters/onepassword1PuxImporter"; -import { OnePasswordMacCsvImporter } from "../importers/onepasswordImporters/onepasswordMacCsvImporter"; -import { OnePasswordWinCsvImporter } from "../importers/onepasswordImporters/onepasswordWinCsvImporter"; -import { PadlockCsvImporter } from "../importers/padlockCsvImporter"; -import { PassKeepCsvImporter } from "../importers/passkeepCsvImporter"; -import { PassmanJsonImporter } from "../importers/passmanJsonImporter"; -import { PasspackCsvImporter } from "../importers/passpackCsvImporter"; -import { PasswordAgentCsvImporter } from "../importers/passwordAgentCsvImporter"; -import { PasswordBossJsonImporter } from "../importers/passwordBossJsonImporter"; -import { PasswordDragonXmlImporter } from "../importers/passwordDragonXmlImporter"; -import { PasswordSafeXmlImporter } from "../importers/passwordSafeXmlImporter"; -import { PasswordWalletTxtImporter } from "../importers/passwordWalletTxtImporter"; -import { RememBearCsvImporter } from "../importers/rememBearCsvImporter"; -import { RoboFormCsvImporter } from "../importers/roboformCsvImporter"; -import { SafariCsvImporter } from "../importers/safariCsvImporter"; -import { SafeInCloudXmlImporter } from "../importers/safeInCloudXmlImporter"; -import { SaferPassCsvImporter } from "../importers/saferpassCsvImport"; -import { SecureSafeCsvImporter } from "../importers/secureSafeCsvImporter"; -import { SplashIdCsvImporter } from "../importers/splashIdCsvImporter"; -import { StickyPasswordXmlImporter } from "../importers/stickyPasswordXmlImporter"; -import { TrueKeyCsvImporter } from "../importers/truekeyCsvImporter"; -import { UpmCsvImporter } from "../importers/upmCsvImporter"; -import { YotiCsvImporter } from "../importers/yotiCsvImporter"; -import { ZohoVaultCsvImporter } from "../importers/zohoVaultCsvImporter"; +import { KasperskyTxtImporter } from "../importers/kaspersky-txt-importer"; +import { KeePass2XmlImporter } from "../importers/keepass2-xml-importer"; +import { KeePassXCsvImporter } from "../importers/keepassx-csv-importer"; +import { KeeperCsvImporter } from "../importers/keeper/keeper-csv-importer"; +import { LastPassCsvImporter } from "../importers/lastpass-csv-importer"; +import { LogMeOnceCsvImporter } from "../importers/logmeonce-csv-importer"; +import { MeldiumCsvImporter } from "../importers/meldium-csv-importer"; +import { MSecureCsvImporter } from "../importers/msecure-csv-importer"; +import { MykiCsvImporter } from "../importers/myki-csv-importer"; +import { NordPassCsvImporter } from "../importers/nordpass-csv-importer"; +import { OnePassword1PifImporter } from "../importers/onepassword/onepassword-1pif-importer"; +import { OnePassword1PuxImporter } from "../importers/onepassword/onepassword-1pux-importer"; +import { OnePasswordMacCsvImporter } from "../importers/onepassword/onepassword-mac-csv-importer"; +import { OnePasswordWinCsvImporter } from "../importers/onepassword/onepassword-win-csv-importer"; +import { PadlockCsvImporter } from "../importers/padlock-csv-importer"; +import { PassKeepCsvImporter } from "../importers/passkeep-csv-importer"; +import { PassmanJsonImporter } from "../importers/passman-json-importer"; +import { PasspackCsvImporter } from "../importers/passpack-csv-importer"; +import { PasswordAgentCsvImporter } from "../importers/passwordagent-csv-importer"; +import { PasswordBossJsonImporter } from "../importers/passwordboss-json-importer"; +import { PasswordDragonXmlImporter } from "../importers/passworddragon-xml-importer"; +import { PasswordSafeXmlImporter } from "../importers/passwordsafe-xml-importer"; +import { PasswordWalletTxtImporter } from "../importers/passwordwallet-txt-importer"; +import { RememBearCsvImporter } from "../importers/remembear-csv-importer"; +import { RoboFormCsvImporter } from "../importers/roboform-csv-importer"; +import { SafariCsvImporter } from "../importers/safari-csv-importer"; +import { SafeInCloudXmlImporter } from "../importers/safeincloud-xml-importer"; +import { SaferPassCsvImporter } from "../importers/saferpass-csv-importer"; +import { SecureSafeCsvImporter } from "../importers/securesafe-csv-importer"; +import { SplashIdCsvImporter } from "../importers/splashid-csv-importer"; +import { StickyPasswordXmlImporter } from "../importers/stickypassword-xml-importer"; +import { TrueKeyCsvImporter } from "../importers/truekey-csv-importer"; +import { UpmCsvImporter } from "../importers/upm-csv-importer"; +import { YotiCsvImporter } from "../importers/yoti-csv-importer"; +import { ZohoVaultCsvImporter } from "../importers/zohovault-csv-importer"; import { Utils } from "../misc/utils"; import { ImportResult } from "../models/domain/import-result"; import { CipherRequest } from "../models/request/cipher.request";