fix: Validate installed app

decentraland · Sep 13, 2024 · 6573053 · 6573053
1 parent 12fb821
commit 6573053
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/packages/main/src/helpers.ts b/packages/main/src/helpers.ts
@@ -135,25 +135,7 @@ export async function decompressFile(sourcePath: string, destinationPath: string
   }
 }
 
-export function isAppInstalled(appPath: string, version: string): boolean {
-  if (!fs.existsSync(appPath)) {
-    return false;
-  }
-
-  if (!fs.existsSync(join(appPath, 'version.json'))) {
-    return false;
-  }
-
-  const versionFile = join(appPath, 'version.json');
-  const versionData = JSON.parse(fs.readFileSync(versionFile, 'utf8'));
-  return versionData[version] !== undefined;
-}
-
 export function isAppUpdated(appPath: string, version: string): boolean {
-  if (!isAppInstalled(appPath, version)) {
-    return false;
-  }
-
   const versionFile = join(appPath, 'version.json');
   const versionData = JSON.parse(fs.readFileSync(versionFile, 'utf8'));
   return versionData.version === version;

diff --git a/packages/main/src/modules/ipc.ts b/packages/main/src/modules/ipc.ts
@@ -5,7 +5,7 @@ import { app, BrowserWindow, ipcMain } from 'electron';
 import { download } from 'electron-dl';
 import log from 'electron-log/main';
 import { Analytics, IPC_EVENTS, IPC_EVENT_DATA_TYPE, ANALYTICS_EVENT, IPC_HANDLERS, getErrorMessage } from '#shared';
-import { getAppBasePath, decompressFile, getOSName, isAppInstalled, isAppUpdated, PLATFORM, getAppVersion } from '../helpers';
+import { getAppBasePath, decompressFile, getOSName, isAppUpdated, PLATFORM, getAppVersion } from '../helpers';
 import { getUserId } from './config';
 
 const EXPLORER_PATH = join(getAppBasePath(), 'Explorer');
@@ -40,11 +40,11 @@ function getExplorerBinPath(version?: string): string {
 }
 
 export function isExplorerInstalled(_event: Electron.IpcMainInvokeEvent, version: string) {
-  return isAppInstalled(getExplorerBinPath(version), version);
+  return fs.existsSync(getExplorerBinPath(version));
 }
 
-export function isExplorerUpdated(_event: Electron.IpcMainInvokeEvent, version: string) {
-  return isAppUpdated(getExplorerBinPath(version), version);
+export function isExplorerUpdated(event: Electron.IpcMainInvokeEvent, version: string) {
+  return isExplorerInstalled(event, version) && isAppUpdated(EXPLORER_PATH, version);
 }
 
 export async function downloadExplorer(event: Electron.IpcMainInvokeEvent, url: string) {