m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 12:29:06 +01:00
Code

Clear cached approval after rejection

Browse Source
This commit is contained in:
bitpshr 2018-11-06 14:13:27 -05:00
parent 7b8a73b01f
commit 34d80f21e2
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/scripts/controllers/provider-approval.js
View File

@ -54,7 +54,7 @@ class ProviderApprovalController {
_handleProviderRequest (origin, siteTitle, siteImage, force) { _handleProviderRequest (origin, siteTitle, siteImage, force) {
this.store.updateState({ providerRequests: [{ origin, siteTitle, siteImage }] }) this.store.updateState({ providerRequests: [{ origin, siteTitle, siteImage }] })
const isUnlocked = this.keyringController.memStore.getState().isUnlocked 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) this.approveProviderRequest(origin)
return return
} }
@ -67,9 +67,11 @@ class ProviderApprovalController {
* @param {string} origin - Origin of the window * @param {string} origin - Origin of the window
*/ */
_handleIsApproved (origin) { _handleIsApproved (origin) {
const isApproved = this.isApproved(origin) && this.caching this.platform && this.platform.sendMessage({
const caching = this.caching action: 'answer-is-approved',
this.platform && this.platform.sendMessage({ action: 'answer-is-approved', isApproved, caching }, { active: true }) 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 }) this.platform && this.platform.sendMessage({ action: 'reject-provider-request' }, { active: true })
const providerRequests = requests.filter(request => request.origin !== origin) const providerRequests = requests.filter(request => request.origin !== origin)
this.store.updateState({ providerRequests }) 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 * @param {string} origin - Domain origin to check for approval status
* @returns {boolean} - True if the origin has been approved * @returns {boolean} - True if the origin has been approved
*/ */
isApproved (origin) { shouldExposeAccounts (origin) {
const privacyMode = this.preferencesController.getFeatureFlags().privacyMode const privacyMode = this.preferencesController.getFeatureFlags().privacyMode
return !privacyMode || this.approvedOrigins[origin] return !privacyMode || this.approvedOrigins[origin]
} }

4
app/scripts/metamask-controller.js
View File

@ -277,8 +277,8 @@ module.exports = class MetamaskController extends EventEmitter {
getAccounts: async ({ origin }) => { getAccounts: async ({ origin }) => {
// Expose no accounts if this origin has not been approved, preventing // Expose no accounts if this origin has not been approved, preventing
// account-requring RPC methods from completing successfully // account-requring RPC methods from completing successfully
const isApproved = this.providerApprovalController.isApproved(origin) const exposeAccounts = this.providerApprovalController.shouldExposeAccounts(origin)
if (origin !== 'MetaMask' && !isApproved) { return [] } if (origin !== 'MetaMask' && !exposeAccounts) { return [] }
const isUnlocked = this.keyringController.memStore.getState().isUnlocked const isUnlocked = this.keyringController.memStore.getState().isUnlocked
const selectedAddress = this.preferencesController.getSelectedAddress() const selectedAddress = this.preferencesController.getSelectedAddress()
// only show address if account is unlocked // only show address if account is unlocked