From 9984f7edebb0de4432e152a7c6f0d93bb00b9da6 Mon Sep 17 00:00:00 2001 From: bitpshr Date: Sat, 3 Nov 2018 11:06:11 +0000 Subject: Mark origins as unapproved if user explicitly locks MetaMask --- app/scripts/controllers/provider-approval.js | 6 ++++-- app/scripts/inpage.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/scripts/controllers/provider-approval.js b/app/scripts/controllers/provider-approval.js index 003f221ac..10b971a73 100644 --- a/app/scripts/controllers/provider-approval.js +++ b/app/scripts/controllers/provider-approval.js @@ -49,7 +49,8 @@ class ProviderApprovalController { */ _handleProviderRequest (origin) { this.store.updateState({ providerRequests: [{ origin }] }) - if (this.isApproved(origin) && this.caching) { + const isUnlocked = this.keyringController.memStore.getState().isUnlocked + if (this.isApproved(origin) && this.caching && isUnlocked) { this.approveProviderRequest(origin) return } @@ -128,8 +129,9 @@ class ProviderApprovalController { * @returns {boolean} - True if the origin has been approved */ isApproved (origin) { + const isUnlocked = this.keyringController.memStore.getState().isUnlocked const privacyMode = this.preferencesController.getFeatureFlags().privacyMode - return !privacyMode || this.approvedOrigins[origin] + return !privacyMode || (isUnlocked && this.approvedOrigins[origin]) } /** diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index 794f15a0b..2ca3abde2 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -65,7 +65,7 @@ inpageProvider.enable = function () { }) }) - // wait for the background to update with an accoount + // wait for the background to update with an account const ethAccounts = new Promise((resolveAccounts, rejectAccounts) => { inpageProvider.sendAsync({ method: 'eth_accounts', params: [] }, (error, response) => { if (error) { -- cgit v1.2.3