Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 17:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

update

Browse source
This commit is contained in:
platform-ops123 2025-04-24 20:35:52 +05:30
parent c1f7de98eb
commit bf4b552c3e
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/src/modules/data-queries/controller.ts
View file

@ -20,6 +20,7 @@ import { AppAbility } from '@modules/casl/casl-ability.factory';
import { AppDecorator } from '@modules/app/decorators/app.decorator';
import { DataQuery } from '@entities/data_query.entity';
import { IDataQueriesController } from './interfaces/IController';
import { QueryAuthGuard } from './guards/query-auth.guard';
@Controller('data-queries')
@InitModule(MODULES.DATA_QUERY)
export class DataQueriesController implements IDataQueriesController {
@ -125,13 +126,7 @@ export class DataQueriesController implements IDataQueriesController {
}
@InitFeature(FEATURE_KEY.RUN_VIEWER)
@UseGuards(
JwtAuthGuard,
ValidateQueryAppGuard,
AppFeatureAbilityGuard,
ValidateQuerySourceGuard,
DataSourceFeatureAbilityGuard
)
@UseGuards(QueryAuthGuard)
@Post(':id/run')
async runQuery(
@User() user: UserEntity,

8
server/src/modules/data-queries/guards/validate-query-app.guard.ts
View file

@ -20,7 +20,7 @@ export class ValidateQueryAppGuard implements CanActivate {
const appId = request.body?.app_id;
const user: User = request.user;
if (!versionId) {
if (!id && !versionId && !appId) {
throw new BadRequestException();
}
@ -30,13 +30,13 @@ export class ValidateQueryAppGuard implements CanActivate {
}
let app;
if (id) {
app = await this.appsRepository.findByDataQuery(id, user.organizationId, versionId);
app = await this.appsRepository.findByDataQuery(id, user?.organizationId, versionId);
}
if (appId) {
app = await this.appsRepository.findById(appId, user.organizationId, versionId);
app = await this.appsRepository.findById(appId, user?.organizationId, versionId);
}
if (versionId) {
app = await this.versionRepository.findAppFromVersion(versionId, user.organizationId);
app = await this.versionRepository.findAppFromVersion(versionId, user?.organizationId);
}
// If app is not found, throw NotFoundException