From 272de6c4558f5d040300772a5708fe5e05d5445c Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:45:40 +0700 Subject: [PATCH 1/3] feat: add log --- src/middlewares/auth.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/middlewares/auth.ts b/src/middlewares/auth.ts index d3c8c88..2c939d3 100644 --- a/src/middlewares/auth.ts +++ b/src/middlewares/auth.ts @@ -52,9 +52,13 @@ export async function expressAuthentication( if (process.env.AUTH_PUBLIC_KEY) payload = await verifyOffline(token); break; } + if (!request.app.locals.logData) { + request.app.locals.logData = {}; + } - // request.app.locals.logData.userId = payload.sub; - // request.app.locals.logData.user = payload.preferred_username; + request.app.locals.logData.userId = payload.sub; + request.app.locals.logData.userName = payload.name; + request.app.locals.logData.user = payload.preferred_username; return payload; } From 5ca06267d313d4486bd5179f7c6e49fda5884155 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:45:48 +0700 Subject: [PATCH 2/3] Reapply "feat: enable log" This reverts commit 94226de1684df518694160fa645ff3ef6030f85b. --- src/app.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app.ts b/src/app.ts index 6efbcf9..2580fda 100644 --- a/src/app.ts +++ b/src/app.ts @@ -8,6 +8,7 @@ import * as cron from "node-cron"; import error from "./middlewares/error"; import { AppDataSource } from "./database/data-source"; import { RegisterRoutes } from "./routes"; +import logMiddleware from "./middlewares/logs"; async function main() { await AppDataSource.initialize(); @@ -21,6 +22,7 @@ async function main() { ); app.use(express.json()); app.use(express.urlencoded({ extended: true })); + app.use(logMiddleware); app.use("/", express.static("static")); app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument)); From 08f8c598ac29a5d1c8b150253f9ae14305c7bd5a Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:46:46 +0700 Subject: [PATCH 3/3] feat: change system name --- src/middlewares/logs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/middlewares/logs.ts b/src/middlewares/logs.ts index ff3cf9f..1e6e16a 100644 --- a/src/middlewares/logs.ts +++ b/src/middlewares/logs.ts @@ -47,7 +47,7 @@ async function logMiddleware(req: Request, res: Response, next: NextFunction) { const obj = { logType: res.statusCode >= 500 ? "error" : res.statusCode >= 400 ? "warning" : "info", - systemName: "BMA_EHR_DEVELOPMENT", + systemName: "development", startTimeStamp: timestamp, endTimeStamp: new Date().toISOString(), processTime: performance.now() - start,