1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 07:43:35 +00:00

Merge pull request #1659 from bitwarden/encrypted-export-warning

Encrypted export warning
This commit is contained in:
Thomas Rittson
2021-03-05 09:55:41 +10:00
committed by GitHub
3 changed files with 9 additions and 4 deletions

2
jslib

Submodule jslib updated: 729ab4f20b...b7acbcf3a7

View File

@@ -612,9 +612,12 @@
"exportWarningDesc": {
"message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
},
"encExportWarningDesc": {
"encExportKeyWarningDesc": {
"message": "This export encrypts your data using your account's encryption key. If you ever rotate your account's encryption key you should export again since you will not be able to decrypt this export file."
},
"encExportAccountWarningDesc": {
"message": "Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account."
},
"exportMasterPassword": {
"message": "Enter your master password to export your vault data."
},

View File

@@ -148,10 +148,12 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService
});
}
showDialog(text: string, title?: string, confirmText?: string, cancelText?: string, type?: string) {
showDialog(body: string, title?: string, confirmText?: string, cancelText?: string, type?: string,
bodyIsHtml: boolean = false) {
const dialogId = Math.floor(Math.random() * Number.MAX_SAFE_INTEGER);
this.messagingService.send('showDialog', {
text: text,
text: bodyIsHtml ? null : body,
html: bodyIsHtml ? body : null,
title: title,
confirmText: confirmText,
cancelText: cancelText,