Heroic-Games-Launcher · imLinguin · Feb 23, 2022 · Dec 31, 2021 · Jan 2, 2022 · Jan 2, 2022
diff --git a/electron/gog/games.ts b/electron/gog/games.ts
@@ -57,16 +57,29 @@ class GOGGame extends Game {
   }
   public async getExtraInfo(namespace: string): Promise<ExtraInfo> {
     const gameInfo = GOGLibrary.get().getGameInfo(this.appName)
+    let targetPlatform: 'windows' | 'osx' | 'linux' = 'windows'
+    switch (process.platform) {
+      case 'darwin': {
+        if (gameInfo.is_mac_native) {
+          targetPlatform = 'osx'
+        }
+        break
+      }
+      case 'linux': {
+        if (gameInfo.is_linux_native) {
+          targetPlatform = 'linux'
+        }
+        break
+      }
+      default: {
+        targetPlatform = 'windows'
+        break
+      }
+    }
+
     const extra: ExtraInfo = {
       about: gameInfo.extra.about,
-      reqs: await GOGLibrary.get().createReqsArray(
-        this.appName,
-        gameInfo.is_mac_native && process.platform == 'darwin'
-          ? 'osx'
-          : gameInfo.is_linux_native && process.platform == 'linux'
-          ? 'linux'
-          : 'windows'
-      )
+      reqs: await GOGLibrary.get().createReqsArray(this.appName, targetPlatform)
     }
     return extra
   }

diff --git a/electron/gog/library.ts b/electron/gog/library.ts
@@ -75,18 +75,6 @@ export class GOGLibrary {
         }
       }
     }
-    const movies = await axios
-      .get(
-        'https://embed.gog.com/account/getFilteredProducts?mediaType=2&totalPages=1&sortBy=title',
-        { headers: headers }
-      )
-      .catch((e: AxiosError) => {
-        logError(
-          ['There was an error getting movies library data', e.message],
-          LogPrefix.Gog
-        )
-        return null
-      })
 
     if (games) {
       const gamesObjects: GameInfo[] = []
@@ -125,10 +113,8 @@ export class GOGLibrary {
       libraryStore.set('totalGames', games.data.totalProducts)
       libraryStore.set('totalMovies', games.data.moviesCount)
       logInfo('Saved games data', LogPrefix.Gog)
-    }
-    if (movies) {
-      libraryStore.set('movies', movies.data.products)
-      logInfo('Saved movies data', LogPrefix.Gog)
+    } else {
+      logError('There was an error Loading games library', LogPrefix.Gog)
     }
   }
 

