diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index fa900cf4e8..0ae0ca22a8 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -3136,8 +3136,8 @@ "invalidFilePassword": { "message": "Invalid file password, please use the password you entered when you created the export file." }, - "importDestination": { - "message": "Import destination" + "destination": { + "message": "Destination" }, "learnAboutImportOptions": { "message": "Learn about your import options" @@ -3693,6 +3693,9 @@ "loading": { "message": "Loading" }, + "data": { + "message": "Data" + }, "assign": { "message": "Assign" }, diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json index b9f5f825db..7b7dc28b31 100644 --- a/apps/desktop/src/locales/en/messages.json +++ b/apps/desktop/src/locales/en/messages.json @@ -1380,7 +1380,7 @@ }, "exportPasswordDescription": { "message": "This password will be used to export and import this file" - }, + }, "accountRestrictedOptionDescription": { "message": "Use your account encryption key, derived from your account's username and Master Password, to encrypt the export and restrict import to only the current Bitwarden account." }, @@ -2817,8 +2817,8 @@ "invalidFilePassword": { "message": "Invalid file password, please use the password you entered when you created the export file." }, - "importDestination": { - "message": "Import destination" + "destination": { + "message": "Destination" }, "learnAboutImportOptions": { "message": "Learn about your import options" @@ -3013,5 +3013,8 @@ "example": "Work" } } + }, + "data": { + "message": "Data" } } diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index d561733620..b9d759d0e3 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -1506,8 +1506,8 @@ "importEncKeyError": { "message": "Error decrypting the exported file. Your encryption key does not match the encryption key used export the data." }, - "importDestination": { - "message": "Import destination" + "destination": { + "message": "Destination" }, "learnAboutImportOptions": { "message": "Learn about your import options" @@ -8622,6 +8622,9 @@ } } }, + "data": { + "message": "Data" + }, "purchasedSeatsRemoved": { "message": "purchased seats removed" } diff --git a/libs/importer/src/components/import.component.html b/libs/importer/src/components/import.component.html index 54df0ba4d2..da39290f6c 100644 --- a/libs/importer/src/components/import.component.html +++ b/libs/importer/src/components/import.component.html @@ -2,396 +2,419 @@ {{ "personalOwnershipPolicyInEffectImports" | i18n }}
- - {{ "importDestination" | i18n }} - - - - - - - - - + + +

{{ "destination" | i18n }}

+ + + + {{ "vault" | i18n }} + + + + + + + {{ organizationId ? ("collection" | i18n) : ("folder" | i18n) }} + + + + + + + + + + + {{ + "importTargetHint" + | i18n + : (organizationId ? ("collection" | i18n | lowercase) : ("folder" | i18n | lowercase)) + }} + + + - - {{ organizationId ? ("collection" | i18n) : ("folder" | i18n) }} - - - - - - - - - - - {{ - "importTargetHint" - | i18n: (organizationId ? ("collection" | i18n | lowercase) : ("folder" | i18n | lowercase)) - }} - - - - {{ "fileFormat" | i18n }} - - - - - - - - - - - - - See detailed instructions on our help site at - - https://bitwarden.com/help/export-your-data/ - - -

- {{ "seeDetailedInstructions" | i18n }} - - https://bitwarden.com/help/import-from-lastpass/ -

