diff --git a/src/entities/note.js b/src/entities/note.js index 195cbfea9..a07fa433d 100644 --- a/src/entities/note.js +++ b/src/entities/note.js @@ -52,7 +52,7 @@ class Note extends Entity { this.isContentAvailable = protectedSessionService.isProtectedSessionAvailable(); if (this.isContentAvailable) { - this.title = protectedSessionService.decrypt(this.title).toString(); + this.title = protectedSessionService.decryptString(this.title); } else { this.title = "[protected]"; diff --git a/src/entities/note_revision.js b/src/entities/note_revision.js index aafef2644..72263d782 100644 --- a/src/entities/note_revision.js +++ b/src/entities/note_revision.js @@ -37,7 +37,7 @@ class NoteRevision extends Entity { if (this.isProtected) { if (protectedSessionService.isProtectedSessionAvailable()) { - this.title = protectedSessionService.decrypt(this.title).toString(); + this.title = protectedSessionService.decryptString(this.title); } else { this.title = "[Protected]"; diff --git a/src/routes/api/recent_changes.js b/src/routes/api/recent_changes.js index fbf6fd446..4ba99886f 100644 --- a/src/routes/api/recent_changes.js +++ b/src/routes/api/recent_changes.js @@ -41,8 +41,8 @@ async function getRecentChanges() { for (const change of recentChanges) { if (change.current_isProtected) { if (protectedSessionService.isProtectedSessionAvailable()) { - change.title = protectedSessionService.decrypt(change.title).toString(); - change.current_title = protectedSessionService.decrypt(change.current_title).toString(); + change.title = protectedSessionService.decryptString(change.title); + change.current_title = protectedSessionService.decryptString(change.current_title); } else { change.title = change.current_title = "[Protected]"; diff --git a/src/services/note_cache.js b/src/services/note_cache.js index c51991e17..3b956bcc2 100644 --- a/src/services/note_cache.js +++ b/src/services/note_cache.js @@ -54,7 +54,7 @@ async function loadProtectedNotes() { protectedNoteTitles = await sql.getMap(`SELECT noteId, title FROM notes WHERE isDeleted = 0 AND isProtected = 1`); for (const noteId in protectedNoteTitles) { - protectedNoteTitles[noteId] = protectedSessionService.decrypt(protectedNoteTitles[noteId]).toString(); + protectedNoteTitles[noteId] = protectedSessionService.decryptString(protectedNoteTitles[noteId]); } } diff --git a/src/services/protected_session.js b/src/services/protected_session.js index 5c71846e9..45e75d08f 100644 --- a/src/services/protected_session.js +++ b/src/services/protected_session.js @@ -37,7 +37,7 @@ function isProtectedSessionAvailable() { function decryptNotes(notes) { for (const note of notes) { if (note.isProtected) { - note.title = decrypt(note.title).toString(); + note.title = decrypt(note.title); } } } @@ -50,12 +50,17 @@ function decrypt(cipherText) { return dataEncryptionService.decrypt(getDataKey(), cipherText); } +function decryptString(cipherText) { + return dataEncryptionService.decryptString(getDataKey(), cipherText); +} + module.exports = { setDataKey, getDataKey, isProtectedSessionAvailable, encrypt, decrypt, + decryptString, decryptNotes, setProtectedSessionId }; \ No newline at end of file