aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorbitpshr <mail@bitpshr.net>2018-11-07 03:13:27 +0800
committerbitpshr <mail@bitpshr.net>2018-11-07 03:13:27 +0800
commit34d80f21e2ed4842d196dc580a9441a2731a5c0e (patch)
tree436a2e614f3b3cbe0f0a093e4b07d35afeedbc6e /app/scripts
parent7b8a73b01f539bd6b36469487404a7f3bac06c68 (diff)
downloadtangerine-wallet-browser-34d80f21e2ed4842d196dc580a9441a2731a5c0e.tar.gz
tangerine-wallet-browser-34d80f21e2ed4842d196dc580a9441a2731a5c0e.tar.zst
tangerine-wallet-browser-34d80f21e2ed4842d196dc580a9441a2731a5c0e.zip
Clear cached approval after rejection
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/controllers/provider-approval.js15
-rw-r--r--app/scripts/metamask-controller.js4
2 files changed, 11 insertions, 8 deletions
diff --git a/app/scripts/controllers/provider-approval.js b/app/scripts/controllers/provider-approval.js
index f17220cb9..42834f1cd 100644
--- a/app/scripts/controllers/provider-approval.js
+++ b/app/scripts/controllers/provider-approval.js
@@ -54,7 +54,7 @@ class ProviderApprovalController {
_handleProviderRequest (origin, siteTitle, siteImage, force) {
this.store.updateState({ providerRequests: [{ origin, siteTitle, siteImage }] })
const isUnlocked = this.keyringController.memStore.getState().isUnlocked
- if (!force && this.isApproved(origin) && this.caching && isUnlocked) {
+ if (!force && this.approvedOrigins[origin] && this.caching && isUnlocked) {
this.approveProviderRequest(origin)
return
}
@@ -67,9 +67,11 @@ class ProviderApprovalController {
* @param {string} origin - Origin of the window
*/
_handleIsApproved (origin) {
- const isApproved = this.isApproved(origin) && this.caching
- const caching = this.caching
- this.platform && this.platform.sendMessage({ action: 'answer-is-approved', isApproved, caching }, { active: true })
+ this.platform && this.platform.sendMessage({
+ action: 'answer-is-approved',
+ isApproved: this.approvedOrigins[origin] && this.caching,
+ caching: this.caching
+ }, { active: true })
}
/**
@@ -117,6 +119,7 @@ class ProviderApprovalController {
this.platform && this.platform.sendMessage({ action: 'reject-provider-request' }, { active: true })
const providerRequests = requests.filter(request => request.origin !== origin)
this.store.updateState({ providerRequests })
+ delete this.approvedOrigins[origin]
}
/**
@@ -127,12 +130,12 @@ class ProviderApprovalController {
}
/**
- * Determines if a given origin has been approved
+ * Determines if a given origin should have accounts exposed
*
* @param {string} origin - Domain origin to check for approval status
* @returns {boolean} - True if the origin has been approved
*/
- isApproved (origin) {
+ shouldExposeAccounts (origin) {
const privacyMode = this.preferencesController.getFeatureFlags().privacyMode
return !privacyMode || this.approvedOrigins[origin]
}
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 33278db85..5ae0f608d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -277,8 +277,8 @@ module.exports = class MetamaskController extends EventEmitter {
getAccounts: async ({ origin }) => {
// Expose no accounts if this origin has not been approved, preventing
// account-requring RPC methods from completing successfully
- const isApproved = this.providerApprovalController.isApproved(origin)
- if (origin !== 'MetaMask' && !isApproved) { return [] }
+ const exposeAccounts = this.providerApprovalController.shouldExposeAccounts(origin)
+ if (origin !== 'MetaMask' && !exposeAccounts) { return [] }
const isUnlocked = this.keyringController.memStore.getState().isUnlocked
const selectedAddress = this.preferencesController.getSelectedAddress()
// only show address if account is unlocked