Upgrade electron@30.0.9 (#2158)

* Upgrade electron@30.0.9

* Adapt media permissions handler due to types changes
This commit is contained in:
Salah Benmoussati 2024-06-05 09:14:09 +02:00 committed by GitHub
parent 7f2fe2c8c4
commit c999e279b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 8 deletions

View File

@ -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",

View File

@ -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);
}