From 26d070f2c32673bd9f0aa15b18a29f4937af1317 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 26 Jun 2024 19:30:13 +0200
Subject: [PATCH 1/2] improve loggly request logging call (#15259)

---
 .../server/middlewares/requestLogHandler.js   | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/website/server/middlewares/requestLogHandler.js b/website/server/middlewares/requestLogHandler.js
index b7d3a499a7..7191e116c0 100644
--- a/website/server/middlewares/requestLogHandler.js
+++ b/website/server/middlewares/requestLogHandler.js
@@ -1,28 +1,35 @@
 import { v4 as uuid } from 'uuid';
+import omit from 'lodash/omit';
 import logger from '../libs/logger';
 
+function buildBaseLogData (req) {
+  return {
+    requestId: req.requestIdentifier,
+    method: req.method,
+    url: req.originalUrl,
+
+    headers: omit(req.headers, ['x-api-key', 'cookie', 'password', 'confirmPassword']),
+    body: omit(req.body, ['password', 'confirmPassword']),
+    query: omit(req.query, ['password', 'confirmPassword']),
+  };
+}
+
 export const logRequestEnd = (req, res) => {
   const now = Date.now();
   const requestTime = now - req.requestStartTime;
-  logger.info('Request completed', {
-    requestId: req.requestIdentifier,
-    method: req.method,
-    url: req.originalUrl,
-    duration: requestTime,
-    endTime: now,
-    statusCode: res.statusCode,
-  });
+  const data = buildBaseLogData(req);
+  data.duration = requestTime;
+  data.endTime = now;
+  data.statusCode = res.statusCode;
+  logger.info('Request completed', data);
 };
 
 export const logRequestData = (req, res, next) => {
   req.requestStartTime = Date.now();
   req.requestIdentifier = uuid();
-  logger.info('Request started', {
-    requestId: req.requestIdentifier,
-    method: req.method,
-    url: req.originalUrl,
-    startTime: req.requestStartTime,
-  });
+  const data = buildBaseLogData(req);
+  data.startTime = req.requestStartTime;
+  logger.info('Request started', data);
   req.on('close', () => {
     logRequestEnd(req, res);
   });

From 760c05df5d84bfc9b50afa955ffb62c54d6dc2a0 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabe@habitica.com>
Date: Wed, 26 Jun 2024 12:36:32 -0500
Subject: [PATCH 2/2] 5.25.8

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 298b9f123a..f7d36bd71d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "habitica",
-  "version": "5.25.7",
+  "version": "5.25.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "habitica",
-      "version": "5.25.7",
+      "version": "5.25.8",
       "hasInstallScript": true,
       "dependencies": {
         "@babel/core": "^7.22.10",
diff --git a/package.json b/package.json
index a8e41d47ab..f166b266f1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "5.25.7",
+  "version": "5.25.8",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.22.10",