Make cors config optional + move withCors to shared package (#216)

apps/policy-engine/.env.default

@@ -2,6 +2,8 @@ NODE_ENV=development
 
 PORT=3010
 
+CORS="http://localhost:4200"
+
 POLICY_ENGINE_DATABASE_URL="postgresql://postgres:postgres@localhost:5432/engine?schema=public"
 
 ENGINE_UID="local-dev-engine-instance-1"

apps/policy-engine/.env.test.default

@@ -2,8 +2,6 @@ NODE_ENV=test
 
 PORT=3010
 
-CORS="http://localhost:4200"
-
 POLICY_ENGINE_DATABASE_URL="postgresql://postgres:postgres@localhost:5432/engine-test?schema=public"
 
 ENGINE_UID="local-dev-engine-instance-1"

apps/policy-engine/src/main.ts

@@ -1,5 +1,5 @@
 import { ConfigService } from '@narval/config-module'
-import { withSwagger } from '@narval/nestjs-shared'
+import { withCors, withSwagger } from '@narval/nestjs-shared'
 import { INestApplication, Logger, ValidationPipe } from '@nestjs/common'
 import { NestFactory } from '@nestjs/core'
 import { lastValueFrom, map, of, switchMap } from 'rxjs'
@@ -35,18 +35,6 @@ const withGlobalFilters =
     return app
   }
 
-const withCors =
-  (configService: ConfigService<Config>) =>
-  (app: INestApplication): INestApplication => {
-    const origin = configService.get('cors')
-
-    if (origin.length > 0) {
-      app.enableCors({ origin })
-    }
-
-    return app
-  }
-
 const provision = async () => {
   const application = await NestFactory.createApplicationContext(ProvisionModule)
 
@@ -78,7 +66,7 @@ async function bootstrap() {
       ),
       map(withGlobalPipes),
       map(withGlobalFilters(configService)),
-      map(withCors(configService)),
+      map(withCors(configService.get('cors'))),
       switchMap((app) => app.listen(port))
     )
   )

apps/policy-engine/src/policy-engine.config.ts

@@ -9,7 +9,7 @@ export enum Env {
 const configSchema = z.object({
   env: z.nativeEnum(Env),
   port: z.coerce.number(),
-  cors: z.array(z.string()),
+  cors: z.array(z.string()).optional(),
   database: z.object({
     url: z.string().startsWith('postgresql:')
   }),

apps/vault/.env.default

@@ -1,9 +1,9 @@
 NODE_ENV=development
 
-CORS="http://localhost:4200"
-
 PORT=3011
 
+CORS="http://localhost:4200"
+
 APP_DATABASE_URL="postgresql://postgres:postgres@localhost:5432/vault?schema=public"
 
 APP_UID="local-dev-vault-instance-1"

apps/vault/src/main.config.ts

@@ -9,7 +9,7 @@ export enum Env {
 const configSchema = z.object({
   env: z.nativeEnum(Env),
   port: z.coerce.number(),
-  cors: z.array(z.string()),
+  cors: z.array(z.string()).optional(),
   database: z.object({
     url: z.string().startsWith('postgresql:')
   }),

apps/vault/src/main.ts

@@ -1,9 +1,8 @@
-import { withSwagger } from '@narval/nestjs-shared'
+import { withCors, withSwagger } from '@narval/nestjs-shared'
 import { INestApplication, Logger, ValidationPipe } from '@nestjs/common'
 import { ConfigService } from '@nestjs/config'
 import { NestFactory } from '@nestjs/core'
 import { lastValueFrom, map, of, switchMap } from 'rxjs'
-import { Config } from './main.config'
 import { MainModule } from './main.module'
 
 /**
@@ -18,18 +17,6 @@ const withGlobalPipes = (app: INestApplication): INestApplication => {
   return app
 }
 
-const withCors =
-  (configService: ConfigService<Config>) =>
-  (app: INestApplication): INestApplication => {
-    const origin = configService.get('cors')
-
-    if (origin.length > 0) {
-      app.enableCors({ origin })
-    }
-
-    return app
-  }
-
 async function bootstrap() {
   const logger = new Logger('AppBootstrap')
   const application = await NestFactory.create(MainModule, { bodyParser: true })
@@ -50,7 +37,7 @@ async function bootstrap() {
         })
       ),
       map(withGlobalPipes),
-      map(withCors(configService)),
+      map(withCors(configService.get('cors'))),
       switchMap((app) => app.listen(port))
     )
   )

packages/nestjs-shared/src/lib/util/index.ts

@@ -1 +1,2 @@
+export * from './with-cors.util'
 export * from './with-swagger.util'

packages/nestjs-shared/src/lib/util/with-cors.util.ts

@@ -0,0 +1,11 @@
+import { INestApplication } from '@nestjs/common'
+
+export const withCors =
+  (origin: string[] | undefined) =>
+  (app: INestApplication): INestApplication => {
+    if (origin && origin.length > 0) {
+      app.enableCors({ origin })
+    }
+
+    return app
+  }