hrms-bangkok/hrms-api-development
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
Details

Browse source
This commit is contained in:
harid 2026-03-20 18:05:06 +07:00
commit eb705231b8
2 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/middlewares/auth.ts
View file

@ -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;
}

23
src/middlewares/logs.ts
View file

@ -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().checkOrg(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: "development",
startTimeStamp: timestamp,
endTimeStamp: new Date().toISOString(),