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

add support for encrypted json export (#1483)

Browse Source
This commit is contained in:
Kyle Spearrin 2020-12-07 13:01:12 -05:00 committed by GitHub
parent 6760cec1ec
commit e42360a1b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit abb54f007305eabd77996623dd20cbe45345e82a Subproject commit dcbd09e736b516b359369f9d9fe5b0f5a6c2a928

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

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

9
src/popup/settings/export.component.html
View File

@ -21,6 +21,7 @@
<select id="format" name="Format" [(ngModel)]="format"> <select id="format" name="Format" [(ngModel)]="format">
<option value="json">.json</option> <option value="json">.json</option>
<option value="csv">.csv</option> <option value="csv">.csv</option>
<option value="encrypted_json">.json (Encrypted)</option>
</select> </select>
</div> </div>
<div class="box-content-row box-content-row-flex" appBoxRow> <div class="box-content-row box-content-row-flex" appBoxRow>
@ -40,7 +41,13 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<p>{{'exportMasterPassword' | i18n}}</p> <p>{{'exportMasterPassword' | i18n}}</p>
<strong>{{'warning' | i18n}}</strong>: {{'exportWarningDesc' | i18n}} <strong>{{'warning' | i18n}}</strong>:
<span *ngIf="!encryptedFormat">
{{'exportWarningDesc' | i18n}}
</span>
<span *ngIf="encryptedFormat">
{{'encExportWarningDesc' | i18n}}
</span>
</div> </div>
</div> </div>
</content> </content>