phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix 3rd party login detection (#1199)

Browse Source
This commit is contained in:
Dean Whillier
2020-02-18 09:50:36 -05:00
committed by GitHub
parent e00f803fd3
commit ab78111a98
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.js
View File

@@ -476,12 +476,13 @@ function handleAppWebContentsCreated(dc, contents) {
contents.on('did-start-navigation', (event, url) => { contents.on('did-start-navigation', (event, url) => {
const contentID = event.sender.id; const contentID = event.sender.id;
const parsedURL = Utils.parseURL(url); const parsedURL = Utils.parseURL(url);
const server = Utils.getServer(parsedURL, config.teams);
if (!isTrustedURL(parsedURL)) { if (!isTrustedURL(parsedURL)) {
return; return;
} }
if (isCustomLoginURL(parsedURL)) { if (isCustomLoginURL(parsedURL, server)) {
customLogins[contentID].inProgress = true; customLogins[contentID].inProgress = true;
} else if (customLogins[contentID].inProgress) { } else if (customLogins[contentID].inProgress) {
customLogins[contentID].inProgress = false; customLogins[contentID].inProgress = false;