🐛 Fix bug with process.versions

theripper93 · Sep 17, 2023 · f309f0c · f309f0c
1 parent 775b1c6
commit f309f0c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -139,12 +139,16 @@ app.whenReady().then(() => {
                 const password = document.querySelector('input[name="password"]');
                 if (password)
                     password.value = "${userData.password}";
+                const fakeEvent = {
+                    preventDefault: () => {
+                    }, target: document.getElementById("join-game")
+                }
                 if ("${autoLogin}" === "true") {
-                    const fakeEvent = {
-                        preventDefault: () => {
-                        }, target: document.getElementById("join-game")
-                    }
                     ui.join._onSubmit(fakeEvent);
+                } else {
+                    document.getElementById("join-game").addEventListener("click", () => {
+                        ui.join._onSubmit(fakeEvent);
+                    });
                 }
             }
 
@@ -211,8 +215,8 @@ function getLoginDetails(gameId: string): GameUserDataDecrypted {
 
     return {
         user: userData.user,
-        password: password.length !== 0 ? safeStorage.decryptString(Buffer.from(password)) : "",
-        adminPassword: password.length !== 0 ? safeStorage.decryptString(Buffer.from(adminPassword)) : "",
+        password: password.length !== 0 ? (safeStorage.isEncryptionAvailable() ? safeStorage.decryptString(Buffer.from(password)) : "") : "",
+        adminPassword: password.length !== 0 ? (safeStorage.isEncryptionAvailable() ? safeStorage.decryptString(Buffer.from(adminPassword)) : "") : "",
     };
 }
 

diff --git a/src/preload.ts b/src/preload.ts
@@ -1,8 +1,8 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: no nodejs in preload
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 import {contextBridge, ipcRenderer} from 'electron';
-import {versions} from 'node:process';
 
 window.addEventListener("DOMContentLoaded", () => {
     const replaceText = (selector: string, text: string) => {
@@ -11,7 +11,7 @@ window.addEventListener("DOMContentLoaded", () => {
     };
 
     for (const dependency of ["chrome", "node", "electron"]) {
-        replaceText(`${dependency}-version`, versions[dependency]);
+        replaceText(`${dependency}-version`, process.versions[dependency]);
     }
 });
 

diff --git a/src/renderer.ts b/src/renderer.ts
@@ -138,9 +138,9 @@ async function createGameList() {
     } catch (e) {
         console.log("Failed to load config.json");
     }
-    config = {...config, ...(JSON.parse(window.localStorage.getItem("appConfig") || "{}") as AppConfig)}
+    config = {...config, ...(JSON.parse(window.localStorage.getItem("appConfig") || "{}") as AppConfig)};
 
-    appVersion = await window.api.request("app-version");
+    appVersion = await window.api.request("app-version") as string;
     document.querySelector("#current-version").textContent = appVersion;
 
     const latestVersion: string = (await (await fetch("https://api.github.com/repos/theripper93/fvtt-player-client/releases/latest", {mode: "cors"})).json())["tag_name"];