From a16bcfef6275832ee86e401f6a9cb29311e963d8 Mon Sep 17 00:00:00 2001
From: Kiran Niranjan <kiran.niranjan@symphony.com>
Date: Tue, 28 May 2019 15:50:38 +0530
Subject: [PATCH] ELECTRON-1265 (Fix checks for handling links & pop-outs)
 (#662)

* ELECTRON-1265 - Fix checks for handling links & pop-outs

* ELECTRON-1265 - Add logs
---
 src/app/child-window-handler.ts | 39 +++++++++++++++------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/app/child-window-handler.ts b/src/app/child-window-handler.ts
index 6e6ad9a2..4acb512a 100644
--- a/src/app/child-window-handler.ts
+++ b/src/app/child-window-handler.ts
@@ -6,6 +6,7 @@ import { isDevEnv, isWindowsOS } from '../common/env';
 import { i18n } from '../common/i18n';
 import { logger } from '../common/logger';
 import { getGuid } from '../common/utils';
+import { whitelistHandler } from '../common/whitelist-handler';
 import { config } from './config-handler';
 import { monitorWindowActions, removeWindowEventListener } from './window-actions';
 import { ICustomBrowserWindow, windowHandler } from './window-handler';
@@ -43,8 +44,8 @@ const getParsedUrl = (configURL: string): Url => {
 
 export const handleChildWindow = (webContents: WebContents): void => {
     const childWindow = (event, newWinUrl, frameName, disposition, newWinOptions): void => {
-        logger.info(`child-window-handler: trying to create new child window for url ${newWinUrl},
-         frame ${frameName}, disposition ${disposition}`);
+        logger.info(`child-window-handler: trying to create new child window for url: ${newWinUrl},
+         frame name: ${frameName || undefined}, disposition: ${disposition}`);
         const mainWindow = windowHandler.getMainWindow();
         if (!mainWindow || mainWindow.isDestroyed()) {
             logger.info(`child-window-handler: main window is not available / destroyed, not creating child window!`);
@@ -60,33 +61,29 @@ export const handleChildWindow = (webContents: WebContents): void => {
         }
 
         Object.assign(newWinOptions.webPreferences, webContents);
-        const newWinParsedUrl = getParsedUrl(newWinUrl);
-        const mainWinParsedUrl = getParsedUrl(windowHandler.url);
 
-        const newWinHost = newWinParsedUrl && newWinParsedUrl.host;
-        const mainWinHost = mainWinParsedUrl && mainWinParsedUrl.host;
+        // need this to extract other parameters
+        const newWinParsedUrl = getParsedUrl(newWinUrl);
+
+        const newWinUrlData = whitelistHandler.parseDomain(newWinUrl);
+        const mainWinUrlData = whitelistHandler.parseDomain(windowHandler.url);
+
+        const newWinDomainName = `${newWinUrlData.domain}${newWinUrlData.tld}`;
+        const mainWinDomainName = `${mainWinUrlData.domain}${mainWinUrlData.tld}`;
+
+        logger.info(`child-window-handler: main window url: ${mainWinUrlData.subdomain}.${mainWinUrlData.domain}.${mainWinUrlData.tld}`);
 
         const emptyUrlString = 'about:blank';
         const dispositionWhitelist = ['new-window', 'foreground-tab'];
 
-        const fullMainUrl = `${mainWinParsedUrl.protocol}//${mainWinParsedUrl.host}/`;
-        logger.info(`child-window-handler: full main url is ${fullMainUrl}`);
-        // If the main url and new window url are the same,
-        // we open that in a browser rather than a separate window
-        if (newWinUrl.startsWith(fullMainUrl)) {
-            event.preventDefault();
-            logger.info(`child-window-handler: the new window url ${newWinUrl} and the main url ${fullMainUrl}
-             are the same, so, redirecting to be opened in the default browser!`);
-            windowHandler.openUrlInDefaultBrowser(newWinUrl);
-            return;
-        }
-
-        // only allow window.open to succeed if it is coming from same host,
+        // only allow window.open to succeed is if coming from same host,
         // otherwise open in default browser.
-        if ((newWinHost === mainWinHost || newWinUrl === emptyUrlString ||
-            (newWinHost && mainWinHost && newWinHost.indexOf(mainWinHost) !== -1 && frameName !== ''))
+        if ((newWinDomainName === mainWinDomainName || newWinUrl === emptyUrlString)
+            && frameName !== ''
             && dispositionWhitelist.includes(disposition)) {
 
+            logger.info(`child-window-handler: opening pop-out window for ${newWinUrl}`);
+
             const newWinKey = getGuid();
             if (!frameName) {
                 logger.info(`child-window-handler: frame name missing! not opening the url ${newWinUrl}`);