Merge pull request #1282 from hydralauncher/fix/intercepting-cookies

Fix/intercepting cookies

src/locales/en/translation.json

@@ -167,7 +167,8 @@
     "manage_files_description": "Manage which files will be backed up and restored",
     "select_folder": "Select folder",
     "backup_from": "Backup from {{date}}",
-    "custom_backup_location_set": "Custom backup location set"
+    "custom_backup_location_set": "Custom backup location set",
+    "no_directory_selected": "No directory selected"
   },
   "activation": {
     "title": "Activate Hydra",

src/locales/es/translation.json

@@ -100,7 +100,7 @@
     "open_screenshot": "Abrir captura {{number}}",
     "download_settings": "Ajustes de descarga",
     "downloader": "Método de descarga",
-    "select_executable": "Seleccionar ejecutable",
+    "select_executable": "Seleccionar",
     "no_executable_selected": "No se seleccionó un ejecutable",
     "open_folder": "Abrir carpeta",
     "open_download_location": "Ver archivos descargados",
@@ -166,7 +166,9 @@
     "manage_files_description": "Gestiona los archivos que serán respaldados y restaurados",
     "select_folder": "Seleccionar carpeta",
     "backup_from": "Copia de seguridad de {{date}}",
-    "custom_backup_location_set": "Se configuró la carpeta de copia de seguridad"
+    "custom_backup_location_set": "Se configuró la carpeta de copia de seguridad",
+    "clear": "Limpiar",
+    "no_directory_selected": "No se seleccionó un directório"
   },
   "activation": {
     "title": "Activar Hydra",

src/locales/pt-BR/translation.json

@@ -162,7 +162,9 @@
     "backup_from": "Backup de {{date}}",
     "custom_backup_location_set": "Localização customizada selecionada",
     "select_folder": "Selecione a pasta",
-    "manage_files_description": "Gerencie quais arquivos serão feitos backup"
+    "manage_files_description": "Gerencie quais arquivos serão feitos backup",
+    "clear": "Limpar",
+    "no_directory_selected": "Nenhum diretório selecionado"
   },
   "activation": {
     "title": "Ativação",

src/main/events/library/select-game-wine-prefix.ts

@@ -5,9 +5,9 @@ import { registerEvent } from "../register-event";
 const selectGameWinePrefix = async (
   _event: Electron.IpcMainInvokeEvent,
   id: number,
-  winePrefixPath: string
+  winePrefixPath: string | null
 ) => {
-  return gameRepository.update({ id }, { winePrefixPath });
+  return gameRepository.update({ id }, { winePrefixPath: winePrefixPath });
 };
 
 registerEvent("selectGameWinePrefix", selectGameWinePrefix);

src/main/events/library/update-executable-path.ts

@@ -6,14 +6,18 @@ import { parseExecutablePath } from "../helpers/parse-executable-path";
 const updateExecutablePath = async (
   _event: Electron.IpcMainInvokeEvent,
   id: number,
-  executablePath: string
+  executablePath: string | null
 ) => {
+  const parsedPath = executablePath
+    ? parseExecutablePath(executablePath)
+    : null;
+
   return gameRepository.update(
     {
       id,
     },
     {
-      executablePath: parseExecutablePath(executablePath),
+      executablePath: parsedPath,
     }
   );
 };

src/preload/index.ts

@@ -87,9 +87,9 @@ contextBridge.exposeInMainWorld("electron", {
     ipcRenderer.invoke("addGameToLibrary", objectId, title, shop),
   createGameShortcut: (id: number) =>
     ipcRenderer.invoke("createGameShortcut", id),
-  updateExecutablePath: (id: number, executablePath: string) =>
+  updateExecutablePath: (id: number, executablePath: string | null) =>
     ipcRenderer.invoke("updateExecutablePath", id, executablePath),
-  selectGameWinePrefix: (id: number, winePrefixPath: string) =>
+  selectGameWinePrefix: (id: number, winePrefixPath: string | null) =>
     ipcRenderer.invoke("selectGameWinePrefix", id, winePrefixPath),
   verifyExecutablePathInUse: (executablePath: string) =>
     ipcRenderer.invoke("verifyExecutablePathInUse", executablePath),

src/renderer/src/cookies.ts

@@ -0,0 +1,44 @@
+export function addCookieInterceptor() {
+  Object.defineProperty(document, "cookie", {
+    enumerable: true,
+    configurable: true,
+    get() {
+      return localStorage.getItem("cookies") || "";
+    },
+    set(cookieString) {
+      try {
+        const [cookieName, cookieValue] = cookieString.split(";")[0].split("=");
+
+        const currentCookies = localStorage.getItem("cookies") || "";
+
+        const cookiesObject = parseCookieStringsToObjects(currentCookies);
+        cookiesObject[cookieName] = cookieValue;
+
+        const newString = Object.entries(cookiesObject)
+          .map(([key, value]) => {
+            return key + "=" + value;
+          })
+          .join("; ");
+
+        localStorage.setItem("cookies", newString);
+      } catch (err) {
+        console.error(err);
+      }
+    },
+  });
+}
+
+const parseCookieStringsToObjects = (
+  cookieStrings: string
+): { [key: string]: string } => {
+  const result = {};
+
+  if (cookieStrings === "") return result;
+
+  cookieStrings.split(";").forEach((cookieString) => {
+    const [name, value] = cookieString.split("=");
+    result[name.trim()] = value.trim();
+  });
+
+  return result;
+};

src/renderer/src/declaration.d.ts

@@ -80,8 +80,14 @@ declare global {
       shop: GameShop
     ) => Promise<void>;
     createGameShortcut: (id: number) => Promise<boolean>;
-    updateExecutablePath: (id: number, executablePath: string) => Promise<void>;
+    updateExecutablePath: (
-    selectGameWinePrefix: (id: number, winePrefixPath: string) => Promise<void>;
+      id: number,
+      executablePath: string | null
+    ) => Promise<void>;
+    selectGameWinePrefix: (
+      id: number,
+      winePrefixPath: string | null
+    ) => Promise<void>;
     verifyExecutablePathInUse: (executablePath: string) => Promise<Game>;
     getLibrary: () => Promise<LibraryGame[]>;
     openGameInstaller: (gameId: number) => Promise<boolean>;

src/renderer/src/main.tsx

@@ -21,6 +21,7 @@ import resources from "@locales";
 import { RepacksContextProvider } from "./context";
 import { SuspenseWrapper } from "./components";
 import { logger } from "./logger";
+import { addCookieInterceptor } from "./cookies";
 
 const Home = React.lazy(() => import("./pages/home/home"));
 const GameDetails = React.lazy(
@@ -37,6 +38,8 @@ const Achievements = React.lazy(
 
 console.log = logger.log;
 
+addCookieInterceptor();
+
 i18n
   .use(LanguageDetector)
   .use(initReactI18next)

src/renderer/src/pages/game-details/modals/game-options-modal.tsx

@@ -96,7 +96,7 @@ export function GameOptionsModal({
   };
 
   const handleClearExecutablePath = async () => {
-    await window.electron.updateExecutablePath(game.id, "");
+    await window.electron.updateExecutablePath(game.id, null);
     updateGame();
   };
 
@@ -112,7 +112,7 @@ export function GameOptionsModal({
   };
 
   const handleClearWinePrefixPath = async () => {
-    await window.electron.selectGameWinePrefix(game.id, "");
+    await window.electron.selectGameWinePrefix(game.id, null);
     updateGame();
   };
 
@@ -155,6 +155,7 @@ export function GameOptionsModal({
             disabled
             placeholder={t("no_executable_selected")}
             rightContent={
+              <>
                 <Button
                   type="button"
                   theme="outline"
@@ -163,6 +164,12 @@ export function GameOptionsModal({
                   <FileIcon />
                   {t("select_executable")}
                 </Button>
+                {game.executablePath && (
+                  <Button onClick={handleClearExecutablePath} theme="outline">
+                    {t("clear")}
+                  </Button>
+                )}
+              </>
             }
           />
 
@@ -178,9 +185,6 @@ export function GameOptionsModal({
               <Button onClick={handleCreateShortcut} theme="outline">
                 {t("create_shortcut")}
               </Button>
-              <Button onClick={handleClearExecutablePath} theme="outline">
-                {t("clear")}
-              </Button>
             </div>
           )}
 
@@ -199,6 +203,7 @@ export function GameOptionsModal({
                 disabled
                 placeholder={t("no_directory_selected")}
                 rightContent={
+                  <>
                     <Button
                       type="button"
                       theme="outline"
@@ -207,15 +212,17 @@ export function GameOptionsModal({
                       <FileDirectoryIcon />
                       {t("select_executable")}
                     </Button>
-                }
-              />
                     {game.winePrefixPath && (
-                <div className={styles.gameOptionRow}>
+                      <Button
-                  <Button onClick={handleClearWinePrefixPath} theme="outline">
+                        onClick={handleClearWinePrefixPath}
+                        theme="outline"
+                      >
                         {t("clear")}
                       </Button>
-                </div>
                     )}
+                  </>
+                }
+              />
             </div>
           )}