diff options
author | vantezzen <hello@vantezzen.io> | 2019-10-09 09:48:41 +0200 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2019-10-09 09:48:41 +0200 |
commit | da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af (patch) | |
tree | a189f4566c6380b86aeb04b9307aea23fc6e14d7 /src/index.js | |
parent | Update zh-HANT.json (diff) | |
parent | Update CHANGELOG.md (diff) | |
download | ferdium-app-da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af.tar.gz ferdium-app-da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af.tar.zst ferdium-app-da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af.zip |
Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.4.0
Diffstat (limited to 'src/index.js')
-rw-r--r-- | src/index.js | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/index.js b/src/index.js index 449bbad19..2ee404c0b 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -336,22 +336,7 @@ app.on('login', (event, webContents, request, authInfo, callback) => { | |||
336 | debug('browser login event', authInfo); | 336 | debug('browser login event', authInfo); |
337 | event.preventDefault(); | 337 | event.preventDefault(); |
338 | 338 | ||
339 | if (authInfo.isProxy && authInfo.scheme === 'basic') { | 339 | if (!authInfo.isProxy && authInfo.scheme === 'basic') { |
340 | debug('Sending service echo ping'); | ||
341 | webContents.send('get-service-id'); | ||
342 | |||
343 | ipcMain.once('service-id', (e, id) => { | ||
344 | debug('Received service id', id); | ||
345 | |||
346 | const ps = proxySettings.get(id); | ||
347 | if (ps) { | ||
348 | debug('Sending proxy auth callback for service', id); | ||
349 | callback(ps.user, ps.password); | ||
350 | } else { | ||
351 | debug('No proxy auth config found for', id); | ||
352 | } | ||
353 | }); | ||
354 | } else if (authInfo.scheme === 'basic') { | ||
355 | debug('basic auth handler', authInfo); | 340 | debug('basic auth handler', authInfo); |
356 | basicAuthHandler(mainWindow, authInfo); | 341 | basicAuthHandler(mainWindow, authInfo); |
357 | } | 342 | } |