diff --git a/src/interfaces/permission.ts b/src/interfaces/permission.ts index 407c08f..d462e4c 100644 --- a/src/interfaces/permission.ts +++ b/src/interfaces/permission.ts @@ -183,7 +183,7 @@ class CheckAuth { return false; }); } - public async checkOrg(token: any,keycloakId: string) { + public async checkOrg(token: any, keycloakId: string) { const redisClient = await this.redis.createClient({ host: process.env.REDIS_HOST, port: process.env.REDIS_PORT, @@ -193,37 +193,16 @@ class CheckAuth { if (reply != null) { reply = JSON.parse(reply); } else { - // await new CallAPI() - // .GetData( - // { - // headers: { authorization: token }, - // }, `/org/permission/checkOrg/${keycloakId}`,false) - // .then((x) => { - // console.log("[In Then]"); - // console.log("[res]",x); - // let data: any = { - // orgRootId: x.orgRootId, - // orgChild1Id: x.orgChild1Id, - // orgChild2Id: x.orgChild2Id, - // orgChild3Id: x.orgChild3Id, - // orgChild4Id: x.orgChild4Id, - // }; - // console.log("[data]",data); - // return data; - // }, - // ) - // .catch((error) => { - // console.error("Error calling API:", error); - // }); + if (!keycloakId) throw "Error calling API No KeycloakId"; try { const x = await new CallAPI().GetData( { headers: { authorization: token }, - }, - `/org/permission/checkOrg/${keycloakId}`, - false + }, + `/org/permission/checkOrg/${keycloakId}`, + false, ); - + const data = { orgRootId: x.orgRootId, orgChild1Id: x.orgChild1Id, @@ -231,7 +210,7 @@ class CheckAuth { orgChild3Id: x.orgChild3Id, orgChild4Id: x.orgChild4Id, }; - + return data; } catch (error) { console.error("Error calling API:", error);