diff --git a/lib/knex/knexfile.ts b/lib/knex/knexfile.ts index 0fcc850..f56bba2 100644 --- a/lib/knex/knexfile.ts +++ b/lib/knex/knexfile.ts @@ -1,6 +1,6 @@ import { DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_DATABASE } from './src/config'; -export const dbConfig = { +const dbConfig = { client: 'mysql', connection: { charset: 'utf8', @@ -21,3 +21,5 @@ export const dbConfig = { // stub: 'src/database/stubs', }, }; + +export default dbConfig diff --git a/lib/knex/src/database/migrations/20210713110926_initial.ts b/lib/knex/src/database/migrations/20210713110926_initial.ts index 708027b..8f96748 100644 --- a/lib/knex/src/database/migrations/20210713110926_initial.ts +++ b/lib/knex/src/database/migrations/20210713110926_initial.ts @@ -1,6 +1,6 @@ import { Knex } from 'knex'; -const up = (knex: Knex): Promise => { +export const up = (knex: Knex): Promise => { return knex.schema.createTable('users', table => { table.bigIncrements('id').unsigned().primary(); table.string('email', 45).notNullable(); @@ -10,8 +10,6 @@ const up = (knex: Knex): Promise => { }); }; -const down = (knex: Knex): Promise => { +export const down = (knex: Knex): Promise => { return knex.schema.dropTable('users'); }; - -export default { up, down }; diff --git a/lib/mikro-orm/src/routes/auth.route.ts b/lib/mikro-orm/src/routes/auth.route.ts index 118af5e..a32969f 100644 --- a/lib/mikro-orm/src/routes/auth.route.ts +++ b/lib/mikro-orm/src/routes/auth.route.ts @@ -15,8 +15,8 @@ export class AuthRoute implements Routes { } private initializeRoutes() { - this.router.post(`${this.path}signup`, ValidationMiddleware(CreateUserDto, 'body'), this.auth.signUp); - this.router.post(`${this.path}login`, ValidationMiddleware(CreateUserDto, 'body'), this.auth.logIn); + this.router.post(`${this.path}signup`, ValidationMiddleware(CreateUserDto), this.auth.signUp); + this.router.post(`${this.path}login`, ValidationMiddleware(CreateUserDto), this.auth.logIn); this.router.post(`${this.path}logout`, AuthMiddleware, this.auth.logOut); } } diff --git a/lib/mikro-orm/src/routes/users.route.ts b/lib/mikro-orm/src/routes/users.route.ts index c56a39b..957f192 100644 --- a/lib/mikro-orm/src/routes/users.route.ts +++ b/lib/mikro-orm/src/routes/users.route.ts @@ -16,8 +16,8 @@ export class UserRoute implements Routes { private initializeRoutes() { this.router.get(`${this.path}`, this.user.getUsers); this.router.get(`${this.path}/:id`, this.user.getUserById); - this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto, 'body'), this.user.createUser); - this.router.put(`${this.path}/:id`, ValidationMiddleware(CreateUserDto, 'body', true), this.user.updateUser); + this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto), this.user.createUser); + this.router.put(`${this.path}/:id`, ValidationMiddleware(CreateUserDto, true), this.user.updateUser); this.router.delete(`${this.path}/:id`, this.user.deleteUser); } } diff --git a/lib/mongoose/src/routes/auth.route.ts b/lib/mongoose/src/routes/auth.route.ts index 118af5e..a32969f 100644 --- a/lib/mongoose/src/routes/auth.route.ts +++ b/lib/mongoose/src/routes/auth.route.ts @@ -15,8 +15,8 @@ export class AuthRoute implements Routes { } private initializeRoutes() { - this.router.post(`${this.path}signup`, ValidationMiddleware(CreateUserDto, 'body'), this.auth.signUp); - this.router.post(`${this.path}login`, ValidationMiddleware(CreateUserDto, 'body'), this.auth.logIn); + this.router.post(`${this.path}signup`, ValidationMiddleware(CreateUserDto), this.auth.signUp); + this.router.post(`${this.path}login`, ValidationMiddleware(CreateUserDto), this.auth.logIn); this.router.post(`${this.path}logout`, AuthMiddleware, this.auth.logOut); } } diff --git a/lib/mongoose/src/routes/users.route.ts b/lib/mongoose/src/routes/users.route.ts index c56a39b..957f192 100644 --- a/lib/mongoose/src/routes/users.route.ts +++ b/lib/mongoose/src/routes/users.route.ts @@ -16,8 +16,8 @@ export class UserRoute implements Routes { private initializeRoutes() { this.router.get(`${this.path}`, this.user.getUsers); this.router.get(`${this.path}/:id`, this.user.getUserById); - this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto, 'body'), this.user.createUser); - this.router.put(`${this.path}/:id`, ValidationMiddleware(CreateUserDto, 'body', true), this.user.updateUser); + this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto), this.user.createUser); + this.router.put(`${this.path}/:id`, ValidationMiddleware(CreateUserDto, true), this.user.updateUser); this.router.delete(`${this.path}/:id`, this.user.deleteUser); } } diff --git a/lib/prisma/src/routes/auth.route.ts b/lib/prisma/src/routes/auth.route.ts index 118af5e..a32969f 100644 --- a/lib/prisma/src/routes/auth.route.ts +++ b/lib/prisma/src/routes/auth.route.ts @@ -15,8 +15,8 @@ export class AuthRoute implements Routes { } private initializeRoutes() { - this.router.post(`${this.path}signup`, ValidationMiddleware(CreateUserDto, 'body'), this.auth.signUp); - this.router.post(`${this.path}login`, ValidationMiddleware(CreateUserDto, 'body'), this.auth.logIn); + this.router.post(`${this.path}signup`, ValidationMiddleware(CreateUserDto), this.auth.signUp); + this.router.post(`${this.path}login`, ValidationMiddleware(CreateUserDto), this.auth.logIn); this.router.post(`${this.path}logout`, AuthMiddleware, this.auth.logOut); } } diff --git a/lib/prisma/src/routes/users.route.ts b/lib/prisma/src/routes/users.route.ts index 8f097f5..b750b9f 100644 --- a/lib/prisma/src/routes/users.route.ts +++ b/lib/prisma/src/routes/users.route.ts @@ -16,8 +16,8 @@ export class UserRoute implements Routes { private initializeRoutes() { this.router.get(`${this.path}`, this.user.getUsers); this.router.get(`${this.path}/:id(\\d+)`, this.user.getUserById); - this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto, 'body'), this.user.createUser); - this.router.put(`${this.path}/:id(\\d+)`, ValidationMiddleware(CreateUserDto, 'body', true), this.user.updateUser); + this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto), this.user.createUser); + this.router.put(`${this.path}/:id(\\d+)`, ValidationMiddleware(CreateUserDto, true), this.user.updateUser); this.router.delete(`${this.path}/:id(\\d+)`, this.user.deleteUser); } } diff --git a/lib/routing-controllers/package.json b/lib/routing-controllers/package.json index cbdb85d..b066800 100644 --- a/lib/routing-controllers/package.json +++ b/lib/routing-controllers/package.json @@ -10,7 +10,7 @@ "build": "swc src -d dist --source-maps --copy-files", "build:tsc": "tsc && tsc-alias", "test": "jest --forceExit --detectOpenHandles", - "lint": "eslint --ignore-path .gitignore --ext .ts src/", + "lint": "eslint --ignore-path .gitignore --ext .ts src", "lint:fix": "npm run lint -- --fix", "deploy:prod": "npm run build && pm2 start ecosystem.config.js --only prod", "deploy:dev": "pm2 start ecosystem.config.js --only dev" diff --git a/lib/routing-controllers/src/controllers/auth.controller.ts b/lib/routing-controllers/src/controllers/auth.controller.ts index bd4133e..7bac911 100644 --- a/lib/routing-controllers/src/controllers/auth.controller.ts +++ b/lib/routing-controllers/src/controllers/auth.controller.ts @@ -13,7 +13,7 @@ export class AuthController { public auth = Container.get(AuthService); @Post('/signup') - @UseBefore(ValidationMiddleware(CreateUserDto, 'body')) + @UseBefore(ValidationMiddleware(CreateUserDto)) @HttpCode(201) async signUp(@Body() userData: User) { const signUpUserData: User = await this.auth.signup(userData); @@ -21,7 +21,7 @@ export class AuthController { } @Post('/login') - @UseBefore(ValidationMiddleware(CreateUserDto, 'body')) + @UseBefore(ValidationMiddleware(CreateUserDto)) async logIn(@Res() res: Response, @Body() userData: User) { const { cookie, findUser } = await this.auth.login(userData); diff --git a/lib/routing-controllers/src/controllers/users.controller.ts b/lib/routing-controllers/src/controllers/users.controller.ts index 4a9ce7a..8a7084f 100644 --- a/lib/routing-controllers/src/controllers/users.controller.ts +++ b/lib/routing-controllers/src/controllers/users.controller.ts @@ -27,7 +27,7 @@ export class UserController { @Post('/users') @HttpCode(201) - @UseBefore(ValidationMiddleware(CreateUserDto, 'body')) + @UseBefore(ValidationMiddleware(CreateUserDto)) @OpenAPI({ summary: 'Create a new user' }) async createUser(@Body() userData: User) { const createUserData: User = await this.user.createUser(userData); @@ -35,7 +35,7 @@ export class UserController { } @Put('/users/:id') - @UseBefore(ValidationMiddleware(CreateUserDto, 'body', true)) + @UseBefore(ValidationMiddleware(CreateUserDto, true)) @OpenAPI({ summary: 'Update a user' }) async updateUser(@Param('id') userId: number, @Body() userData: User) { const updateUserData: User[] = await this.user.updateUser(userId, userData); diff --git a/lib/sequelize/src/routes/auth.route.ts b/lib/sequelize/src/routes/auth.route.ts index 1025094..1a18f73 100644 --- a/lib/sequelize/src/routes/auth.route.ts +++ b/lib/sequelize/src/routes/auth.route.ts @@ -14,8 +14,8 @@ export class AuthRoute implements Routes { } private initializeRoutes() { - this.router.post('/signup', ValidationMiddleware(CreateUserDto, 'body'), this.auth.signUp); - this.router.post('/login', ValidationMiddleware(CreateUserDto, 'body'), this.auth.logIn); + this.router.post('/signup', ValidationMiddleware(CreateUserDto), this.auth.signUp); + this.router.post('/login', ValidationMiddleware(CreateUserDto), this.auth.logIn); this.router.post('/logout', AuthMiddleware, this.auth.logOut); } } diff --git a/lib/sequelize/src/routes/users.route.ts b/lib/sequelize/src/routes/users.route.ts index 8f097f5..b750b9f 100644 --- a/lib/sequelize/src/routes/users.route.ts +++ b/lib/sequelize/src/routes/users.route.ts @@ -16,8 +16,8 @@ export class UserRoute implements Routes { private initializeRoutes() { this.router.get(`${this.path}`, this.user.getUsers); this.router.get(`${this.path}/:id(\\d+)`, this.user.getUserById); - this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto, 'body'), this.user.createUser); - this.router.put(`${this.path}/:id(\\d+)`, ValidationMiddleware(CreateUserDto, 'body', true), this.user.updateUser); + this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto), this.user.createUser); + this.router.put(`${this.path}/:id(\\d+)`, ValidationMiddleware(CreateUserDto, true), this.user.updateUser); this.router.delete(`${this.path}/:id(\\d+)`, this.user.deleteUser); } } diff --git a/lib/typegoose/src/routes/auth.route.ts b/lib/typegoose/src/routes/auth.route.ts index 1025094..1a18f73 100644 --- a/lib/typegoose/src/routes/auth.route.ts +++ b/lib/typegoose/src/routes/auth.route.ts @@ -14,8 +14,8 @@ export class AuthRoute implements Routes { } private initializeRoutes() { - this.router.post('/signup', ValidationMiddleware(CreateUserDto, 'body'), this.auth.signUp); - this.router.post('/login', ValidationMiddleware(CreateUserDto, 'body'), this.auth.logIn); + this.router.post('/signup', ValidationMiddleware(CreateUserDto), this.auth.signUp); + this.router.post('/login', ValidationMiddleware(CreateUserDto), this.auth.logIn); this.router.post('/logout', AuthMiddleware, this.auth.logOut); } } diff --git a/lib/typegoose/src/routes/users.route.ts b/lib/typegoose/src/routes/users.route.ts index c56a39b..957f192 100644 --- a/lib/typegoose/src/routes/users.route.ts +++ b/lib/typegoose/src/routes/users.route.ts @@ -16,8 +16,8 @@ export class UserRoute implements Routes { private initializeRoutes() { this.router.get(`${this.path}`, this.user.getUsers); this.router.get(`${this.path}/:id`, this.user.getUserById); - this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto, 'body'), this.user.createUser); - this.router.put(`${this.path}/:id`, ValidationMiddleware(CreateUserDto, 'body', true), this.user.updateUser); + this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto), this.user.createUser); + this.router.put(`${this.path}/:id`, ValidationMiddleware(CreateUserDto, true), this.user.updateUser); this.router.delete(`${this.path}/:id`, this.user.deleteUser); } } diff --git a/lib/typeorm/src/routes/auth.route.ts b/lib/typeorm/src/routes/auth.route.ts index 1025094..1a18f73 100644 --- a/lib/typeorm/src/routes/auth.route.ts +++ b/lib/typeorm/src/routes/auth.route.ts @@ -14,8 +14,8 @@ export class AuthRoute implements Routes { } private initializeRoutes() { - this.router.post('/signup', ValidationMiddleware(CreateUserDto, 'body'), this.auth.signUp); - this.router.post('/login', ValidationMiddleware(CreateUserDto, 'body'), this.auth.logIn); + this.router.post('/signup', ValidationMiddleware(CreateUserDto), this.auth.signUp); + this.router.post('/login', ValidationMiddleware(CreateUserDto), this.auth.logIn); this.router.post('/logout', AuthMiddleware, this.auth.logOut); } } diff --git a/lib/typeorm/src/routes/users.route.ts b/lib/typeorm/src/routes/users.route.ts index 8f097f5..b750b9f 100644 --- a/lib/typeorm/src/routes/users.route.ts +++ b/lib/typeorm/src/routes/users.route.ts @@ -16,8 +16,8 @@ export class UserRoute implements Routes { private initializeRoutes() { this.router.get(`${this.path}`, this.user.getUsers); this.router.get(`${this.path}/:id(\\d+)`, this.user.getUserById); - this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto, 'body'), this.user.createUser); - this.router.put(`${this.path}/:id(\\d+)`, ValidationMiddleware(CreateUserDto, 'body', true), this.user.updateUser); + this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto), this.user.createUser); + this.router.put(`${this.path}/:id(\\d+)`, ValidationMiddleware(CreateUserDto, true), this.user.updateUser); this.router.delete(`${this.path}/:id(\\d+)`, this.user.deleteUser); } } diff --git a/package.json b/package.json index b863807..11fa391 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "typescript-express-starter", - "version": "10.1.1", + "version": "10.2.1", "description": "Quick and Easy TypeScript Express Starter", "author": "AGUMON ", "license": "MIT",