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

Merge pull request #264 from KiranNiranjan/ELECTRON-253

Browse Source 
Electron-253 (Fixed an issue whit basic auth)
This commit is contained in:
Vikas Shashidhar 2017-12-22 15:55:14 +05:30 committed by GitHub
commit 029358f6b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/basicAuth/index.js
View File

@ -111,18 +111,12 @@ function openBasicAuthWindow(windowName, hostname, isValidCredentials, clearSett
ipc.on('login', (event, args) => { ipc.on('login', (event, args) => {
if (typeof args === 'object' && typeof local.authCallback === 'function') { if (typeof args === 'object' && typeof local.authCallback === 'function') {
local.authCallback(args.username, args.password); local.authCallback(args.username, args.password);
basicAuthWindow.close(); closeAuthWindow(false);
} }
}); });
ipc.on('close-basic-auth', () => { ipc.on('close-basic-auth', () => {
if (typeof local.clearSettings === 'function') { closeAuthWindow(true);
local.clearSettings();
}
if (basicAuthWindow) {
basicAuthWindow.close();
}
}); });
/** /**
@ -132,6 +126,19 @@ function destroyWindow() {
basicAuthWindow = null; basicAuthWindow = null;
} }
/**
* Method to close the auth window
* @param {boolean} clearSettings - Whether to clear the auth settings
*/
function closeAuthWindow(clearSettings) {
if (clearSettings && typeof local.clearSettings === 'function') {
local.clearSettings();
}
if (basicAuthWindow) {
basicAuthWindow.close();
}
}
module.exports = { module.exports = {
openBasicAuthWindow: openBasicAuthWindow openBasicAuthWindow: openBasicAuthWindow