fix: remove log query string from url for every ctx log

gravity-ui · Oct 14, 2024 · d52865d · d52865d
1 parent 9da8f4f
commit d52865d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/base-middleware.ts b/src/base-middleware.ts
@@ -47,7 +47,7 @@ export function setupBaseMiddleware(ctx: AppContext, expressApp: Express) {
             req.ctx.addLoggerExtra('req', {
                 id: req.id,
                 method: req.method,
-                url: ctx.utils.redactSensitiveQueryParams(req.url),
+                url: ctx.utils.redactSensitiveQueryParams(req.path),
             });
 
             const requestStartedExtra = ctx.config.appDevMode

diff --git a/src/tests/logging.test.ts b/src/tests/logging.test.ts
@@ -227,7 +227,7 @@ describe('log system', () => {
             req: {
                 id: requestId,
                 method: 'GET',
-                url: `/log?q=${query}`,
+                url: '/log',
             },
             res: {
                 statusCode: '200',
@@ -250,9 +250,25 @@ describe('log system', () => {
             req: {
                 id: requestId,
                 method: 'GET',
-                url: `/log?q=${query}`,
+                url: '/log',
             },
             query,
         });
+
+        // first log with request
+        log = JSON.parse(logger.write.mock.calls?.pop() || '{}');
+
+        // check request log
+        expect(log).toMatchObject({
+            msg: `[Express GET] Request started [${requestId}]`,
+            level: 30,
+            name: APP_NAME,
+            time: expect.any(Number),
+            req: {
+                id: requestId,
+                method: 'GET',
+                url: `/log?q=${query}`,
+            },
+        });
     });
 });