Merge pull request #56 from cham11ng/fix-lint

Fix lint issue and fix securities

Author: cham11ng

.env.docker

@@ -11,7 +11,6 @@ DB_USER=starter
 DB_PASSWORD=secret
 
 # Log
-LOGGING_DIR=logs
 LOGGING_LEVEL=debug
 
 # Authentication

.env.example

@@ -1,5 +1,7 @@
 APP_PORT=8000
 
+CODE_SOURCE=
+
 # Database Configurations
 DB_CLIENT=pg
 DB_HOST=127.0.0.1
@@ -9,7 +11,6 @@ DB_USER=
 DB_PASSWORD=
 
 # Log
-LOGGING_DIR=logs
 LOGGING_LEVEL=debug
 
 # Authentication

.eslintignore

@@ -1,2 +1,3 @@
 node_modules
 build
+volumes

.husky/pre-commit

@@ -1,4 +1,5 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn sync-env && yarn lint-staged
+npx sync-dotenv
+yarn lint-staged

README.md

@@ -113,7 +113,7 @@ $ yarn seed # to seed
 
 Create a file or add following lines in `.vscode` > `settings.json` and switch an environment `Cmd/Ctrl + Shift + P` > `REST Client: Switch Environment`. Then, you can request APIs from `api.rest` file.
 
-```
+```json
 {
   "rest-client.environmentVariables": {
     "$shared": {

nodemon.json

@@ -4,6 +4,5 @@
     ".env"
   ],
   "ext": "ts,.env",
-  "verbose": true,
-  "exec": "ts-node src/index.ts"
+  "verbose": true
 }

package.json

@@ -15,26 +15,30 @@
     "node": ">= 16.5.0"
   },
   "scripts": {
-    "start": "nodemon",
+    "start": "concurrently 'npx tsc --watch' 'nodemon -q build/index.js'",
     "transpile": "tsc",
     "clean": "rimraf build",
     "sync-env": "sync-dotenv",
     "build": "concurrently 'yarn clean' 'yarn lint:fix' 'yarn transpile'",
     "send:mail": "ts-node scripts/mail-test",
-    "load:fake": "NODE_ENV=test ts-node scripts/fake-loader",
+    "load:fake": "ts-node scripts/fake-loader",
     "test": "NODE_ENV=test yarn migrate && NODE_ENV=test jest --forceExit --detectOpenHandles --maxWorkers=1 --verbose",
     "seed": "knex seed:run --knexfile=knexfile.ts --verbose",
     "migrate": "knex migrate:latest --knexfile=knexfile.ts --verbose",
     "rollback": "knex migrate:rollback --knexfile=knexfile.ts --verbose",
     "make:seeder": "knex seed:make --knexfile=knexfile.ts -x ts",
     "make:migration": "knex migrate:make --knexfile=knexfile.ts -x ts",
+    "prepare": "husky install",
     "lint": "eslint . --ext .ts,.json",
     "lint:fix": "eslint --fix . --ext .ts,.json",
-    "prettify": "prettier 'src/**/*.ts' --write"
+    "prettify": "prettier 'src/**/*.ts' --write",
+    "prettier:check": "prettier --list-different 'src/**/*.ts'",
+    "format:code": "concurrently 'yarn lint:fix' 'yarn prettify' 'sync-dotenv'"
   },
   "lint-staged": {
     "*.{ts,json}": [
-      "eslint --fix . --ext .ts,.json"
+      "eslint --fix",
+      "prettier --write"
     ]
   },
   "private": true,
@@ -55,7 +59,7 @@
     "date-fns": "^2.11.1",
     "dotenv": "^16.0.1",
     "express": "4.17.1",
-    "helmet": "^4.6.0",
+    "helmet": "^5.1.0",
     "http-status-codes": "^2.1.4",
     "joi": "^17.6.0",
     "jsonwebtoken": "^8.5.1",
@@ -76,7 +80,7 @@
     "@types/jest": "^28.1.3",
     "@types/jsonwebtoken": "^8.5.4",
     "@types/morgan": "^1.9.3",
-    "@types/node": "^16.4.0",
+    "@types/node": "^18.0.0",
     "@types/nodemailer": "^6.4.4",
     "@types/supertest": "^2.0.11",
     "@typescript-eslint/eslint-plugin": "^5.30.0",
@@ -87,7 +91,7 @@
     "eslint-plugin-security": "^1.4.0",
     "husky": "^8.0.1",
     "jest": "^28.1.2",
-    "lint-staged": "^11.0.1",
+    "lint-staged": "^13.0.3",
     "nodemon": "^2.0.12",
     "prettier": "^2.3.2",
     "rimraf": "^3.0.2",

scripts/fake-loader.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 
 import * as fake from '../src/utils/fake';
-import * as factories from '../src/database/factories';
+import factories, { FactoryType } from '../src/database/factories';
 
 const { info } = console;
 
@@ -15,7 +15,8 @@ function print<T>(data: T): void {
   try {
     const table = process.argv[2];
     const total = +process.argv[3] || 1;
-    const factoryCallback = (factories as any)[table].run;
+
+    const factoryCallback = factories[table as FactoryType].run;
 
     print(await fake.generate(factoryCallback, total));
 

src/config/config.ts

@@ -28,7 +28,6 @@ export default {
     refreshTokenSecretKey: process.env.REFRESH_TOKEN_SECRET_KEY || ''
   },
   logging: {
-    dir: process.env.LOGGING_DIR || 'logs',
     level: process.env.LOGGING_LEVEL || 'info',
     maxSize: process.env.LOGGING_MAX_SIZE || '20m',
     maxFiles: process.env.LOGGING_MAX_FILES || '7d',

src/database/factories/index.ts

@@ -1,3 +1,18 @@
-import * as User from './userFactory';
+import * as userFactory from './userFactory';
+import UserDetail from '../../domain/entities/UserDetail';
 
-export { User };
+interface Callback<T> {
+  run: () => Promise<T>;
+}
+
+export enum FactoryType {
+  USER = 'User'
+}
+
+export interface Factories {
+  [FactoryType.USER]: Callback<UserDetail>;
+}
+
+const factories: Factories = { [FactoryType.USER]: userFactory };
+
+export default factories;