Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-06 09:20:43 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Encrypted export warning
This commit is contained in:
Thomas Rittson 2021-03-05 09:55:41 +10:00 committed by GitHub
commit 0828f43215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 729ab4f20b81d7e465d7570c51cdb67d3cc49e6f Subproject commit b7acbcf3a7766eb0a52f21fe90505a69b4c19444

5
src/_locales/en/messages.json
View File

@ -612,9 +612,12 @@
"exportWarningDesc": { "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." "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." "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": { "exportMasterPassword": {
"message": "Enter your master password to export your vault data." "message": "Enter your master password to export your vault data."
}, },

6
src/services/browserPlatformUtils.service.ts
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); const dialogId = Math.floor(Math.random() * Number.MAX_SAFE_INTEGER);
this.messagingService.send('showDialog', { this.messagingService.send('showDialog', {
text: text, text: bodyIsHtml ? null : body,
html: bodyIsHtml ? body : null,
title: title, title: title,
confirmText: confirmText, confirmText: confirmText,
cancelText: cancelText, cancelText: cancelText,