Merge pull request #2753 from getAlby/persist-enable

feat: add isEnabled provider method, which returns provider was ever enabled

src/extension/background-script/actions/alby/index.ts

@@ -1,2 +1,3 @@
 import enable from "./enable";
-export { enable };
+import isEnabled from "./isEnabled";
+export { enable, isEnabled };

src/extension/background-script/actions/alby/isEnabled.ts

@@ -0,0 +1,30 @@
+import { getHostFromSender } from "~/common/utils/helpers";
+import db from "~/extension/background-script/db";
+import type { MessageAllowanceEnable, Sender } from "~/types";
+
+import state from "../../state";
+
+const isEnabled = async (message: MessageAllowanceEnable, sender: Sender) => {
+  const host = getHostFromSender(sender);
+  if (!host) return;
+
+  const isUnlocked = await state.getState().isUnlocked();
+  const allowance = await db.allowances
+    .where("host")
+    .equalsIgnoreCase(host)
+    .first();
+
+  const enabledFor = new Set(allowance?.enabledFor);
+
+  if (isUnlocked && allowance && allowance.enabled && enabledFor.has("alby")) {
+    return {
+      data: { isEnabled: true },
+    };
+  } else {
+    return {
+      data: { isEnabled: false },
+    };
+  }
+};
+
+export default isEnabled;

src/extension/background-script/actions/liquid/index.ts

@@ -2,6 +2,7 @@ import enable from "./enable";
 import fetchAssetRegistry from "./fetchAssetRegistry";
 import getAddressOrPrompt from "./getAddressOrPrompt";
 import getPsetPreview from "./getPsetPreview";
+import isEnabled from "./isEnabled";
 import signPset from "./signPset";
 import signPsetWithPrompt from "./signPsetWithPrompt";
 
@@ -10,6 +11,7 @@ export {
   fetchAssetRegistry,
   getAddressOrPrompt,
   getPsetPreview,
+  isEnabled,
   signPset,
   signPsetWithPrompt,
 };

src/extension/background-script/actions/liquid/isEnabled.ts

@@ -0,0 +1,35 @@
+import { getHostFromSender } from "~/common/utils/helpers";
+import db from "~/extension/background-script/db";
+import type { MessageAllowanceEnable, Sender } from "~/types";
+
+import state from "../../state";
+
+const isEnabled = async (message: MessageAllowanceEnable, sender: Sender) => {
+  const host = getHostFromSender(sender);
+  if (!host) return;
+
+  const isUnlocked = await state.getState().isUnlocked();
+  const allowance = await db.allowances
+    .where("host")
+    .equalsIgnoreCase(host)
+    .first();
+
+  const enabledFor = new Set(allowance?.enabledFor);
+
+  if (
+    isUnlocked &&
+    allowance &&
+    allowance.enabled &&
+    enabledFor.has("liquid")
+  ) {
+    return {
+      data: { isEnabled: true },
+    };
+  } else {
+    return {
+      data: { isEnabled: false },
+    };
+  }
+};
+
+export default isEnabled;

src/extension/background-script/actions/nostr/index.ts

@@ -7,6 +7,7 @@ import generatePrivateKey from "./generatePrivateKey";
 import getPrivateKey from "./getPrivateKey";
 import getPublicKeyOrPrompt from "./getPublicKeyOrPrompt";
 import getRelays from "./getRelays";
+import isEnabled from "./isEnabled";
 import removePrivateKey from "./removePrivateKey";
 import setPrivateKey from "./setPrivateKey";
 import signEventOrPrompt from "./signEventOrPrompt";
