if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:symphonyoss/SymphonyElectron

Browse Source
This commit is contained in:
Vishwas Shashidhar 2021-03-03 11:50:16 +05:30
commit dd94d7cb2e
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/child-window-handler.ts
View File

@ -36,25 +36,18 @@ const MIN_HEIGHT = 300;
*/
const verifyProtocolForNewUrl = (url: string): boolean => {
const parsedUrl = parse(url);
if (!parsedUrl) {
if (!parsedUrl || !parsedUrl.protocol) {
logger.info(
`child-window-handler: The url ${url} doesn't have a protocol. Returning false for verification!`,
);
return false;
}
const allowedProtocols = ['http:', 'https:', 'mailto:'];
// url parse returns protocol with :
if (parsedUrl.protocol === 'https:') {
if (allowedProtocols.includes(parsedUrl.protocol)) {
logger.info(
`child-window-handler: The url ${url} is a https url! Returning true for verification!`,
);
return true;
}
// url parse returns protocol with :
if (parsedUrl.protocol === 'http:') {
logger.info(
`child-window-handler: The url ${url} is a http url! Returning true for verification!`,
`child-window-handler: Protocol of the url ${url} is whitelisted! Returning true for verification!`,
);
return true;
}
@ -303,7 +296,7 @@ export const handleChildWindow = (webContents: WebContents): void => {
return;
}
logger.info(`child-window-handler: new window url is ${newWinUrl} which is not of the same host,
so opening it in the default browser!`);
so opening it in the default app!`);
windowHandler.openUrlInDefaultBrowser(newWinUrl);
}
};

8
src/renderer/notification.ts
View File

@ -434,6 +434,7 @@ class Notification extends NotificationHandler {
...this.activeNotifications,
};
const inactiveNotificationWindows = { ...[], ...this.inactiveWindows };
if (activeNotificationWindows && Array.isArray(activeNotificationWindows)) {
for (const activeWindow of activeNotificationWindows) {
if (activeWindow && windowExists(activeWindow)) {
await this.hideNotification(
@ -441,11 +442,18 @@ class Notification extends NotificationHandler {
);
}
}
}
if (
inactiveNotificationWindows &&
Array.isArray(inactiveNotificationWindows)
) {
for (const inactiveWindow of inactiveNotificationWindows) {
if (inactiveWindow && windowExists(inactiveWindow)) {
inactiveWindow.close();
}
}
}
this.activeNotifications = [];
this.inactiveWindows = [];