mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-04-23 21:29:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

we now remember past source ids so app restart won't change anything in sync operation

Browse Source
This commit is contained in:
azivner
2017-11-16 21:50:00 -05:00
parent 9e7fcdfe15
commit b2d1ca1c28
15 changed files with 144 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/options.js
+12 -1
View File
@@ -1,5 +1,6 @@
const sql = require('./sql');
const utils = require('./utils');
const sync_table = require('./sync_table');
const SYNCED_OPTIONS = [ 'username', 'password_verification_hash', 'encrypted_data_key', 'protected_session_timeout',
'history_snapshot_time_interval' ];
@@ -20,7 +21,7 @@ async function setOptionInTransaction(optName, optValue) {
async function setOption(optName, optValue) {
if (SYNCED_OPTIONS.includes(optName)) {
await sql.addOptionsSync(optName);
await sync_table.addOptionsSync(optName);
}
await setOptionNoSync(optName, optValue);
@@ -32,6 +33,16 @@ async function setOptionNoSync(optName, optValue) {
await sql.execute("UPDATE options SET opt_value = ?, date_modified = ? WHERE opt_name = ?", [optValue, now, optName]);
}
sql.dbReady.then(async () => {
if (!await getOption('document_id')) {
await setOption('document_id', utils.randomSecureToken(16));
}
if (!await getOption('document_secret')) {
await setOption('document_secret', utils.randomSecureToken(16));
}
});
module.exports = {
getOption,
setOption,