From 0a64fb8408333b5f609d22908d606fd012d7992a Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 28 Feb 2024 13:42:03 +0000
Subject: [PATCH] fix: avoid reimporting global module

---
 packages/nocodb/src/modules/auth/auth.module.ts   | 7 +------
 packages/nocodb/src/modules/jobs/jobs.module.ts   | 4 +---
 packages/nocodb/src/modules/metas/metas.module.ts | 4 +---
 packages/nocodb/src/modules/users/users.module.ts | 7 +------
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/packages/nocodb/src/modules/auth/auth.module.ts b/packages/nocodb/src/modules/auth/auth.module.ts
index 878c22abaf..df6d07283a 100644
--- a/packages/nocodb/src/modules/auth/auth.module.ts
+++ b/packages/nocodb/src/modules/auth/auth.module.ts
@@ -1,17 +1,12 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { PassportModule } from '@nestjs/passport';
 import { GoogleStrategyProvider } from '~/strategies/google.strategy/google.strategy';
-import { GlobalModule } from '~/modules/global/global.module';
 import { UsersService } from '~/services/users/users.service';
 import { AuthController } from '~/controllers/auth/auth.controller';
 import { MetasModule } from '~/modules/metas/metas.module';
 
 @Module({
-  imports: [
-    forwardRef(() => GlobalModule),
-    PassportModule,
-    forwardRef(() => MetasModule),
-  ],
+  imports: [PassportModule, forwardRef(() => MetasModule)],
   controllers: [
     ...(process.env.NC_WORKER_CONTAINER !== 'true' ? [AuthController] : []),
   ],
diff --git a/packages/nocodb/src/modules/jobs/jobs.module.ts b/packages/nocodb/src/modules/jobs/jobs.module.ts
index 87a61d7b42..736d0c7ddd 100644
--- a/packages/nocodb/src/modules/jobs/jobs.module.ts
+++ b/packages/nocodb/src/modules/jobs/jobs.module.ts
@@ -1,4 +1,4 @@
-import { forwardRef, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { BullModule } from '@nestjs/bull';
 
 // Jobs
@@ -30,11 +30,9 @@ import { JobsEventService as FallbackJobsEventService } from '~/modules/jobs/fal
 import { JOBS_QUEUE } from '~/interface/Jobs';
 import { MetasModule } from '~/modules/metas/metas.module';
 import { DatasModule } from '~/modules/datas/datas.module';
-import { GlobalModule } from '~/modules/global/global.module';
 
 export const JobsModuleMetadata = {
   imports: [
-    forwardRef(() => GlobalModule),
     DatasModule,
     MetasModule,
     ...(process.env.NC_REDIS_JOB_URL
diff --git a/packages/nocodb/src/modules/metas/metas.module.ts b/packages/nocodb/src/modules/metas/metas.module.ts
index fc316292bd..e7ed58663b 100644
--- a/packages/nocodb/src/modules/metas/metas.module.ts
+++ b/packages/nocodb/src/modules/metas/metas.module.ts
@@ -1,7 +1,6 @@
-import { forwardRef, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { MulterModule } from '@nestjs/platform-express';
 import multer from 'multer';
-import { GlobalModule } from '~/modules/global/global.module';
 import { NC_ATTACHMENT_FIELD_SIZE } from '~/constants';
 import { ApiDocsController } from '~/controllers/api-docs/api-docs.controller';
 import { ApiTokensController } from '~/controllers/api-tokens.controller';
@@ -86,7 +85,6 @@ export const metaModuleMetadata = {
         fieldSize: NC_ATTACHMENT_FIELD_SIZE,
       },
     }),
-    forwardRef(() => GlobalModule),
   ],
   controllers: [
     ...(process.env.NC_WORKER_CONTAINER !== 'true'
diff --git a/packages/nocodb/src/modules/users/users.module.ts b/packages/nocodb/src/modules/users/users.module.ts
index 8fc5677adb..1ee14b3f2d 100644
--- a/packages/nocodb/src/modules/users/users.module.ts
+++ b/packages/nocodb/src/modules/users/users.module.ts
@@ -1,16 +1,11 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { PassportModule } from '@nestjs/passport';
-import { GlobalModule } from '~/modules/global/global.module';
 import { UsersService } from '~/services/users/users.service';
 import { UsersController } from '~/controllers/users/users.controller';
 import { MetasModule } from '~/modules/metas/metas.module';
 
 @Module({
-  imports: [
-    forwardRef(() => GlobalModule),
-    PassportModule,
-    forwardRef(() => MetasModule),
-  ],
+  imports: [PassportModule, forwardRef(() => MetasModule)],
   controllers: [
     ...(process.env.NC_WORKER_CONTAINER !== 'true' ? [UsersController] : []),
   ],