fix: issues

hydralauncher · Dec 31, 2024 · ad204e3 · ad204e3
1 parent cbbe699
commit ad204e3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/src/main/events/auth/get-session-hash.ts b/src/main/events/auth/get-session-hash.ts
@@ -9,6 +9,8 @@ const getSessionHash = async (_event: Electron.IpcMainInvokeEvent) => {
   if (!auth) return null;
   const payload = jwt.decode(auth.accessToken) as jwt.JwtPayload;
 
+  if (!payload) return null;
+
   return payload.sessionId;
 };
 

diff --git a/src/main/events/cloud-save/get-game-artifacts.ts b/src/main/events/cloud-save/get-game-artifacts.ts
@@ -1,7 +1,7 @@
 import { HydraApi } from "@main/services";
 import { registerEvent } from "../register-event";
 import type { GameArtifact, GameShop } from "@types";
-import { SubscriptionRequiredError } from "@shared";
+import { SubscriptionRequiredError, UserNotLoggedInError } from "@shared";
 
 const getGameArtifacts = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -22,6 +22,10 @@ const getGameArtifacts = async (
       return [];
     }
 
+    if (err instanceof UserNotLoggedInError) {
+      return [];
+    }
+
     throw err;
   });
 };

diff --git a/src/main/events/misc/open-checkout.ts b/src/main/events/misc/open-checkout.ts
@@ -1,16 +1,10 @@
 import { shell } from "electron";
 import { registerEvent } from "../register-event";
-import {
-  userAuthRepository,
-  userPreferencesRepository,
-} from "@main/repository";
+import { userAuthRepository } from "@main/repository";
 import { HydraApi } from "@main/services";
 
 const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
-  const [userAuth, userPreferences] = await Promise.all([
-    userAuthRepository.findOne({ where: { id: 1 } }),
-    userPreferencesRepository.findOne({ where: { id: 1 } }),
-  ]);
+  const userAuth = await userAuthRepository.findOne({ where: { id: 1 } });
 
   if (!userAuth) {
     return;
@@ -22,7 +16,6 @@ const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
 
   const params = new URLSearchParams({
     token: paymentToken,
-    lng: userPreferences?.language || "en",
   });
 
   shell.openExternal(

diff --git a/src/renderer/src/context/game-details/game-details.context.tsx b/src/renderer/src/context/game-details/game-details.context.tsx
@@ -117,11 +117,7 @@ export function GameDetailsContextProvider({
     abortControllerRef.current = abortController;
 
     window.electron
-      .getGameShopDetails(
-        objectId!,
-        shop as GameShop,
-        getSteamLanguage(i18n.language)
-      )
+      .getGameShopDetails(objectId, shop, getSteamLanguage(i18n.language))
       .then((result) => {
         if (abortController.signal.aborted) return;
 
@@ -140,14 +136,14 @@ export function GameDetailsContextProvider({
         setIsLoading(false);
       });
 
-    window.electron.getGameStats(objectId, shop as GameShop).then((result) => {
+    window.electron.getGameStats(objectId, shop).then((result) => {
       if (abortController.signal.aborted) return;
       setStats(result);
     });
 
     if (userDetails) {
       window.electron
-        .getUnlockedAchievements(objectId, shop as GameShop)
+        .getUnlockedAchievements(objectId, shop)
         .then((achievements) => {
           if (abortController.signal.aborted) return;
           setAchievements(achievements);