refactor: move cors to middleware

src/app.module.ts

@@ -1,4 +1,9 @@
-import { Module } from '@nestjs/common';
+import {
+  MiddlewareConsumer,
+  Module,
+  NestModule,
+  RequestMethod,
+} from '@nestjs/common';
 
 import { ConfigModule } from '@nestjs/config';
 import { SequelizeModule } from '@nestjs/sequelize';
@@ -12,6 +17,7 @@ import { UserModule } from './modules/user/user.module';
 import { UserController } from './modules/user/user.controller';
 import { AuthService } from './modules/auth/auth.service';
 import { AuthModule } from './modules/auth/auth.module';
+import { CorsMiddleware } from './core/middleware/cors.middleware';
 
 @Module({
   imports: [
@@ -24,4 +30,14 @@ import { AuthModule } from './modules/auth/auth.module';
   controllers: [AppController, UserController],
   providers: [AppService, AuthService],
 })
-export class AppModule {}
+export class AppModule implements NestModule {
+  constructor() {}
+
+  configure(consumer: MiddlewareConsumer) {
+    const middlewares = [CorsMiddleware];
+
+    consumer
+      .apply(...middlewares)
+      .forRoutes({ path: '*', method: RequestMethod.ALL });
+  }
+}

src/core/config/cors.ts

@@ -18,11 +18,7 @@ export default async (app) => {
       if (!origin) callback(new Error(errorMessage));
 
       const originIsWhitelisted = allowedOrigins.includes(origin);
-      const originStartsOrEndsWithAllowed = allowedOrigins.some(
-        (or) => origin.endsWith(or) || origin.startsWith(or),
-      );
-
-      if (!originIsWhitelisted || !originStartsOrEndsWithAllowed) {
+      if (!originIsWhitelisted) {
         callback(new Error(errorMessage));
       }
 

src/core/middleware/cors.middleware.ts

@@ -0,0 +1,15 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+
+@Injectable()
+export class CorsMiddleware implements NestMiddleware {
+  constructor() {}
+
+  use(request: Request, response: Response, next: () => void) {
+    const req: any = request;
+
+    req.headers.origin = req.headers.origin || req.headers.host;
+    console.log('>', req.headers);
+
+    next();
+  }
+}

src/main.ts

@@ -3,19 +3,12 @@ import { AppModule } from './app.module';
 import { BadRequestException, ValidationPipe } from '@nestjs/common';
 import { initSequelizeCLS } from 'sequelize-transactional-decorator';
 import { ConfigService } from '@nestjs/config';
-import setupCors from './core/config/cors';
 
 initSequelizeCLS();
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
 
-  app.use(function (req, res, next) {
-    console.log(req.headers);
-    req.headers.origin = req.headers.origin || req.headers.host;
-    next();
-  });
-
   const configService = app.get(ConfigService);
 
   // ========================================
@@ -33,8 +26,6 @@ async function bootstrap() {
     }),
   );
 
-  setupCors(app);
-
   await app.listen(configService.get<string>('PORT'));
 }
 bootstrap();