From 16c026e7a47ba93da991cda0f2feb3d42006914d Mon Sep 17 00:00:00 2001
From: Harid Promsri <52228846+Harid-999@users.noreply.github.com>
Date: Tue, 21 Oct 2025 14:51:24 +0700
Subject: [PATCH] fix log (#22)

Co-authored-by: harid <harid_pr61@live.rmutl.com>
---
 src/interfaces/permission.ts | 84 +++++++++++++-----------------------
 1 file changed, 31 insertions(+), 53 deletions(-)

diff --git a/src/interfaces/permission.ts b/src/interfaces/permission.ts
index cfe76e6..6ff8977 100644
--- a/src/interfaces/permission.ts
+++ b/src/interfaces/permission.ts
@@ -184,61 +184,39 @@ class CheckAuth {
       });
   }
   public async checkOrg(token: any, keycloakId: string) {
-    try {
-      // Validate required environment variables
-      const REDIS_HOST = process.env.REDIS_HOST;
-      const REDIS_PORT = process.env.REDIS_PORT ? Number(process.env.REDIS_PORT) : 6379;
+    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
+				)
 
-      if (!REDIS_HOST) {
-        throw new Error("REDIS_HOST is not set in environment variables");
-      }
+				const data = {
+					orgRootId: x.orgRootId,
+					orgChild1Id: x.orgChild1Id,
+					orgChild2Id: x.orgChild2Id,
+					orgChild3Id: x.orgChild3Id,
+					orgChild4Id: x.orgChild4Id,
+				}
 
-      console.log(`[REDIS] Connecting to Redis at ${REDIS_HOST}:${REDIS_PORT}`);
-
-      // Create Redis client
-      const redisClient = this.redis.createClient({
-        socket: {
-          host: REDIS_HOST,
-          port: REDIS_PORT,
-        },
-      });
-
-      redisClient.on("error", (err: any) => {
-        console.error("[REDIS] Connection error:", err.message);
-      });
-
-      await redisClient.connect();
-      console.log("[REDIS] Connected successfully!");
-
-      const getAsync = promisify(redisClient.get).bind(redisClient);
-
-      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;
-    }
+				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");