From a9829ccc87be64755cbe1bf2196e1a36e5ad4463 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 13 Apr 2023 16:49:51 +0530 Subject: [PATCH] fix: add missing authguard decorator for controllers Signed-off-by: Pranav C --- .../nocodb-nest/src/modules/columns/columns.controller.ts | 4 ++-- packages/nocodb-nest/src/modules/datas/datas.controller.ts | 6 ++++-- .../nocodb-nest/src/modules/import/import.controller.ts | 5 ++++- .../src/modules/org-lcense/org-lcense.controller.ts | 6 ++++-- packages/nocodb-nest/src/modules/sync/sync.controller.ts | 6 ++++-- packages/nocodb-nest/src/run/testDocker.ts | 1 - 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/nocodb-nest/src/modules/columns/columns.controller.ts b/packages/nocodb-nest/src/modules/columns/columns.controller.ts index f2ae507f54..91c5de9918 100644 --- a/packages/nocodb-nest/src/modules/columns/columns.controller.ts +++ b/packages/nocodb-nest/src/modules/columns/columns.controller.ts @@ -11,7 +11,7 @@ import { } from '@nestjs/common' import { ColumnReqType } from 'nocodb-sdk'; import { AuthGuard } from '@nestjs/passport'; -import { GlobalGuard } from '../../guards/global/global.guard' +import { GlobalGuard } from '../../guards/global/global.guard'; import { Acl, ExtractProjectIdMiddleware, @@ -19,7 +19,7 @@ import { import { ColumnsService } from './columns.service'; @Controller() -@UseGuards(ExtractProjectIdMiddleware,GlobalGuard) +@UseGuards(ExtractProjectIdMiddleware, GlobalGuard) export class ColumnsController { constructor(private readonly columnsService: ColumnsService) {} diff --git a/packages/nocodb-nest/src/modules/datas/datas.controller.ts b/packages/nocodb-nest/src/modules/datas/datas.controller.ts index b9f97eb13f..30710626a6 100644 --- a/packages/nocodb-nest/src/modules/datas/datas.controller.ts +++ b/packages/nocodb-nest/src/modules/datas/datas.controller.ts @@ -6,12 +6,14 @@ import { Param, Patch, Post, - Request, + Request, UseGuards, } from '@nestjs/common' -import { Acl } from '../../middlewares/extract-project-id/extract-project-id.middleware'; +import { GlobalGuard } from '../../guards/global/global.guard' +import { Acl, ExtractProjectIdMiddleware } from '../../middlewares/extract-project-id/extract-project-id.middleware' import { DatasService } from './datas.service'; @Controller() +@UseGuards(ExtractProjectIdMiddleware, GlobalGuard) export class DatasController { constructor(private readonly datasService: DatasService) {} diff --git a/packages/nocodb-nest/src/modules/import/import.controller.ts b/packages/nocodb-nest/src/modules/import/import.controller.ts index a4309d80b8..6e578e5510 100644 --- a/packages/nocodb-nest/src/modules/import/import.controller.ts +++ b/packages/nocodb-nest/src/modules/import/import.controller.ts @@ -1,7 +1,9 @@ -import { Controller, HttpCode, Post, Request } from '@nestjs/common' +import { Controller, HttpCode, Post, Request, UseGuards } from '@nestjs/common' import { forwardRef, Inject } from '@nestjs/common'; import { ModuleRef } from '@nestjs/core'; +import { GlobalGuard } from '../../guards/global/global.guard' import { NcError } from '../../helpers/catchError'; +import { ExtractProjectIdMiddleware } from '../../middlewares/extract-project-id/extract-project-id.middleware' import { SyncSource } from '../../models'; import NocoJobs from '../../jobs/NocoJobs'; import { ImportService } from './import.service'; @@ -81,6 +83,7 @@ export default ( }); }; @Controller() +@UseGuards(ExtractProjectIdMiddleware, GlobalGuard) export class ImportController { constructor( private readonly importService: ImportService, diff --git a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.controller.ts b/packages/nocodb-nest/src/modules/org-lcense/org-lcense.controller.ts index 192b473f54..f3f683c405 100644 --- a/packages/nocodb-nest/src/modules/org-lcense/org-lcense.controller.ts +++ b/packages/nocodb-nest/src/modules/org-lcense/org-lcense.controller.ts @@ -1,9 +1,11 @@ -import { Controller, Get, HttpCode, Post } from '@nestjs/common' +import { Controller, Get, HttpCode, Post, UseGuards } from '@nestjs/common' import { OrgUserRoles } from 'nocodb-sdk'; -import { Acl } from '../../middlewares/extract-project-id/extract-project-id.middleware'; +import { GlobalGuard } from '../../guards/global/global.guard' +import { Acl } from '../../middlewares/extract-project-id/extract-project-id.middleware' import { OrgLcenseService } from './org-lcense.service'; @Controller() +@UseGuards(GlobalGuard) export class OrgLcenseController { constructor(private readonly orgLcenseService: OrgLcenseService) {} diff --git a/packages/nocodb-nest/src/modules/sync/sync.controller.ts b/packages/nocodb-nest/src/modules/sync/sync.controller.ts index 63fafc07ac..aaab82e720 100644 --- a/packages/nocodb-nest/src/modules/sync/sync.controller.ts +++ b/packages/nocodb-nest/src/modules/sync/sync.controller.ts @@ -6,12 +6,14 @@ import { Param, Patch, Post, - Req, + Req, UseGuards, } from '@nestjs/common' -import { Acl } from '../../middlewares/extract-project-id/extract-project-id.middleware'; +import { GlobalGuard } from '../../guards/global/global.guard' +import { Acl, ExtractProjectIdMiddleware } from '../../middlewares/extract-project-id/extract-project-id.middleware' import { SyncService } from './sync.service'; @Controller() +@UseGuards(ExtractProjectIdMiddleware, GlobalGuard) export class SyncController { constructor(private readonly syncService: SyncService) {} diff --git a/packages/nocodb-nest/src/run/testDocker.ts b/packages/nocodb-nest/src/run/testDocker.ts index 7f4bf194dd..04340aac7a 100644 --- a/packages/nocodb-nest/src/run/testDocker.ts +++ b/packages/nocodb-nest/src/run/testDocker.ts @@ -23,7 +23,6 @@ process.env[`DEBUG`] = 'xc*'; (async () => { await nocobuild(server); const httpServer = server.listen(process.env.PORT || 8080, async () => { - await new Promise((resolve) => setTimeout(resolve, 1000)); if (!(await User.getByEmail('user@nocodb.com'))) { const response = await axios.post( `http://localhost:${process.env.PORT || 8080}/api/v1/auth/user/signup`,