mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-01-06 12:59:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

renamed encryption session timeout to protected session timeout

Browse Source
This commit is contained in:
azivner
2017-11-14 22:44:45 -05:00
parent 4aa70d3574
commit 892aa39d46
7 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/javascripts/dialogs/settings.js
View File

@@ -108,19 +108,19 @@ settings.addModule((function() {
})());
settings.addModule((function() {
const formEl = $("#encryption-timeout-form");
const encryptionTimeoutEl = $("#encryption-timeout-in-seconds");
const settingName = 'encryption_session_timeout';
const formEl = $("#protected-session-timeout-form");
const protectedSessionTimeoutEl = $("#protected-session-timeout-in-seconds");
const settingName = 'protected_session_timeout';
function settingsLoaded(settings) {
encryptionTimeoutEl.val(settings[settingName]);
protectedSessionTimeoutEl.val(settings[settingName]);
}
formEl.submit(() => {
const encryptionTimeout = encryptionTimeoutEl.val();
const protectedSessionTimeout = protectedSessionTimeoutEl.val();
settings.saveSettings(settingName, encryptionTimeout).then(() => {
protected_session.setEncryptionSessionTimeout(encryptionTimeout);
settings.saveSettings(settingName, protectedSessionTimeout).then(() => {
protected_session.setProtectedSessionTimeout(protectedSessionTimeout);
});
return false;

12
public/javascripts/protected_session.js
View File

@@ -7,7 +7,7 @@ const protected_session = (function() {
let protectedSessionDeferred = null;
let lastProtectedSessionOperationDate = null;
let encryptionSessionTimeout = null;
let protectedSessionTimeout = null;
let protectedSessionId = null;
$.ajax({
@@ -15,11 +15,11 @@ const protected_session = (function() {
type: 'GET',
error: () => showError("Error getting encryption settings.")
}).then(settings => {
encryptionSessionTimeout = settings.encryption_session_timeout;
protectedSessionTimeout = settings.protected_session_timeout;
});
function setEncryptionSessionTimeout(encSessTimeout) {
encryptionSessionTimeout = encSessTimeout;
function setProtectedSessionTimeout(encSessTimeout) {
protectedSessionTimeout = encSessTimeout;
}
function ensureProtectedSession(requireProtectedSession, modal) {
@@ -140,13 +140,13 @@ const protected_session = (function() {
});
setInterval(() => {
if (lastProtectedSessionOperationDate !== null && new Date().getTime() - lastProtectedSessionOperationDate.getTime() > encryptionSessionTimeout * 1000) {
if (lastProtectedSessionOperationDate !== null && new Date().getTime() - lastProtectedSessionOperationDate.getTime() > protectedSessionTimeout * 1000) {
resetProtectedSession();
}
}, 5000);
return {
setEncryptionSessionTimeout,
setProtectedSessionTimeout,
ensureProtectedSession,
resetProtectedSession,
isProtectedSessionAvailable,