From 205b1153de768895727b5fdcec1c30f6e2ee407f Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Wed, 15 Sep 2021 21:06:13 +0200 Subject: [PATCH] Disable Private Vault Export Policy (#2064) --- jslib | 2 +- src/_locales/en/messages.json | 8 +++++++- src/content/contextMenuHandler.ts | 2 +- src/popup/settings/export.component.html | 11 ++++++++--- src/popup/settings/export.component.ts | 5 +++-- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/jslib b/jslib index a85c45a34e..ee1ea922a9 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit a85c45a34ed90b09f59ec27bdba754d66452915e +Subproject commit ee1ea922a9d5a51ef8df2abf4b97fc035ed782be diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 1a3296d2e1..044301571f 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -1764,7 +1764,7 @@ }, "updateMasterPasswordWarning": { "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour." - }, + }, "resetPasswordPolicyAutoEnroll": { "message": "Automatic Enrollment" }, @@ -1798,5 +1798,11 @@ }, "vaultTimeoutToLarge": { "message": "Your vault timeout exceeds the restrictions set by your organization." + }, + "vaultExportDisabled": { + "message": "Vault Export Disabled" + }, + "personalVaultExportPolicyInEffect": { + "message": "One or more organization policies prevents you from exporting your personal vault." } } diff --git a/src/content/contextMenuHandler.ts b/src/content/contextMenuHandler.ts index 6aae8ca168..e4be3aa1a8 100644 --- a/src/content/contextMenuHandler.ts +++ b/src/content/contextMenuHandler.ts @@ -5,7 +5,7 @@ let clickedEl: HTMLElement = null; // Find the best attribute to be used as the Name for an element in a custom field. function getClickedElementIdentifier() { if (clickedEl == null) { - return 'Unable to identify clicked element.' + return 'Unable to identify clicked element.'; } if (!inputTags.includes(clickedEl.nodeName.toLowerCase())) { diff --git a/src/popup/settings/export.component.html b/src/popup/settings/export.component.html index 759fbec53c..27d42cdf56 100644 --- a/src/popup/settings/export.component.html +++ b/src/popup/settings/export.component.html @@ -10,15 +10,19 @@ {{'exportVault' | i18n}}
- +
+ + {{'personalVaultExportPolicyInEffect' | i18n}} + +
- @@ -28,7 +32,8 @@
+ class="monospaced" [(ngModel)]="masterPassword" required appInputVerbatim appAutofocus + [disabled]="disabledByPolicy">