@@ -21,6 +22,7 @@ export {
   getPublicKey,
   getPublicKeyOrPrompt,
   getRelays,
+  isEnabled,
   removePrivateKey,
   setPrivateKey,
   signEventOrPrompt,

src/extension/background-script/actions/nostr/isEnabled.ts

@@ -0,0 +1,30 @@
+import { getHostFromSender } from "~/common/utils/helpers";
+import db from "~/extension/background-script/db";
+import type { MessageAllowanceEnable, Sender } from "~/types";
+
+import state from "../../state";
+
+const isEnabled = async (message: MessageAllowanceEnable, sender: Sender) => {
+  const host = getHostFromSender(sender);
+  if (!host) return;
+
+  const isUnlocked = await state.getState().isUnlocked();
+  const allowance = await db.allowances
+    .where("host")
+    .equalsIgnoreCase(host)
+    .first();
+
+  const enabledFor = new Set(allowance?.enabledFor);
+
+  if (isUnlocked && allowance && allowance.enabled && enabledFor.has("nostr")) {
+    return {
+      data: { isEnabled: true },
+    };
+  } else {
+    return {
+      data: { isEnabled: false },
+    };
+  }
+};
+
+export default isEnabled;

src/extension/background-script/actions/webbtc/index.ts

@@ -2,5 +2,6 @@ import enable from "./enable";
 import getAddress from "./getAddress";
 import getAddressOrPrompt from "./getAddressOrPrompt";
 import getInfo from "./getInfo";
+import isEnabled from "./isEnabled";
 
-export { enable, getAddress, getAddressOrPrompt, getInfo };
+export { enable, getAddress, getAddressOrPrompt, getInfo, isEnabled };

src/extension/background-script/actions/webbtc/isEnabled.ts

@@ -0,0 +1,35 @@
+import { getHostFromSender } from "~/common/utils/helpers";
+import db from "~/extension/background-script/db";
+import type { MessageAllowanceEnable, Sender } from "~/types";
+
+import state from "../../state";
+
+const isEnabled = async (message: MessageAllowanceEnable, sender: Sender) => {
+  const host = getHostFromSender(sender);
+  if (!host) return;
+
+  const isUnlocked = await state.getState().isUnlocked();
+  const allowance = await db.allowances
+    .where("host")
+    .equalsIgnoreCase(host)
+    .first();
+
+  const enabledFor = new Set(allowance?.enabledFor);
+
+  if (
+    isUnlocked &&
+    allowance &&
+    allowance.enabled &&
+    enabledFor.has("webbtc")
+  ) {
+    return {
+      data: { isEnabled: true },
+    };
+  } else {
+    return {
+      data: { isEnabled: false },
+    };
+  }
+};
+
+export default isEnabled;

src/extension/background-script/actions/webln/index.ts

@@ -1,5 +1,6 @@
 import enable from "./enable";
 import getBalanceOrPrompt from "./getBalanceOrPrompt";
+import isEnabled from "./isEnabled";
 import keysendOrPrompt from "./keysendOrPrompt";
 import lnurl from "./lnurl";
 import makeInvoiceOrPrompt from "./makeInvoiceOrPrompt";
@@ -9,6 +10,7 @@ import signMessageOrPrompt from "./signMessageOrPrompt";
 export {
   enable,
   getBalanceOrPrompt,
+  isEnabled,
   keysendOrPrompt,
   lnurl,
   makeInvoiceOrPrompt,

src/extension/background-script/actions/webln/isEnabled.ts

@@ -0,0 +1,30 @@
+import { getHostFromSender } from "~/common/utils/helpers";
+import db from "~/extension/background-script/db";
+import type { MessageAllowanceEnable, Sender } from "~/types";
+
+import state from "../../state";
+
+const isEnabled = async (message: MessageAllowanceEnable, sender: Sender) => {
+  const host = getHostFromSender(sender);
+  if (!host) return;
+
+  const isUnlocked = await state.getState().isUnlocked();
+  const allowance = await db.allowances
+    .where("host")
+    .equalsIgnoreCase(host)
+    .first();
+
+  const enabledFor = new Set(allowance?.enabledFor);
+
+  if (isUnlocked && allowance && allowance.enabled && enabledFor.has("webln")) {
+    return {
+      data: { isEnabled: true },
+    };
+  } else {
+    return {
+      data: { isEnabled: false },
+    };
+  }
+};
+
+export default isEnabled;

src/extension/background-script/router.ts

@@ -84,16 +84,19 @@ const routes = {
   // Public calls that are accessible from the inpage script (through the content script)
   public: {
     webbtc: {
+      isEnabled: webbtc.isEnabled,
       enable: webbtc.enable,
       getInfo: webbtc.getInfo,
       getAddressOrPrompt: webbtc.getAddressOrPrompt,
     },
     alby: {
+      isEnabled: alby.isEnabled,
       enable: alby.enable,
       addAccount: accounts.promptAdd,
     },
     webln: {
       enable: webln.enable,
+      isEnabled: webln.isEnabled,
       getInfo: ln.getInfo,
       sendPaymentOrPrompt: webln.sendPaymentOrPrompt,
       keysendOrPrompt: webln.keysendOrPrompt,
@@ -104,11 +107,13 @@ const routes = {
       request: ln.request,
     },
     liquid: {
+      isEnabled: liquid.isEnabled,
       enable: liquid.enable,
       getAddressOrPrompt: liquid.getAddressOrPrompt,
       signPsetWithPrompt: liquid.signPsetWithPrompt,
     },
     nostr: {
+      isEnabled: nostr.isEnabled,
       enable: nostr.enable,
       getPublicKeyOrPrompt: nostr.getPublicKeyOrPrompt,
       signEventOrPrompt: nostr.signEventOrPrompt,

src/extension/content-script/alby.js

@@ -5,9 +5,9 @@ import shouldInject from "./shouldInject";
 
 // Alby calls that can be executed from the AlbyProvider.
 // Update when new calls are added
-const albyCalls = ["alby/enable", "alby/addAccount"];
+const albyCalls = ["alby/enable", "alby/addAccount", "alby/isEnabled"];
 // calls that can be executed when alby is not enabled for the current content page
-const disabledCalls = ["alby/enable"];
+const disabledCalls = ["alby/enable", "alby/isEnabled"];
 
 let isEnabled = false; // store if alby is enabled for this content page
 let isRejected = false; // store if the alby enable call failed. if so we do not prompt again
@@ -70,6 +70,9 @@ async function init() {
             isRejected = true;
           }
         }
+        if (ev.data.action === "alby/isEnabled") {
+          isEnabled = response.data?.isEnabled;
+        }
         postMessage(ev, response);
       };
       return browser.runtime

src/extension/content-script/liquid.js

@@ -9,9 +9,10 @@ const liquidCalls = [
   "liquid/getAddressOrPrompt",
   "liquid/signPsetWithPrompt",
   "liquid/enable",
+  "liquid/isEnabled",
 ];
 // calls that can be executed when liquid is not enabled for the current content page
-const disabledCalls = ["liquid/enable"];
+const disabledCalls = ["liquid/enable", "liquid/isEnabled"];
 
 let isEnabled = false; // store if liquid is enabled for this content page
 let isRejected = false; // store if the liquid enable call failed. if so we do not prompt again
@@ -76,6 +77,10 @@ async function init() {
           }
         }
 
+        if (ev.data.action === `${SCOPE}/isEnabled`) {
+          isEnabled = response.data?.isEnabled;
+        }
+
         postMessage(ev, response);
       };
 

src/extension/content-script/nostr.js

@@ -16,9 +16,10 @@ const nostrCalls = [
   "nostr/on",
   "nostr/off",
   "nostr/emit",
+  "nostr/isEnabled",
 ];
 // calls that can be executed when nostr is not enabled for the current content page
-const disabledCalls = ["nostr/enable"];
+const disabledCalls = ["nostr/enable", "nostr/isEnabled"];
 
 let isEnabled = false; // store if nostr is enabled for this content page
 let isRejected = false; // store if the nostr enable call failed. if so we do not prompt again
@@ -92,6 +93,9 @@ async function init() {
             isRejected = true;
           }
         }
+        if (ev.data.action === "nostr/isEnabled") {
+          isEnabled = response.data?.isEnabled;
+        }
 
         postMessage(ev, response);
       };

