feat: Enable worldSafeExecuteJavaScript (#4135)

wireapp · Aug 13, 2020 · 579c3d5 · 579c3d5
1 parent b188c80
commit 579c3d5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/electron/src/main.ts b/electron/src/main.ts
@@ -537,6 +537,7 @@ class ElectronWrapperInit {
             webPreferences.preload = PRELOAD_RENDERER_JS;
             webPreferences.spellcheck = enableSpellChecking;
             webPreferences.webSecurity = true;
+            webPreferences.worldSafeExecuteJavaScript = true;
           });
           break;
         }

diff --git a/electron/src/renderer/preload-sso.ts b/electron/src/renderer/preload-sso.ts
@@ -21,6 +21,4 @@ const {webFrame, remote} = require('electron');
 const {SingleSignOn} = remote.require('./sso/SingleSignOn');
 
 //eslint-disable-next-line @typescript-eslint/no-floating-promises
-(async () => {
-  await webFrame.executeJavaScript(SingleSignOn.getWindowOpenerScript());
-})();
+webFrame.executeJavaScript(SingleSignOn.getWindowOpenerScript());
diff --git a/electron/src/sso/SingleSignOn.ts b/electron/src/sso/SingleSignOn.ts
@@ -162,6 +162,7 @@ export class SingleSignOn {
         webSecurity: true,
         webgl: false,
         webviewTag: false,
+        worldSafeExecuteJavaScript: true,
       },
       width: this.windowOptions.width || 480,
     });