From 70b9fc931f7215d2a563066b547d012fa88649b9 Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Fri, 5 Mar 2021 07:05:49 +1000 Subject: [PATCH 1/3] update jslib --- jslib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jslib b/jslib index 729ab4f20b..8328b55774 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 729ab4f20b81d7e465d7570c51cdb67d3cc49e6f +Subproject commit 8328b557748801b1767a584b8f5a2bad6696671e From 962678bd4ee275bf1df39cec18d3e0f7994a0201 Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Fri, 5 Mar 2021 07:06:02 +1000 Subject: [PATCH 2/3] Add extra warnings about encrypted export --- src/_locales/en/messages.json | 5 ++++- src/services/browserPlatformUtils.service.ts | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 90301bb584..c046645f75 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -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." }, diff --git a/src/services/browserPlatformUtils.service.ts b/src/services/browserPlatformUtils.service.ts index 16876542d6..62f5912dfa 100644 --- a/src/services/browserPlatformUtils.service.ts +++ b/src/services/browserPlatformUtils.service.ts @@ -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, From e7fe3761b3cc1184b85521692c7befa8593a3fd6 Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Fri, 5 Mar 2021 09:01:16 +1000 Subject: [PATCH 3/3] update jslib --- jslib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jslib b/jslib index 8328b55774..b7acbcf3a7 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 8328b557748801b1767a584b8f5a2bad6696671e +Subproject commit b7acbcf3a7766eb0a52f21fe90505a69b4c19444