From 2e906af77d144bedc046199193ba70a65a9f8344 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sun, 7 Apr 2024 14:32:08 +0300
Subject: [PATCH] server-ts: Convert routes/session_parser

---
 package-lock.json                             | 19 +++++++++++++++++++
 package.json                                  |  1 +
 src/app.js                                    |  2 +-
 .../{session_parser.js => session_parser.ts}  |  8 ++++----
 src/services/session_secret.ts                |  2 +-
 5 files changed, 26 insertions(+), 6 deletions(-)
 rename src/routes/{session_parser.js => session_parser.ts} (78%)

diff --git a/package-lock.json b/package-lock.json
index 6adfcaed4..3c5e38812 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -93,6 +93,7 @@
         "@types/cls-hooked": "^4.3.8",
         "@types/escape-html": "^1.0.4",
         "@types/express": "^4.17.21",
+        "@types/express-session": "^1.18.0",
         "@types/html": "^1.0.4",
         "@types/ini": "^4.1.0",
         "@types/jsdom": "^21.1.6",
@@ -1315,6 +1316,15 @@
         "@types/send": "*"
       }
     },
+    "node_modules/@types/express-session": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.0.tgz",
+      "integrity": "sha512-27JdDRgor6PoYlURY+Y5kCakqp5ulC0kmf7y+QwaY+hv9jEFuQOThgkjyA53RP3jmKuBsH5GR6qEfFmvb8mwOA==",
+      "dev": true,
+      "dependencies": {
+        "@types/express": "*"
+      }
+    },
     "node_modules/@types/fs-extra": {
       "version": "9.0.13",
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
@@ -14293,6 +14303,15 @@
         "@types/send": "*"
       }
     },
+    "@types/express-session": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.0.tgz",
+      "integrity": "sha512-27JdDRgor6PoYlURY+Y5kCakqp5ulC0kmf7y+QwaY+hv9jEFuQOThgkjyA53RP3jmKuBsH5GR6qEfFmvb8mwOA==",
+      "dev": true,
+      "requires": {
+        "@types/express": "*"
+      }
+    },
     "@types/fs-extra": {
       "version": "9.0.13",
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
diff --git a/package.json b/package.json
index eead6dea0..106b21964 100644
--- a/package.json
+++ b/package.json
@@ -114,6 +114,7 @@
     "@types/cls-hooked": "^4.3.8",
     "@types/escape-html": "^1.0.4",
     "@types/express": "^4.17.21",
+    "@types/express-session": "^1.18.0",
     "@types/html": "^1.0.4",
     "@types/ini": "^4.1.0",
     "@types/jsdom": "^21.1.6",
diff --git a/src/app.js b/src/app.js
index 8c812dafe..30daf58ea 100644
--- a/src/app.js
+++ b/src/app.js
@@ -4,7 +4,7 @@ const favicon = require('serve-favicon');
 const cookieParser = require('cookie-parser');
 const helmet = require('helmet');
 const compression = require('compression');
-const sessionParser = require('./routes/session_parser.js');
+const sessionParser = require('./routes/session_parser');
 const utils = require('./services/utils');
 
 require('./services/handlers');
diff --git a/src/routes/session_parser.js b/src/routes/session_parser.ts
similarity index 78%
rename from src/routes/session_parser.js
rename to src/routes/session_parser.ts
index afe99fa2f..431476f15 100644
--- a/src/routes/session_parser.js
+++ b/src/routes/session_parser.ts
@@ -1,6 +1,6 @@
-const session = require("express-session");
-const sessionSecret = require('../services/session_secret');
-const dataDir = require('../services/data_dir');
+import session = require("express-session");
+import sessionSecret = require('../services/session_secret');
+import dataDir = require('../services/data_dir');
 const FileStore = require('session-file-store')(session);
 
 const sessionParser = session({
@@ -19,4 +19,4 @@ const sessionParser = session({
     })
 });
 
-module.exports = sessionParser;
+export = sessionParser;
diff --git a/src/services/session_secret.ts b/src/services/session_secret.ts
index 3721cf63f..20b35efb2 100644
--- a/src/services/session_secret.ts
+++ b/src/services/session_secret.ts
@@ -7,7 +7,7 @@ import log = require('./log');
 
 const sessionSecretPath = `${dataDir.TRILIUM_DATA_DIR}/session_secret.txt`;
 
-let sessionSecret;
+let sessionSecret: string;
 
 const ENCODING = "ascii";