diff --git a/electron/gog/setup.ts b/electron/gog/setup.ts
@@ -39,7 +39,7 @@ async function setup(appName: string): Promise<void> {
   const isCrossover = gameSettings.wineVersion.name.includes('CrossOver')
   const crossoverBottle = gameSettings.wineCrossoverBottle
   const crossoverEnv =
-    isCrossover && crossoverBottle != '' ? `CX_BOTTLE=${crossoverBottle}` : ''
+    isCrossover && crossoverBottle ? `CX_BOTTLE=${crossoverBottle}` : ''
   const isProton =
     gameSettings.wineVersion.name.includes('Proton') ||
     gameSettings.wineVersion.name.includes('Steam')

diff --git a/electron/gog/user.ts b/electron/gog/user.ts
@@ -1,48 +1,24 @@
 import axios from 'axios'
 import Store from 'electron-store'
-import { BrowserWindow } from 'electron'
 import { logError, logInfo, LogPrefix } from '../logger/logger'
-import { gogLoginUrl } from '../constants'
 import { GOGLoginData } from '../types'
 
 const configStore = new Store({
   cwd: 'gog_store'
 })
 
-const gogEmbedRegExp = new RegExp('https://embed.gog.com/on_login_success?')
+const gogAuthenticateUrl =
+  'https://auth.gog.com/token?client_id=46899977096215655&client_secret=9d85c43b1482497dbbce61f6e4aa173a433796eeae2ca8c5f6129f2dc4de46d9&grant_type=authorization_code&redirect_uri=https%3A%2F%2Fembed.gog.com%2Fon_login_success%3Forigin%3Dclient&code='
 const gogRefreshTokenUrl =
   'https://auth.gog.com/token?client_id=46899977096215655&client_secret=9d85c43b1482497dbbce61f6e4aa173a433796eeae2ca8c5f6129f2dc4de46d9&grant_type=refresh_token'
 
 export class GOGUser {
-  // This is executed below in edge error cases most likely won't run ever
-  public static async handleGOGLogin() {
-    const popupWindow = new BrowserWindow({
-      width: 450,
-      height: 700,
-      title: 'GOG'
-    })
-    popupWindow.loadURL(gogLoginUrl)
-    popupWindow.once('ready-to-show', popupWindow.show)
-
-    popupWindow.webContents.on('did-finish-load', () => {
-      const pageUrl = popupWindow.webContents.getURL()
-      if (pageUrl.match(gogEmbedRegExp)) {
-        const parsedURL = new URL(pageUrl)
-        const code = parsedURL.searchParams.get('code')
-        this.login(code)
-        popupWindow.close()
-      }
-    })
-  }
-
   static async login(code: string) {
     logInfo('Logging using GOG credentials', LogPrefix.Gog)
 
     // Gets token from GOG basaed on authorization code
     const response = await axios
-      .get(
-        `https://auth.gog.com/token?client_id=46899977096215655&client_secret=9d85c43b1482497dbbce61f6e4aa173a433796eeae2ca8c5f6129f2dc4de46d9&grant_type=authorization_code&redirect_uri=https%3A%2F%2Fembed.gog.com%2Fon_login_success%3Forigin%3Dclient&code=${code}`
-      )
+      .get(gogAuthenticateUrl + code)
       .catch((error) => {
         // Handle fetching error
         logError(['Failed to get access_token', `${error}`], LogPrefix.Gog)
@@ -57,7 +33,7 @@ export class GOGUser {
     data.loginTime = Date.now()
     configStore.set('credentials', data)
     logInfo('Login Successful', LogPrefix.Gog)
-    this.getUserDetails()
+    await this.getUserDetails()
     return { status: 'done' }
   }
 
@@ -96,7 +72,6 @@ export class GOGUser {
             'Error with refreshing token, reauth required',
             LogPrefix.Gog
           )
-          this.handleGOGLogin()
           return null
         })
 
@@ -110,7 +85,6 @@ export class GOGUser {
       logInfo('Token refreshed successfully', LogPrefix.Gog)
     } else {
       logError('No credentials, auth required', LogPrefix.Gog)
-      await this.handleGOGLogin()
     }
   }
 
@@ -124,10 +98,9 @@ export class GOGUser {
   }
   public static logout() {
     const libraryStore = new Store({ cwd: 'gog_store', name: 'library' })
-    configStore.delete('credentials')
-    configStore.delete('userData')
-    libraryStore.delete('games')
-    libraryStore.delete('movies')
+    configStore.clear()
+    libraryStore.clear()
+    logInfo('Logging user out', LogPrefix.Gog)
   }
 
   public static isLoggedIn() {

diff --git a/electron/launcher.ts b/electron/launcher.ts
@@ -131,12 +131,19 @@ async function launch(
       } ${launcherArgs}`
       logInfo(['Launch Command:', command], LogPrefix.Legendary)
     } else if (runner == 'gog') {
-      // MangoHud,Gamemode, nvidia prime can be used in native titles
-      command = `${mangohud} ${runWithGameMode} ${
-        nvidiaPrime
-          ? 'DRI_PRIME=1 __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia'
-          : ''
-      } ${audioFix ? `PULSE_LATENCY_MSEC=60` : ''} ${gogdlBin} launch "${
+      // MangoHud,Gamemode, nvidia prime, audio fix can be used in Linux native titles
+      if (isLinux) {
+        const options = [
+          mangohud,
+          runWithGameMode,
+          nvidiaPrime
+            ? 'DRI_PRIME=1 __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia'
+            : '',
+          audioFix ? `PULSE_LATENCY_MSEC=60` : ''
+        ]
+        envVars = options.join(' ')
+      }
+      command = `${envVars} ${gogdlBin} launch "${
         gameInfo.install.install_path
       }" ${gameInfo.app_name} --platform=${gameInfo.install.platform} ${
         launchArguments ?? ''

diff --git a/electron/legendary/user.ts b/electron/legendary/user.ts
@@ -39,7 +39,7 @@ export class LegendaryUser {
       })
       child.on('close', () => {
         logInfo('finished login', LogPrefix.Legendary)
-        res('finished')
+        this.getUserInfo().then(() => res('finished'))
       })
     })
   }

diff --git a/electron/main.ts b/electron/main.ts
@@ -562,7 +562,11 @@ ipcMain.on('resetHeroic', async () => {
   }
 })
 
-ipcMain.handle('authGOG', (event, code) => GOGUser.login(code))
+ipcMain.handle('authGOG', (event, code) =>
+  GOGUser.login(code).then(() =>
+    mainWindow.webContents.send('updateLoginState')
+  )
+)
 
 ipcMain.on('createNewWindow', (e, url) =>
   new BrowserWindow({ height: 700, width: 1200 }).loadURL(url)
@@ -613,7 +617,12 @@ ipcMain.handle('getUserInfo', async () => await LegendaryUser.getUserInfo())
 // Checks if the user have logged in with Legendary already
 ipcMain.handle('isLoggedIn', async () => await LegendaryUser.isLoggedIn())
 
-ipcMain.handle('login', async (event, sid) => await LegendaryUser.login(sid))
+ipcMain.handle('login', async (event, sid) =>
+  LegendaryUser.login(sid).then((value) => {
+    mainWindow.webContents.send('updateLoginState')
+    return value
+  })
+)
 
 ipcMain.handle('logoutLegendary', async () => await LegendaryUser.logout())
 ipcMain.handle('logoutGOG', async () => GOGUser.logout())
@@ -902,13 +911,15 @@ ipcMain.handle('install', async (event, params) => {
 })
 
 ipcMain.handle('uninstall', async (event, args) => {
-  const title = (await Game.get(args[0], args[2]).getGameInfo()).title
-  const winePrefix = (await Game.get(args[0], args[2]).getSettings()).winePrefix
+  const [appName, shouldRemovePrefix, runner] = args
 
-  return Game.get(args[0], args[2])
+  const title = (await Game.get(appName, runner).getGameInfo()).title
+  const winePrefix = (await Game.get(appName, runner).getSettings()).winePrefix
+
+  return Game.get(appName, runner)
     .uninstall()
     .then(() => {
-      if (args[1]) {
+      if (shouldRemovePrefix) {
         logInfo(`Removing prefix ${winePrefix}`)
         if (existsSync(winePrefix)) {
           // remove prefix if exists
@@ -1006,7 +1017,7 @@ ipcMain.handle('importGame', async (event, args) => {
 })
 
 ipcMain.handle('updateGame', async (e, game, runner) => {
-  if (!(await isOnline()) && runner == 'legendary') {
+  if (!(await isOnline())) {
     logWarning(
       `App offline, skipping install for game '${game}'.`,
       LogPrefix.Backend

diff --git a/package.json b/package.json
@@ -112,7 +112,6 @@
     "@fortawesome/react-fontawesome": "^0.1.16",
     "@mui/icons-material": "^5.3.1",
     "@mui/material": "^5.4.0",
-    "@types/ini": "^1.3.31",
     "axios": "^0.21.1",
     "classnames": "^2.2.6",
     "discord-rich-presence-typescript": "^0.0.8",
@@ -175,6 +174,7 @@
     "@testing-library/user-event": "^13.1.9",
     "@types/classnames": "^2.2.11",
     "@types/i18next-fs-backend": "^1.0.0",
+    "@types/ini": "^1.3.31",
     "@types/jest": "^26.0.23",
     "@types/node": "^17.0.10",
     "@types/plist": "^3.0.2",
@@ -207,4 +207,4 @@
       "last 1 chrome version"
     ]
   }
-}
+}
diff --git a/public/locales/bg/gamepage.json b/public/locales/bg/gamepage.json
@@ -53,6 +53,7 @@
         "downloadSize": "Размер за сваляне",
         "firstPlayed": "Пусната за пръв път",
         "installSize": "Размер на инсталацията",
+        "language": "Language",
         "lastPlayed": "Последно пускане",
         "neverPlayed": "Никога",
         "totalPlayed": "Изиграно време"

diff --git a/public/locales/bg/login.json b/public/locales/bg/login.json
@@ -2,9 +2,6 @@
     "button": {
         "login": "Вход"
     },
-    "input": {
-        "placeholder": "Въведете своя SID тук"
-    },
     "message": {
         "part1": "За да можете да влезете и инсталирате игрите си, трябва първо да изпълните следните стъпки:",
         "part2": "",
@@ -17,8 +14,7 @@
     },
     "status": {
         "error": "Грешка",
-        "loading": "Зареждане на списъка с игри. Моля, изчакайте",
-        "logging": "Влизане…"
+        "loading": "Зареждане на списъка с игри. Моля, изчакайте"
     },
     "welcome": "Добре дошли!"
 }
diff --git a/public/locales/bg/translation.json b/public/locales/bg/translation.json
@@ -84,6 +84,7 @@
         "yes": "ДА"
     },
     "button": {
+        "continue": "Continue",
         "login": "Вход",
         "sync": "Синхронизиране",
         "syncing": "Синхронизиране",
@@ -100,6 +101,7 @@
     },
     "Filter": "Филтриране",
     "globalSettings": "Глобални настройки",
+    "GOG": "GOG",
     "help": {
         "general": "Синхронизирайте с EGS, в случай че вече имате работеща инсталация на Epic Games Store и искате да внесете игрите си от там, за да избегнете повторното им сваляне.",
         "other": {
@@ -137,8 +139,7 @@
         "website": "Зареждане на уеб сайта"
     },
     "login": {
-        "loginWithEpic": "Вход чрез Epic",
-        "loginWithSid": "Login with SID"
+        "externalLogin": "External Login"
     },
     "message": {
         "sync": "Синхронизацията е завършена",
@@ -270,7 +271,6 @@
     },
     "Settings": "Настройки",
     "status": {
-        "loading": "Зареждане на списъка с игри. Моля, изчакайте",
         "logging": "Влизане…"
     },
     "store": "Магазин",
@@ -308,6 +308,7 @@
         "discord": "Дискорд",
         "logout": "Излизане от акаунта",
         "logout_confirmation": "Наистина ли искате да излезете от акаунта си?",
+        "manageaccounts": "Manage Accounts",
         "quit": "Изход"
     },
     "wiki": "Уики",

diff --git a/public/locales/ca/gamepage.json b/public/locales/ca/gamepage.json
@@ -53,6 +53,7 @@
         "downloadSize": "Mida de la descàrrega",
         "firstPlayed": "Jugat primer",
         "installSize": "Mida d'instal·lació",
+        "language": "Language",
         "lastPlayed": "Jugat abans",
         "neverPlayed": "Mai jugat",
         "totalPlayed": "Temps jugat"

diff --git a/public/locales/ca/login.json b/public/locales/ca/login.json
@@ -2,9 +2,6 @@
     "button": {
         "login": "Iniciar sessió"
     },
-    "input": {
-        "placeholder": "Enganxa l'SID aquí"
-    },
     "message": {
         "part1": "Per iniciar sessió i començar a instal·lar els teus jocs, primer has de seguir les passes d'aquí avall:",
         "part2": "Obrir",
@@ -17,8 +14,7 @@
     },
     "status": {
         "error": "Error",
-        "loading": "Cargant la llista de jocs, si us plau esperi",
-        "logging": "Iniciant sessió…"
+        "loading": "Cargant la llista de jocs, si us plau esperi"
     },
     "welcome": "Benvingut/da!"
 }