src/extension/content-script/webbtc.js

@@ -8,9 +8,10 @@ const webbtcCalls = [
   "webbtc/enable",
   "webbtc/getInfo",
   "webbtc/getAddressOrPrompt",
+  "webbtc/isEnabled",
 ];
 // calls that can be executed when `window.webbtc` is not enabled for the current content page
-const disabledCalls = ["webbtc/enable"];
+const disabledCalls = ["webbtc/enable", "webbtc/isEnabled"];
 
 let isEnabled = false; // store if webbtc is enabled for this content page
 let isRejected = false; // store if the webbtc enable call failed. if so we do not prompt again
@@ -75,6 +76,10 @@ async function init() {
           }
         }
 
+        if (ev.data.action === `${SCOPE}/isEnabled`) {
+          isEnabled = response.data?.isEnabled;
+        }
+
         postMessage(ev, response);
       };
 

src/extension/content-script/webln.js

@@ -19,9 +19,10 @@ const weblnCalls = [
   "webln/on",
   "webln/emit",
   "webln/off",
+  "webln/isEnabled",
 ];
 // calls that can be executed when webln is not enabled for the current content page
-const disabledCalls = ["webln/enable"];
+const disabledCalls = ["webln/enable", "webln/isEnabled"];
 
 let isEnabled = false; // store if webln is enabled for this content page
 let isRejected = false; // store if the webln enable call failed. if so we do not prompt again
@@ -101,6 +102,10 @@ async function init() {
             isRejected = true;
           }
         }
+
+        if (ev.data.action === "webln/isEnabled") {
+          isEnabled = response.data?.isEnabled;
+        }
         postMessage(ev, response);
       };
       return browser.runtime