diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 84ee7e7..b3f45fe 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -1227,6 +1227,7 @@ export class ReportController extends Controller { commandYear: number templateDoc: string | null amount: Double | null + amountSpecial?: Double | null positionSalaryAmount: Double | null mouthSalaryAmount: Double | null }[] diff --git a/src/interfaces/call-api.ts b/src/interfaces/call-api.ts index db76a72..44fc0ea 100644 --- a/src/interfaces/call-api.ts +++ b/src/interfaces/call-api.ts @@ -1,86 +1,86 @@ -import { Path } from "tsoa" -import axios from "axios" -import { addLogSequence } from "./utils" - -class CallAPI { - //Get - public async GetData(request: any, @Path() path: any, log = true) { - const token = "Bearer " + request.headers.authorization.replace("Bearer ", "") - const url = process.env.API_URL + path - try { - const response = await axios.get(url, { - headers: { - Authorization: `${token}`, - "Content-Type": "application/json", - api_key: process.env.API_KEY, - }, - }) - if (log) - addLogSequence(request, { - action: "request", - status: "success", - description: "connected", - request: { - method: "GET", - url: url, - response: JSON.stringify(response.data.result), - }, - }) - return response.data.result - } catch (error) { - if (log) - addLogSequence(request, { - action: "request", - status: "error", - description: "unconnected", - request: { - method: "GET", - url: url, - response: JSON.stringify(error), - }, - }) - throw error - } - } - //Post - public async PostData(request: any, @Path() path: any, sendData: any) { - const token = "Bearer " + request.headers.authorization.replace("Bearer ", "") - const url = process.env.API_URL + path - try { - const response = await axios.post(url, sendData, { - headers: { - Authorization: `${token}`, - "Content-Type": "application/json", - api_key: process.env.API_KEY, - }, - }) - addLogSequence(request, { - action: "request", - status: "success", - description: "connected", - request: { - method: "POST", - url: url, - payload: JSON.stringify(sendData), - response: JSON.stringify(response.data.result), - }, - }) - return response.data.result - } catch (error) { - addLogSequence(request, { - action: "request", - status: "error", - description: "unconnected", - request: { - method: "POST", - url: url, - payload: JSON.stringify(sendData), - response: JSON.stringify(error), - }, - }) - throw error - } - } -} - -export default CallAPI +import { Path } from "tsoa" +import axios from "axios" +import { addLogSequence } from "./utils" + +class CallAPI { + //Get + public async GetData(request: any, @Path() path: any, log = true) { + const token = "Bearer " + request.headers.authorization.replace("Bearer ", "") + const url = process.env.API_URL + path + try { + const response = await axios.get(url, { + headers: { + Authorization: `${token}`, + "Content-Type": "application/json", + api_key: process.env.API_KEY, + }, + }) + if (log) + addLogSequence(request, { + action: "request", + status: "success", + description: "connected", + request: { + method: "GET", + url: url, + response: JSON.stringify(response.data.result), + }, + }) + return response.data.result + } catch (error) { + if (log) + addLogSequence(request, { + action: "request", + status: "error", + description: "unconnected", + request: { + method: "GET", + url: url, + response: JSON.stringify(error), + }, + }) + throw error + } + } + //Post + public async PostData(request: any, @Path() path: any, sendData: any) { + const token = "Bearer " + request.headers.authorization.replace("Bearer ", "") + const url = process.env.API_URL + path + try { + const response = await axios.post(url, sendData, { + headers: { + Authorization: `${token}`, + "Content-Type": "application/json", + api_key: process.env.API_KEY, + }, + }) + addLogSequence(request, { + action: "request", + status: "success", + description: "connected", + request: { + method: "POST", + url: url, + payload: JSON.stringify(sendData), + response: JSON.stringify(response.data.result), + }, + }) + return response.data.result + } catch (error) { + addLogSequence(request, { + action: "request", + status: "error", + description: "unconnected", + request: { + method: "POST", + url: url, + payload: JSON.stringify(sendData), + response: JSON.stringify(error), + }, + }) + throw error + } + } +} + +export default CallAPI diff --git a/src/interfaces/permission.ts b/src/interfaces/permission.ts index a4b989e..b100be3 100644 --- a/src/interfaces/permission.ts +++ b/src/interfaces/permission.ts @@ -1,245 +1,245 @@ -import axios from "axios" -import { RequestWithUser } from "../middlewares/user" -import CallAPI from "./call-api" -import HttpError from "./http-error" -import HttpStatus from "./http-status" -import { promisify } from "util" - -class CheckAuth { - private redis = require("redis") - - public async Permission(req: RequestWithUser, system: string, action: string) { - if (req.headers.hasOwnProperty("api_key") && req.headers["api_key"] && req.headers["api_key"] == process.env.API_KEY) { - return null - } - return await new CallAPI() - .GetData(req, "/org/permission") - .then(x => { - let permission = false - let role = x.roles.find((x: any) => x.authSysId == system) - if (!role) throw "ไม่มีสิทธิ์เข้าระบบ" - if (role.attrOwnership == "OWNER") return "OWNER" - if (action.trim().toLocaleUpperCase() == "CREATE") permission = role.attrIsCreate - if (action.trim().toLocaleUpperCase() == "DELETE") permission = role.attrIsDelete - if (action.trim().toLocaleUpperCase() == "GET") permission = role.attrIsGet - if (action.trim().toLocaleUpperCase() == "LIST") permission = role.attrIsList - if (action.trim().toLocaleUpperCase() == "UPDATE") permission = role.attrIsUpdate - if (permission == false) throw "ไม่มีสิทธิ์ใช้งานระบบนี้" - return role.attrPrivilege - }) - .catch(x => { - if (x.status != undefined) { - throw new HttpError(x.status, x.message) - } else { - throw new HttpError(HttpStatus.FORBIDDEN, x) - } - }) - } - public async PermissionOrg(req: RequestWithUser, system: string, action: string) { - if (req.headers.hasOwnProperty("api_key") && req.headers["api_key"] && req.headers["api_key"] == process.env.API_KEY) { - return { - root: null, - child1: null, - child2: null, - child3: null, - child4: null, - } - } - return await new CallAPI() - .GetData(req, `/org/permission/org/${system}/${action}`) - .then(async x => { - let privilege = x.privilege - - let data: any = { - root: [null], - child1: [null], - child2: [null], - child3: [null], - child4: [null], - privilege: [null], - } - let node = 4 - if (x.orgChild1Id == null) { - node = 0 - } else if (x.orgChild2Id == null) { - node = 1 - } else if (x.orgChild3Id == null) { - node = 2 - } else if (x.orgChild4Id == null) { - node = 3 - } - if (privilege == "OWNER") { - data = { - root: null, - child1: null, - child2: null, - child3: null, - child4: null, - privilege: "OWNER", - } - } else if (privilege == "ROOT") { - data = { - root: [x.orgRootId], - child1: null, - child2: null, - child3: null, - child4: null, - privilege: "ROOT", - } - } else if (privilege == "CHILD") { - data = { - root: node >= 0 ? [x.orgRootId] : null, - child1: node >= 1 ? [x.orgChild1Id] : null, - child2: node >= 2 ? [x.orgChild2Id] : null, - child3: node >= 3 ? [x.orgChild3Id] : null, - child4: node >= 4 ? [x.orgChild4Id] : null, - privilege: "CHILD", - } - } else if (privilege == "NORMAL") { - data = { - root: [x.orgRootId], - child1: [x.orgChild1Id], - child2: [x.orgChild2Id], - child3: [x.orgChild3Id], - child4: [x.orgChild4Id], - privilege: "NORMAL", - } - } else if (privilege == "SPECIFIC") { - } - - return data - }) - .catch(x => { - if (x.status != undefined) { - throw new HttpError(x.status, x.message) - } else { - throw new HttpError(HttpStatus.FORBIDDEN, x) - } - }) - } - public async PermissionOrgByUser(req: RequestWithUser, system: string, action: string, profileId: string) { - if (req.headers.hasOwnProperty("api_key") && req.headers["api_key"] && req.headers["api_key"] == process.env.API_KEY) { - return true - } - return await new CallAPI() - .GetData(req, `/org/permission/user/${system}/${action}/${profileId}`) - .then(async x => { - let org = x.org - - if (org.root != null) if (x.orgRootId != org.root[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล" - if (org.child1 != null) if (x.orgChild1Id != org.child1[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล" - if (org.child2 != null) if (x.orgChild2Id != org.child2[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล" - if (org.child3 != null) if (x.orgChild3Id != org.child3[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล" - if (org.child4 != null) if (x.orgChild4Id != org.child4[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล" - - return true - }) - .catch(x => { - if (x.status != undefined) { - throw new HttpError(x.status, x.message) - } else { - throw new HttpError(HttpStatus.FORBIDDEN, x) - } - }) - } - public async Workflow(req: RequestWithUser, id: string, sysName: string) { - if (req.headers.hasOwnProperty("api_key") && req.headers["api_key"] && req.headers["api_key"] == process.env.API_KEY) { - return null - } - return await new CallAPI() - .PostData(req, "/org/workflow/keycloak/isofficer", { - refId: id, - sysName: sysName, - }) - .then(x => { - return true - }) - .catch(x => { - return false - }) - } - public async checkOrg(token: any, keycloakId: string) { - const redisClient = await this.redis.createClient({ - host: process.env.REDIS_HOST, - port: process.env.REDIS_PORT, - }) - const getAsync = promisify(redisClient.get).bind(redisClient) - let reply = await getAsync("org_" + keycloakId) - if (reply != null) { - reply = JSON.parse(reply) - } else { - try { - if (!keycloakId) throw "Error calling API No KeycloakId" - const x = await new CallAPI().GetData( - { - headers: { authorization: token }, - }, - `/org/permission/checkOrg/${keycloakId}`, - false - ) - - const data = { - orgRootId: x.orgRootId, - orgChild1Id: x.orgChild1Id, - orgChild2Id: x.orgChild2Id, - orgChild3Id: x.orgChild3Id, - orgChild4Id: x.orgChild4Id, - } - - return data - } catch (error) { - console.error("Error calling API:", error) - throw error - } - } - } - public async PermissionCreate(req: RequestWithUser, system: string) { - return await this.Permission(req, system, "CREATE") - } - public async PermissionDelete(req: RequestWithUser, system: string) { - return await this.Permission(req, system, "DELETE") - } - public async PermissionGet(req: RequestWithUser, system: string) { - return await this.Permission(req, system, "GET") - } - public async PermissionList(req: RequestWithUser, system: string) { - return await this.Permission(req, system, "LIST") - } - public async PermissionUpdate(req: RequestWithUser, system: string) { - return await this.Permission(req, system, "UPDATE") - } - - public async PermissionOrgCreate(req: RequestWithUser, system: string) { - return await this.PermissionOrg(req, system, "CREATE") - } - public async PermissionOrgDelete(req: RequestWithUser, system: string) { - return await this.PermissionOrg(req, system, "DELETE") - } - public async PermissionOrgGet(req: RequestWithUser, system: string) { - return await this.PermissionOrg(req, system, "GET") - } - public async PermissionOrgList(req: RequestWithUser, system: string) { - return await this.PermissionOrg(req, system, "LIST") - } - public async PermissionOrgUpdate(req: RequestWithUser, system: string) { - return await this.PermissionOrg(req, system, "UPDATE") - } - - public async PermissionOrgUserCreate(req: RequestWithUser, system: string, profileId: string) { - return await this.PermissionOrgByUser(req, system, "CREATE", profileId) - } - public async PermissionOrgUserDelete(req: RequestWithUser, system: string, profileId: string) { - return await this.PermissionOrgByUser(req, system, "DELETE", profileId) - } - public async PermissionOrgUserGet(req: RequestWithUser, system: string, profileId: string) { - return await this.PermissionOrgByUser(req, system, "GET", profileId) - } - public async PermissionOrgUserList(req: RequestWithUser, system: string, profileId: string) { - return await this.PermissionOrgByUser(req, system, "LIST", profileId) - } - public async PermissionOrgUserUpdate(req: RequestWithUser, system: string, profileId: string) { - return await this.PermissionOrgByUser(req, system, "UPDATE", profileId) - } -} - -export default CheckAuth +import axios from "axios" +import { RequestWithUser } from "../middlewares/user" +import CallAPI from "./call-api" +import HttpError from "./http-error" +import HttpStatus from "./http-status" +import { promisify } from "util" + +class CheckAuth { + private redis = require("redis") + + public async Permission(req: RequestWithUser, system: string, action: string) { + if (req.headers.hasOwnProperty("api_key") && req.headers["api_key"] && req.headers["api_key"] == process.env.API_KEY) { + return null + } + return await new CallAPI() + .GetData(req, "/org/permission") + .then(x => { + let permission = false + let role = x.roles.find((x: any) => x.authSysId == system) + if (!role) throw "ไม่มีสิทธิ์เข้าระบบ" + if (role.attrOwnership == "OWNER") return "OWNER" + if (action.trim().toLocaleUpperCase() == "CREATE") permission = role.attrIsCreate + if (action.trim().toLocaleUpperCase() == "DELETE") permission = role.attrIsDelete + if (action.trim().toLocaleUpperCase() == "GET") permission = role.attrIsGet + if (action.trim().toLocaleUpperCase() == "LIST") permission = role.attrIsList + if (action.trim().toLocaleUpperCase() == "UPDATE") permission = role.attrIsUpdate + if (permission == false) throw "ไม่มีสิทธิ์ใช้งานระบบนี้" + return role.attrPrivilege + }) + .catch(x => { + if (x.status != undefined) { + throw new HttpError(x.status, x.message) + } else { + throw new HttpError(HttpStatus.FORBIDDEN, x) + } + }) + } + public async PermissionOrg(req: RequestWithUser, system: string, action: string) { + if (req.headers.hasOwnProperty("api_key") && req.headers["api_key"] && req.headers["api_key"] == process.env.API_KEY) { + return { + root: null, + child1: null, + child2: null, + child3: null, + child4: null, + } + } + return await new CallAPI() + .GetData(req, `/org/permission/org/${system}/${action}`) + .then(async x => { + let privilege = x.privilege + + let data: any = { + root: [null], + child1: [null], + child2: [null], + child3: [null], + child4: [null], + privilege: [null], + } + let node = 4 + if (x.orgChild1Id == null) { + node = 0 + } else if (x.orgChild2Id == null) { + node = 1 + } else if (x.orgChild3Id == null) { + node = 2 + } else if (x.orgChild4Id == null) { + node = 3 + } + if (privilege == "OWNER") { + data = { + root: null, + child1: null, + child2: null, + child3: null, + child4: null, + privilege: "OWNER", + } + } else if (privilege == "ROOT") { + data = { + root: [x.orgRootId], + child1: null, + child2: null, + child3: null, + child4: null, + privilege: "ROOT", + } + } else if (privilege == "CHILD") { + data = { + root: node >= 0 ? [x.orgRootId] : null, + child1: node >= 1 ? [x.orgChild1Id] : null, + child2: node >= 2 ? [x.orgChild2Id] : null, + child3: node >= 3 ? [x.orgChild3Id] : null, + child4: node >= 4 ? [x.orgChild4Id] : null, + privilege: "CHILD", + } + } else if (privilege == "NORMAL") { + data = { + root: [x.orgRootId], + child1: [x.orgChild1Id], + child2: [x.orgChild2Id], + child3: [x.orgChild3Id], + child4: [x.orgChild4Id], + privilege: "NORMAL", + } + } else if (privilege == "SPECIFIC") { + } + + return data + }) + .catch(x => { + if (x.status != undefined) { + throw new HttpError(x.status, x.message) + } else { + throw new HttpError(HttpStatus.FORBIDDEN, x) + } + }) + } + public async PermissionOrgByUser(req: RequestWithUser, system: string, action: string, profileId: string) { + if (req.headers.hasOwnProperty("api_key") && req.headers["api_key"] && req.headers["api_key"] == process.env.API_KEY) { + return true + } + return await new CallAPI() + .GetData(req, `/org/permission/user/${system}/${action}/${profileId}`) + .then(async x => { + let org = x.org + + if (org.root != null) if (x.orgRootId != org.root[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล" + if (org.child1 != null) if (x.orgChild1Id != org.child1[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล" + if (org.child2 != null) if (x.orgChild2Id != org.child2[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล" + if (org.child3 != null) if (x.orgChild3Id != org.child3[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล" + if (org.child4 != null) if (x.orgChild4Id != org.child4[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล" + + return true + }) + .catch(x => { + if (x.status != undefined) { + throw new HttpError(x.status, x.message) + } else { + throw new HttpError(HttpStatus.FORBIDDEN, x) + } + }) + } + public async Workflow(req: RequestWithUser, id: string, sysName: string) { + if (req.headers.hasOwnProperty("api_key") && req.headers["api_key"] && req.headers["api_key"] == process.env.API_KEY) { + return null + } + return await new CallAPI() + .PostData(req, "/org/workflow/keycloak/isofficer", { + refId: id, + sysName: sysName, + }) + .then(x => { + return true + }) + .catch(x => { + return false + }) + } + public async checkOrg(token: any, keycloakId: string) { + const redisClient = await this.redis.createClient({ + host: process.env.REDIS_HOST, + port: process.env.REDIS_PORT, + }) + const getAsync = promisify(redisClient.get).bind(redisClient) + try { + let reply = await getAsync("org_" + keycloakId) + if (reply != null) { + reply = JSON.parse(reply) + } else { + if (!keycloakId) throw new Error("No KeycloakId provided") + const x = await new CallAPI().GetData( + { + headers: { authorization: token }, + }, + `/org/permission/checkOrg/${keycloakId}`, + false + ) + + const data = { + orgRootId: x.orgRootId, + orgChild1Id: x.orgChild1Id, + orgChild2Id: x.orgChild2Id, + orgChild3Id: x.orgChild3Id, + orgChild4Id: x.orgChild4Id, + } + + return data + } + } catch (error) { + console.error("Error calling API:", error) + throw error + } + } + public async PermissionCreate(req: RequestWithUser, system: string) { + return await this.Permission(req, system, "CREATE") + } + public async PermissionDelete(req: RequestWithUser, system: string) { + return await this.Permission(req, system, "DELETE") + } + public async PermissionGet(req: RequestWithUser, system: string) { + return await this.Permission(req, system, "GET") + } + public async PermissionList(req: RequestWithUser, system: string) { + return await this.Permission(req, system, "LIST") + } + public async PermissionUpdate(req: RequestWithUser, system: string) { + return await this.Permission(req, system, "UPDATE") + } + + public async PermissionOrgCreate(req: RequestWithUser, system: string) { + return await this.PermissionOrg(req, system, "CREATE") + } + public async PermissionOrgDelete(req: RequestWithUser, system: string) { + return await this.PermissionOrg(req, system, "DELETE") + } + public async PermissionOrgGet(req: RequestWithUser, system: string) { + return await this.PermissionOrg(req, system, "GET") + } + public async PermissionOrgList(req: RequestWithUser, system: string) { + return await this.PermissionOrg(req, system, "LIST") + } + public async PermissionOrgUpdate(req: RequestWithUser, system: string) { + return await this.PermissionOrg(req, system, "UPDATE") + } + + public async PermissionOrgUserCreate(req: RequestWithUser, system: string, profileId: string) { + return await this.PermissionOrgByUser(req, system, "CREATE", profileId) + } + public async PermissionOrgUserDelete(req: RequestWithUser, system: string, profileId: string) { + return await this.PermissionOrgByUser(req, system, "DELETE", profileId) + } + public async PermissionOrgUserGet(req: RequestWithUser, system: string, profileId: string) { + return await this.PermissionOrgByUser(req, system, "GET", profileId) + } + public async PermissionOrgUserList(req: RequestWithUser, system: string, profileId: string) { + return await this.PermissionOrgByUser(req, system, "LIST", profileId) + } + public async PermissionOrgUserUpdate(req: RequestWithUser, system: string, profileId: string) { + return await this.PermissionOrgByUser(req, system, "UPDATE", profileId) + } +} + +export default CheckAuth diff --git a/src/middlewares/logs.ts b/src/middlewares/logs.ts index 44245fc..739d707 100644 --- a/src/middlewares/logs.ts +++ b/src/middlewares/logs.ts @@ -19,12 +19,10 @@ const LOG_LEVEL_MAP: Record = { const elasticsearch = new Client({ node: `${process.env.ELASTICSEARCH_PROTOCOL}://${process.env.ELASTICSEARCH_HOST}:${process.env.ELASTICSEARCH_PORT}`, }) - async function logMiddleware(req: Request, res: Response, next: NextFunction) { if (!req.url.startsWith("/api/")) return next() let data: any - const originalJson = res.json res.json = function (v: any) { @@ -38,41 +36,50 @@ async function logMiddleware(req: Request, res: Response, next: NextFunction) { req.app.locals.logData = {} res.on("finish", async () => { - if (!req.url.startsWith("/api/")) return + try { + if (!req.url.startsWith("/api/")) return - const level = LOG_LEVEL_MAP[process.env.LOG_LEVEL ?? "debug"] || 4 + const level = LOG_LEVEL_MAP[process.env.LOG_LEVEL ?? "debug"] || 4 - if (level === 1 && res.statusCode < 500) return - if (level === 2 && res.statusCode < 400) return - if (level === 3 && res.statusCode < 200) return + if (level === 1 && res.statusCode < 500) return + if (level === 2 && res.statusCode < 400) return + if (level === 3 && res.statusCode < 200) return - let token: any - token = req.headers["authorization"] + const token = req.headers["authorization"] + let rootId = null - const rootId = await new permission().checkOrg(token, req.app.locals.logData.userId) + try { + rootId = token ? await new permission().checkOrg(token, req.app.locals.logData.userId) : null + } catch (err) { + console.warn("Error fetching rootId:", err) + } - const obj = { - logType: res.statusCode >= 500 ? "error" : res.statusCode >= 400 ? "warning" : "info", - ip: req.ip, - rootId: rootId ? rootId.orgRootId : null, - systemName: "probation", - startTimeStamp: timestamp, - endTimeStamp: new Date().toISOString(), - processTime: performance.now() - start, - host: req.hostname, - method: req.method, - endpoint: req.url, - responseCode: String(res.statusCode === 304 ? 200 : res.statusCode), - responseDescription: data?.message, - input: (level === 4 && JSON.stringify(req.body, null, 2)) || undefined, - output: (level === 4 && JSON.stringify(data, null, 2)) || undefined, - ...req.app.locals.logData, + const obj = { + logType: res.statusCode >= 500 ? "error" : res.statusCode >= 400 ? "warning" : "info", + ip: req.ip, + rootId: rootId?.orgRootId ?? null, + systemName: "evaluation", + startTimeStamp: timestamp, + endTimeStamp: new Date().toISOString(), + processTime: performance.now() - start, + host: req.hostname, + method: req.method, + endpoint: req.url, + responseCode: String(res.statusCode === 304 ? 200 : res.statusCode), + responseDescription: data?.message, + input: level === 4 ? JSON.stringify(req.body, null, 2) : undefined, + output: level === 4 ? JSON.stringify(data, null, 2) : undefined, + ...req.app.locals.logData, + } + + // Send log to Elasticsearch + await elasticsearch.index({ + index: ELASTICSEARCH_INDEX, + document: obj, + }) + } catch (err) { + console.error("Error in logMiddleware:", err) } - - elasticsearch.index({ - index: ELASTICSEARCH_INDEX, - document: obj, - }) }) return next()