From 0140436af8ac658450e71b146e3a1ef9dbf26826 Mon Sep 17 00:00:00 2001 From: Johan Kwarnmark Date: Thu, 28 May 2020 16:09:40 +0200 Subject: [PATCH 1/3] Disable certificate verification proxy --- src/app/child-window-handler.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/child-window-handler.ts b/src/app/child-window-handler.ts index 69aa0c01..55c58675 100644 --- a/src/app/child-window-handler.ts +++ b/src/app/child-window-handler.ts @@ -2,7 +2,7 @@ import { BrowserWindow, WebContents } from 'electron'; import { parse as parseQuerystring } from 'querystring'; import { format, parse, Url } from 'url'; -import { isDevEnv, isWindowsOS } from '../common/env'; +import { isWindowsOS } from '../common/env'; import { i18n } from '../common/i18n'; import { logger } from '../common/logger'; import { getGuid } from '../common/utils'; @@ -17,7 +17,7 @@ import { import { ICustomBrowserWindow, windowHandler } from './window-handler'; import { getBounds, - handleCertificateProxyVerification, + // handleCertificateProxyVerification, injectStyles, preventWindowNavigation, } from './window-utils'; @@ -211,9 +211,9 @@ export const handleChildWindow = (webContents: WebContents): void => { handleChildWindow(browserWin.webContents); // Certificate verification proxy - if (!isDevEnv) { - browserWin.webContents.session.setCertificateVerifyProc(handleCertificateProxyVerification); - } + // if (!isDevEnv) { + // browserWin.webContents.session.setCertificateVerifyProc(handleCertificateProxyVerification); + // } // Updates media permissions for preload context const { permissions } = config.getConfigFields([ 'permissions' ]); From ac28ed155edf12494d5226b6c491f9663c1d6c2c Mon Sep 17 00:00:00 2001 From: Johan Kwarnmark Date: Wed, 3 Jun 2020 17:46:57 +0200 Subject: [PATCH 2/3] add dependcy url --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9cbf6e01..83ff68b2 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,8 @@ "spectron": "10.0.1", "ts-jest": "25.3.0", "tslint": "5.11.0", - "typescript": "3.1.1" + "typescript": "3.1.1", + "url": "0.11.1" }, "dependencies": { "archiver": "3.1.1", From ec94e2c607f0d7b6219889b635ed22363d758c73 Mon Sep 17 00:00:00 2001 From: Johan Kwarnmark Date: Wed, 3 Jun 2020 19:36:54 +0200 Subject: [PATCH 3/3] Revert "add dependcy url" This reverts commit ac28ed155edf12494d5226b6c491f9663c1d6c2c. --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 83ff68b2..9cbf6e01 100644 --- a/package.json +++ b/package.json @@ -143,8 +143,7 @@ "spectron": "10.0.1", "ts-jest": "25.3.0", "tslint": "5.11.0", - "typescript": "3.1.1", - "url": "0.11.1" + "typescript": "3.1.1" }, "dependencies": { "archiver": "3.1.1",