From dc18a48727dcbf91a3ddff444647ca92489fe51f Mon Sep 17 00:00:00 2001 From: Devin Binnie Date: Thu, 20 Jan 2022 15:25:34 -0500 Subject: [PATCH] Merge'd --- src/common/utils/url.ts | 10 +++++++++- src/main/views/webContentEvents.ts | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/common/utils/url.ts b/src/common/utils/url.ts index dc20d942..66f78b29 100644 --- a/src/common/utils/url.ts +++ b/src/common/utils/url.ts @@ -247,7 +247,15 @@ function isCustomLoginURL(url: URL | string, server: ServerFromURL, teams: TeamW } function isChannelExportUrl(serverUrl: URL | string, inputUrl: URL | string): boolean { - return isUrlType('plugins/com.mattermost.plugin-channel-export/api/v1/export', serverUrl, inputUrl); + const server = getServerInfo(serverUrl); + const parsedURL = parseURL(inputUrl); + if (!parsedURL || !server) { + return false; + } + return ( + equalUrlsIgnoringSubpath(server.url, parsedURL) && + (parsedURL.pathname.toLowerCase().startsWith(`${server.subpath}plugins/com.mattermost.plugin-channel-export/api/v1/export/`) || + parsedURL.pathname.toLowerCase().startsWith('/plugins/com.mattermost.plugin-channel-export/api/v1/export/'))); } export default { diff --git a/src/main/views/webContentEvents.ts b/src/main/views/webContentEvents.ts index 5dc643b4..3b9f6dc9 100644 --- a/src/main/views/webContentEvents.ts +++ b/src/main/views/webContentEvents.ts @@ -49,7 +49,7 @@ const generateWillNavigate = (getServersFunction: () => TeamWithTabs[]) => { if (server && (urlUtils.isTeamUrl(server.url, parsedURL) || urlUtils.isAdminUrl(server.url, parsedURL) || isTrustedPopupWindow(event.sender))) { return; } - + if (server && urlUtils.isChannelExportUrl(server.url, parsedURL)) { return; }