src/middlewares/auth.ts

@@ -67,16 +67,6 @@ 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;
 }
 

src/middlewares/logs.ts

@@ -45,22 +45,19 @@ 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"]
+			const token = req.headers["authorization"]
-			// let rootId = null
+			let rootId = null
 
-			// try {
+			try {
-			// 	rootId = token ? await new permission().checkRootDna(token, req.app.locals.logData.userId) : null
+				rootId = token ? await new permission().checkRootDna(token, req.app.locals.logData.userId) : null
-			// } catch (err) {
+			} catch (err) {
-			// 	console.warn("Error fetching rootId:", 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 ?? null,
+				rootId: rootId?.rootDnaId ?? null,
 				systemName: "probation",
 				startTimeStamp: timestamp,
 				endTimeStamp: new Date().toISOString(),