Make cors fully configurable and fix error properties naming

Author: Bruno Castro

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   mongodb:
-    container_name: nab-mongodb
+    container_name: blog-mongodb
     image: mongo:4.2
     ports:
       - 27017:27017
@@ -13,17 +13,17 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: blog
 
   mongo-express:
-    container_name: nab-mongo-express
+    container_name: blog-mongo-express
     image: mongo-express
     depends_on:
       - mongodb
     ports:
       - 8081:8081
     environment:
-      ME_CONFIG_MONGODB_URL: mongodb://blog:blog@nab-mongodb:27017
+      ME_CONFIG_MONGODB_URL: mongodb://blog:blog@blog-mongodb:27017
 
   dev:
-    container_name: nab-dev
+    container_name: blog-dev
     build:
       context: .
       dockerfile: ./docker/Dockerfile.dev

src/_boot/server.ts

@@ -6,7 +6,7 @@ import { requestContainer } from '@/_lib/http/middlewares/requestContainer';
 import { statusHandler } from '@/_lib/http/middlewares/statusHandler';
 import { errorConverters } from '@/_sharedKernel/interface/http/ErrorConverters';
 import { asValue } from 'awilix';
-import cors from 'cors';
+import cors, { CorsOptions } from 'cors';
 import express, { Application, json, Router, urlencoded } from 'express';
 import helmet from 'helmet';
 import { createServer, Server } from 'http';
@@ -15,11 +15,7 @@ type ServerConfig = {
   http: {
     host: string;
     port: number;
-    cors?:
-      | boolean
-      | {
-          allowedOrigins: string | string[];
-        };
+    cors?: boolean | CorsOptions;
   };
 };
 
@@ -42,15 +38,7 @@ const server = makeModule(
     server.use(shutdownHandler());
 
     if (http.cors) {
-      server.use((req, res, next) => {
-        return cors({
-          allowedHeaders:
-            'accept, accept-encoding, origin, referer, sec-fetch-*, user-agent, content-type, authorization',
-          credentials: true,
-          origin: typeof http.cors === 'boolean' ? req.get('origin') : http.cors?.allowedOrigins,
-          methods: '*',
-        })(req, res, next);
-      });
+      server.use(cors(typeof http.cors !== 'boolean' ? http.cors : {}));
     }
 
     server.use(httpLogger());

src/_lib/PartializeProperties.d.ts

@@ -0,0 +1,4 @@
+type PartializeProperties<Type, Properties extends keyof Type> = Omit<Type, Properties> &
+  Partial<Pick<Type, Properties>>;
+
+export { PartializeProperties };

src/_lib/errors/BadRequestError.ts

@@ -4,9 +4,9 @@ import { makePredicate } from '@/_lib/Predicate';
 namespace BadRequestError {
   const type = Symbol();
   const name = 'BadRequestError';
-  const _message = 'Bad Request';
+  const defaultMessage = 'Bad Request';
 
-  export const create = (message: string = _message, code: string = name): Exception =>
+  export const create = (message: string = defaultMessage, code: string = name): Exception =>
     new BaseError({ type, name, code, message });
 
   export const is = makePredicate<Exception>(type);

src/_lib/errors/BaseError.ts

@@ -1,3 +1,5 @@
+import { PartializeProperties } from '@/_lib/PartializeProperties';
+
 type Exception<M = any> = Readonly<{
   name: string;
   type: symbol;
@@ -6,7 +8,7 @@ type Exception<M = any> = Readonly<{
   meta?: M;
 }>;
 
-type Props<M = any> = Omit<Exception<M>, 'name'> & { name?: string };
+type Props<M = any> = PartializeProperties<Exception<M>, 'name'>;
 
 class BaseError<M = any> extends Error implements Exception<M> {
   public readonly type: symbol;

src/_lib/errors/ForbiddenError.ts

@@ -4,9 +4,9 @@ import { makePredicate } from '@/_lib/Predicate';
 namespace ForbiddenError {
   const type = Symbol();
   const name = 'ForbiddenError';
-  const _message = 'Forbidden';
+  const defaultMessage = 'Forbidden';
 
-  export const create = (message: string = _message, code: string = name): Exception =>
+  export const create = (message: string = defaultMessage, code: string = name): Exception =>
     new BaseError({ type, name, code, message });
 
   export const is = makePredicate<Exception>(type);

src/_lib/errors/NotFoundError.ts

@@ -4,9 +4,9 @@ import { makePredicate } from '@/_lib/Predicate';
 namespace NotFoundError {
   const type = Symbol();
   const name = 'NotFoundError';
-  const _message = 'Not Found';
+  const defaultMessage = 'Not Found';
 
-  export const create = (message: string = _message, code: string = name): Exception =>
+  export const create = (message: string = defaultMessage, code: string = name): Exception =>
     new BaseError({ type, name, code, message });
 
   export const is = makePredicate<Exception>(type);

src/_lib/errors/UnauthorizedError.ts

@@ -4,9 +4,9 @@ import { makePredicate } from '@/_lib/Predicate';
 namespace UnauthorizedError {
   const type = Symbol();
   const name = 'UnauthorizedError';
-  const _message = 'Unauthorized';
+  const defaultMessage = 'Unauthorized';
 
-  export const create = (message: string = _message, code: string = name): Exception =>
+  export const create = (message: string = defaultMessage, code: string = name): Exception =>
     new BaseError({ type, name, code, message });
 
   export const is = makePredicate<Exception>(type);

src/_lib/repl/index.ts

@@ -1,6 +1,6 @@
 import REPL, { REPLEval, ReplOptions, REPLServer } from 'repl';
 import vm from 'vm';
-import { createServer, Server } from 'net';
+import { createServer, Server, Socket } from 'net';
 
 type REPLProps = {
   context: Record<string, any>;
@@ -44,7 +44,7 @@ const makeREPL = ({ context, prompt, cli, remote, logger }: REPLProps): REPLInst
     return repl;
   };
 
-  let destroySocket: (...args: any) => void = () => null;
+  let destroySocket: Socket['destroy'] = () => null;
 
   return {
     create,

src/article/application/useCases/PublishArticle.ts

@@ -19,7 +19,7 @@ const makePublishArticle =
     if (Article.isPublished(article)) {
       throw BusinessError.create(
         // eslint-disable-next-line max-len
-        `Can't republish the Article(id=${payload}) because it was already published on ${article.publishedAt.toISOString()}`
+        `Can't republish the Article(id=${payload}) because it was already published at ${article.publishedAt.toISOString()}`
       );
     }