Merge pull request #1412 from jetstreamapp/bug/desktop-fixes

Disable search features without valid organization and allow duplicate filenames for zip exports

Author: paustint

apps/api/src/app/db/web-extension.db.ts

@@ -17,6 +17,16 @@ const SELECT = Prisma.validator<Prisma.WebExtensionTokenSelect>()({
   user: {
     select: {
       entitlements: { select: { chromeExtension: true, googleDrive: true, recordSync: true, desktop: true } },
+      teamMembership: {
+        select: {
+          status: true,
+          team: {
+            select: {
+              entitlements: { select: { chromeExtension: true, googleDrive: true, recordSync: true, desktop: true } },
+            },
+          },
+        },
+      },
     },
   },
   type: true,

apps/api/src/app/services/external-auth.service.ts

@@ -75,13 +75,16 @@ export async function verifyToken(
   const decodedPayload = decoder(token) as JwtDecodedPayload;
 
   const userAccessToken = await webExtDb.findByAccessTokenAndDeviceId({ deviceId, token, type: webExtDb.TOKEN_TYPE_AUTH });
+  const entitlements = userAccessToken?.user?.teamMembership?.team?.entitlements || userAccessToken?.user?.entitlements;
   if (!userAccessToken) {
     throw new InvalidAccessToken('Access token is invalid for device');
+  } else if (userAccessToken.user.teamMembership && userAccessToken.user.teamMembership.status !== 'ACTIVE') {
+    throw new InvalidAccessToken('User is not active');
   } else if (decodedPayload?.userProfile?.id !== userAccessToken.userId) {
     throw new InvalidAccessToken('Access token is invalid for user');
-  } else if (audience === AUDIENCE_WEB_EXT && !userAccessToken.user.entitlements?.chromeExtension) {
+  } else if (audience === AUDIENCE_WEB_EXT && !entitlements?.chromeExtension) {
     throw new InvalidAccessToken('Browser extension is not enabled');
-  } else if (audience === AUDIENCE_DESKTOP && !userAccessToken.user.entitlements?.desktop) {
+  } else if (audience === AUDIENCE_DESKTOP && !entitlements?.desktop) {
     throw new InvalidAccessToken('Desktop application is not enabled');
   }
 

apps/jetstream-desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jetstream",
   "description": "The ultimate Salesforce administrator companion.",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/jetstreamapp/jetstream"
@@ -12,6 +12,8 @@
     "postinstall": "electron-builder install-app-deps",
     "build:mac": "electron-builder build --mac --config electron-builder.config.js",
     "build:win": "electron-builder build --win --config electron-builder.config.js",
+    "publish:mac:dev": "electron-builder build --mac --config electron-builder.config.js --publish always --config.publish.provider=s3 --config.publish.endpoint=http://localhost:9000 --config.publish.bucket=desktop-updates --config.publish.path=jetstream/releases",
+    "publish:win:dev": "electron-builder build --win --config electron-builder.config.js --publish always --config.publish.provider=s3 --config.publish.endpoint=http://localhost:9000 --config.publish.bucket=desktop-updates --config.publish.path=jetstream/releases",
     "publish:mac": "electron-builder build --mac --config electron-builder.config.js -p always",
     "publish:win": "electron-builder build --win --config electron-builder.config.js -p always"
   },

apps/jetstream-desktop/src/config/auto-updater.ts

@@ -1,16 +1,27 @@
-import { BrowserWindow, dialog } from 'electron';
+import { UpdateStatus } from '@jetstream/desktop/types';
+import { BrowserWindow } from 'electron';
 import logger from 'electron-log';
 import { autoUpdater, UpdateInfo } from 'electron-updater';
 
 // Configure logging
 autoUpdater.logger = logger;
 
-// Disable auto-download - we'll control when to download
-autoUpdater.autoDownload = false;
+// Enable auto-download - non-blocking background download
+autoUpdater.autoDownload = true;
 autoUpdater.autoInstallOnAppQuit = true;
 
-function getFocusedOrFirstWindow(): BrowserWindow | null {
-  return BrowserWindow.getFocusedWindow() || BrowserWindow.getAllWindows()[0] || null;
+// State management
+let currentUpdateStatus: UpdateStatus = { status: 'idle' };
+let lastCheckTime = 0;
+const MIN_CHECK_INTERVAL = 5 * 60 * 1000; // 5 minutes between checks to prevent spam
+
+function sendUpdateStatus(status: UpdateStatus) {
+  currentUpdateStatus = status;
+  const windows = BrowserWindow.getAllWindows();
+  windows.forEach((window) => {
+    window.webContents.send('update-status', status);
+  });
+  logger.info('Update status:', status);
 }
 
 export function initializeAutoUpdater() {
@@ -33,103 +44,106 @@ function setupAutoUpdaterListeners() {
 
   autoUpdater.on('checking-for-update', () => {
     logger.info('Checking for update...');
+    sendUpdateStatus({ status: 'checking' });
   });
 
   autoUpdater.on('update-available', (info: UpdateInfo) => {
     logger.info('Update available:', info);
-
-    const updateWindow = getFocusedOrFirstWindow();
-    if (!updateWindow) {
-      return;
-    }
-
-    dialog
-      .showMessageBox(updateWindow, {
-        type: 'info',
-        title: 'Update Available',
-        message: `A new version ${info.version} is available. Would you like to download it now?`,
-        detail: 'The update will be installed when you restart the application.',
-        buttons: ['Download', 'Later'],
-        defaultId: 0,
-      })
-      .then((result) => {
-        if (result.response === 0) {
-          autoUpdater.downloadUpdate();
-        }
-      });
+    sendUpdateStatus({
+      status: 'available',
+      version: info.version,
+    });
+    // Auto-download will start automatically since autoDownload is true
   });
 
   autoUpdater.on('update-not-available', (info) => {
     logger.info('Update not available', info);
+    sendUpdateStatus({ status: 'up-to-date' });
   });
 
   autoUpdater.on('error', (err) => {
     logger.error('Error in auto-updater:', err);
+    sendUpdateStatus({
+      status: 'error',
+      error: err.message || 'Unknown error occurred',
+    });
   });
 
   autoUpdater.on('download-progress', (progressObj) => {
-    let logMessage = 'Download speed: ' + progressObj.bytesPerSecond;
-    logMessage = logMessage + ' - Downloaded ' + progressObj.percent + '%';
-    logMessage = logMessage + ' (' + progressObj.transferred + '/' + progressObj.total + ')';
+    const logMessage =
+      `Download speed: ${progressObj.bytesPerSecond} - ` +
+      `Downloaded ${progressObj.percent}% ` +
+      `(${progressObj.transferred}/${progressObj.total})`;
     logger.info(logMessage);
 
-    const updateWindow = getFocusedOrFirstWindow();
-    // Send progress to renderer
-    if (updateWindow) {
-      updateWindow.webContents.send('update-download-progress', progressObj);
-    }
+    sendUpdateStatus({
+      status: 'downloading',
+      downloadProgress: {
+        percent: progressObj.percent,
+        transferred: progressObj.transferred,
+        total: progressObj.total,
+      },
+    });
   });
 
   autoUpdater.on('update-downloaded', (info: UpdateInfo) => {
     logger.info('Update downloaded:', info);
-
-    const updateWindow = getFocusedOrFirstWindow();
-    if (!updateWindow) {
-      return;
-    }
-
-    dialog
-      .showMessageBox(updateWindow, {
-        type: 'info',
-        title: 'Update Ready',
-        message: 'Update downloaded',
-        detail: `Version ${info.version} has been downloaded and will be automatically installed on restart.`,
-        buttons: ['Restart Now', 'Later'],
-        defaultId: 0,
-      })
-      .then((result) => {
-        if (result.response === 0) {
-          // Use default behavior for NSIS installers on Windows
-          // This ensures proper quit sequence and allows installer to complete
-          autoUpdater.quitAndInstall();
-        }
-      });
+    sendUpdateStatus({
+      status: 'ready',
+      version: info.version,
+    });
   });
 }
 
-export function checkForUpdates(silent = false) {
+export function checkForUpdates(silent = false, userInitiated = false) {
+  // Debounce automatic checks to prevent spam
+  if (!userInitiated && Date.now() - lastCheckTime < MIN_CHECK_INTERVAL) {
+    logger.info('Skipping update check - too soon since last check');
+    return;
+  }
+
+  lastCheckTime = Date.now();
+
   if (silent) {
     autoUpdater
       .checkForUpdates()
       .then((result) => {
-        if (result?.isUpdateAvailable) {
-          logger.info('Update available', result?.isUpdateAvailable);
+        if (result?.updateInfo) {
+          logger.info('Update check result:', result.updateInfo.version);
         }
       })
       .catch((error) => {
-        logger.error('Update failure', error);
+        logger.error('Update check failed:', error);
+        sendUpdateStatus({
+          status: 'error',
+          error: error.message || 'Failed to check for updates',
+        });
       });
   } else {
+    // User-initiated check - always show feedback
     autoUpdater
-      .checkForUpdatesAndNotify()
+      .checkForUpdates()
       .then((result) => {
-        if (result?.isUpdateAvailable) {
-          logger.info('Update available', result?.isUpdateAvailable);
+        if (result?.updateInfo) {
+          logger.info('Update check result:', result.updateInfo.version);
         }
       })
       .catch((err) => {
         logger.error('Update check failed:', err);
-        dialog.showErrorBox('Update Error', `Failed to check for updates: ${err.message}`);
+        sendUpdateStatus({
+          status: 'error',
+          error: err.message || 'Failed to check for updates',
+        });
       });
   }
 }
+
+export function installUpdate() {
+  // Use default behavior for NSIS installers on Windows
+  // This ensures proper quit sequence and allows installer to complete
+  autoUpdater.quitAndInstall();
+}
+
+export function getCurrentUpdateStatus(): UpdateStatus {
+  return currentUpdateStatus;
+}

apps/jetstream-desktop/src/preload.ts

@@ -6,6 +6,7 @@ const API: ElectronAPI = {
   onAuthenticate: (callback) => ipcRenderer.on('authenticate', (_event, payload) => callback(payload)),
   onOrgAdded: (callback) => ipcRenderer.on('orgAdded', (_event, payload) => callback(payload)),
   onAction: (callback) => ipcRenderer.on('action', (_event, payload) => callback(payload)),
+  onUpdateStatus: (callback) => ipcRenderer.on('update-status', (_event, payload) => callback(payload)),
   // One-Way from Client
   login: () => ipcRenderer.invoke('login'),
   logout: () => ipcRenderer.invoke('logout'),
@@ -16,6 +17,9 @@ const API: ElectronAPI = {
   getPreferences: () => ipcRenderer.invoke('getPreferences'),
   setPreferences: (payload) => ipcRenderer.invoke('setPreferences', payload),
   request: (payload) => ipcRenderer.invoke('request', payload),
+  checkForUpdates: (userInitiated) => ipcRenderer.invoke('checkForUpdates', userInitiated),
+  getUpdateStatus: () => ipcRenderer.invoke('getUpdateStatus'),
+  installUpdate: () => ipcRenderer.invoke('installUpdate'),
 };
 
 contextBridge.exposeInMainWorld('electronAPI', API);

apps/jetstream-desktop/src/services/ipc.service.ts

@@ -14,6 +14,7 @@ import logger from 'electron-log';
 import { Method } from 'tiny-request-router';
 import { z } from 'zod';
 import { ENV } from '../config/environment';
+import { checkForUpdates, getCurrentUpdateStatus, installUpdate } from '../config/auto-updater';
 import { desktopRoutes } from '../controllers/desktop.routes';
 import { getOrgFromHeaderOrQuery } from '../utils/route.utils';
 import { logout, verifyAuthToken } from './api.service';
@@ -47,6 +48,10 @@ export function registerIpc(): void {
   registerHandler('setPreferences', handleSetPreferences);
   // Handle API requests to Salesforce
   registerHandler('request', handleRequestEvent);
+  // Handle auto-update requests
+  registerHandler('checkForUpdates', handleCheckForUpdatesEvent);
+  registerHandler('getUpdateStatus', handleGetUpdateStatusEvent);
+  registerHandler('installUpdate', handleInstallUpdateEvent);
 }
 
 const handleSelectFolderEvent: MainIpcHandler<'selectFolder'> = async (event) => {
@@ -257,3 +262,17 @@ const handleRequestEvent: MainIpcHandler<'request'> = async (event, { url: urlSt
     body: await response.json(),
   };
 };
+
+const handleCheckForUpdatesEvent: MainIpcHandler<'checkForUpdates'> = async (event, userInitiated) => {
+  checkForUpdates(false, userInitiated);
+  // Send current status immediately
+  event.sender.send('update-status', getCurrentUpdateStatus());
+};
+
+const handleGetUpdateStatusEvent: MainIpcHandler<'getUpdateStatus'> = async (_event) => {
+  return getCurrentUpdateStatus();
+};
+
+const handleInstallUpdateEvent: MainIpcHandler<'installUpdate'> = async (_event) => {
+  installUpdate();
+};

apps/jetstream-desktop/src/services/menu.service.ts

@@ -17,7 +17,7 @@ export function initAppMenu() {
               { role: 'about' },
               {
                 label: 'Check for Updates',
-                click: () => checkForUpdates(),
+                click: () => checkForUpdates(false, true),
               },
               { type: 'separator' },
               { role: 'services' },
@@ -44,7 +44,7 @@ export function initAppMenu() {
           : [
               {
                 label: 'Check for Updates',
-                click: () => checkForUpdates(),
+                click: () => checkForUpdates(false, true),
               },
             ]) as any[]),
         { type: 'separator' },

custom-typings/index.d.ts

@@ -1,4 +1,5 @@
 /* eslint-disable no-var */
+import { ElectronAPI } from '@jetstream/desktop/types';
 import 'vite/client';
 
 // https://webpack.js.org/loaders/worker-loader/#integrating-with-typescript
@@ -14,6 +15,6 @@ declare global {
   var __IS_BROWSER_EXTENSION__: boolean | undefined;
   var __IS_DESKTOP__: boolean | undefined;
   interface Window {
-    // placeholder for any global properties
+    electronAPI?: ElectronAPI;
   }
 }

libs/connected/connected-ui/src/lib/useDescribeMetadata.tsx

@@ -50,7 +50,7 @@ export function useDescribeMetadata(
 
   const loadDescribeMetadata = useCallback(
     async (clearCache = false) => {
-      if (!selectedOrg) {
+      if (!selectedOrg?.uniqueId) {
         return;
       }
       const uniqueId = selectedOrg.uniqueId;

libs/connected/connected-ui/src/lib/useListMetadata.tsx

@@ -289,7 +289,7 @@ export function useListMetadata(selectedOrg: SalesforceOrgUi) {
         skipCacheIfOlderThan?: number;
       } = {},
     ) => {
-      if (!selectedOrg || !types?.length) {
+      if (!selectedOrg?.uniqueId || !types?.length) {
         return;
       }