diff --git a/packages/nocodb-nest/src/app.module.ts b/packages/nocodb-nest/src/app.module.ts index 6ee483ff45..a7419af19b 100644 --- a/packages/nocodb-nest/src/app.module.ts +++ b/packages/nocodb-nest/src/app.module.ts @@ -51,10 +51,12 @@ import type { MiddlewareConsumer, OnApplicationBootstrap, } from '@nestjs/common'; +import { GlobalModule } from './modules/global/global.module'; import NcUpgrader from './version-upgrader/NcUpgrader'; @Module({ imports: [ + GlobalModule, AuthModule, UsersModule, UtilsModule, @@ -102,12 +104,9 @@ import NcUpgrader from './version-upgrader/NcUpgrader'; provide: APP_FILTER, useClass: GlobalExceptionFilter, }, - Connection, - MetaService, JwtStrategy, ExtractProjectIdMiddleware, ], - exports: [Connection, MetaService], }) export class AppModule implements OnApplicationBootstrap { constructor( diff --git a/packages/nocodb-nest/src/connection/connection.ts b/packages/nocodb-nest/src/connection/connection.ts index a37f3c702e..136075aad7 100644 --- a/packages/nocodb-nest/src/connection/connection.ts +++ b/packages/nocodb-nest/src/connection/connection.ts @@ -1,11 +1,12 @@ -import { Global, Injectable, OnModuleInit } from '@nestjs/common'; +import { Global, Injectable, Scope } from '@nestjs/common' +import type * as knex from 'knex' -import { XKnex } from '../db/CustomKnex'; -import NcConfigFactory from '../utils/NcConfigFactory'; -import type * as knex from 'knex'; +import { XKnex } from '../db/CustomKnex' +import NcConfigFactory from '../utils/NcConfigFactory' -@Global() -@Injectable() +@Injectable({ + scope: Scope.DEFAULT +}) export class Connection { private knex: knex.Knex; private _config: any; diff --git a/packages/nocodb-nest/src/filters/global-exception/global-exception.filter.ts b/packages/nocodb-nest/src/filters/global-exception/global-exception.filter.ts index 214af2b8ca..998e067ea4 100644 --- a/packages/nocodb-nest/src/filters/global-exception/global-exception.filter.ts +++ b/packages/nocodb-nest/src/filters/global-exception/global-exception.filter.ts @@ -15,6 +15,8 @@ import type { Response } from 'express'; @Catch() export class GlobalExceptionFilter implements ExceptionFilter { catch(exception: any, host: ArgumentsHost) { + console.log(exception) + const ctx = host.switchToHttp(); const response = ctx.getResponse(); diff --git a/packages/nocodb-nest/src/init.ts b/packages/nocodb-nest/src/init.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nocodb-nest/src/meta/meta.service.ts b/packages/nocodb-nest/src/meta/meta.service.ts index 0ad046a532..f9c32fd5c9 100644 --- a/packages/nocodb-nest/src/meta/meta.service.ts +++ b/packages/nocodb-nest/src/meta/meta.service.ts @@ -184,7 +184,6 @@ export enum CacheDelDirection { const nanoidv2 = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz', 14); -@Global() @Injectable() export class MetaService { constructor(private metaConnection: Connection) {} diff --git a/packages/nocodb-nest/src/modules/auth/auth.controller.ts b/packages/nocodb-nest/src/modules/auth/auth.controller.ts index 8c75bb2254..cef65502e1 100644 --- a/packages/nocodb-nest/src/modules/auth/auth.controller.ts +++ b/packages/nocodb-nest/src/modules/auth/auth.controller.ts @@ -29,7 +29,7 @@ export class AuthController { @Post('/api/v1/auth/user/signup') async signup(@Body() createUserDto: CreateUserDto) { - const user = await this.authService.signup(createUserDto); + return await this.authService.signup(createUserDto); } @UseGuards(ExtractProjectIdMiddleware, AuthGuard('jwt')) diff --git a/packages/nocodb-nest/src/modules/projects/projects.service.ts b/packages/nocodb-nest/src/modules/projects/projects.service.ts index ab8ff3e0e1..f16fc5a208 100644 --- a/packages/nocodb-nest/src/modules/projects/projects.service.ts +++ b/packages/nocodb-nest/src/modules/projects/projects.service.ts @@ -4,7 +4,6 @@ import * as DOMPurify from 'isomorphic-dompurify'; import { customAlphabet } from 'nanoid'; import { T } from 'nc-help'; import { OrgUserRoles } from '../../../../nocodb-sdk'; -import { projectList } from '../../../../nocodb/src/lib/services/project.svc'; import { populateMeta, validatePayload } from '../../helpers'; import { NcError } from '../../helpers/catchError'; import { extractPropsAndSanitize } from '../../helpers/extractProps'; diff --git a/packages/nocodb-nest/src/modules/users/users.module.ts b/packages/nocodb-nest/src/modules/users/users.module.ts index 1c0314266d..a303f12f12 100644 --- a/packages/nocodb-nest/src/modules/users/users.module.ts +++ b/packages/nocodb-nest/src/modules/users/users.module.ts @@ -1,13 +1,13 @@ import { Module } from '@nestjs/common'; import { JwtService } from '@nestjs/jwt'; -import { Connection } from '../../connection/connection'; -import { MetaService } from '../../meta/meta.service'; +import { GlobalModule } from '../global/global.module'; import { UsersService } from './users.service'; import { UsersController } from './users.controller'; @Module({ + imports: [GlobalModule], controllers: [UsersController], - providers: [UsersService, MetaService, Connection, JwtService], - exports: [UsersService, Connection, MetaService], + providers: [UsersService, JwtService], + exports: [UsersService], }) export class UsersModule {} diff --git a/packages/nocodb-nest/src/run/testDocker.ts b/packages/nocodb-nest/src/run/testDocker.ts index 9625c65fd2..c532bf04dd 100644 --- a/packages/nocodb-nest/src/run/testDocker.ts +++ b/packages/nocodb-nest/src/run/testDocker.ts @@ -24,6 +24,7 @@ process.env[`DEBUG`] = 'xc*'; const httpServer = server.listen(process.env.PORT || 8080, async () => { await nocobuild(server); + if (!(await User.getByEmail('user@nocodb.com'))) { const response = await axios.post( `http://localhost:${process.env.PORT || 8080}/api/v1/auth/user/signup`, diff --git a/packages/nocodb-nest/src/version-upgrader/v1-legacy/gql/GqlApiBuilder.ts b/packages/nocodb-nest/src/version-upgrader/v1-legacy/gql/GqlApiBuilder.ts index 4cab838253..064d399f83 100644 --- a/packages/nocodb-nest/src/version-upgrader/v1-legacy/gql/GqlApiBuilder.ts +++ b/packages/nocodb-nest/src/version-upgrader/v1-legacy/gql/GqlApiBuilder.ts @@ -1,6 +1,6 @@ import debug from 'debug'; import { Router } from 'express'; -import GqlXcSchemaFactory from '../../../../../nocodb/src/lib/db/sql-mgr/code/gql-schema/xc-ts/GqlXcSchemaFactory'; +import GqlXcSchemaFactory from '../../../db/sql-mgr/code/gql-schema/xc-ts/GqlXcSchemaFactory' import { MetaService } from '../../../meta/meta.service'; import Noco from '../../../Noco'; import type NcProjectBuilder from '../NcProjectBuilder';