From 9984f7edebb0de4432e152a7c6f0d93bb00b9da6 Mon Sep 17 00:00:00 2001
From: bitpshr <mail@bitpshr.net>
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 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'app/scripts/controllers/provider-approval.js')
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])
}
/**
--
cgit