if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

SDA-4593 - Use only host name from redirect url to navigate (#2182)

Browse Source
This commit is contained in:
Kiran Niranjan 2024-07-25 13:21:12 +05:30 committed by GitHub
parent 042beda844
commit ee888916b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/protocol-handler.ts
View File

@ -175,6 +175,7 @@ class ProtocolHandler {
const redirectURL = userConfig.url ? userConfig.url : globalConfig.url;
const { subdomain, tld, domain } =
whitelistHandler.parseDomain(redirectURL);
const navigateURL = `https://${subdomain}.${domain}${tld}`;
const cookieDomain = `.${subdomain}.${domain}${tld}`;
if (protocolUri) {
const urlParams = new URLSearchParams(new URL(protocolUri).search);
@ -182,7 +183,7 @@ class ProtocolHandler {
const anticsrfValue = urlParams.get('anticsrf');
if (skeyValue && anticsrfValue) {
const skeyCookie: CookiesSetDetails = {
url: redirectURL,
url: navigateURL,
name: 'skey',
value: skeyValue,
secure: true,
@ -192,7 +193,7 @@ class ProtocolHandler {
path: '/',
};
const csrfCookie: CookiesSetDetails = {
url: redirectURL,
url: navigateURL,
name: 'anti-csrf-cookie',
value: anticsrfValue,
secure: true,
@ -212,13 +213,13 @@ class ProtocolHandler {
}
}
const mainWebContents = windowHandler.getMainWebContents();
if (mainWebContents && !mainWebContents?.isDestroyed() && redirectURL) {
if (mainWebContents && !mainWebContents?.isDestroyed() && navigateURL) {
logger.info(
'protocol-handler: redirecting main webContents ',
redirectURL,
navigateURL,
);
windowHandler.setMainWindowOrigin(redirectURL);
mainWebContents?.loadURL(redirectURL);
windowHandler.setMainWindowOrigin(navigateURL);
mainWebContents?.loadURL(navigateURL);
const mainWindow = windowHandler.getMainWindow();
if (mainWindow?.isMinimized()) {
mainWindow.restore();