1 files changed, 56 insertions, 18 deletions

diff --git a/app/scripts/controllers/provider-approval.js b/app/scripts/controllers/provider-approval.js
index 06c499780..00ec0aea1 100644
--- a/app/scripts/controllers/provider-approval.js
+++ b/app/scripts/controllers/provider-approval.js
@@ -18,12 +18,12 @@ class ProviderApprovalController extends SafeEventEmitter {
    */
   constructor ({ closePopup, keyringController, openPopup, preferencesController } = {}) {
     super()
-    this.approvedOrigins = {}
     this.closePopup = closePopup
     this.keyringController = keyringController
     this.openPopup = openPopup
     this.preferencesController = preferencesController
     this.store = new ObservableStore({
+      approvedOrigins: {},
       providerRequests: [],
     })
   }
@@ -45,7 +45,7 @@ class ProviderApprovalController extends SafeEventEmitter {
       }
       // register the provider request
       const metadata = await getSiteMetadata(origin)
-      this._handleProviderRequest(origin, metadata.name, metadata.icon, false, null)
+      this._handleProviderRequest(origin, metadata.name, metadata.icon)
       // wait for resolution of request
       const approved = await new Promise(resolve => this.once(`resolvedRequest:${origin}`, ({ approved }) => resolve(approved)))
       if (approved) {
@@ -63,10 +63,10 @@ class ProviderApprovalController extends SafeEventEmitter {
    * @param {string} siteTitle - The title of the document requesting full provider access
    * @param {string} siteImage - The icon of the window requesting full provider access
    */
-  _handleProviderRequest (origin, siteTitle, siteImage, force, tabID) {
-    this.store.updateState({ providerRequests: [{ origin, siteTitle, siteImage, tabID }] })
+  _handleProviderRequest (origin, siteTitle, siteImage) {
+    this.store.updateState({ providerRequests: [{ origin, siteTitle, siteImage }] })
     const isUnlocked = this.keyringController.memStore.getState().isUnlocked
-    if (!force && this.approvedOrigins[origin] && this.caching && isUnlocked) {
+    if (this.store.getState().approvedOrigins[origin] && this.caching && isUnlocked) {
       return
     }
     this.openPopup && this.openPopup()
@@ -78,11 +78,19 @@ class ProviderApprovalController extends SafeEventEmitter {
    * @param {string} origin - origin of the domain that had provider access approved
    */
   approveProviderRequestByOrigin (origin) {
-    this.closePopup && this.closePopup()
-    const requests = this.store.getState().providerRequests
-    const providerRequests = requests.filter(request => request.origin !== origin)
-    this.store.updateState({ providerRequests })
-    this.approvedOrigins[origin] = true
+    if (this.closePopup) {
+      this.closePopup()
+    }
+
+    const { approvedOrigins, providerRequests } = this.store.getState()
+    const remainingProviderRequests = providerRequests.filter(request => request.origin !== origin)
+    this.store.updateState({
+      approvedOrigins: {
+        ...approvedOrigins,
+        [origin]: true,
+      },
+      providerRequests: remainingProviderRequests,
+    })
     this.emit(`resolvedRequest:${origin}`, { approved: true })
   }
 
@@ -92,19 +100,50 @@ class ProviderApprovalController extends SafeEventEmitter {
    * @param {string} origin - origin of the domain that had provider access approved
    */
   rejectProviderRequestByOrigin (origin) {
-    this.closePopup && this.closePopup()
-    const requests = this.store.getState().providerRequests
-    const providerRequests = requests.filter(request => request.origin !== origin)
-    this.store.updateState({ providerRequests })
-    delete this.approvedOrigins[origin]
+    if (this.closePopup) {
+      this.closePopup()
+    }
+
+    const { approvedOrigins, providerRequests } = this.store.getState()
+    const remainingProviderRequests = providerRequests.filter(request => request.origin !== origin)
+
+    // We're cloning and deleting keys here because we don't want to keep unneeded keys
+    const _approvedOrigins = Object.assign({}, approvedOrigins)
+    delete _approvedOrigins[origin]
+
+    this.store.putState({
+      approvedOrigins: _approvedOrigins,
+      providerRequests: remainingProviderRequests,
+    })
     this.emit(`resolvedRequest:${origin}`, { approved: false })
   }
 
   /**
+   * Silently approves access to a full Ethereum provider API for the origin
+   *
+   * @param {string} origin - origin of the domain that had provider access approved
+   */
+  forceApproveProviderRequestByOrigin (origin) {
+    const { approvedOrigins, providerRequests } = this.store.getState()
+    const remainingProviderRequests = providerRequests.filter(request => request.origin !== origin)
+    this.store.updateState({
+      approvedOrigins: {
+        ...approvedOrigins,
+        [origin]: true,
+      },
+      providerRequests: remainingProviderRequests,
+    })
+
+    this.emit(`forceResolvedRequest:${origin}`, { approved: true, forced: true })
+  }
+
+  /**
    * Clears any cached approvals for user-approved origins
    */
   clearApprovedOrigins () {
-    this.approvedOrigins = {}
+    this.store.updateState({
+      approvedOrigins: {},
+    })
   }
 
   /**
@@ -115,8 +154,7 @@ class ProviderApprovalController extends SafeEventEmitter {
    */
   shouldExposeAccounts (origin) {
     const privacyMode = this.preferencesController.getFeatureFlags().privacyMode
-    const result = !privacyMode || Boolean(this.approvedOrigins[origin])
-    return result
+    return !privacyMode || Boolean(this.store.getState().approvedOrigins[origin])
   }
 
 }