From 04379b4e1f58e68087e890e4ccb649a7b21a4420 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Tue, 17 May 2022 20:22:33 +0200
Subject: [PATCH] delay protected session expiration check after DB init, fixes
 #2855

---
 src/services/protected_session.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/services/protected_session.js b/src/services/protected_session.js
index ad125deca..22e531738 100644
--- a/src/services/protected_session.js
+++ b/src/services/protected_session.js
@@ -3,6 +3,7 @@
 const log = require('./log');
 const dataEncryptionService = require('./data_encryption');
 const options = require("./options");
+const sqlInit = require("./sql_init");
 
 let dataKey = null;
 
@@ -63,17 +64,19 @@ function touchProtectedSession() {
     }
 }
 
-setInterval(() => {
-    const protectedSessionTimeout = options.getOptionInt('protectedSessionTimeout');
-    if (isProtectedSessionAvailable()
-        && lastProtectedSessionOperationDate
-        && Date.now() - lastProtectedSessionOperationDate > protectedSessionTimeout * 1000) {
+sqlInit.dbReady.then(() => {
+    setInterval(() => {
+        const protectedSessionTimeout = options.getOptionInt('protectedSessionTimeout');
+        if (isProtectedSessionAvailable()
+            && lastProtectedSessionOperationDate
+            && Date.now() - lastProtectedSessionOperationDate > protectedSessionTimeout * 1000) {
 
-        resetDataKey();
+            resetDataKey();
 
-        require('./ws').reloadFrontend();
-    }
-}, 30000);
+            require('./ws').reloadFrontend();
+        }
+    }, 30000);
+});
 
 
 module.exports = {