aboutsummaryrefslogtreecommitdiffstats
path: root/src/index.js
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-10-02 21:38:26 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-10-02 21:38:26 +0200
commite2126a60ad287e76a24c44242b80699e49e8fb0e (patch)
treee58b8d367ff7f218ba1a3bd2ae59e52e16ac778c /src/index.js
parentRevert "feat(App): Update to electron 6.0.11" (diff)
downloadferdium-app-e2126a60ad287e76a24c44242b80699e49e8fb0e.tar.gz
ferdium-app-e2126a60ad287e76a24c44242b80699e49e8fb0e.tar.zst
ferdium-app-e2126a60ad287e76a24c44242b80699e49e8fb0e.zip
fix(Service Proxies): Fix proxy setting rehydration
Diffstat (limited to 'src/index.js')
-rw-r--r--src/index.js17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/index.js b/src/index.js
index d9d51fd5b..7de7a5e1c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -331,22 +331,7 @@ app.on('login', (event, webContents, request, authInfo, callback) => {
331 debug('browser login event', authInfo); 331 debug('browser login event', authInfo);
332 event.preventDefault(); 332 event.preventDefault();
333 333
334 if (authInfo.isProxy && authInfo.scheme === 'basic') { 334 if (!authInfo.isProxy && authInfo.scheme === 'basic') {
335 debug('Sending service echo ping');
336 webContents.send('get-service-id');
337
338 ipcMain.once('service-id', (e, id) => {
339 debug('Received service id', id);
340
341 const ps = proxySettings.get(id);
342 if (ps) {
343 debug('Sending proxy auth callback for service', id);
344 callback(ps.user, ps.password);
345 } else {
346 debug('No proxy auth config found for', id);
347 }
348 });
349 } else if (authInfo.scheme === 'basic') {
350 debug('basic auth handler', authInfo); 335 debug('basic auth handler', authInfo);
351 basicAuthHandler(mainWindow, authInfo); 336 basicAuthHandler(mainWindow, authInfo);
352 } 337 }