feat(nostr): apply enable to support unlock #1727

src/app/screens/Unlock/index.tsx

@@ -43,7 +43,16 @@ function Unlock() {
   function unlock() {
     auth
       .unlock(password, () => {
-        navigate(from, { replace: true });
+        console.log("FROM", from);
+
+        if (from !== "/") {
+          console.log("FROM JA");
+          navigate(from, { replace: true });
+        } else {
+          //  unlock was triggered on it's own there's no from (i.e. nostr action)
+          console.log("FROM NEIn");
+          window.close();
+        }
       })
       .catch((e) => {
         setError(e.message);

src/extension/background-script/actions/allowances/__tests__/enable.test.ts

@@ -59,7 +59,7 @@ describe("enable allowance", () => {
     const message: MessageAllowanceEnable = {
       application: "LBE",
       prompt: true,
-      action: "enableAllowance",
+      action: "public/webln/enable",
       origin: {
         location: "test",
         domain: "",
@@ -95,7 +95,7 @@ describe("enable allowance", () => {
     const message: MessageAllowanceEnable = {
       application: "LBE",
       prompt: true,
-      action: "enableAllowance",
+      action: "public/webln/enable",
       origin: {
         location: "test",
         domain: "",

src/extension/background-script/actions/allowances/enable.ts

@@ -8,28 +8,40 @@ import { setIcon, ExtensionIcon } from "../setup/setIcon";
 
 const enable = async (
   message: MessageAllowanceEnable,
-  sender: Runtime.MessageSender
+  sender?: Runtime.MessageSender
 ) => {
+  console.log("INSIDE enbale <---- message: ", message);
   const isUnlocked = state.getState().isUnlocked();
   const host = message.origin.host || message.args.host;
   const allowance = await db.allowances
     .where("host")
     .equalsIgnoreCase(host)
     .first();
+  console.log("enable -> isUnlocked: ", isUnlocked);
+  console.log("enable -> allowance: ", allowance);
 
   if (isUnlocked && allowance && allowance.enabled) {
+    console.log("enable -> no prompt needed");
+
     return {
       data: { enabled: true },
     };
   } else {
+    console.log("enable -> prompt needed");
+
     try {
+      console.log("enable -> prompt needed - try");
       const response = await utils.openPrompt<{
         enabled: boolean;
         remember: boolean;
       }>(message);
-      if (response.data.enabled && sender.tab) {
+
+      if (response.data.enabled && sender?.tab) {
         await setIcon(ExtensionIcon.Active, sender.tab.id as number); // highlight the icon when enabled
       }
+
+      console.log("enable -> prompt needed - response: ", response);
+
       // if the response should be saved/remembered we update the allowance for the domain
       // as this returns a promise we must wait until it resolves
       if (response.data.enabled && response.data.remember) {

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

@@ -1,6 +1,11 @@
 import utils from "~/common/lib/utils";
+import enable from "~/extension/background-script/actions/allowances/enable";
 import db from "~/extension/background-script/db";
-import { DbPermission, MessageSignEvent, DbAllowance } from "~/types";
+import {
+  MessageAllowanceEnable,
+  DbPermission,
+  MessageSignEvent,
+} from "~/types";
 
 import state from "../../state";
 import { validateEvent } from "./helpers";
@@ -20,6 +25,17 @@ const signEventOrPrompt = async (message: MessageSignEvent) => {
 
   console.log("message.args.event", message.args.event);
 
+  const enableMessage: MessageAllowanceEnable = {
+    origin: message.origin, // TODO: make sure we pass the image as well
+    args: {
+      host: message.origin.host,
+    },
+    action: "public/webln/enable",
+  };
+
+  const foo = await enable(enableMessage);
+  console.log("after enbale <----", foo);
+
   const dbPermissions = await db.permissions
     .where("host")
     .equalsIgnoreCase(message.origin.host)
@@ -44,33 +60,35 @@ const signEventOrPrompt = async (message: MessageSignEvent) => {
         throw new Error("User rejected");
       }
 
-      const matchingAllowance = await db.allowances
-        .where("host")
-        .equalsIgnoreCase(message.origin.host)
-        .first();
-      let allowanceId = matchingAllowance?.id;
-
-      if (!allowanceId) {
-        console.log("mno matching allowance");
-
-        const dbAllowance: DbAllowance = {
-          createdAt: Date.now().toString(),
-          enabled: true,
-          host: message.origin.host,
-          imageURL: "", // need to get the image
-          lastPaymentAt: 0,
-          lnurlAuth: false,
-          name: "",
-          remainingBudget: 0,
-          tag: "",
-          totalBudget: 0,
-        };
-        allowanceId = await db.allowances.add(dbAllowance);
-      }
+      // if (!allowanceId) {
+      //   console.log("mno matching allowance");
+
+      //   const dbAllowance: DbAllowance = {
+      //     createdAt: Date.now().toString(),
+      //     enabled: true,
+      //     host: message.origin.host,
+      //     imageURL: "", // need to get the image
+      //     lastPaymentAt: 0,
+      //     lnurlAuth: false,
+      //     name: "",
+      //     remainingBudget: 0,
+      //     tag: "",
+      //     totalBudget: 0,
+      //   };
+      //   allowanceId = await db.allowances.add(dbAllowance);
+      // }
 
       console.log("matching allowance!");
 
       if (response.data.rememberPermission) {
+        const matchingAllowance = await db.allowances
+          .where("host")
+          .equalsIgnoreCase(message.origin.host)
+          .first();
+        const allowanceId = matchingAllowance?.id;
+
+        if (!allowanceId) return; // type-guard only
+
         console.log("rememberme?");
 
         const permission: DbPermission = {

src/types.ts

@@ -278,7 +278,7 @@ export interface MessageAllowanceEnable extends MessageDefault {
   args: {
     host: Allowance["host"];
   };
-  action: "enableAllowance";
+  action: "public/webln/enable";
 }
 
 export interface MessageAllowanceDelete extends MessageDefault {