@ProtonMail web clients: make outside links clicking work, closes #344

Author: vladimiry

patches/protonmail/common.patch

@@ -24,6 +24,37 @@ index b6913e1..31a52f7 100644
 
  export const getClientID = (appName: APP_NAMES) => {
      return APPS_CONFIGURATION[appName].clientID;
+diff --git a/node_modules/proton-shared/lib/helpers/browser.ts b/node_modules/proton-shared/lib/helpers/browser.ts
+index cf3991e..8ff16c7 100644
+--- a/node_modules/proton-shared/lib/helpers/browser.ts
++++ b/node_modules/proton-shared/lib/helpers/browser.ts
+@@ -112,20 +112,10 @@ export const requireDirectAction = () => isSafari() || isFirefox() || isEdge();
+  * @links { https://mathiasbynens.github.io/rel-noopener/}
+  */
+ export const openNewTab = (url: string) => {
+-    if (isIE11() || isFirefox()) {
+-        const otherWindow = window.open();
+-        if (!otherWindow) {
+-            return;
+-        }
+-        otherWindow.opener = null;
+-        otherWindow.location.href = url;
+-        return;
+-    }
+-    const anchor = document.createElement('a');
+-
+-    anchor.setAttribute('rel', 'noreferrer nofollow noopener');
+-    anchor.setAttribute('target', '_blank');
+-    anchor.href = url;
+-
+-    return anchor.click();
++    window.dispatchEvent(
++        new CustomEvent(
++            "electron-mail:./node_modules/proton-shared/lib/helpers/browser.ts:openNewTab",
++            {detail: { url }},
++        ),
++    );
+ };
 diff --git a/node_modules/proton-shared/lib/constants.ts b/node_modules/proton-shared/lib/constants.ts
 index a1b7919..ff7f6ec 100644
 --- a/node_modules/proton-shared/lib/constants.ts

src/electron-preload/webview/calendar/index.ts

@@ -3,10 +3,13 @@ import {curryFunctionMembers, testProtonCalendarAppPage} from "src/shared/util";
 import {getLocationHref} from "src/electron-preload/webview/lib/util";
 import {initProviderApi} from "./provider-api";
 import {registerApi} from "./api";
+import {setupProtonOpenNewTabEventHandler} from "src/electron-preload/webview/lib/custom-event";
 
 const logger = curryFunctionMembers(WEBVIEW_LOGGERS.calendar, "[index]");
 const protonAppPageStatus = testProtonCalendarAppPage({url: getLocationHref(), logger});
 
+setupProtonOpenNewTabEventHandler(logger);
+
 // TODO throw error if "not calendar or blank.html" page loaded
 if (protonAppPageStatus.shouldInitProviderApi) {
     // TODO set up timeout

src/electron-preload/webview/lib/const.ts

@@ -8,3 +8,4 @@ export const WEBVIEW_LOGGERS: Readonly<Record<"primary" | "calendar", Logger>> =
     primary: buildLoggerBundle("[preload: webview/primary]"),
     calendar: buildLoggerBundle("[preload: webview/calendar]"),
 };
+

src/electron-preload/webview/lib/custom-event.ts

@@ -0,0 +1,24 @@
+import {Logger} from "src/shared/model/common";
+import {resolveIpcMainApi} from "src/electron-preload/lib/util";
+
+class ProtonOpenNewTabEvent extends CustomEvent<{ url: string }> {
+    static readonly eventType = "electron-mail:./node_modules/proton-shared/lib/helpers/browser.ts:openNewTab";
+
+    constructor(detail: { url: string }) {
+        super(ProtonOpenNewTabEvent.eventType, {detail});
+    }
+}
+
+declare global {
+    interface WindowEventMap {
+        [ProtonOpenNewTabEvent.eventType]: ProtonOpenNewTabEvent
+    }
+}
+
+export const setupProtonOpenNewTabEventHandler = (logger: Logger): void => {
+    const openExternal = resolveIpcMainApi({logger})("openExternal");
+
+    window.addEventListener(ProtonOpenNewTabEvent.eventType, async ({detail: {url}}) => {
+        await openExternal({url}); // eslint-disable-line @typescript-eslint/no-floating-promises
+    });
+};

src/electron-preload/webview/primary/index.ts

@@ -3,11 +3,13 @@ import {curryFunctionMembers, testProtonMailAppPage} from "src/shared/util";
 import {getLocationHref} from "src/electron-preload/webview/lib/util";
 import {initProviderApi} from "./provider-api";
 import {registerApi} from "./api";
+import {setupProtonOpenNewTabEventHandler} from "src/electron-preload/webview/lib/custom-event";
 import {setupProviderIntegration} from "./provider-api/setup";
 
 const logger = curryFunctionMembers(WEBVIEW_LOGGERS.primary, "[index]");
 const protonAppPageStatus = testProtonMailAppPage({url: getLocationHref(), logger});
 
+setupProtonOpenNewTabEventHandler(logger);
 setupProviderIntegration(protonAppPageStatus);
 
 if (protonAppPageStatus.shouldInitProviderApi) {