🎨 Improve typeorm config

Author: hirsch88

.env.example

@@ -16,9 +16,14 @@ LOG_JSON=false
 LOG_OUTPUT=dev
 
 #
-# AUTHORIZATION
-#
-AUTH_ROUTE=http://localhost:3333/tokeninfo
+# AUTHENTIFICATION
+#
+AUTH_JWT_CACHE=true
+AUTH_JWT_RATE_LIMIT=true
+AUTH_JWKS_REQUEST_PER_MINUTE=5
+AUTH_JWKS_URI=https://example.eu.auth0.com/.well-known/jwks.jso
+AUTH_ISSUER=https://example.eu.auth0.com/
+AUTH_ALGORITHMS=RS256
 
 #
 # DATABASE
@@ -33,17 +38,17 @@ TYPEORM_SYNCHRONIZE=false
 TYPEORM_LOGGING=false
 
 #
-# Additional settings (optional as defaults are in env.ts)
-#
-# TYPEORM_MIGRATIONS=
-# TYPEORM_MIGRATIONS_DIR=
-# TYPEORM_ENTITIES=
-# TYPEORM_SUBSCRIBERS=
-# CONTROLLERS=
-# MIDDLEWARES=
-# INTERCEPTORS=
-# QUERIES=
-# MUTATIONS=
+# PATH STRUCTRUE
+#
+TYPEORM_MIGRATIONS=src/database/migrations/**/*.ts
+TYPEORM_MIGRATIONS_DIR=src/database/migrations
+TYPEORM_ENTITIES=src/api/models/**/*{.js,.ts}.ts
+TYPEORM_SUBSCRIBERS=src/api/subscribers/**/*Subscriber{.js,.ts}
+CONTROLLERS=src/api/controllers/**/*Controller{.js,.ts}
+MIDDLEWARES=src/api/middlewares/**/*Middleware{.js,.ts}
+INTERCEPTORS=src/api/interceptors/**/*Interceptor{.js,.ts}
+QUERIES=src/api/queries/**/*Query{.js,.ts}
+MUTATIONS=src/api/mutations/**/*Mutation{.js,.ts}
 
 #
 # GraphQL

.env.test

@@ -16,9 +16,14 @@ LOG_JSON=false
 LOG_OUTPUT=dev
 
 #
-# AUTHORIZATION
+# AUTHENTIFICATION
 #
-AUTH_ROUTE=http://localhost:3333/tokeninfo
+AUTH_JWT_CACHE=true
+AUTH_JWT_RATE_LIMIT=true
+AUTH_JWKS_REQUEST_PER_MINUTE=5
+AUTH_JWKS_URI=https://example.eu.auth0.com/.well-known/jwks.jso
+AUTH_ISSUER=https://example.eu.auth0.com/
+AUTH_ALGORITHMS=RS256
 
 #
 # DATABASE
@@ -27,6 +32,20 @@ TYPEORM_CONNECTION=sqlite
 TYPEORM_DATABASE=./mydb.sql
 TYPEORM_LOGGING=false
 
+#
+# PATH STRUCTRUE
+#
+TYPEORM_MIGRATIONS=src/database/migrations/**/*.ts
+TYPEORM_MIGRATIONS_DIR=src/database/migrations
+TYPEORM_ENTITIES=src/api/models/**/*{.js,.ts}.ts
+TYPEORM_SUBSCRIBERS=src/api/subscribers/**/*Subscriber{.js,.ts}
+CONTROLLERS=src/api/controllers/**/*Controller{.js,.ts}
+MIDDLEWARES=src/api/middlewares/**/*Middleware{.js,.ts}
+INTERCEPTORS=src/api/interceptors/**/*Interceptor{.js,.ts}
+QUERIES=src/api/queries/**/*Query{.js,.ts}
+MUTATIONS=src/api/mutations/**/*Mutation{.js,.ts}
+
+
 #
 # GraphQL
 #

.vscode/settings.json

@@ -3,7 +3,6 @@
     "cSpell.enabled": true,
     "files.exclude": {
         "tsconfig.build.json": true,
-        "ormconfig.json": true
     },
     "importSorter.generalConfiguration.sortOnBeforeSave": true,
     "files.trimTrailingWhitespace": true,

commands/ormconfig.ts

@@ -42,7 +42,6 @@ module.exports = {
         config: {
             script: series(
                 runFast('./commands/tsconfig.ts'),
-                runFast('./commands/ormconfig.ts')
             ),
             hiddenFromHelp: true
         },

package-scripts.js

@@ -92,7 +92,7 @@
     "ts-node": "^6.0.0",
     "tslint": "^5.8.0",
     "typedi": "^0.7.2",
-    "typeorm": "^0.2.1",
+    "typeorm": "^0.2.5",
     "typeorm-typedi-extensions": "^0.2.1",
     "typescript": "2.8.3",
     "uuid": "^3.1.0",

package.json

@@ -27,39 +27,15 @@ export const env = {
         port: normalizePort(process.env.PORT || getOsEnv('APP_PORT')),
         banner: toBool(getOsEnv('APP_BANNER')),
         dirs: {
-            migrations: (
-                getOsEnvArray('TYPEORM_MIGRATIONS') ||
-                [path.relative(path.join(process.cwd()), path.join(__dirname, 'database/migrations/**/*.ts'))]
-            ) as string[],
-            migrationsDir: getOsEnv('TYPEORM_MIGRATIONS_DIR') || path.relative(path.join(process.cwd()), path.join(__dirname, 'database/migrations')),
-            entities: (
-                getOsEnvArray('TYPEORM_ENTITIES') ||
-                [path.relative(path.join(process.cwd()), path.join(__dirname, 'api/models/**/*{.js,.ts}'))]
-            ) as string[],
-            subscribers: (
-                getOsEnvArray('TYPEORM_SUBSCRIBERS') ||
-                [path.join(__dirname, 'api/subscribers/**/*Subscriber{.js,.ts}')]
-            ) as string[],
-            controllers: (
-                getOsEnvArray('CONTROLLERS') ||
-                [path.join(__dirname, 'api/controllers/**/*Controller{.js,.ts}')]
-            ) as string[],
-            middlewares: (
-                getOsEnvArray('MIDDLEWARES') ||
-                [path.join(__dirname, 'api/middlewares/**/*Middleware{.js,.ts}')]
-            ) as string[],
-            interceptors: (
-                getOsEnvArray('INTERCEPTORS') ||
-                [path.join(__dirname, 'api/interceptors/**/*Interceptor{.js,.ts}')]
-            ) as string[],
-            queries: (
-                getOsEnvArray('QUERIES') ||
-                [path.join(__dirname, 'api/queries/**/*Query{.js,.ts}')]
-            ) as string[],
-            mutations: (
-                getOsEnvArray('MUTATIONS') ||
-                [path.join(__dirname, 'api/mutations/**/*Mutation{.js,.ts}')]
-            ) as string[],
+            migrations: getOsEnvArray('TYPEORM_MIGRATIONS'),
+            migrationsDir: getOsEnv('TYPEORM_MIGRATIONS_DIR'),
+            entities: getOsEnvArray('TYPEORM_ENTITIES'),
+            subscribers: getOsEnvArray('TYPEORM_SUBSCRIBERS'),
+            controllers: getOsEnvArray('CONTROLLERS'),
+            middlewares: getOsEnvArray('MIDDLEWARES'),
+            interceptors: getOsEnvArray('INTERCEPTORS'),
+            queries: getOsEnvArray('QUERIES'),
+            mutations: getOsEnvArray('MUTATIONS'),
         },
     },
     log: {