From b74958a689adb454956e2dd83c104df59e04428a Mon Sep 17 00:00:00 2001
From: harid <harid_pr61@live.rmutl.com>
Date: Mon, 23 Mar 2026 09:36:27 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20middleware=20log=20=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=83?=
 =?UTF-8?q?=E0=B8=8A=E0=B9=89=E0=B8=88=E0=B8=B2=E0=B8=81=20token=20#223?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/middlewares/auth.ts | 10 ++++++++++
 src/middlewares/logs.ts | 23 +++++++++++++----------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/middlewares/auth.ts b/src/middlewares/auth.ts
index de43a0c..c358b82 100644
--- a/src/middlewares/auth.ts
+++ b/src/middlewares/auth.ts
@@ -67,6 +67,16 @@ export async function expressAuthentication(
   request.app.locals.logData.userName = payload.name;
   request.app.locals.logData.user = payload.preferred_username;
 
+  // เก็บค่า profileId และ orgRootDnaId จาก token (ใช้ค่าว่างถ้าไม่มี)
+  request.app.locals.logData.profileId = payload.profileId ?? "";
+  request.app.locals.logData.orgRootDnaId = payload.orgRootDnaId ?? "";
+  request.app.locals.logData.orgChild1DnaId = payload.orgChild1DnaId ?? "";
+  request.app.locals.logData.orgChild2DnaId = payload.orgChild2DnaId ?? "";
+  request.app.locals.logData.orgChild3DnaId = payload.orgChild3DnaId ?? "";
+  request.app.locals.logData.orgChild4DnaId = payload.orgChild4DnaId ?? "";
+  request.app.locals.logData.empType = payload.empType ?? "";
+  request.app.locals.logData.prefix = payload.prefix ?? "";
+
   return payload;
 }
 
diff --git a/src/middlewares/logs.ts b/src/middlewares/logs.ts
index 81cad3d..1cf869d 100644
--- a/src/middlewares/logs.ts
+++ b/src/middlewares/logs.ts
@@ -45,21 +45,24 @@ async function logMiddleware(req: Request, res: Response, next: NextFunction) {
       if (level === 2 && res.statusCode < 400) return;
       if (level === 3 && res.statusCode < 200) return;
 
-      const token = req.headers["authorization"];
-      let rootId = null;
+      // const token = req.headers["authorization"];
+      // let rootId = null;
 
-      try {
-        rootId = token
-          ? await new permission().checkRootDna(token, req.app.locals.logData.userId)
-          : null;
-      } catch (err) {
-        console.warn("Error fetching rootId:", err);
-      }
+      // try {
+      //   rootId = token
+      //     ? await new permission().checkRootDna(token, req.app.locals.logData.userId)
+      //     : null;
+      // } catch (err) {
+      //   console.warn("Error fetching rootId:", err);
+      // }
+
+      // Get rootId from token
+      const rootId = req.app.locals.logData?.orgRootDnaId;
 
       const obj = {
         logType: res.statusCode >= 500 ? "error" : res.statusCode >= 400 ? "warning" : "info",
         ip: req.ip,
-        rootId: rootId?.rootDnaId ?? null,
+        rootId: rootId ?? null,
         systemName: "KPI",
         startTimeStamp: timestamp,
         endTimeStamp: new Date().toISOString(),