Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-16 02:05:53 +01:00
Code Issues Packages Projects Releases Activity

removed username/password from setup

Browse Source
This commit is contained in:
zadam
2021-12-28 22:59:38 +01:00
parent a910034c96
commit 7e48d214ca
5 changed files with 52 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/public/app/setup.js
View File

@@ -19,11 +19,6 @@ function SetupModel() {
this.setupSyncFromDesktop = ko.observable(false);
this.setupSyncFromServer = ko.observable(false);
this.username = ko.observable();
this.password1 = ko.observable();
this.password2 = ko.observable();
this.theme = ko.observable("light");
this.syncServerHost = ko.observable();
this.syncProxy = ko.observable();
@@ -32,7 +27,16 @@ function SetupModel() {
this.setupTypeSelected = () => !!this.setupType();
this.selectSetupType = () => {
this.step(this.setupType());
if (this.setupType() === 'new-document') {
this.step('new-document-in-progress');
$.post('api/setup/new-document').then(() => {
window.location.replace("./setup");
});
}
else {
this.step(this.setupType());
}
};
this.back = () => {
@@ -42,77 +46,43 @@ function SetupModel() {
};
this.finish = async () => {
if (this.setupType() === 'new-document') {
const username = this.username();
const password1 = this.password1();
const password2 = this.password2();
const theme = this.theme();
const syncServerHost = this.syncServerHost();
const syncProxy = this.syncProxy();
const username = this.username();
const password = this.password1();
if (!username) {
showAlert("Username can't be empty");
return;
}
if (!password1) {
showAlert("Password can't be empty");
return;
}
if (password1 !== password2) {
showAlert("Both password fields need be identical.");
return;
}
this.step('new-document-in-progress');
// not using server.js because it loads too many dependencies
$.post('api/setup/new-document', {
username: username,
password: password1,
theme: theme
}).then(() => {
window.location.replace("./setup");
});
if (!syncServerHost) {
showAlert("Trilium server address can't be empty");
return;
}
else if (this.setupType() === 'sync-from-server') {
const syncServerHost = this.syncServerHost();
const syncProxy = this.syncProxy();
const username = this.username();
const password = this.password1();
if (!syncServerHost) {
showAlert("Trilium server address can't be empty");
return;
}
if (!username) {
showAlert("Username can't be empty");
return;
}
if (!username) {
showAlert("Username can't be empty");
return;
}
if (!password) {
showAlert("Password can't be empty");
return;
}
if (!password) {
showAlert("Password can't be empty");
return;
}
// not using server.js because it loads too many dependencies
const resp = await $.post('api/setup/sync-from-server', {
syncServerHost: syncServerHost,
syncProxy: syncProxy,
username: username,
password: password
});
// not using server.js because it loads too many dependencies
const resp = await $.post('api/setup/sync-from-server', {
syncServerHost: syncServerHost,
syncProxy: syncProxy,
username: username,
password: password
});
if (resp.result === 'success') {
this.step('sync-in-progress');
if (resp.result === 'success') {
this.step('sync-in-progress');
setInterval(checkOutstandingSyncs, 1000);
setInterval(checkOutstandingSyncs, 1000);
hideAlert();
}
else {
showAlert('Sync setup failed: ' + resp.error);
}
hideAlert();
}
else {
showAlert('Sync setup failed: ' + resp.error);
}
};
}