- - - {{ "importDirectlyFromLastPass" | i18n }} - - - {{ "importFromCSV" | i18n }} - - - - - Using the KeePassX desktop application, navigate to "Database" → "Export to CSV file" and - save the CSV file. - - - In the Avira web vault, go to "Settings" → "My Data" → "Export data" and save the - CSV file. - - - In the Blur web vault, click your username at the top and go to "Settings" → "Export - Data", then click "Export CSV" for your "Accounts". - - - Using the SaveInCloud desktop application, navigate to "File" → "Export" → "As XML" - and save the XML file. - - - Using the Padlock desktop application, click the hamburger icon in the top left corner and - navigate to "Settings" → "Export" button and save the file "As CSV". - - - Using the KeePass 2 desktop application, navigate to "File" → "Export" and select the - "KeePass XML (2.x)" option. - - - Using the Universal Password Manager desktop application, navigate to "Database" → - "Export" and save the CSV file. - - - Using the SaferPass browser extension, click the hamburger icon in the top left corner and - navigate to "Settings". Click the "Export accounts" button to save the CSV file. - - - Using the Meldium web vault, navigate to "Settings". Locate the "Export data" function and - click "Show me my data" to save the CSV file. - - - Log into the Keeper web vault (keepersecurity.com/vault). Click on your "account email" (top - right) and select "Settings". Go to "Export" and find the "Export to .csv File" option. Click - "Export" to save the CSV file. - - - - - The process is exactly the same as importing from Google Chrome. - - See detailed instructions on our help site at - - https://bitwarden.com/help/import-from-chrome/ - - - See detailed instructions on our help site at - - https://bitwarden.com/help/import-from-firefox/. - - - See detailed instructions on our help site at - - https://bitwarden.com/help/import-from-safari/. - - - See detailed instructions on our help site at - - https://bitwarden.com/help/import-from-1password/. - - - Using the Password Dragon desktop application, navigate to "File" → "Export" → "To - XML". In the dialog that pops up select "All Rows" and check all fields. Click the "Export" - button and save the XML file. - - - Using the Enpass desktop application, navigate to "File" → "Export" → "As CSV". - Select "OK" to the warning alert and save the CSV file. Note that the importer only supports - files exported while Enpass is set to the English language, so adjust your settings - accordingly. - - - Using the Enpass 6 desktop application, click the menu button and navigate to "File" → - "Export". Select the ".json" file format option and save the JSON file. - - - Using the Password Safe desktop application, navigate to "File" → "Export To" → "XML - format..." and save the XML file. - - - Log in to Dashlane, click on "My Account" → "Settings" → "Export file" and select - "Export as a CSV file". This will download a zip archive containing various CSV files. Unzip - the archive and import each CSV file individually. - - - Dashlane no longer supports the JSON format. Only use this if you have an existing JSON for - import. Use the CSV importer when creating new exports. - - - Using the mSecure desktop application, navigate to "File" → "Export" → "CSV File..." - and save the CSV file. - - - Using the Sticky Password desktop application, navigate to "Menu" (top right) → "Export" - → "Export all". Select the unencrypted format XML option and save the XML file. - - - Using the True Key desktop application, click the gear icon (top right) and then navigate to - "App Settings". Click the "Export" button, enter your password and save the CSV file. - - - Log into the Clipperz web application (clipperz.is/app). Click the hamburger menu icon in the - top right to expand the navigation bar. Navigate to "Data" → "Export". Click the - "download HTML+JSON" button to save the HTML file. - - - Using the RoboForm Editor desktop application, navigate to "RoboForm" (top left) → - "Options" → "Account & Data" and click the "Export" button. Select all of your data, - change the "Format" to "CSV file" and then click the "Export" button to save the CSV file. - Note: RoboForm only allows you to export Logins. Other items will not be exported. - - - Log into the Passbolt web vault and navigate to the "Passwords" listing. Select all of the - passwords you would like to export and click the "Export" button at the top of the listing. - Choose the "csv (lastpass)" export format and click the "Export" button. - - - Using the Ascendo DataVault desktop application, navigate to "Tools" → "Export". In the - dialog that pops up, select the "All Items (DVX, CSV)" option. Click the "Ok" button to save - the CSV file. - - - Using the Password Boss desktop application, navigate to "File" → "Export data" → - "Password Boss JSON - not encrypted" and save the JSON file. - - - Log into the Zoho web vault (vault.zoho.com). Navigate to "Tools" → "Export Secrets". - Select "All Secrets" and click the "Zoho Vault Format CSV" button. Highlight and copy the data - from the textarea. Open a text editor like Notepad and paste the data. Save the data from the - text editor as - zoho_export.csv. - - - Using the SplashID Safe desktop application, click on the SplashID blue lock logo in the top - right corner. Navigate to "Export" → "Export as CSV" and save the CSV file. - - - Using the PassKeep mobile app, navigate to "Backup/Restore". Locate the "CSV Backup/Restore" - section and click "Backup to CSV" to save the CSV file. - - - Make sure you have python-keyring and python-gnomekeyring installed. Save the - GNOME Keyring Import/Export - python script to your desktop as pw_helper.py. Open terminal and run - chmod +rx Desktop/pw_helper.py and then - python Desktop/pw_helper.py export Desktop/my_passwords.json. Then upload the - resulting my_passwords.json file here to Bitwarden. - - - Using the Password Agent desktop application navigate to "File" → "Export", select the - "Fields to export" button and check all of the fields, change the "Output format" to "CSV", - and then click the "Start" button to save the CSV file. - - - Log into the Passpack website vault and navigate to "Settings" → "Export", then click the - "Download" button to save the CSV file. - - - Open your Passman vault and click on "Settings" in the bottom left corner. In the "Settings" - window switch to the "Export credentials" tab and choose "JSON" as the export type. Enter your - vault's passphrase and click the "Export" button to save the JSON file. - - - Open the Avast Passwords desktop application and navigate to "Settings" → "Import/export - data". Select the "Export" button for the "Export to CSV file" option to save the CSV file. - - - Open the Avast Passwords desktop application and navigate to "Settings" → "Import/export - data". Select the "Export" button for the "Export to JSON file" option to save the JSON file. - - - Open the F-Secure KEY desktop application and navigate to "Settings" → "Export - Passwords". Select the "Export" button, enter your master password, and save the FSK file. - - - Open the Kaspersky Password Manager desktop application and navigate to "Settings" → - "Import/Export". Locate the "Export to text file" section and select the "Export" button to - save the TXT file. - - - Open the RememBear desktop application and navigate to "Settings" → "Account" → - "Export". Enter your master password and select the "Export Anyway" button to save the CSV - file. - - - Open the PasswordWallet desktop application and navigate to "File" → "Export" → - "Visible entries to text file". Enter your password and select the "Ok" button to save the TXT - file. - - - Open the Myki desktop browser extension and navigate to "Advanced" → "Export Accounts" - and then scan the QR code with your mobile device. Various CSV files will then be saved to - your computer's downloads folder. - - - Export your SecureSafe password safe to a CSV file with a comma delimiter. - - - Open the LogMeOnce browser extension, then navigate to "Open Menu" → "Export To" and - select "CSV File" to save the CSV file. - - - Open the BlackBerry Password Keeper application, then navigate to "Settings" → - "Import/Export". Select "Export Passwords" and follow the instructions on screen to save the - unencrypted CSV file. - - - Open the Buttercup desktop application and unlock your vault. Right click on your vault's icon - and select "Export" to save the CSV file. - - - Open the Codebook desktop application and log in. Navigate to "File" → "Export all", then - click "Yes" on the dialog and save the CSV file. - - - Open the newest version of the Encryptr desktop application and allow all of your data to - sync. Once syncing of your data is complete, the download icon in the top right corner will - turn pink. Click the download icon and save the CSV file. - - - From the Yoti browser extension, click on "Settings", then "Export Saved Logins" and save the - CSV file. - - - Log in to the Psono web vault, click on the "Signed in as"-dropdown, select "Others". Go to - the "Export"-tab and select the json type export and then click on Export. - - - Log in to "https://vault.passky.org" → "Import & Export" → "Export" in the Passky - section. ("Backup" is unsupported as it is encrypted). - - - In the ProtonPass browser extension, go to Settings > Export. Export without PGP encryption - and save the zip file. - - - -
- - {{ "selectImportFile" | i18n }} -
- - {{ this.fileSelected ? this.fileSelected.name : ("noFileChosen" | i18n) }} + + + The process is exactly the same as importing from Google Chrome. + + See detailed instructions on our help site at + + https://bitwarden.com/help/import-from-chrome/ + + + See detailed instructions on our help site at + + https://bitwarden.com/help/import-from-firefox/. + + + See detailed instructions on our help site at + + https://bitwarden.com/help/import-from-safari/. + + + See detailed instructions on our help site at + + https://bitwarden.com/help/import-from-1password/. + + + Using the Password Dragon desktop application, navigate to "File" → "Export" → + "To XML". In the dialog that pops up select "All Rows" and check all fields. Click the + "Export" button and save the XML file. + + + Using the Enpass desktop application, navigate to "File" → "Export" → "As CSV". + Select "OK" to the warning alert and save the CSV file. Note that the importer only + supports files exported while Enpass is set to the English language, so adjust your + settings accordingly. + + + Using the Enpass 6 desktop application, click the menu button and navigate to "File" + → "Export". Select the ".json" file format option and save the JSON file. + + + Using the Password Safe desktop application, navigate to "File" → "Export To" → + "XML format..." and save the XML file. + + + Log in to Dashlane, click on "My Account" → "Settings" → "Export file" and + select "Export as a CSV file". This will download a zip archive containing various CSV + files. Unzip the archive and import each CSV file individually. + + + Dashlane no longer supports the JSON format. Only use this if you have an existing JSON + for import. Use the CSV importer when creating new exports. + + + Using the mSecure desktop application, navigate to "File" → "Export" → "CSV + File..." and save the CSV file. + + + Using the Sticky Password desktop application, navigate to "Menu" (top right) → + "Export" → "Export all". Select the unencrypted format XML option and save the XML + file. + + + Using the True Key desktop application, click the gear icon (top right) and then navigate + to "App Settings". Click the "Export" button, enter your password and save the CSV file. + + + Log into the Clipperz web application (clipperz.is/app). Click the hamburger menu icon in + the top right to expand the navigation bar. Navigate to "Data" → "Export". Click the + "download HTML+JSON" button to save the HTML file. + + + Using the RoboForm Editor desktop application, navigate to "RoboForm" (top left) → + "Options" → "Account & Data" and click the "Export" button. Select all of your + data, change the "Format" to "CSV file" and then click the "Export" button to save the CSV + file. Note: RoboForm only allows you to export Logins. Other items will not be exported. + + + Log into the Passbolt web vault and navigate to the "Passwords" listing. Select all of the + passwords you would like to export and click the "Export" button at the top of the + listing. Choose the "csv (lastpass)" export format and click the "Export" button. + + + Using the Ascendo DataVault desktop application, navigate to "Tools" → "Export". In + the dialog that pops up, select the "All Items (DVX, CSV)" option. Click the "Ok" button + to save the CSV file. + + + Using the Password Boss desktop application, navigate to "File" → "Export data" + → "Password Boss JSON - not encrypted" and save the JSON file. + + + Log into the Zoho web vault (vault.zoho.com). Navigate to "Tools" → "Export Secrets". + Select "All Secrets" and click the "Zoho Vault Format CSV" button. Highlight and copy the + data from the textarea. Open a text editor like Notepad and paste the data. Save the data + from the text editor as + zoho_export.csv. + + + Using the SplashID Safe desktop application, click on the SplashID blue lock logo in the + top right corner. Navigate to "Export" → "Export as CSV" and save the CSV file. + + + Using the PassKeep mobile app, navigate to "Backup/Restore". Locate the "CSV + Backup/Restore" section and click "Backup to CSV" to save the CSV file. + + + Make sure you have python-keyring and python-gnomekeyring installed. Save the + GNOME Keyring Import/Export + python script to your desktop as pw_helper.py. Open terminal and run + chmod +rx Desktop/pw_helper.py and then + python Desktop/pw_helper.py export Desktop/my_passwords.json. Then upload the + resulting my_passwords.json file here to Bitwarden. + + + Using the Password Agent desktop application navigate to "File" → "Export", select + the "Fields to export" button and check all of the fields, change the "Output format" to + "CSV", and then click the "Start" button to save the CSV file. + + + Log into the Passpack website vault and navigate to "Settings" → "Export", then click + the "Download" button to save the CSV file. + + + Open your Passman vault and click on "Settings" in the bottom left corner. In the + "Settings" window switch to the "Export credentials" tab and choose "JSON" as the export + type. Enter your vault's passphrase and click the "Export" button to save the JSON file. + + + Open the Avast Passwords desktop application and navigate to "Settings" → + "Import/export data". Select the "Export" button for the "Export to CSV file" option to + save the CSV file. + + + Open the Avast Passwords desktop application and navigate to "Settings" → + "Import/export data". Select the "Export" button for the "Export to JSON file" option to + save the JSON file. + + + Open the F-Secure KEY desktop application and navigate to "Settings" → "Export + Passwords". Select the "Export" button, enter your master password, and save the FSK file. + + + Open the Kaspersky Password Manager desktop application and navigate to "Settings" → + "Import/Export". Locate the "Export to text file" section and select the "Export" button + to save the TXT file. + + + Open the RememBear desktop application and navigate to "Settings" → "Account" → + "Export". Enter your master password and select the "Export Anyway" button to save the CSV + file. + + + Open the PasswordWallet desktop application and navigate to "File" → "Export" → + "Visible entries to text file". Enter your password and select the "Ok" button to save the + TXT file. + + + Open the Myki desktop browser extension and navigate to "Advanced" → "Export + Accounts" and then scan the QR code with your mobile device. Various CSV files will then + be saved to your computer's downloads folder. + + + Export your SecureSafe password safe to a CSV file with a comma delimiter. + + + Open the LogMeOnce browser extension, then navigate to "Open Menu" → "Export To" and + select "CSV File" to save the CSV file. + + + Open the BlackBerry Password Keeper application, then navigate to "Settings" → + "Import/Export". Select "Export Passwords" and follow the instructions on screen to save + the unencrypted CSV file. + + + Open the Buttercup desktop application and unlock your vault. Right click on your vault's + icon and select "Export" to save the CSV file. + + + Open the Codebook desktop application and log in. Navigate to "File" → "Export all", + then click "Yes" on the dialog and save the CSV file. + + + Open the newest version of the Encryptr desktop application and allow all of your data to + sync. Once syncing of your data is complete, the download icon in the top right corner + will turn pink. Click the download icon and save the CSV file. + + + From the Yoti browser extension, click on "Settings", then "Export Saved Logins" and save + the CSV file. + + + Log in to the Psono web vault, click on the "Signed in as"-dropdown, select "Others". Go + to the "Export"-tab and select the json type export and then click on Export. + + + Log in to "https://vault.passky.org" → "Import & Export" → "Export" in the + Passky section. ("Backup" is unsupported as it is encrypted). + + + In the ProtonPass browser extension, go to Settings > Export. Export without PGP + encryption and save the zip file. + + + +
+ + {{ "selectImportFile" | i18n }} +
+ + {{ this.fileSelected ? this.fileSelected.name : ("noFileChosen" | i18n) }} +
+ + + + {{ "orCopyPasteFileContents" | i18n }} + +
- - - - {{ "orCopyPasteFileContents" | i18n }} - - -
+ + diff --git a/libs/importer/src/components/import.component.ts b/libs/importer/src/components/import.component.ts index 8f3566831d..4670cb2f75 100644 --- a/libs/importer/src/components/import.component.ts +++ b/libs/importer/src/components/import.component.ts @@ -43,10 +43,14 @@ import { BitSubmitDirective, ButtonModule, CalloutModule, + CardComponent, + ContainerComponent, DialogService, FormFieldModule, IconButtonModule, RadioButtonModule, + SectionComponent, + SectionHeaderComponent, SelectModule, ToastService, } from "@bitwarden/components"; @@ -104,6 +108,10 @@ const safeProviders: SafeProvider[] = [ ReactiveFormsModule, ImportLastPassComponent, RadioButtonModule, + CardComponent, + ContainerComponent, + SectionHeaderComponent, + SectionComponent, ], providers: safeProviders, })