From 323fc6e817cd6745964b923fdf7bdc2f7564ec85 Mon Sep 17 00:00:00 2001
From: Boris D <Window controlAboutboriss@alicorn.lv>
Date: Fri, 10 Oct 2025 16:47:58 +0300
Subject: [PATCH] refactor: streamline AdminGuard logic and remove commented
 code; clean up imports in BaseQueryController and QueryExecuterService

---
 src/api/guards/admin.guard.ts                | 16 +++++++---------
 src/query/base/base-query.controller.ts      |  3 +--
 src/query/executer/query.executer.service.ts |  2 --
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/api/guards/admin.guard.ts b/src/api/guards/admin.guard.ts
index 1291e01..6d419f3 100644
--- a/src/api/guards/admin.guard.ts
+++ b/src/api/guards/admin.guard.ts
@@ -15,15 +15,13 @@ export class AdminGuard implements CanActivate {
   ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest();
+    const apiToken = request.apiToken;
+
+    if (!apiToken || !apiToken.isAdmin) {
+      throw new UnauthorizedException("Admin privileges are required");
+    }
+
     return true;
-
-    // const request = context.switchToHttp().getRequest();
-    // const apiToken = request.apiToken;
-
-    // if (!apiToken || !apiToken.isAdmin) {
-    //   throw new UnauthorizedException("Admin privileges are required");
-    // }
-
-    // return true;
   }
 }
diff --git a/src/query/base/base-query.controller.ts b/src/query/base/base-query.controller.ts
index dbcfcf9..ca5adf4 100644
--- a/src/query/base/base-query.controller.ts
+++ b/src/query/base/base-query.controller.ts
@@ -5,11 +5,10 @@ import {
   Inject,
   Param,
   Post,
-  Req,
   Res,
   UseGuards,
 } from "@nestjs/common";
-import { Response, Request } from "express";
+import { Response } from "express";
 import { QueryHandlerService } from "../handler/query.handler.service";
 import { ApiTokenGuard } from "src/api/guards/api-token.guard";
 import { QueryExecuterService } from "../executer/query.executer.service";
diff --git a/src/query/executer/query.executer.service.ts b/src/query/executer/query.executer.service.ts
index 1c6b43e..60ba258 100644
--- a/src/query/executer/query.executer.service.ts
+++ b/src/query/executer/query.executer.service.ts
@@ -95,8 +95,6 @@ export class QueryExecuterService {
 
     const sessionId = cookies["x-session-id"] || null;
 
-    console.log("Session ID:", sessionId);
-
     if (!sessionId) {
       const session = await this.sessionService.create(query.project.id);
       cookies["x-session-id"] = session.sessionId;