[FIX]: Multiple Amazon Games bugs

src/backend/storeManagers/nile/library.ts

@@ -26,7 +26,7 @@ import {
 } from 'common/types/nile'
 import { existsSync, readFileSync, writeFileSync } from 'graceful-fs'
 import { installStore, libraryStore } from './electronStores'
-import { getNileBin } from 'backend/utils'
+import { getFileSize, getNileBin, removeSpecialcharacters } from 'backend/utils'
 import { callRunner } from 'backend/launcher'
 import { dirname, join } from 'path'
 import { app } from 'electron'
@@ -66,7 +66,8 @@ function loadGamesInAccount() {
     } = productDetail
 
     const info = installedGames.get(product.id)
-
+    // Create save folder name like nile
+    const safeFolderName = removeSpecialcharacters(title ?? '')
     library.set(product.id, {
       app_name: product.id,
       art_cover: iconUrl,
@@ -75,11 +76,14 @@ function loadGamesInAccount() {
       install: info
         ? {
             install_path: info.path,
+            // For some time size was undefined in installed.json, that's why we
+            // need to keep this fallback to 0
+            install_size: getFileSize(info.size ?? 0),
             version: info.version,
             platform: 'Windows' // Amazon Games only supports Windows
           }
         : {},
-      folder_name: title,
+      folder_name: safeFolderName,
       is_installed: info !== undefined,
       runner: 'nile',
       title: title ?? '???',

src/backend/utils.ts

@@ -490,6 +490,8 @@ async function errorHandler({
   }
 }
 
+// If you ever modify this range of characters, please also add them to nile
+// source as this function is used to determine how game directory will be named
 function removeSpecialcharacters(text: string): string {
   const regexp = new RegExp(/[:|/|*|?|<|>|\\|&|{|}|%|$|@|`|!|™|+|'|"|®]/, 'gi')
   return text.replaceAll(regexp, '')

src/common/types/nile.ts

@@ -30,6 +30,7 @@ export interface NileInstallMetadataInfo {
   id: string
   version: string
   path: string
+  size?: number
 }
 
 export interface NileInstallInfo {

src/frontend/components/UI/Sidebar/components/SidebarLinks/index.tsx

@@ -54,15 +54,15 @@ export default function SidebarLinks() {
 
   const settingsPath = '/settings/app/default/general'
 
-  const loggedIn = epic.username || gog.username || amazon.username
+  const loggedIn = epic.username || gog.username || amazon.user_id
 
   async function handleRefresh() {
     localStorage.setItem('scrollPosition', '0')
 
     const shouldRefresh =
       (epic.username && !epic.library.length) ||
       (gog.username && !gog.library.length) ||
-      (amazon.username && !amazon.library.length)
+      (amazon.user_id && !amazon.library.length)
     if (shouldRefresh) {
       return refreshLibrary({ runInBackground: true })
     }
@@ -82,7 +82,7 @@ export default function SidebarLinks() {
 
   // By default, open Epic Store
   let defaultStore = '/epicstore'
-  if (!epic.username && !gog.username && amazon.username) {
+  if (!epic.username && !gog.username && amazon.user_id) {
     // If only logged in to Amazon Games, open Amazon Gaming
     defaultStore = '/amazonstore'
   } else if (!epic.username && gog.username) {

src/frontend/components/UI/StoreFilter/index.tsx

@@ -11,7 +11,7 @@ export default React.memo(function StoreFilter() {
 
   const isGOGLoggedin = gog.username
   const isEpicLoggedin = epic.username
-  const isAmazonLoggedin = amazon.username
+  const isAmazonLoggedin = amazon.user_id
 
   return (
     <div className="storeFilter">

src/frontend/screens/Library/index.tsx

@@ -153,7 +153,7 @@ export default React.memo(function Library(): JSX.Element {
     if (gogCategories.includes(category) && !gog.username) {
       handleCategory('all')
     }
-    if (amazonCategories.includes(category) && !amazon.username) {
+    if (amazonCategories.includes(category) && !amazon.user_id) {
       handleCategory('all')
     }
   }, [epic.username, gog.username, amazon.username])
@@ -244,7 +244,7 @@ export default React.memo(function Library(): JSX.Element {
     } else {
       const isEpic = epic.username && epicCategories.includes(category)
       const isGog = gog.username && gogCategories.includes(category)
-      const isAmazon = amazon.username && amazonCategories.includes(category)
+      const isAmazon = amazon.user_id && amazonCategories.includes(category)
       const epicLibrary = isEpic ? epic.library : []
       const gogLibrary = isGog ? gog.library : []
       const sideloadedApps = sideloadedCategories.includes(category)

src/frontend/screens/Login/index.tsx

@@ -27,7 +27,7 @@ export default React.memo(function NewLogin() {
   const [isEpicLoggedIn, setIsEpicLoggedIn] = useState(Boolean(epic.username))
   const [isGogLoggedIn, setIsGogLoggedIn] = useState(Boolean(gog.username))
   const [isAmazonLoggedIn, setIsAmazonLoggedIn] = useState(
-    Boolean(amazon.username)
+    Boolean(amazon.user_id)
   )
 
   const loginMessage = t(
@@ -42,8 +42,8 @@ export default React.memo(function NewLogin() {
   useEffect(() => {
     setIsEpicLoggedIn(Boolean(epic.username))
     setIsGogLoggedIn(Boolean(gog.username))
-    setIsAmazonLoggedIn(Boolean(amazon.username))
-  }, [epic.username, gog.username, amazon.username, t])
+    setIsAmazonLoggedIn(Boolean(amazon.user_id))
+  }, [epic.username, gog.username, amazon.user_id, t])
 
   async function handleLibraryClick() {
     await refreshLibrary({ runInBackground: false })
@@ -110,7 +110,7 @@ export default React.memo(function NewLogin() {
               icon={() => <AmazonLogo />}
               loginUrl={amazonLoginPath}
               isLoggedIn={isAmazonLoggedIn}
-              user={amazon.username}
+              user={amazon.username || 'Unknown'}
               logoutAction={amazon.logout}
             />
           </div>

src/frontend/screens/WebView/index.tsx

@@ -225,7 +225,7 @@ export default function WebView() {
       !gog.username
     ) {
       setShowLoginWarningFor('gog')
-    } else if (startUrl.match(/gaming\.amazon\.com/) && !amazon.username) {
+    } else if (startUrl.match(/gaming\.amazon\.com/) && !amazon.user_id) {
       setShowLoginWarningFor('amazon')
     }
   }, [startUrl])

src/frontend/state/GlobalState.tsx

@@ -69,6 +69,7 @@ interface StateProps {
   }
   amazon: {
     library: GameInfo[]
+    user_id?: string
     username?: string
   }
   wineVersions: WineVersionInfo[]
@@ -147,7 +148,8 @@ class GlobalState extends PureComponent<Props> {
     },
     amazon: {
       library: this.loadAmazonLibrary(),
-      username: nileConfigStore.get_nodefault('userData.given_name')
+      user_id: nileConfigStore.get_nodefault('userData.user_id'),
+      username: nileConfigStore.get_nodefault('userData.name')
     },
     wineVersions: wineDownloaderInfoStore.get('wine-releases', []),
     error: false,
@@ -423,6 +425,7 @@ class GlobalState extends PureComponent<Props> {
       this.setState({
         amazon: {
           library: [],
+          user_id: response.user?.user_id,
           username: response.user?.name
         }
       })
@@ -438,6 +441,7 @@ class GlobalState extends PureComponent<Props> {
     this.setState({
       amazon: {
         library: [],
+        user_id: null,
         username: null
       }
     })
@@ -497,7 +501,7 @@ class GlobalState extends PureComponent<Props> {
     }
 
     let amazonLibrary = nileLibraryStore.get('library', [])
-    if (amazon.username && (!amazonLibrary.length || !amazon.library.length)) {
+    if (amazon.user_id && (!amazonLibrary.length || !amazon.library.length)) {
       window.api.logInfo('No cache found, getting data from nile...')
       await window.api.refreshLibrary('nile')
       amazonLibrary = this.loadAmazonLibrary()
@@ -516,6 +520,7 @@ class GlobalState extends PureComponent<Props> {
       },
       amazon: {
         library: amazonLibrary,
+        user_id: amazon.user_id,
         username: amazon.username
       },
       gameUpdates: updates,
@@ -861,6 +866,7 @@ class GlobalState extends PureComponent<Props> {
           },
           amazon: {
             library: amazon.library,
+            user_id: amazon.user_id,
             username: amazon.username,
             getLoginData: this.getAmazonLoginData,
             login: this.amazonLogin,

src/frontend/types.ts

@@ -71,6 +71,7 @@ export interface ContextType {
   }
   amazon: {
     library: GameInfo[]
+    user_id?: string
     username?: string
     getLoginData: () => Promise<NileLoginData>
     login: (data: NileRegisterData) => Promise<string>