Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-29 17:26:38 +01:00
Code Issues Packages Projects Releases Activity

encryption settings loading moved from tree to encryption module

Browse Source
This commit is contained in:
azivner
2017-11-04 19:57:40 -04:00
parent dfaa59b0a9
commit 9c88fc6060
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
routes/api/settings.js
View File

@@ -7,19 +7,20 @@ const options = require('../../services/options');
const audit_category = require('../../services/audit_category');
const auth = require('../../services/auth');
// options allowed to be updated directly in settings dialog
const ALLOWED_OPTIONS = ['encryption_session_timeout', 'history_snapshot_time_interval'];
router.get('/', auth.checkApiAuth, async (req, res, next) => {
const dict = {};
router.get('/all', auth.checkApiAuth, async (req, res, next) => {
const settings = await sql.getMap("SELECT opt_name, opt_value FROM options");
const settings = await sql.getResults("SELECT opt_name, opt_value FROM options WHERE opt_name IN ("
res.send(settings);
});
router.get('/', auth.checkApiAuth, async (req, res, next) => {
const settings = await sql.getMap("SELECT opt_name, opt_value FROM options WHERE opt_name IN ("
+ ALLOWED_OPTIONS.map(x => '?').join(",") + ")", ALLOWED_OPTIONS);
for (const set of settings) {
dict[set['opt_name']] = set['opt_value'];
}
res.send(dict);
res.send(settings);
});
router.post('/', async (req, res, next) => {