merge

1 files changed, 9 insertions, 2 deletions

diff --git a/src/server/Initialization.ts b/src/server/Initialization.ts
index 08b476822..76acb4363 100644
--- a/src/server/Initialization.ts
+++ b/src/server/Initialization.ts
@@ -20,6 +20,7 @@ import * as request from 'request';
 import RouteSubscriber from './RouteSubscriber';
 import { publicDirectory } from '.';
 import { ConsoleColors, logPort } from './ActionUtilities';
+import { timeMap } from './ApiManagers/UserManager';
 
 /* RouteSetter is a wrapper around the server that prevents the server
    from being exposed. */
@@ -36,8 +37,14 @@ export default async function InitializeServer(options: InitializationOptions) {
     server.use(express.static(publicDirectory));
     server.use("/images", express.static(publicDirectory));
 
-    server.use("*", (req, _res, next) => {
-        console.log(ConsoleColors.Cyan, req.originalUrl, req.user.email);
+    server.use("*", ({ user, originalUrl }, _res, next) => {
+        if (!originalUrl.includes("Heartbeat")) {
+            const userEmail = user?.email;
+            console.log(ConsoleColors.Cyan, originalUrl, userEmail ?? "<user logged out>");
+            if (userEmail) {
+                timeMap[userEmail] = Date.now();
+            }
+        }
         next();
     });