Upgrade [email protected] (#2160)

* Upgrade [email protected] * Upgrade [email protected] (#2158) * Upgrade [email protected] * Adapt media permissions handler due to types changes
finos · Jun 5, 2024 · 19c761f · 19c761f
1 parent 7f2fe2c
commit 19c761f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -178,7 +178,7 @@
     "builder-util-runtime": "^9.0.3",
     "cross-env": "7.0.3",
     "del": "3.0.0",
-    "electron": "29.3.1",
+    "electron": "30.0.9",
     "electron-builder": "^24.13.2",
     "electron-devtools-installer": "^3.2.0",
     "electron-icon-maker": "0.0.5",

diff --git a/src/app/window-actions.ts b/src/app/window-actions.ts
@@ -1,7 +1,8 @@
 import {
   BrowserWindow,
   dialog,
-  PermissionRequestHandlerHandlerDetails,
+  MediaAccessPermissionRequest,
+  OpenExternalPermissionRequest,
   systemPreferences,
   WebContents,
 } from 'electron';
@@ -414,13 +415,13 @@ export const handleSessionPermissions = async (
  * @param permission {boolean} - config value to a specific permission (only supports media permissions)
  * @param message {string} - custom message displayed to the user
  * @param callback {function}
- * @param details {PermissionRequestHandlerHandlerDetails} - object passed along with certain permission types. see {@link https://www.electronjs.org/docs/api/session#sessetpermissionrequesthandlerhandler}
+ * @param details MediaAccessPermissionRequest see {@link https://www.electronjs.org/docs/latest/api/session/#sessetpermissionrequesthandlerhandler}
  */
 const handleMediaPermissions = async (
   permission: boolean,
   message: string,
   callback: (permission: boolean) => void,
-  details: PermissionRequestHandlerHandlerDetails,
+  details: MediaAccessPermissionRequest,
 ): Promise<void> => {
   logger.info('window-action: permission is ->', permission);
   let systemAudioPermission;
@@ -497,7 +498,7 @@ export const handlePermissionRequests = (webContents: WebContents): void => {
               PERMISSIONS_NAMESPACE,
             )(),
             callback,
-            details,
+            details as MediaAccessPermissionRequest,
           );
         case Permissions.LOCATION:
           return handleSessionPermissions(
@@ -546,9 +547,15 @@ export const handlePermissionRequests = (webContents: WebContents): void => {
           );
         case Permissions.OPEN_EXTERNAL:
           if (
-            details?.externalURL?.startsWith('symphony:') ||
-            details?.externalURL?.startsWith('tel:') ||
-            details?.externalURL?.startsWith('mailto:')
+            (details as OpenExternalPermissionRequest)?.externalURL?.startsWith(
+              'symphony:',
+            ) ||
+            (details as OpenExternalPermissionRequest)?.externalURL?.startsWith(
+              'tel:',
+            ) ||
+            (details as OpenExternalPermissionRequest)?.externalURL?.startsWith(
+              'mailto:',
+            )
           ) {
             return callback(true);
           }