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

add switch to manually enter/leave protected session, fixes #107

Browse Source
This commit is contained in:
azivner
2018-05-31 20:00:39 -04:00
parent 8bf4633cd0
commit 5dde2752d2
4 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/public/javascripts/services/protected_session.js
View File

@@ -11,9 +11,23 @@ const $password = $("#protected-session-password");
const $noteDetailWrapper = $("#note-detail-wrapper");
const $protectButton = $("#protect-button");
const $unprotectButton = $("#unprotect-button");
const $protectedSessionOnButton = $("#protected-session-on");
const $protectedSessionOffButton = $("#protected-session-off");
let protectedSessionDeferred = null;
async function enterProtectedSession() {
if (!protectedSessionHolder.isProtectedSessionAvailable()) {
await ensureProtectedSession(true, true);
}
}
async function leaveProtectedSession() {
if (protectedSessionHolder.isProtectedSessionAvailable()) {
utils.reloadApp();
}
}
function ensureProtectedSession(requireProtectedSession, modal) {
const dfd = $.Deferred();
@@ -46,7 +60,7 @@ async function setupProtectedSession() {
const password = $password.val();
$password.val("");
const response = await enterProtectedSession(password);
const response = await enterProtectedSessionOnServer(password);
if (!response.success) {
infoService.showError("Wrong password.");
@@ -67,6 +81,9 @@ async function setupProtectedSession() {
protectedSessionDeferred.resolve();
$protectedSessionOnButton.addClass('active');
$protectedSessionOffButton.removeClass('active');
protectedSessionDeferred = null;
}
}
@@ -81,7 +98,7 @@ function ensureDialogIsClosed() {
$password.val('');
}
async function enterProtectedSession(password) {
async function enterProtectedSessionOnServer(password) {
return await server.post('login/protected', {
password: password
});
@@ -138,5 +155,7 @@ export default {
protectNoteAndSendToServer,
unprotectNoteAndSendToServer,
protectBranch,
ensureDialogIsClosed
ensureDialogIsClosed,
enterProtectedSession,
leaveProtectedSession
};