Add 1102 support for other extensions

Fixes #5950 when combined with an update to `metamask-extension-provider`.
MetaMask · Jan 3, 2019 · 66eb966 · 66eb966
1 parent da7208c
commit 66eb966
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 16 deletions.
diff --git a/app/scripts/controllers/provider-approval.js b/app/scripts/controllers/provider-approval.js
@@ -26,23 +26,49 @@ class ProviderApprovalController {
       providerRequests: [],
     })
 
+    const internalListener = ({ action = '', force, origin, siteTitle, siteImage, target, name }) => {
+      switch (action) {
+        case 'init-provider-request':
+          this._handleProviderRequest(origin, siteTitle, siteImage, force)
+          break
+        case 'init-is-approved':
+          this._handleIsApproved(origin)
+          break
+        case 'init-is-unlocked':
+          this._handleIsUnlocked()
+          break
+        case 'init-privacy-request':
+          this._handlePrivacyRequest()
+          break
+      }
+    }
+
+    const externalListener = (opts, sender) => {
+      const { action, force, origin, siteTitle, siteImage, target, name } = opts
+      const title = origin || siteTitle || 'Extension'
+      switch (action) {
+        case 'init-provider-request':
+          this._handleProviderRequest(sender.id, title, siteImage, force)
+          break
+        case 'init-is-approved':
+          this._handleIsApproved(origin)
+          break
+        case 'init-is-unlocked':
+          this._handleIsUnlocked()
+          break
+        case 'init-privacy-request':
+          this._handlePrivacyRequest()
+          break
+      }
+    }
+
     if (platform && platform.addMessageListener) {
-      platform.addMessageListener(({ action = '', force, origin, siteTitle, siteImage }) => {
-        switch (action) {
-          case 'init-provider-request':
-            this._handleProviderRequest(origin, siteTitle, siteImage, force)
-            break
-          case 'init-is-approved':
-            this._handleIsApproved(origin)
-            break
-          case 'init-is-unlocked':
-            this._handleIsUnlocked()
-            break
-          case 'init-privacy-request':
-            this._handlePrivacyRequest()
-            break
-        }
-      })
+      platform.addMessageListener(internalListener)
+    }
+
+    // Allow cross-extension provider requests:
+    if (platform && platform.addExternalMessageListener) {
+      platform.addExternalMessageListener(externalListener)
     }
   }
 

diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
@@ -64,6 +64,10 @@ class ExtensionPlatform {
     extension.runtime.onMessage.addListener(cb)
   }
 
+  addExternalMessageListener (cb) {
+    extension.runtime.onMessageExternal.addListener(cb)
+  }
+
   sendMessage (message, query = {}) {
     extension.tabs.query(query, tabs => {
       tabs.forEach(tab => {