if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-27 01:11:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

SDA-4150: Non-Browser Login will be able to login normally (#1847)

Browse Source
This commit is contained in:
NguyenTranHoangSym 2023-04-07 15:45:06 +07:00 committed by Salah Benmoussati
parent 8c0ae96edc
commit aa03d1d5ff
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/app/main-api-handler.ts
View File

@ -421,6 +421,8 @@ ipcMain.on(
? userConfigURL
: globalConfigURL;
const { subdomain, domain, tld } = whitelistHandler.parseDomain(podUrl);
const localConfig = config.getConfigFields(['enableBrowserLogin']);
formattedPodUrl = `https://${subdomain}.${domain}${tld}`;
loginUrl = getBrowserLoginUrl(formattedPodUrl);
logger.info(
@ -428,7 +430,27 @@ ipcMain.on(
'check if sso is enabled for the pod',
formattedPodUrl,
);
loadPodUrl();
if (localConfig.enableBrowserLogin) {
logger.info(
'main-api-handler:',
'check if sso is enabled for the pod',
formattedPodUrl,
);
loadPodUrl(false);
} else {
logger.info(
'main-api-handler:',
'browser login is not enabled - loading main window with',
formattedPodUrl,
);
const mainWebContents = windowHandler.getMainWebContents();
if (mainWebContents && !mainWebContents.isDestroyed()) {
windowHandler.setMainWindowOrigin(formattedPodUrl);
mainWebContents.loadURL(formattedPodUrl);
}
}
break;
case apiCmds.setBroadcastMessage:
if (swiftSearchInstance) {
@ -673,17 +695,6 @@ const loadPodUrl = (proxyLogin = false) => {
loginUrl,
);
await shell.openExternal(loginUrl);
} else {
logger.info(
'main-api-handler:',
'browser login is not enabled - loading main window with',
formattedPodUrl,
);
const mainWebContents = windowHandler.getMainWebContents();
if (mainWebContents && !mainWebContents.isDestroyed()) {
windowHandler.setMainWindowOrigin(formattedPodUrl);
mainWebContents.loadURL(formattedPodUrl);
}
}
})
.catch(async (error) => {