gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-05 17:38:47 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix export of protected notes to tar archive, fixes #432

Browse Source
This commit is contained in:
zadam 2019-03-07 22:00:23 +01:00
parent ee58bf3d5c
commit 02eddc347a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/protected_session.js
View File

@ -15,7 +15,7 @@ function setDataKey(decryptedDataKey) {
}
function setProtectedSessionId(req) {
cls.namespace.set('protectedSessionId', req.headers['trilium-protected-session-id']);
cls.namespace.set('protectedSessionId', req.headers['trilium-protected-session-id'] || req.query.protectedSessionId);
}
function getProtectedSessionId() {
@ -62,7 +62,9 @@ function decryptNoteContent(noteContent) {
}
try {
noteContent.content = dataEncryptionService.decrypt(getDataKey(), noteContent.content);
if (noteContent.content != null) {
noteContent.content = dataEncryptionService.decrypt(getDataKey(), noteContent.content.toString());
}
}
catch (e) {
e.message = `Cannot decrypt note content for noteContentId=${noteContent.noteContentId}: ` + e.message;