From ca52b5b077febb14ac49b3cb3c521f421753c710 Mon Sep 17 00:00:00 2001 From: Adisak Date: Wed, 29 Oct 2025 11:19:07 +0700 Subject: [PATCH] revert code to normal --- src/interfaces/call-api.ts | 14 +++++++------- src/interfaces/permission.ts | 37 +----------------------------------- src/interfaces/utils.ts | 34 ++------------------------------- 3 files changed, 10 insertions(+), 75 deletions(-) diff --git a/src/interfaces/call-api.ts b/src/interfaces/call-api.ts index 3ae4a7c..73f6c90 100644 --- a/src/interfaces/call-api.ts +++ b/src/interfaces/call-api.ts @@ -12,7 +12,7 @@ import { Path, } from "tsoa"; import axios from "axios"; -import { addLogSequence, safeStringify } from "./utils"; +import { addLogSequence } from "./utils"; class CallAPI { //Get @@ -34,7 +34,7 @@ class CallAPI { request: { method: "GET", url: url, - response: safeStringify(response.data.result), + response: JSON.stringify(response.data.result), }, }); return response.data.result; @@ -46,7 +46,7 @@ class CallAPI { request: { method: "GET", url: url, - response: safeStringify(error), + response: JSON.stringify(error), }, }); throw error; @@ -71,8 +71,8 @@ class CallAPI { request: { method: "POST", url: url, - payload: safeStringify(sendData), - response: safeStringify(response.data.result), + payload: JSON.stringify(sendData), + response: JSON.stringify(response.data.result), }, }); return response.data.result; @@ -84,8 +84,8 @@ class CallAPI { request: { method: "POST", url: url, - payload: safeStringify(sendData), - response: safeStringify(error), + payload: JSON.stringify(sendData), + response: JSON.stringify(error), }, }); throw error; diff --git a/src/interfaces/permission.ts b/src/interfaces/permission.ts index 9980858..cfe76e6 100644 --- a/src/interfaces/permission.ts +++ b/src/interfaces/permission.ts @@ -183,42 +183,7 @@ class CheckAuth { 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 checkOrg(token: any, keycloakId: string) { + public async checkOrg(token: any, keycloakId: string) { try { // Validate required environment variables const REDIS_HOST = process.env.REDIS_HOST; diff --git a/src/interfaces/utils.ts b/src/interfaces/utils.ts index 259b113..c667f54 100644 --- a/src/interfaces/utils.ts +++ b/src/interfaces/utils.ts @@ -27,8 +27,8 @@ export function setLogDataDiff(req: RequestWithUser, data: DataDiff) { typeof data.after === "object" ) { req.app.locals.logData.dataDiff = { - before: safeStringify(data.before), - after: safeStringify(data.after), + before: JSON.stringify(data.before), + after: JSON.stringify(data.after), }; } else { console.error("Invalid data provided: both before and after must be valid objects."); @@ -45,33 +45,3 @@ export function addLogSequence(req: RequestWithUser, data: LogSequence) { export function editLogSequence(req: RequestWithUser, index: number, data: LogSequence) { req.app.locals.logData.sequence[index] = data; } - -/** - * ปลอดภัยกว่า JSON.stringify() - * - กัน circular reference - * - จำกัดความลึก - * - return string แน่นอนเสมอ - */ -export function safeStringify(obj: any, space?: number): string { - const cache = new WeakSet(); - - try { - return JSON.stringify( - obj, - (key, value) => { - // ป้องกัน circular reference - if (typeof value === "object" && value !== null) { - if (cache.has(value)) { - return "[Circular]"; - } - cache.add(value); - } - return value; - }, - space, - ); - } catch (err) { - console.error("⚠️ safeStringify error:", err); - return "[Unserializable object]"; - } -}