server-ts: protected_session.js -> ts

src/becca/entities/abstract_becca_entity.js

@@ -7,7 +7,7 @@ const eventService = require('../../services/events.js');
 const dateUtils = require('../../services/date_utils');
 const cls = require('../../services/cls');
 const log = require('../../services/log');
-const protectedSessionService = require('../../services/protected_session.js');
+const protectedSessionService = require('../../services/protected_session');
 const blobService = require('../../services/blob.js');
 
 let becca = null;

src/becca/entities/battachment.js

@@ -4,7 +4,7 @@ const utils = require('../../services/utils');
 const dateUtils = require('../../services/date_utils');
 const AbstractBeccaEntity = require('./abstract_becca_entity.js');
 const sql = require('../../services/sql');
-const protectedSessionService = require('../../services/protected_session.js');
+const protectedSessionService = require('../../services/protected_session');
 const log = require('../../services/log');
 
 const attachmentRoleToNoteTypeMapping = {

src/becca/entities/brevision.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const protectedSessionService = require('../../services/protected_session.js');
+const protectedSessionService = require('../../services/protected_session');
 const utils = require('../../services/utils');
 const dateUtils = require('../../services/date_utils');
 const becca = require('../becca.js');

src/routes/api/files.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const protectedSessionService = require('../../services/protected_session.js');
+const protectedSessionService = require('../../services/protected_session');
 const utils = require('../../services/utils');
 const log = require('../../services/log');
 const noteService = require('../../services/notes.js');

src/routes/api/login.js

@@ -5,7 +5,7 @@ const utils = require('../../services/utils');
 const dateUtils = require('../../services/date_utils');
 const instanceId = require('../../services/instance_id.js');
 const passwordEncryptionService = require('../../services/encryption/password_encryption.js');
-const protectedSessionService = require('../../services/protected_session.js');
+const protectedSessionService = require('../../services/protected_session');
 const appInfo = require('../../services/app_info.js');
 const eventService = require('../../services/events.js');
 const sqlInit = require('../../services/sql_init.js');

src/routes/api/recent_changes.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const sql = require('../../services/sql');
-const protectedSessionService = require('../../services/protected_session.js');
+const protectedSessionService = require('../../services/protected_session');
 const noteService = require('../../services/notes.js');
 const becca = require('../../becca/becca.js');
 

src/routes/index.js

@@ -7,7 +7,7 @@ const optionService = require('../services/options.js');
 const log = require('../services/log');
 const env = require('../services/env.js');
 const utils = require('../services/utils');
-const protectedSessionService = require('../services/protected_session.js');
+const protectedSessionService = require('../services/protected_session');
 const packageJson = require('../../package.json');
 const assetPath = require('../services/asset_path.js');
 const appPath = require('../services/app_path.js');

src/services/date_notes.js

@@ -4,7 +4,7 @@ const noteService = require('./notes.js');
 const attributeService = require('./attributes.js');
 const dateUtils = require('./date_utils');
 const sql = require('./sql');
-const protectedSessionService = require('./protected_session.js');
+const protectedSessionService = require('./protected_session');
 const searchService = require('../services/search/services/search.js');
 const SearchContext = require('../services/search/search_context.js');
 const hoistedNoteService = require('./hoisted_note.js');

src/services/export/zip.js

@@ -7,7 +7,7 @@ const mimeTypes = require('mime-types');
 const mdService = require('./md.js');
 const packageInfo = require('../../../package.json');
 const utils = require('../utils');
-const protectedSessionService = require('../protected_session.js');
+const protectedSessionService = require('../protected_session');
 const sanitize = require("sanitize-filename");
 const fs = require("fs");
 const becca = require('../../becca/becca.js');

src/services/image.js

@@ -2,7 +2,7 @@
 
 const becca = require('../becca/becca.js');
 const log = require('./log');
-const protectedSessionService = require('./protected_session.js');
+const protectedSessionService = require('./protected_session');
 const noteService = require('./notes.js');
 const optionService = require('./options.js');
 const sql = require('./sql');

src/services/import/enex.js

@@ -6,7 +6,7 @@ const utils = require('../utils');
 const sql = require('../sql');
 const noteService = require('../notes.js');
 const imageService = require('../image.js');
-const protectedSessionService = require('../protected_session.js');
+const protectedSessionService = require('../protected_session');
 const htmlSanitizer = require('../html_sanitizer.js');
 const {sanitizeAttributeName} = require('../sanitize_attribute_name.js');
 

src/services/import/opml.js

@@ -2,7 +2,7 @@
 
 const noteService = require('../../services/notes.js');
 const parseString = require('xml2js').parseString;
-const protectedSessionService = require('../protected_session.js');
+const protectedSessionService = require('../protected_session');
 const htmlSanitizer = require('../html_sanitizer.js');
 
 /**

src/services/import/single.js

@@ -2,7 +2,7 @@
 
 const noteService = require('../../services/notes.js');
 const imageService = require('../../services/image.js');
-const protectedSessionService = require('../protected_session.js');
+const protectedSessionService = require('../protected_session');
 const markdownService = require('./markdown.js');
 const mimeService = require('./mime.js');
 const utils = require('../../services/utils');

src/services/import/zip.js

@@ -7,7 +7,7 @@ const noteService = require('../../services/notes.js');
 const attributeService = require('../../services/attributes.js');
 const BBranch = require('../../becca/entities/bbranch.js');
 const path = require('path');
-const protectedSessionService = require('../protected_session.js');
+const protectedSessionService = require('../protected_session');
 const mimeService = require('./mime.js');
 const treeService = require('../tree.js');
 const yauzl = require("yauzl");

src/services/notes.js

@@ -4,7 +4,7 @@ const dateUtils = require('./date_utils');
 const entityChangesService = require('./entity_changes.js');
 const eventService = require('./events.js');
 const cls = require('../services/cls');
-const protectedSessionService = require('../services/protected_session.js');
+const protectedSessionService = require('../services/protected_session');
 const log = require('../services/log');
 const utils = require('../services/utils');
 const revisionService = require('./revisions.js');

src/services/protected_session.ts

@@ -1,12 +1,12 @@
 "use strict";
 
-const log = require('./log');
+import log = require('./log');
-const dataEncryptionService = require('./encryption/data_encryption.js');
+import dataEncryptionService = require('./encryption/data_encryption');
 
-let dataKey = null;
+let dataKey: Buffer | null = null;
 
-function setDataKey(decryptedDataKey) {
+function setDataKey(decryptedDataKey: Buffer) {
-    dataKey = Array.from(decryptedDataKey);
+    dataKey = Buffer.from(decryptedDataKey);
 }
 
 function getDataKey() {
@@ -21,27 +21,33 @@ function isProtectedSessionAvailable() {
     return !!dataKey;
 }
 
-function encrypt(plainText) {
+function encrypt(plainText: string | Buffer) {
-    if (plainText === null) {
+    const dataKey = getDataKey();
+    if (plainText === null || dataKey === null) {
         return null;
     }
 
-    return dataEncryptionService.encrypt(getDataKey(), plainText);
+    return dataEncryptionService.encrypt(dataKey, plainText);
 }
 
-function decrypt(cipherText) {
+function decrypt(cipherText: string | Buffer) {
-    if (cipherText === null) {
+    const dataKey = getDataKey();
+    if (cipherText === null || dataKey === null) {
         return null;
     }
 
-    return dataEncryptionService.decrypt(getDataKey(), cipherText);
+    return dataEncryptionService.decrypt(dataKey, cipherText);
 }
 
-function decryptString(cipherText) {
+function decryptString(cipherText: string) {
-    return dataEncryptionService.decryptString(getDataKey(), cipherText);
+    const dataKey = getDataKey();
+    if (dataKey === null) {
+        return null;
+    }
+    return dataEncryptionService.decryptString(dataKey, cipherText);
 }
 
-let lastProtectedSessionOperationDate = null;
+let lastProtectedSessionOperationDate: number | null = null;
 
 function touchProtectedSession() {
     if (isProtectedSessionAvailable()) {

src/services/revisions.js

@@ -2,7 +2,7 @@
 
 const log = require('./log');
 const sql = require('./sql');
-const protectedSessionService = require('./protected_session.js');
+const protectedSessionService = require('./protected_session');
 const dateUtils = require('./date_utils');
 
 /**

src/services/scheduler.js

@@ -4,7 +4,7 @@ const sqlInit = require('./sql_init.js');
 const config = require('./config.js');
 const log = require('./log');
 const attributeService = require('../services/attributes.js');
-const protectedSessionService = require('../services/protected_session.js');
+const protectedSessionService = require('../services/protected_session');
 const hiddenSubtreeService = require('./hidden_subtree.js');
 
 /**

src/services/search/expressions/note_content_fulltext.js

@@ -4,7 +4,7 @@ const Expression = require('./expression.js');
 const NoteSet = require('../note_set.js');
 const log = require('../../log');
 const becca = require('../../../becca/becca.js');
-const protectedSessionService = require('../../protected_session.js');
+const protectedSessionService = require('../../protected_session');
 const striptags = require('striptags');
 const utils = require('../../utils');
 

src/services/ws.js

@@ -5,7 +5,7 @@ const sql = require('./sql');
 const cls = require('./cls');
 const config = require('./config.js');
 const syncMutexService = require('./sync_mutex.js');
-const protectedSessionService = require('./protected_session.js');
+const protectedSessionService = require('./protected_session');
 const becca = require('../becca/becca.js');
 const AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity.js');