fix(desktop): use different method to send messages across main and render without node integration in preload (#1769)

packages/desktop/app/javascripts/Renderer/Preload.ts

@@ -1,42 +1,28 @@
+import { IpcRendererEvent } from 'electron/renderer'
 import { MessageToWebApp } from '../Shared/IpcMessages'
 const { ipcRenderer } = require('electron')
-const path = require('path')
-const rendererPath = path.join('file://', __dirname, '/renderer.js')
 const RemoteBridge = require('@electron/remote').getGlobal('RemoteBridge')
 const { contextBridge } = require('electron')
 
+type MainEventCallback = (event: IpcRendererEvent, value: any) => void
+
 process.once('loaded', function () {
   contextBridge.exposeInMainWorld('electronRemoteBridge', RemoteBridge.exposableValue)
 
-  listenForIpcEventsFromMainProcess()
+  contextBridge.exposeInMainWorld('electronMainEvents', {
+    handleUpdateAvailable: (callback: MainEventCallback) => ipcRenderer.on(MessageToWebApp.UpdateAvailable, callback),
+
+    handlePerformAutomatedBackup: (callback: MainEventCallback) =>
+      ipcRenderer.on(MessageToWebApp.PerformAutomatedBackup, callback),
+
+    handleFinishedSavingBackup: (callback: MainEventCallback) =>
+      ipcRenderer.on(MessageToWebApp.FinishedSavingBackup, callback),
+
+    handleWindowBlurred: (callback: MainEventCallback) => ipcRenderer.on(MessageToWebApp.WindowBlurred, callback),
+
+    handleWindowFocused: (callback: MainEventCallback) => ipcRenderer.on(MessageToWebApp.WindowFocused, callback),
+
+    handleInstallComponentComplete: (callback: MainEventCallback) =>
+      ipcRenderer.on(MessageToWebApp.InstallComponentComplete, callback),
+  })
 })
-
-function listenForIpcEventsFromMainProcess() {
-  const sendMessageToRenderProcess = (message: string, payload = {}) => {
-    window.postMessage(JSON.stringify({ message, data: payload }), rendererPath)
-  }
-
-  ipcRenderer.on(MessageToWebApp.UpdateAvailable, function (_event, data) {
-    sendMessageToRenderProcess(MessageToWebApp.UpdateAvailable, data)
-  })
-
-  ipcRenderer.on(MessageToWebApp.PerformAutomatedBackup, function (_event, data) {
-    sendMessageToRenderProcess(MessageToWebApp.PerformAutomatedBackup, data)
-  })
-
-  ipcRenderer.on(MessageToWebApp.FinishedSavingBackup, function (_event, data) {
-    sendMessageToRenderProcess(MessageToWebApp.FinishedSavingBackup, data)
-  })
-
-  ipcRenderer.on(MessageToWebApp.WindowBlurred, function (_event, data) {
-    sendMessageToRenderProcess(MessageToWebApp.WindowBlurred, data)
-  })
-
-  ipcRenderer.on(MessageToWebApp.WindowFocused, function (_event, data) {
-    sendMessageToRenderProcess(MessageToWebApp.WindowFocused, data)
-  })
-
-  ipcRenderer.on(MessageToWebApp.InstallComponentComplete, function (_event, data) {
-    sendMessageToRenderProcess(MessageToWebApp.InstallComponentComplete, data)
-  })
-}