Explicit wallet disable => no dapp detection

Fix brave/brave-browser#6181
brave · Oct 2, 2019 · 9189967 · 9189967
1 parent 355732d
commit 9189967
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 10 deletions.
diff --git a/browser/extensions/api/brave_wallet_api.cc b/browser/extensions/api/brave_wallet_api.cc
@@ -63,14 +63,22 @@ BraveWalletPromptToEnableWalletFunction::Run() {
 }
 
 ExtensionFunction::ResponseAction
-BraveWalletIsEnabledFunction::Run() {
+BraveWalletIsInstalledFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
   auto* registry = extensions::ExtensionRegistry::Get(profile);
   bool enabled = !brave::IsTorProfile(profile) &&
     registry->ready_extensions().GetByID(ethereum_remote_client_extension_id);
   return RespondNow(OneArgument(std::make_unique<base::Value>(enabled)));
 }
 
+ExtensionFunction::ResponseAction
+BraveWalletIsEnabledFunction::Run() {
+  Profile* profile = Profile::FromBrowserContext(browser_context());
+  bool enabled = !brave::IsTorProfile(profile) &&
+    profile->GetPrefs()->GetBoolean(kBraveWalletEnabled);
+  return RespondNow(OneArgument(std::make_unique<base::Value>(enabled)));
+}
+
 // Returns 32 bytes of output from HKDF-SHA256.
 // This is done so that ethereum-remote-client never actually directly has
 // access to the master seed, but it does have a deterministic seed.

diff --git a/browser/extensions/api/brave_wallet_api.h b/browser/extensions/api/brave_wallet_api.h
@@ -36,6 +36,16 @@ class BraveWalletIsEnabledFunction : public UIThreadExtensionFunction {
   ResponseAction Run() override;
 };
 
+class BraveWalletIsInstalledFunction : public UIThreadExtensionFunction {
+ public:
+  DECLARE_EXTENSION_FUNCTION("braveWallet.isInstalled", UNKNOWN)
+
+ protected:
+  ~BraveWalletIsInstalledFunction() override {}
+
+  ResponseAction Run() override;
+};
+
 class BraveWalletGetWalletSeedFunction : public UIThreadExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("braveWallet.getWalletSeed", UNKNOWN)

diff --git a/browser/extensions/brave_wallet_apitest.cc b/browser/extensions/brave_wallet_apitest.cc
@@ -35,6 +35,9 @@ IN_PROC_BROWSER_TEST_F(BraveWalletExtensionApiTest,
   const Extension* extension =
     LoadExtension(extension_dir_.AppendASCII("braveShieldsWithWallet"));
   ASSERT_TRUE(extension);
+  ASSERT_TRUE(browsertest_util::ExecuteScriptInBackgroundPageNoWait(
+      browser()->profile(), brave_extension_id,
+      "testBasics()"));
   ASSERT_TRUE(catcher.GetNextResult()) << message_;
 }
 

diff --git a/common/extensions/api/brave_wallet.json b/common/extensions/api/brave_wallet.json
@@ -22,10 +22,26 @@
             "type": "integer"
           }
         ]
+      }, {
+        "name": "isInstalled",
+        "type": "function",
+        "description": "Called to determine if brave wallet extension is installed",
+        "parameters": [
+          {
+            "type": "function",
+            "name": "callback",
+            "parameters": [
+              {
+                "name": "enabled",
+                "type": "boolean"
+              }
+            ]
+          }
+        ]
       }, {
         "name": "isEnabled",
         "type": "function",
-        "description": "Called to determine if brave wallet is alrady enabled",
+        "description": "Called to determine if brave wallet is enabled and can be used",
         "parameters": [
           {
             "type": "function",

diff --git a/...nts/brave_extension/extension/brave_extension/background/reducers/dappDetectionReducer.ts b/...nts/brave_extension/extension/brave_extension/background/reducers/dappDetectionReducer.ts
@@ -10,14 +10,16 @@ export default function dappDetectionReducer (state = {}, action: Actions) {
     case webNavigationTypes.ON_COMMITTED: {
       if (chrome.braveWallet && action.isMainFrame) {
         chrome.braveWallet.isEnabled((enabled) => {
-          if (enabled) {
-            return
-          }
-          chrome.tabs.executeScript(action.tabId, {
-            file: 'out/content_dapps.bundle.js',
-            allFrames: false,
-            runAt: 'document_start',
-            frameId: 0
+          chrome.braveWallet.isInstalled((installed) => {
+            if (installed || !enabled) {
+              return
+            }
+            chrome.tabs.executeScript(action.tabId, {
+              file: 'out/content_dapps.bundle.js',
+              allFrames: false,
+              runAt: 'document_start',
+              frameId: 0
+            })
           })
         })
       }

diff --git a/components/definitions/chromel.d.ts b/components/definitions/chromel.d.ts
@@ -212,6 +212,7 @@ declare namespace chrome.braveShields {
 declare namespace chrome.braveWallet {
   const promptToEnableWallet: (tabId: number | undefined) => void
   const isEnabled: (callback: (enabled: boolean) => void) => void
+  const isInstalled: (callback: (enabled: boolean) => void) => void
 }
 
 declare namespace chrome.test {