refactor(config): rename Cookies to Session

as requested in PR #1155
TriliumNext · Feb 10, 2025 · 7e9e896 · 7e9e896
1 parent b6d73df
commit 7e9e896
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/routes/csrf_protection.ts b/src/routes/csrf_protection.ts
@@ -6,7 +6,7 @@ import config from "../services/config.js";
 const doubleCsrfUtilities = doubleCsrf({
     getSecret: () => sessionSecret,
     cookieOptions: {
-        path: config.Cookies.cookiePath,
+        path: config.Session.cookiePath,
         secure: false,
         sameSite: "strict",
         httpOnly: !isElectron // set to false for Electron, see https://github.com/TriliumNext/Notes/pull/966

diff --git a/src/routes/session_parser.ts b/src/routes/session_parser.ts
@@ -10,7 +10,7 @@ const sessionParser = session({
     resave: false, // true forces the session to be saved back to the session store, even if the session was never modified during the request.
     saveUninitialized: false, // true forces a session that is "uninitialized" to be saved to the store. A session is uninitialized when it is new but not modified.
     cookie: {
-        path: config.Cookies.cookiePath,
+        path: config.Session.cookiePath,
         httpOnly: true,
         maxAge: 24 * 60 * 60 * 1000 // in milliseconds
     },

diff --git a/src/services/config.ts b/src/services/config.ts
@@ -32,7 +32,7 @@ export interface TriliumConfig {
         keyPath: string;
         trustedReverseProxy: boolean | string;
     };
-    Cookies: {
+    Session: {
         cookiePath: string;
     }
     Sync: {
@@ -79,9 +79,9 @@ const config: TriliumConfig = {
             process.env.TRILIUM_NETWORK_TRUSTEDREVERSEPROXY || iniConfig.Network.trustedReverseProxy || false
     },
 
-    Cookies: {
+    Session: {
         cookiePath:
-            process.env.TRILIUM_COOKIES_COOKIEPATH || iniConfig?.Cookies?.cookiePath || "/"
+            process.env.TRILIUM_SESSION_COOKIEPATH || iniConfig?.Session?.cookiePath || "/"
     },
 
     Sync: {