paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-15 11:21:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] issue #126, now not remembering servers

Browse Source
This commit is contained in:
Lplenka
2017-04-21 18:39:58 +05:30
parent 2dd44852fa
commit cbcff67d28
3 changed files with 5 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/main/index.js
View File

@@ -268,7 +268,6 @@ ipc.on('certificate-err', (e, domain) => {
}, response => { }, response => {
if (response === 0) { if (response === 0) {
// eslint-disable-next-line object-shorthand // eslint-disable-next-line object-shorthand
db.push('/certifiedURL', [{domain: domain}], false);
db.push('/domain', domain); db.push('/domain', domain);
mainWindow.loadURL(domain); mainWindow.loadURL(domain);
} }

27
app/renderer/js/domain.js
View File

@@ -4,23 +4,6 @@ const JsonDB = require('node-json-db');
const request = require('request'); const request = require('request');
const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true); const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
const data = db.getData('/');
if (!data.certifiedURL) {
db.push('/certifiedURL', []);
}
const UrlList = db.getData('/certifiedURL');
const UrlLength = UrlList.length;
const checkURL = domain => {
for (let i = 0; i < UrlLength; i++) {
if (UrlList[i].domain === domain) {
return true;
}
}
return false;
};
window.addDomain = function () { window.addDomain = function () {
const el = sel => { const el = sel => {
@@ -77,14 +60,8 @@ window.addDomain = function () {
db.push('/domain', domain); db.push('/domain', domain);
ipcRenderer.send('new-domain', domain); ipcRenderer.send('new-domain', domain);
} else if (error.toString().indexOf('Error: self signed certificate') >= 0) { } else if (error.toString().indexOf('Error: self signed certificate') >= 0) {
if (checkURL(domain)) { $el.main.innerHTML = 'Connect';
$el.main.innerHTML = 'Connect'; ipcRenderer.send('certificate-err', domain);
db.push('/domain', domain);
ipcRenderer.send('new-domain', domain);
} else {
$el.main.innerHTML = 'Connect';
ipcRenderer.send('certificate-err', domain);
}
} else { } else {
$el.main.innerHTML = 'Connect'; $el.main.innerHTML = 'Connect';
displayError('Not a valid Zulip server'); displayError('Not a valid Zulip server');

25
app/renderer/js/pref.js
View File

@@ -24,19 +24,6 @@ window.prefDomain = function () {
const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true); const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
const UrlList = db.getData('/certifiedURL');
const UrlLength = UrlList.length;
const checkURL = domain => {
for (let i = 0; i < UrlLength; i++) {
if (UrlList[i].domain === domain) {
return true;
}
}
return false;
};
let newDomain = document.getElementById('url').value; let newDomain = document.getElementById('url').value;
newDomain = newDomain.replace(/^https?:\/\//, ''); newDomain = newDomain.replace(/^https?:\/\//, '');
newDomain = newDomain.replace(/^http?:\/\//, ''); newDomain = newDomain.replace(/^http?:\/\//, '');
@@ -69,15 +56,9 @@ window.prefDomain = function () {
db.push('/domain', domain); db.push('/domain', domain);
ipcRenderer.send('new-domain', domain); ipcRenderer.send('new-domain', domain);
} else if (error.toString().indexOf('Error: self signed certificate') >= 0) { } else if (error.toString().indexOf('Error: self signed certificate') >= 0) {
if (checkURL(domain)) { document.getElementById('main').innerHTML = 'Switch';
document.getElementById('main').innerHTML = 'Switch'; ipcRenderer.send('certificate-err', domain);
document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain; document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain;
db.push('/domain', domain);
ipcRenderer.send('new-domain', domain);
} else {
document.getElementById('main').innerHTML = 'Switch';
ipcRenderer.send('certificate-err', domain);
}
} else { } else {
document.getElementById('main').innerHTML = 'Switch'; document.getElementById('main').innerHTML = 'Switch';
document.getElementById('urladded').innerHTML = 'Not a valid Zulip Server.'; document.getElementById('urladded').innerHTML = 'Not a valid Zulip Server.';