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

fix: SDA-2287 (Only create context bridge when CI is enabled and create new config filed for defining origin) (#1036)

Browse Source 
* SDA-2287 - Only create context bridge when CI is enabled and create new config filed for defining origin

* SDA-2287 - Revert loading context bridge as it is not necessary
This commit is contained in:
Kiran Niranjan 2020-07-27 19:41:21 +05:30 committed by GitHub
parent 589bc1f8e5
commit 81c67a1e08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/Symphony.config
View File

@ -10,6 +10,7 @@
"memoryThreshold": "800", "memoryThreshold": "800",
"devToolsEnabled": true, "devToolsEnabled": true,
"contextIsolation": true, "contextIsolation": true,
"contextOriginUrl": "",
"disableGpu": false, "disableGpu": false,
"enableRendererLogs": false, "enableRendererLogs": false,
"ctWhitelist": [], "ctWhitelist": [],

1
src/app/config-handler.ts
View File

@ -42,6 +42,7 @@ export interface IConfig {
} }
export interface IGlobalConfig { export interface IGlobalConfig {
contextOriginUrl: string;
url: string; url: string;
contextIsolation: boolean; contextIsolation: boolean;
} }

4
src/app/window-handler.ts
View File

@ -117,7 +117,7 @@ export class WindowHandler {
this.config = config.getConfigFields([ 'isCustomTitleBar', 'mainWinPos', 'minimizeOnClose', 'notificationSettings', 'alwaysOnTop', 'locale', 'customFlags', 'clientSwitch' ]); this.config = config.getConfigFields([ 'isCustomTitleBar', 'mainWinPos', 'minimizeOnClose', 'notificationSettings', 'alwaysOnTop', 'locale', 'customFlags', 'clientSwitch' ]);
logger.info(`window-handler: main windows initialized with following config data`, this.config); logger.info(`window-handler: main windows initialized with following config data`, this.config);
this.globalConfig = config.getGlobalConfigFields([ 'url', 'contextIsolation' ]); this.globalConfig = config.getGlobalConfigFields([ 'url', 'contextIsolation', 'contextOriginUrl' ]);
this.userConfig = config.getUserConfigFields([ 'url' ]); this.userConfig = config.getUserConfigFields([ 'url' ]);
const { customFlags } = this.config; const { customFlags } = this.config;
@ -296,7 +296,7 @@ export class WindowHandler {
// update version info from server // update version info from server
this.updateVersionInfo(); this.updateVersionInfo();
// need this for postMessage origin // need this for postMessage origin
this.mainWindow.origin = this.url; this.mainWindow.origin = this.globalConfig.contextOriginUrl || this.url;
// Event needed to hide native menu bar on Windows 10 as we use custom menu bar // Event needed to hide native menu bar on Windows 10 as we use custom menu bar
this.mainWindow.webContents.once('did-start-loading', () => { this.mainWindow.webContents.once('did-start-loading', () => {