Merge pull request #96 from w3tecch/feature/auth_and_typeorm_config

Feature/auth and typeorm config

Author: Gery Hirschfeld

.env.example

@@ -15,11 +15,6 @@ LOG_LEVEL=debug
 LOG_JSON=false
 LOG_OUTPUT=dev
 
-#
-# AUTHORIZATION
-#
-AUTH_ROUTE=http://localhost:3333/tokeninfo
-
 #
 # DATABASE
 #
@@ -30,20 +25,22 @@ TYPEORM_USERNAME=root
 TYPEORM_PASSWORD=
 TYPEORM_DATABASE=my_database
 TYPEORM_SYNCHRONIZE=false
-TYPEORM_LOGGING=false
+TYPEORM_LOGGING=error
+TYPEORM_LOGGER=advanced-console
 
 #
-# 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/**/*.ts
+TYPEORM_ENTITIES_DIR=src/api/models
+CONTROLLERS=src/api/controllers/**/*Controller.ts
+MIDDLEWARES=src/api/middlewares/**/*Middleware.ts
+INTERCEPTORS=src/api/interceptors/**/*Interceptor.ts
+SUBSCRIBERS=src/api/subscribers/**/*Subscriber.ts
+QUERIES=src/api/queries/**/*Query.ts
+MUTATIONS=src/api/mutations/**/*Mutation.ts
 
 #
 # GraphQL

.env.test

@@ -15,17 +15,27 @@ LOG_LEVEL=none
 LOG_JSON=false
 LOG_OUTPUT=dev
 
-#
-# AUTHORIZATION
-#
-AUTH_ROUTE=http://localhost:3333/tokeninfo
-
 #
 # DATABASE
 #
 TYPEORM_CONNECTION=sqlite
 TYPEORM_DATABASE=./mydb.sql
-TYPEORM_LOGGING=false
+TYPEORM_LOGGING=error
+TYPEORM_LOGGER=advanced-console
+
+#
+# PATH STRUCTRUE
+#
+TYPEORM_MIGRATIONS=src/database/migrations/**/*.ts
+TYPEORM_MIGRATIONS_DIR=src/database/migrations
+TYPEORM_ENTITIES=src/api/models/**/*.ts
+TYPEORM_ENTITIES_DIR=src/api/models
+CONTROLLERS=src/api/controllers/**/*Controller.ts
+MIDDLEWARES=src/api/middlewares/**/*Middleware.ts
+INTERCEPTORS=src/api/interceptors/**/*Interceptor.ts
+SUBSCRIBERS=src/api/subscribers/**/*Subscriber.ts
+QUERIES=src/api/queries/**/*Query.ts
+MUTATIONS=src/api/mutations/**/*Mutation.ts
 
 #
 # GraphQL

.gitignore

@@ -20,7 +20,6 @@ typings/
 
 # Dist #
 dist/
-ormconfig.json
 tsconfig.build.json
 
 # IDE #

.vscode/launch.json

@@ -15,7 +15,7 @@
             ],
             "protocol": "inspector",
             "env": {
-                "NODE_ENV": "development"
+                "NODE_ENV": "production"
             }
         }
     ]

.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,

README.md

@@ -228,7 +228,6 @@ The swagger and the monitor route can be altered in the `.env` file.
 | **test/unit/** *.test.ts          | Unit tests |
 | .env.example                      | Environment configurations |
 | .env.test                         | Test environment configurations |
-| ormconfig.json                    | TypeORM configuration for the database. Used by seeds and the migration. (generated file) |
 | mydb.sql                          | SQLite database for integration tests. Ignored by git and only available after integration tests |
 
 ![divider](./w3tec-divider.png)
@@ -390,7 +389,6 @@ npm start db.seed
 | `npm start "db.seed -L"`                            | Log database queries to the terminal |
 | `npm start "db.seed --factories <path>"`            | Add a different path to your factories (Default: `src/database/`) |
 | `npm start "db.seed --seeds <path>"`                | Add a different path to your seeds (Default: `src/database/seeds/`) |
-| `npm start "db.seed --config <file>"`               | Path to your ormconfig.json file |
 
 ![divider](./w3tec-divider.png)
 

commands/ormconfig.ts

@@ -11,7 +11,7 @@ module.exports = {
          * Starts the builded app from the dist directory
          */
         start: {
-            script: 'node dist/app.js',
+            script: 'cross-env NODE_ENV=production node dist/app.js',
             description: 'Starts the builded app from the dist directory'
         },
         /**
@@ -30,9 +30,7 @@ module.exports = {
         setup: {
             script: series(
                 'yarn install',
-                'nps db.drop',
-                'nps db.migrate',
-                'nps db.seed'
+                'nps db.setup',
             ),
             description: 'Setup`s the development environment(yarn & database)'
         },
@@ -42,7 +40,6 @@ module.exports = {
         config: {
             script: series(
                 runFast('./commands/tsconfig.ts'),
-                runFast('./commands/ormconfig.ts')
             ),
             hiddenFromHelp: true
         },
@@ -147,8 +144,15 @@ module.exports = {
             drop: {
                 script: runFast('./node_modules/typeorm/cli.js schema:drop'),
                 description: 'Drops the schema of the database'
+            },
+            setup: {
+                script: series(
+                    'nps db.drop',
+                    'nps db.migrate',
+                    'nps db.seed'
+                ),
+                description: 'Recreates the database with seeded data'
             }
-
         },
         /**
          * These run various kinds of tests. Default is unit.

package-scripts.js

@@ -38,6 +38,7 @@
     }
   ],
   "dependencies": {
+    "@types/bcrypt": "^2.0.0",
     "@types/bluebird": "^3.5.18",
     "@types/body-parser": "^1.16.7",
     "@types/chalk": "^2.2.0",
@@ -55,6 +56,7 @@
     "@types/supertest": "^2.0.4",
     "@types/uuid": "^3.4.3",
     "@types/winston": "^2.3.7",
+    "bcrypt": "^2.0.1",
     "body-parser": "^1.18.2",
     "chalk": "^2.3.0",
     "class-validator": "^0.8.5",
@@ -92,7 +94,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

@@ -21,22 +21,22 @@ export class PetController {
 
     @Get('/:id')
     @OnUndefined(PetNotFoundError)
-    public one( @Param('id') id: string): Promise<Pet | undefined> {
+    public one(@Param('id') id: string): Promise<Pet | undefined> {
         return this.petService.findOne(id);
     }
 
     @Post()
-    public create( @Body() pet: Pet): Promise<Pet> {
+    public create(@Body() pet: Pet): Promise<Pet> {
         return this.petService.create(pet);
     }
 
     @Put('/:id')
-    public update( @Param('id') id: string, @Body() pet: Pet): Promise<Pet> {
+    public update(@Param('id') id: string, @Body() pet: Pet): Promise<Pet> {
         return this.petService.update(id, pet);
     }
 
     @Delete('/:id')
-    public delete( @Param('id') id: string): Promise<void> {
+    public delete(@Param('id') id: string): Promise<void> {
         return this.petService.delete(id);
     }