refactor: streamline AdminGuard logic and remove commented code; clean up imports in BaseQueryController and QueryExecuterService
This commit is contained in:
@ -15,15 +15,13 @@ export class AdminGuard implements CanActivate {
|
|||||||
) {}
|
) {}
|
||||||
|
|
||||||
async canActivate(context: ExecutionContext): Promise<boolean> {
|
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;
|
return true;
|
||||||
|
|
||||||
// const request = context.switchToHttp().getRequest();
|
|
||||||
// const apiToken = request.apiToken;
|
|
||||||
|
|
||||||
// if (!apiToken || !apiToken.isAdmin) {
|
|
||||||
// throw new UnauthorizedException("Admin privileges are required");
|
|
||||||
// }
|
|
||||||
|
|
||||||
// return true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,11 +5,10 @@ import {
|
|||||||
Inject,
|
Inject,
|
||||||
Param,
|
Param,
|
||||||
Post,
|
Post,
|
||||||
Req,
|
|
||||||
Res,
|
Res,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
import { Response, Request } from "express";
|
import { Response } from "express";
|
||||||
import { QueryHandlerService } from "../handler/query.handler.service";
|
import { QueryHandlerService } from "../handler/query.handler.service";
|
||||||
import { ApiTokenGuard } from "src/api/guards/api-token.guard";
|
import { ApiTokenGuard } from "src/api/guards/api-token.guard";
|
||||||
import { QueryExecuterService } from "../executer/query.executer.service";
|
import { QueryExecuterService } from "../executer/query.executer.service";
|
||||||
|
|||||||
@ -95,8 +95,6 @@ export class QueryExecuterService {
|
|||||||
|
|
||||||
const sessionId = cookies["x-session-id"] || null;
|
const sessionId = cookies["x-session-id"] || null;
|
||||||
|
|
||||||
console.log("Session ID:", sessionId);
|
|
||||||
|
|
||||||
if (!sessionId) {
|
if (!sessionId) {
|
||||||
const session = await this.sessionService.create(query.project.id);
|
const session = await this.sessionService.create(query.project.id);
|
||||||
cookies["x-session-id"] = session.sessionId;
|
cookies["x-session-id"] = session.sessionId;
|
||||||
|
|||||||
Reference in New Issue
Block a user