From 37e7fb11003681097d6a66471bb37fb8d66b97f7 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Wed, 15 Mar 2023 09:08:33 -0400
Subject: [PATCH] [MM-51406] Check for other server URLs when trying to
 navigate (#2616)

---
 src/main/views/webContentEvents.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/views/webContentEvents.ts b/src/main/views/webContentEvents.ts
index 99f86a3a..4ea52509 100644
--- a/src/main/views/webContentEvents.ts
+++ b/src/main/views/webContentEvents.ts
@@ -241,6 +241,12 @@ export class WebContentsEventManager {
                 return {action: 'deny'};
             }
 
+            const otherServerURL = WindowManager.viewManager?.getViewByURL(parsedURL);
+            if (otherServerURL && urlUtils.isTeamUrl(otherServerURL.server.url, parsedURL, true)) {
+                WindowManager.showMainWindow(parsedURL);
+                return {action: 'deny'};
+            }
+
             // If all else fails, just open externally
             shell.openExternal(details.url);
             return {action: 'deny'};