Fix electron's handler

JezerM · Feb 2, 2022 · fe07e99 · fe07e99
1 parent 9f1a4b3
commit fe07e99
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/ts/bridge/bridge.ts b/ts/bridge/bridge.ts
@@ -524,7 +524,7 @@ export class Greeter {
       if (started || this.is_authenticated) reset_screensaver();
       return started;
     } catch (err) {
-      console.log(err);
+      logger.error(err);
       general_error_prompt(
         browser.primary_window,
         "LightDM couldn't start session",
@@ -738,14 +738,13 @@ function handler(
   const param = args[0];
   args.shift();
   if (!hasKey(accesor, param)) return (ev.returnValue = undefined);
-  const pr = accesor[param];
+  const pr: unknown = accesor[param];
   const ac = descriptors[param];
-  global.lightdm["respond"];
 
   let value = undefined;
 
   if (typeof pr === "function") {
-    const func: (...v: unknown[]) => unknown = Object.bind(pr, accesor);
+    const func: (...v: unknown[]) => unknown = pr.bind(accesor);
     value = func(...args);
   } else {
     if (args.length > 0 && ac && ac.set) {
@@ -754,6 +753,12 @@ function handler(
       value = pr || undefined;
     }
   }
+  //console.log({
+  //accesor: accesor.constructor.name,
+  //result: value,
+  //args,
+  //param,
+  //});
   return (ev.returnValue = value);
 }
 

diff --git a/ts/browser.ts b/ts/browser.ts
@@ -79,7 +79,7 @@ class Browser {
       const req_url = request.url;
       const url = new URL(req_url);
       const res = decodeURI(url.pathname);
-      //console.log({ url, res });
+      //console.error("Protocol:", { url, res });
       callback(res);
     });
   }
@@ -266,13 +266,17 @@ class Browser {
 
     session.defaultSession.webRequest.onBeforeRequest((details, callback) => {
       const url = new URL(details.url);
-      //console.log({ origin: details.url, url });
       const block =
         !(
           url.protocol.includes("web-greeter") ||
           url.protocol.includes("file") ||
           url.protocol.includes("devtools")
         ) && nody_greeter.config.greeter.secure_mode;
+      //console.error("BeforeRequest:", {
+      //origin: details.url,
+      //url,
+      //blocked: block,
+      //});
       callback({ cancel: block });
     });
   }