Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-28 12:35:40 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Add extra encrypted export warnings
This commit is contained in:
Thomas Rittson 2021-03-05 09:56:25 +10:00 committed by GitHub
commit 79d0fa842f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 3942868cf488ed8c1983ffadab2c8900b8c78410
Subproject commit b7acbcf3a7766eb0a52f21fe90505a69b4c19444

19
src/app/vault/export.component.ts
View File

@ -5,6 +5,8 @@ import {
OnInit,
} from '@angular/core';
import * as os from 'os';
import { CryptoService } from 'jslib/abstractions/crypto.service';
import { EventService } from 'jslib/abstractions/event.service';
import { ExportService } from 'jslib/abstractions/export.service';
@ -49,4 +51,21 @@ export class ExportComponent extends BaseExportComponent implements OnInit {
onWindowHidden() {
this.showPassword = false;
}
async warningDialog() {
if (this.encryptedFormat) {
return await this.platformUtilsService.showDialog(
this.i18nService.t('encExportKeyWarningDesc') +
os.EOL + os.EOL +
this.i18nService.t('encExportAccountWarningDesc'),
this.i18nService.t('confirmVaultExport'), this.i18nService.t('exportVault'),
this.i18nService.t('cancel'), 'warning',
true);
} else {
return await this.platformUtilsService.showDialog(
this.i18nService.t('exportWarningDesc'),
this.i18nService.t('confirmVaultExport'), this.i18nService.t('exportVault'),
this.i18nService.t('cancel'), 'warning');
}
}
}

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

@ -1227,9 +1227,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."
},