typescript-express-starter 9.1.2 → 10.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.vscode/configurationCache.log +1 -0
- package/.vscode/dryrun.log +6 -0
- package/.vscode/settings.json +3 -0
- package/.vscode/targets.log +239 -0
- package/CONTRIBUTORS.md +61 -0
- package/README.kr.md +122 -161
- package/README.md +118 -157
- package/bin/cli.js +1 -1
- package/lib/default/.swcrc +0 -3
- package/lib/default/Dockerfile.dev +18 -0
- package/lib/default/Dockerfile.prod +18 -0
- package/lib/default/Makefile +29 -16
- package/lib/default/docker-compose.yml +8 -8
- package/lib/default/jest.config.js +1 -1
- package/lib/default/package.json +42 -40
- package/lib/default/src/app.ts +4 -5
- package/lib/default/src/controllers/auth.controller.ts +9 -11
- package/lib/default/src/controllers/users.controller.ts +11 -13
- package/lib/default/src/dtos/users.dto.ts +12 -1
- package/lib/default/src/interfaces/users.interface.ts +2 -2
- package/lib/default/src/middlewares/auth.middleware.ts +16 -10
- package/lib/default/src/middlewares/error.middleware.ts +2 -4
- package/lib/default/src/middlewares/validation.middleware.ts +22 -20
- package/lib/default/src/models/users.model.ts +6 -8
- package/lib/default/src/routes/auth.route.ts +8 -11
- package/lib/default/src/routes/users.route.ts +10 -12
- package/lib/default/src/server.ts +6 -7
- package/lib/default/src/services/auth.service.ts +25 -36
- package/lib/default/src/services/users.service.ts +20 -29
- package/lib/{graphql/src/tests → default/src/test}/auth.test.ts +21 -21
- package/lib/default/src/test/users.test.ts +62 -0
- package/lib/default/src/utils/validateEnv.ts +1 -3
- package/lib/default/tsconfig.json +1 -1
- package/lib/graphql/.env.development.local +6 -6
- package/lib/graphql/.env.production.local +6 -6
- package/lib/graphql/.env.test.local +6 -6
- package/lib/graphql/.swcrc +1 -1
- package/lib/graphql/Dockerfile.dev +19 -0
- package/lib/graphql/Dockerfile.prod +19 -0
- package/lib/graphql/Makefile +32 -15
- package/lib/graphql/docker-compose.yml +23 -15
- package/lib/graphql/jest.config.js +1 -1
- package/lib/graphql/package.json +42 -41
- package/lib/graphql/src/app.ts +14 -13
- package/lib/graphql/src/config/index.ts +2 -2
- package/lib/{typeorm/src/databases → graphql/src/database}/index.ts +6 -6
- package/lib/graphql/src/dtos/users.dto.ts +14 -1
- package/lib/graphql/src/interfaces/users.interface.ts +2 -2
- package/lib/graphql/src/middlewares/auth.middleware.ts +16 -6
- package/lib/graphql/src/middlewares/error.middleware.ts +2 -4
- package/lib/graphql/src/repositories/auth.repository.ts +19 -27
- package/lib/graphql/src/repositories/users.repository.ts +9 -18
- package/lib/graphql/src/resolvers/auth.resolver.ts +2 -2
- package/lib/graphql/src/resolvers/users.resolver.ts +4 -4
- package/lib/graphql/src/server.ts +6 -7
- package/lib/graphql/src/test/auth.test.ts +10 -0
- package/lib/graphql/src/test/users.test.ts +11 -0
- package/lib/graphql/src/typedefs/users.type.ts +2 -2
- package/lib/graphql/src/utils/logger.ts +2 -0
- package/lib/graphql/src/utils/validateEnv.ts +1 -3
- package/lib/graphql/tsconfig.json +2 -2
- package/lib/knex/.env.development.local +2 -2
- package/lib/knex/.env.production.local +3 -3
- package/lib/knex/.env.test.local +3 -3
- package/lib/knex/.swcrc +1 -1
- package/lib/knex/Dockerfile.dev +19 -0
- package/lib/knex/Dockerfile.prod +19 -0
- package/lib/knex/Makefile +32 -15
- package/lib/knex/docker-compose.yml +19 -14
- package/lib/knex/jest.config.js +1 -1
- package/lib/knex/knexfile.ts +8 -8
- package/lib/knex/package.json +44 -42
- package/lib/knex/src/app.ts +6 -7
- package/lib/knex/src/config/index.ts +2 -1
- package/lib/knex/src/controllers/auth.controller.ts +9 -11
- package/lib/knex/src/controllers/users.controller.ts +10 -12
- package/lib/knex/src/{databases → database}/index.ts +4 -4
- package/lib/knex/src/database/migrations/20210713110926_initial.ts +17 -0
- package/lib/knex/src/dtos/users.dto.ts +12 -1
- package/lib/knex/src/interfaces/users.interface.ts +2 -2
- package/lib/knex/src/middlewares/auth.middleware.ts +17 -10
- package/lib/knex/src/middlewares/error.middleware.ts +2 -4
- package/lib/knex/src/middlewares/validation.middleware.ts +22 -20
- package/lib/knex/src/models/users.model.ts +2 -2
- package/lib/knex/src/routes/auth.route.ts +8 -10
- package/lib/knex/src/routes/users.route.ts +10 -12
- package/lib/knex/src/server.ts +6 -7
- package/lib/knex/src/services/auth.service.ts +27 -36
- package/lib/knex/src/services/users.service.ts +18 -23
- package/lib/knex/src/{tests → test}/auth.test.ts +2 -2
- package/lib/knex/src/{tests → test}/users.test.ts +2 -2
- package/lib/knex/src/utils/validateEnv.ts +1 -3
- package/lib/knex/tsconfig.json +2 -2
- package/lib/mikro-orm/.env.production.local +1 -1
- package/lib/mikro-orm/.env.test.local +1 -1
- package/lib/mikro-orm/.swcrc +1 -1
- package/lib/mikro-orm/Dockerfile.dev +19 -0
- package/lib/mikro-orm/Dockerfile.prod +19 -0
- package/lib/mikro-orm/Makefile +32 -15
- package/lib/mikro-orm/docker-compose.yml +20 -11
- package/lib/mikro-orm/package.json +42 -40
- package/lib/mikro-orm/src/app.ts +10 -12
- package/lib/mikro-orm/src/config/index.ts +2 -1
- package/lib/mikro-orm/src/controllers/auth.controller.ts +9 -11
- package/lib/mikro-orm/src/controllers/users.controller.ts +11 -13
- package/lib/mikro-orm/src/dtos/users.dto.ts +12 -1
- package/lib/mikro-orm/src/interfaces/users.interface.ts +1 -1
- package/lib/mikro-orm/src/middlewares/auth.middleware.ts +17 -10
- package/lib/mikro-orm/src/middlewares/error.middleware.ts +2 -4
- package/lib/mikro-orm/src/middlewares/validation.middleware.ts +22 -20
- package/lib/mikro-orm/src/routes/auth.route.ts +8 -10
- package/lib/mikro-orm/src/routes/users.route.ts +9 -11
- package/lib/mikro-orm/src/server.ts +6 -7
- package/lib/mikro-orm/src/services/auth.service.ts +23 -33
- package/lib/mikro-orm/src/services/users.service.ts +13 -21
- package/lib/mikro-orm/src/{tests → test}/auth.test.ts +3 -4
- package/lib/mikro-orm/src/{tests → test}/users.test.ts +4 -5
- package/lib/mikro-orm/src/utils/validateEnv.ts +1 -3
- package/lib/mikro-orm/tsconfig.json +2 -2
- package/lib/mongoose/.env.production.local +1 -1
- package/lib/mongoose/.env.test.local +1 -1
- package/lib/mongoose/.swcrc +1 -1
- package/lib/mongoose/Dockerfile.dev +19 -0
- package/lib/mongoose/Dockerfile.prod +19 -0
- package/lib/mongoose/Makefile +32 -15
- package/lib/mongoose/docker-compose.yml +20 -11
- package/lib/mongoose/jest.config.js +1 -1
- package/lib/mongoose/package.json +43 -41
- package/lib/mongoose/src/app.ts +6 -7
- package/lib/mongoose/src/config/index.ts +2 -1
- package/lib/mongoose/src/controllers/auth.controller.ts +9 -11
- package/lib/mongoose/src/controllers/users.controller.ts +11 -13
- package/lib/mongoose/src/{databases → database}/index.ts +1 -2
- package/lib/mongoose/src/dtos/users.dto.ts +12 -1
- package/lib/mongoose/src/interfaces/users.interface.ts +1 -1
- package/lib/mongoose/src/middlewares/auth.middleware.ts +16 -9
- package/lib/mongoose/src/middlewares/error.middleware.ts +2 -4
- package/lib/mongoose/src/middlewares/validation.middleware.ts +22 -20
- package/lib/mongoose/src/models/users.model.ts +2 -4
- package/lib/mongoose/src/routes/auth.route.ts +8 -10
- package/lib/mongoose/src/routes/users.route.ts +9 -11
- package/lib/mongoose/src/server.ts +6 -7
- package/lib/mongoose/src/services/auth.service.ts +26 -37
- package/lib/mongoose/src/services/users.service.ts +19 -29
- package/lib/{typegoose/src/tests → mongoose/src/test}/users.test.ts +7 -7
- package/lib/mongoose/src/utils/validateEnv.ts +1 -3
- package/lib/mongoose/tsconfig.json +2 -2
- package/lib/node-postgres/.dockerignore +18 -0
- package/lib/node-postgres/.editorconfig +9 -0
- package/lib/node-postgres/.env.development.local +13 -0
- package/lib/node-postgres/.env.production.local +13 -0
- package/lib/node-postgres/.env.test.local +13 -0
- package/lib/node-postgres/.eslintignore +1 -0
- package/lib/node-postgres/.eslintrc +18 -0
- package/lib/node-postgres/.huskyrc +5 -0
- package/lib/node-postgres/.lintstagedrc.json +5 -0
- package/lib/node-postgres/.prettierrc +8 -0
- package/lib/node-postgres/.swcrc +39 -0
- package/lib/node-postgres/.vscode/launch.json +35 -0
- package/lib/node-postgres/.vscode/settings.json +6 -0
- package/lib/node-postgres/Dockerfile.dev +17 -0
- package/lib/node-postgres/Dockerfile.prod +17 -0
- package/lib/node-postgres/Makefile +46 -0
- package/lib/node-postgres/docker-compose.yml +61 -0
- package/lib/node-postgres/ecosystem.config.js +57 -0
- package/lib/node-postgres/jest.config.js +12 -0
- package/lib/node-postgres/nginx.conf +40 -0
- package/lib/node-postgres/nodemon.json +12 -0
- package/lib/node-postgres/package.json +78 -0
- package/lib/node-postgres/src/app.ts +87 -0
- package/lib/node-postgres/src/config/index.ts +6 -0
- package/lib/node-postgres/src/controllers/auth.controller.ts +44 -0
- package/lib/node-postgres/src/controllers/users.controller.ts +63 -0
- package/lib/node-postgres/src/database/index.ts +6 -0
- package/lib/node-postgres/src/database/init.sql +110 -0
- package/lib/node-postgres/src/dtos/users.dto.ts +20 -0
- package/lib/node-postgres/src/http/auth.http +27 -0
- package/lib/node-postgres/src/http/users.http +34 -0
- package/lib/node-postgres/src/interfaces/auth.interface.ts +15 -0
- package/lib/node-postgres/src/interfaces/routes.interface.ts +6 -0
- package/lib/node-postgres/src/interfaces/users.interface.ts +5 -0
- package/lib/node-postgres/src/middlewares/auth.middleware.ts +38 -0
- package/lib/node-postgres/src/middlewares/error.middleware.ts +15 -0
- package/lib/node-postgres/src/middlewares/validation.middleware.ts +27 -0
- package/lib/node-postgres/src/models/users.model.ts +9 -0
- package/lib/node-postgres/src/routes/auth.route.ts +21 -0
- package/lib/node-postgres/src/routes/users.route.ts +23 -0
- package/lib/node-postgres/src/server.ts +10 -0
- package/lib/node-postgres/src/services/auth.service.ts +52 -0
- package/lib/node-postgres/src/services/users.service.ts +51 -0
- package/lib/{default/src/tests → node-postgres/src/test}/auth.test.ts +2 -2
- package/lib/{default/src/tests → node-postgres/src/test}/users.test.ts +5 -5
- package/lib/node-postgres/src/utils/logger.ts +65 -0
- package/lib/node-postgres/src/utils/validateEnv.ts +8 -0
- package/lib/node-postgres/swagger.yaml +123 -0
- package/lib/node-postgres/tsconfig.json +40 -0
- package/lib/prisma/.env.production.local +1 -1
- package/lib/prisma/.env.test.local +1 -1
- package/lib/prisma/Dockerfile.dev +19 -0
- package/lib/prisma/Dockerfile.prod +19 -0
- package/lib/prisma/Makefile +32 -15
- package/lib/prisma/docker-compose.yml +15 -14
- package/lib/prisma/jest.config.js +1 -1
- package/lib/prisma/package.json +43 -41
- package/lib/prisma/src/app.ts +4 -5
- package/lib/prisma/src/controllers/auth.controller.ts +10 -12
- package/lib/prisma/src/controllers/users.controller.ts +12 -14
- package/lib/prisma/src/dtos/users.dto.ts +12 -1
- package/lib/prisma/src/interfaces/auth.interface.ts +1 -1
- package/lib/prisma/src/interfaces/users.interface.ts +5 -0
- package/lib/prisma/src/middlewares/auth.middleware.ts +16 -11
- package/lib/prisma/src/middlewares/error.middleware.ts +2 -4
- package/lib/prisma/src/middlewares/validation.middleware.ts +22 -20
- package/lib/prisma/src/routes/auth.route.ts +8 -10
- package/lib/prisma/src/routes/users.route.ts +9 -11
- package/lib/prisma/src/server.ts +6 -7
- package/lib/prisma/src/services/auth.service.ts +10 -16
- package/lib/prisma/src/services/users.service.ts +19 -27
- package/lib/prisma/src/utils/validateEnv.ts +1 -3
- package/lib/prisma/tsconfig.json +1 -1
- package/lib/routing-controllers/Dockerfile.dev +19 -0
- package/lib/routing-controllers/Dockerfile.prod +19 -0
- package/lib/routing-controllers/Makefile +29 -16
- package/lib/routing-controllers/docker-compose.yml +9 -9
- package/lib/routing-controllers/jest.config.js +1 -1
- package/lib/routing-controllers/package.json +41 -40
- package/lib/routing-controllers/src/app.ts +4 -6
- package/lib/routing-controllers/src/controllers/auth.controller.ts +13 -12
- package/lib/routing-controllers/src/controllers/users.controller.ts +15 -13
- package/lib/routing-controllers/src/dtos/users.dto.ts +12 -1
- package/lib/routing-controllers/src/interfaces/users.interface.ts +1 -1
- package/lib/routing-controllers/src/middlewares/auth.middleware.ts +16 -10
- package/lib/routing-controllers/src/middlewares/error.middleware.ts +2 -5
- package/lib/routing-controllers/src/middlewares/validation.middleware.ts +23 -27
- package/lib/routing-controllers/src/models/users.model.ts +1 -3
- package/lib/routing-controllers/src/server.ts +5 -6
- package/lib/routing-controllers/src/services/auth.service.ts +25 -35
- package/lib/routing-controllers/src/services/users.service.ts +17 -25
- package/lib/routing-controllers/src/{tests → test}/auth.test.ts +1 -1
- package/lib/routing-controllers/src/{tests → test}/users.test.ts +10 -10
- package/lib/routing-controllers/src/utils/validateEnv.ts +1 -3
- package/lib/routing-controllers/tsconfig.json +1 -1
- package/lib/sequelize/.env.development.local +2 -2
- package/lib/sequelize/.env.production.local +3 -3
- package/lib/sequelize/.env.test.local +3 -3
- package/lib/sequelize/.swcrc +1 -1
- package/lib/sequelize/Dockerfile.dev +23 -0
- package/lib/sequelize/Dockerfile.prod +23 -0
- package/lib/sequelize/Makefile +32 -15
- package/lib/sequelize/docker-compose.yml +19 -14
- package/lib/sequelize/jest.config.js +1 -1
- package/lib/sequelize/package.json +45 -43
- package/lib/sequelize/src/app.ts +5 -6
- package/lib/sequelize/src/config/index.ts +2 -1
- package/lib/sequelize/src/controllers/auth.controller.ts +7 -8
- package/lib/sequelize/src/controllers/users.controller.ts +9 -10
- package/lib/sequelize/src/{databases → database}/index.ts +1 -3
- package/lib/sequelize/src/dtos/users.dto.ts +12 -1
- package/lib/sequelize/src/interfaces/users.interface.ts +1 -1
- package/lib/sequelize/src/middlewares/auth.middleware.ts +16 -10
- package/lib/sequelize/src/middlewares/error.middleware.ts +2 -4
- package/lib/sequelize/src/middlewares/validation.middleware.ts +22 -20
- package/lib/sequelize/src/routes/auth.route.ts +8 -11
- package/lib/sequelize/src/routes/users.route.ts +9 -11
- package/lib/sequelize/src/server.ts +6 -7
- package/lib/sequelize/src/services/auth.service.ts +24 -35
- package/lib/sequelize/src/services/users.service.ts +18 -29
- package/lib/sequelize/src/{tests → test}/auth.test.ts +2 -2
- package/lib/sequelize/src/{tests → test}/users.test.ts +2 -2
- package/lib/sequelize/src/utils/validateEnv.ts +1 -3
- package/lib/sequelize/tsconfig.json +2 -2
- package/lib/starter.js +18 -27
- package/lib/typegoose/.env.production.local +1 -1
- package/lib/typegoose/.env.test.local +1 -1
- package/lib/typegoose/.swcrc +1 -1
- package/lib/typegoose/Dockerfile.dev +19 -0
- package/lib/typegoose/Dockerfile.prod +19 -0
- package/lib/typegoose/Makefile +32 -15
- package/lib/typegoose/docker-compose.yml +20 -11
- package/lib/typegoose/jest.config.js +1 -1
- package/lib/typegoose/package.json +41 -39
- package/lib/typegoose/src/app.ts +3 -2
- package/lib/typegoose/src/config/index.ts +2 -1
- package/lib/typegoose/src/controllers/auth.controller.ts +9 -11
- package/lib/typegoose/src/controllers/users.controller.ts +11 -13
- package/lib/typegoose/src/database/index.ts +11 -0
- package/lib/typegoose/src/dtos/users.dto.ts +12 -1
- package/lib/typegoose/src/interfaces/users.interface.ts +1 -1
- package/lib/typegoose/src/middlewares/auth.middleware.ts +16 -10
- package/lib/typegoose/src/middlewares/error.middleware.ts +2 -4
- package/lib/typegoose/src/middlewares/validation.middleware.ts +22 -20
- package/lib/typegoose/src/models/users.model.ts +1 -3
- package/lib/typegoose/src/routes/auth.route.ts +8 -11
- package/lib/typegoose/src/routes/users.route.ts +9 -11
- package/lib/typegoose/src/server.ts +5 -6
- package/lib/typegoose/src/services/auth.service.ts +27 -36
- package/lib/typegoose/src/services/users.service.ts +17 -26
- package/lib/typegoose/src/{tests → test}/auth.test.ts +2 -2
- package/lib/{mongoose/src/tests → typegoose/src/test}/users.test.ts +7 -7
- package/lib/typegoose/src/utils/validateEnv.ts +1 -3
- package/lib/typegoose/tsconfig.json +2 -2
- package/lib/typeorm/.env.development.local +2 -2
- package/lib/typeorm/.env.production.local +3 -3
- package/lib/typeorm/.env.test.local +3 -3
- package/lib/typeorm/.swcrc +1 -1
- package/lib/typeorm/Dockerfile.dev +19 -0
- package/lib/typeorm/Dockerfile.prod +19 -0
- package/lib/typeorm/Makefile +32 -15
- package/lib/typeorm/docker-compose.yml +21 -14
- package/lib/typeorm/jest.config.js +1 -1
- package/lib/typeorm/package.json +42 -41
- package/lib/typeorm/src/app.ts +6 -8
- package/lib/typeorm/src/config/index.ts +2 -1
- package/lib/typeorm/src/controllers/auth.controller.ts +9 -11
- package/lib/typeorm/src/controllers/users.controller.ts +11 -13
- package/lib/{graphql/src/databases → typeorm/src/database}/index.ts +3 -3
- package/lib/typeorm/src/dtos/users.dto.ts +12 -1
- package/lib/typeorm/src/exceptions/httpException.ts +10 -0
- package/lib/typeorm/src/interfaces/users.interface.ts +1 -1
- package/lib/typeorm/src/middlewares/auth.middleware.ts +14 -7
- package/lib/typeorm/src/middlewares/error.middleware.ts +2 -4
- package/lib/typeorm/src/middlewares/validation.middleware.ts +22 -20
- package/lib/typeorm/src/routes/auth.route.ts +8 -11
- package/lib/typeorm/src/routes/users.route.ts +9 -11
- package/lib/typeorm/src/server.ts +6 -7
- package/lib/typeorm/src/services/auth.service.ts +24 -32
- package/lib/typeorm/src/services/users.service.ts +10 -20
- package/lib/typeorm/src/{tests → test}/auth.test.ts +10 -11
- package/lib/typeorm/src/{tests → test}/users.test.ts +34 -38
- package/lib/typeorm/src/utils/validateEnv.ts +1 -3
- package/lib/typeorm/tsconfig.json +2 -2
- package/package.json +3 -3
- package/lib/default/Dockerfile +0 -24
- package/lib/default/src/controllers/index.controller.ts +0 -13
- package/lib/default/src/routes/index.route.ts +0 -19
- package/lib/default/src/utils/util.ts +0 -19
- package/lib/graphql/Dockerfile +0 -24
- package/lib/graphql/src/tests/index.test.ts +0 -18
- package/lib/graphql/src/tests/users.test.ts +0 -71
- package/lib/graphql/src/utils/util.ts +0 -19
- package/lib/knex/Dockerfile +0 -24
- package/lib/knex/src/controllers/index.controller.ts +0 -13
- package/lib/knex/src/databases/migrations/20210713110926_initial.ts +0 -13
- package/lib/knex/src/routes/index.route.ts +0 -19
- package/lib/knex/src/tests/index.test.ts +0 -17
- package/lib/knex/src/utils/util.ts +0 -19
- package/lib/mikro-orm/Dockerfile +0 -24
- package/lib/mikro-orm/src/controllers/index.controller.ts +0 -13
- package/lib/mikro-orm/src/routes/index.route.ts +0 -19
- package/lib/mikro-orm/src/tests/index.test.ts +0 -18
- package/lib/mikro-orm/src/utils/util.ts +0 -19
- package/lib/mongoose/Dockerfile +0 -24
- package/lib/mongoose/src/controllers/index.controller.ts +0 -13
- package/lib/mongoose/src/routes/index.route.ts +0 -19
- package/lib/mongoose/src/utils/util.ts +0 -19
- package/lib/prisma/Dockerfile +0 -24
- package/lib/prisma/src/controllers/index.controller.ts +0 -13
- package/lib/prisma/src/routes/index.route.ts +0 -19
- package/lib/prisma/src/tests/index.test.ts +0 -18
- package/lib/prisma/src/utils/util.ts +0 -19
- package/lib/routing-controllers/Dockerfile +0 -24
- package/lib/routing-controllers/src/controllers/index.controller.ts +0 -9
- package/lib/routing-controllers/src/tests/index.test.ts +0 -17
- package/lib/routing-controllers/src/utils/util.ts +0 -19
- package/lib/sequelize/Dockerfile +0 -28
- package/lib/sequelize/src/controllers/index.controller.ts +0 -13
- package/lib/sequelize/src/routes/index.route.ts +0 -19
- package/lib/sequelize/src/tests/index.test.ts +0 -18
- package/lib/sequelize/src/utils/util.ts +0 -19
- package/lib/typegoose/Dockerfile +0 -24
- package/lib/typegoose/src/controllers/index.controller.ts +0 -13
- package/lib/typegoose/src/databases/index.ts +0 -3
- package/lib/typegoose/src/routes/index.route.ts +0 -19
- package/lib/typegoose/src/tests/index.test.ts +0 -18
- package/lib/typegoose/src/utils/util.ts +0 -19
- package/lib/typeorm/Dockerfile +0 -24
- package/lib/typeorm/src/controllers/index.controller.ts +0 -13
- package/lib/typeorm/src/routes/index.route.ts +0 -19
- package/lib/typeorm/src/tests/index.test.ts +0 -18
- package/lib/typeorm/src/utils/util.ts +0 -19
- package/lib/default/src/exceptions/{HttpException.ts → httpException.ts} +0 -0
- package/lib/graphql/src/exceptions/{HttpException.ts → httpException.ts} +0 -0
- package/lib/knex/src/{databases → database}/migrations/.gitkeep +0 -0
- package/lib/knex/src/{databases → database}/seeds/.gitkeep +0 -0
- package/lib/knex/src/exceptions/{HttpException.ts → httpException.ts} +0 -0
- package/lib/mikro-orm/src/{databases → database}/index.ts +0 -0
- package/lib/mikro-orm/src/exceptions/{HttpException.ts → httpException.ts} +0 -0
- package/lib/mongoose/src/exceptions/{HttpException.ts → httpException.ts} +0 -0
- package/lib/mongoose/src/{tests → test}/auth.test.ts +0 -0
- package/lib/{default/src/tests → mongoose/src/test}/index.test.ts +0 -0
- package/lib/{prisma/src/exceptions/HttpException.ts → node-postgres/src/exceptions/httpException.ts} +0 -0
- package/lib/{sequelize/src/exceptions/HttpException.ts → prisma/src/exceptions/httpException.ts} +0 -0
- package/lib/prisma/src/{tests → test}/auth.test.ts +1 -1
- package/lib/{mongoose/src/tests → prisma/src/test}/index.test.ts +0 -0
- package/lib/prisma/src/{tests → test}/users.test.ts +1 -1
- /package/lib/routing-controllers/src/exceptions/{HttpException.ts → httpException.ts} +0 -0
- /package/lib/sequelize/src/{migrations → database/migrations}/.gitkeep +0 -0
- /package/lib/sequelize/src/{seeders → database/seeders}/.gitkeep +0 -0
- /package/lib/{typegoose/src/exceptions/HttpException.ts → sequelize/src/exceptions/httpException.ts} +0 -0
- /package/lib/{typeorm/src/exceptions/HttpException.ts → typegoose/src/exceptions/httpException.ts} +0 -0
- /package/lib/typeorm/src/{migration → database/migrations}/.gitkeep +0 -0
|
@@ -18,59 +18,61 @@
|
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"bcrypt": "^5.0.1",
|
|
20
20
|
"class-transformer": "^0.5.1",
|
|
21
|
-
"class-validator": "^0.13.
|
|
21
|
+
"class-validator": "^0.13.2",
|
|
22
22
|
"compression": "^1.7.4",
|
|
23
|
-
"cookie-parser": "^1.4.
|
|
23
|
+
"cookie-parser": "^1.4.6",
|
|
24
24
|
"cors": "^2.8.5",
|
|
25
|
-
"dotenv": "^
|
|
26
|
-
"envalid": "^7.1
|
|
27
|
-
"express": "^4.
|
|
28
|
-
"helmet": "^
|
|
25
|
+
"dotenv": "^16.0.1",
|
|
26
|
+
"envalid": "^7.3.1",
|
|
27
|
+
"express": "^4.18.1",
|
|
28
|
+
"helmet": "^5.1.1",
|
|
29
29
|
"hpp": "^0.2.3",
|
|
30
30
|
"jsonwebtoken": "^8.5.1",
|
|
31
|
-
"mongoose": "^5.
|
|
31
|
+
"mongoose": "^6.5.0",
|
|
32
32
|
"morgan": "^1.10.0",
|
|
33
|
-
"
|
|
34
|
-
"swagger-
|
|
35
|
-
"
|
|
36
|
-
"
|
|
33
|
+
"reflect-metadata": "^0.1.13",
|
|
34
|
+
"swagger-jsdoc": "^6.2.1",
|
|
35
|
+
"swagger-ui-express": "^4.5.0",
|
|
36
|
+
"typedi": "^0.10.0",
|
|
37
|
+
"winston": "^3.8.1",
|
|
38
|
+
"winston-daily-rotate-file": "^4.7.1"
|
|
37
39
|
},
|
|
38
40
|
"devDependencies": {
|
|
39
|
-
"@swc/cli": "^0.1.
|
|
40
|
-
"@swc/core": "^1.2.
|
|
41
|
+
"@swc/cli": "^0.1.57",
|
|
42
|
+
"@swc/core": "^1.2.220",
|
|
41
43
|
"@types/bcrypt": "^5.0.0",
|
|
42
|
-
"@types/compression": "^1.7.
|
|
43
|
-
"@types/cookie-parser": "^1.4.
|
|
44
|
-
"@types/cors": "^2.8.
|
|
44
|
+
"@types/compression": "^1.7.2",
|
|
45
|
+
"@types/cookie-parser": "^1.4.3",
|
|
46
|
+
"@types/cors": "^2.8.12",
|
|
45
47
|
"@types/express": "^4.17.13",
|
|
46
|
-
"@types/hpp": "^0.2.
|
|
47
|
-
"@types/jest": "
|
|
48
|
-
"@types/jsonwebtoken": "^8.5.
|
|
49
|
-
"@types/mongoose": "^5.
|
|
48
|
+
"@types/hpp": "^0.2.2",
|
|
49
|
+
"@types/jest": "^28.1.6",
|
|
50
|
+
"@types/jsonwebtoken": "^8.5.8",
|
|
51
|
+
"@types/mongoose": "^5.11.97",
|
|
50
52
|
"@types/morgan": "^1.9.3",
|
|
51
|
-
"@types/node": "^
|
|
52
|
-
"@types/supertest": "^2.0.
|
|
53
|
+
"@types/node": "^17.0.45",
|
|
54
|
+
"@types/supertest": "^2.0.12",
|
|
53
55
|
"@types/swagger-jsdoc": "^6.0.1",
|
|
54
56
|
"@types/swagger-ui-express": "^4.1.3",
|
|
55
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
56
|
-
"@typescript-eslint/parser": "^
|
|
57
|
+
"@typescript-eslint/eslint-plugin": "^5.29.0",
|
|
58
|
+
"@typescript-eslint/parser": "^5.29.0",
|
|
57
59
|
"cross-env": "^7.0.3",
|
|
58
|
-
"eslint": "^
|
|
59
|
-
"eslint-config-prettier": "^8.
|
|
60
|
-
"eslint-plugin-prettier": "^
|
|
61
|
-
"husky": "^
|
|
62
|
-
"jest": "
|
|
63
|
-
"lint-staged": "^
|
|
60
|
+
"eslint": "^8.20.0",
|
|
61
|
+
"eslint-config-prettier": "^8.5.0",
|
|
62
|
+
"eslint-plugin-prettier": "^4.2.1",
|
|
63
|
+
"husky": "^8.0.1",
|
|
64
|
+
"jest": "^28.1.1",
|
|
65
|
+
"lint-staged": "^13.0.3",
|
|
64
66
|
"node-config": "^0.0.2",
|
|
65
|
-
"node-gyp": "^
|
|
66
|
-
"nodemon": "^2.0.
|
|
67
|
-
"pm2": "^5.
|
|
68
|
-
"prettier": "^2.
|
|
69
|
-
"supertest": "^6.2.
|
|
70
|
-
"ts-jest": "^
|
|
71
|
-
"ts-node": "^10.
|
|
72
|
-
"tsc-alias": "^1.
|
|
73
|
-
"tsconfig-paths": "^
|
|
74
|
-
"typescript": "^4.
|
|
67
|
+
"node-gyp": "^9.1.0",
|
|
68
|
+
"nodemon": "^2.0.19",
|
|
69
|
+
"pm2": "^5.2.0",
|
|
70
|
+
"prettier": "^2.7.1",
|
|
71
|
+
"supertest": "^6.2.4",
|
|
72
|
+
"ts-jest": "^28.0.7",
|
|
73
|
+
"ts-node": "^10.9.1",
|
|
74
|
+
"tsc-alias": "^1.7.0",
|
|
75
|
+
"tsconfig-paths": "^4.0.0",
|
|
76
|
+
"typescript": "^4.7.4"
|
|
75
77
|
}
|
|
76
|
-
}
|
|
78
|
+
}
|
package/lib/mongoose/src/app.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import 'reflect-metadata';
|
|
1
2
|
import compression from 'compression';
|
|
2
3
|
import cookieParser from 'cookie-parser';
|
|
3
4
|
import cors from 'cors';
|
|
@@ -11,10 +12,10 @@ import swaggerUi from 'swagger-ui-express';
|
|
|
11
12
|
import { NODE_ENV, PORT, LOG_FORMAT, ORIGIN, CREDENTIALS } from '@config';
|
|
12
13
|
import { dbConnection } from '@databases';
|
|
13
14
|
import { Routes } from '@interfaces/routes.interface';
|
|
14
|
-
import
|
|
15
|
+
import { ErrorMiddleware } from '@middlewares/error.middleware';
|
|
15
16
|
import { logger, stream } from '@utils/logger';
|
|
16
17
|
|
|
17
|
-
class App {
|
|
18
|
+
export class App {
|
|
18
19
|
public app: express.Application;
|
|
19
20
|
public env: string;
|
|
20
21
|
public port: string | number;
|
|
@@ -44,12 +45,12 @@ class App {
|
|
|
44
45
|
return this.app;
|
|
45
46
|
}
|
|
46
47
|
|
|
47
|
-
private connectToDatabase() {
|
|
48
|
+
private async connectToDatabase() {
|
|
48
49
|
if (this.env !== 'production') {
|
|
49
50
|
set('debug', true);
|
|
50
51
|
}
|
|
51
52
|
|
|
52
|
-
connect(dbConnection.url, dbConnection.options);
|
|
53
|
+
await connect(dbConnection.url, dbConnection.options);
|
|
53
54
|
}
|
|
54
55
|
|
|
55
56
|
private initializeMiddlewares() {
|
|
@@ -86,8 +87,6 @@ class App {
|
|
|
86
87
|
}
|
|
87
88
|
|
|
88
89
|
private initializeErrorHandling() {
|
|
89
|
-
this.app.use(
|
|
90
|
+
this.app.use(ErrorMiddleware);
|
|
90
91
|
}
|
|
91
92
|
}
|
|
92
|
-
|
|
93
|
-
export default App;
|
|
@@ -2,4 +2,5 @@ import { config } from 'dotenv';
|
|
|
2
2
|
config({ path: `.env.${process.env.NODE_ENV || 'development'}.local` });
|
|
3
3
|
|
|
4
4
|
export const CREDENTIALS = process.env.CREDENTIALS === 'true';
|
|
5
|
-
export const { NODE_ENV, PORT,
|
|
5
|
+
export const { NODE_ENV, PORT, SECRET_KEY, LOG_FORMAT, LOG_DIR, ORIGIN } = process.env;
|
|
6
|
+
export const { DB_HOST, DB_PORT, DB_DATABASE } = process.env;
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { NextFunction, Request, Response } from 'express';
|
|
2
|
-
import {
|
|
2
|
+
import { Container } from 'typedi';
|
|
3
3
|
import { RequestWithUser } from '@interfaces/auth.interface';
|
|
4
4
|
import { User } from '@interfaces/users.interface';
|
|
5
|
-
import AuthService from '@services/auth.service';
|
|
5
|
+
import { AuthService } from '@services/auth.service';
|
|
6
6
|
|
|
7
|
-
class AuthController {
|
|
8
|
-
public
|
|
7
|
+
export class AuthController {
|
|
8
|
+
public auth = Container.get(AuthService);
|
|
9
9
|
|
|
10
10
|
public signUp = async (req: Request, res: Response, next: NextFunction) => {
|
|
11
11
|
try {
|
|
12
|
-
const userData:
|
|
13
|
-
const signUpUserData: User = await this.
|
|
12
|
+
const userData: User = req.body;
|
|
13
|
+
const signUpUserData: User = await this.auth.signup(userData);
|
|
14
14
|
|
|
15
15
|
res.status(201).json({ data: signUpUserData, message: 'signup' });
|
|
16
16
|
} catch (error) {
|
|
@@ -20,8 +20,8 @@ class AuthController {
|
|
|
20
20
|
|
|
21
21
|
public logIn = async (req: Request, res: Response, next: NextFunction) => {
|
|
22
22
|
try {
|
|
23
|
-
const userData:
|
|
24
|
-
const { cookie, findUser } = await this.
|
|
23
|
+
const userData: User = req.body;
|
|
24
|
+
const { cookie, findUser } = await this.auth.login(userData);
|
|
25
25
|
|
|
26
26
|
res.setHeader('Set-Cookie', [cookie]);
|
|
27
27
|
res.status(200).json({ data: findUser, message: 'login' });
|
|
@@ -33,7 +33,7 @@ class AuthController {
|
|
|
33
33
|
public logOut = async (req: RequestWithUser, res: Response, next: NextFunction) => {
|
|
34
34
|
try {
|
|
35
35
|
const userData: User = req.user;
|
|
36
|
-
const logOutUserData: User = await this.
|
|
36
|
+
const logOutUserData: User = await this.auth.logout(userData);
|
|
37
37
|
|
|
38
38
|
res.setHeader('Set-Cookie', ['Authorization=; Max-age=0']);
|
|
39
39
|
res.status(200).json({ data: logOutUserData, message: 'logout' });
|
|
@@ -42,5 +42,3 @@ class AuthController {
|
|
|
42
42
|
}
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
|
-
|
|
46
|
-
export default AuthController;
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { NextFunction, Request, Response } from 'express';
|
|
2
|
-
import {
|
|
2
|
+
import { Container } from 'typedi';
|
|
3
3
|
import { User } from '@interfaces/users.interface';
|
|
4
|
-
import
|
|
4
|
+
import { UserService } from '@services/users.service';
|
|
5
5
|
|
|
6
|
-
class
|
|
7
|
-
public
|
|
6
|
+
export class UserController {
|
|
7
|
+
public user = Container.get(UserService);
|
|
8
8
|
|
|
9
9
|
public getUsers = async (req: Request, res: Response, next: NextFunction) => {
|
|
10
10
|
try {
|
|
11
|
-
const findAllUsersData: User[] = await this.
|
|
11
|
+
const findAllUsersData: User[] = await this.user.findAllUser();
|
|
12
12
|
|
|
13
13
|
res.status(200).json({ data: findAllUsersData, message: 'findAll' });
|
|
14
14
|
} catch (error) {
|
|
@@ -19,7 +19,7 @@ class UsersController {
|
|
|
19
19
|
public getUserById = async (req: Request, res: Response, next: NextFunction) => {
|
|
20
20
|
try {
|
|
21
21
|
const userId: string = req.params.id;
|
|
22
|
-
const findOneUserData: User = await this.
|
|
22
|
+
const findOneUserData: User = await this.user.findUserById(userId);
|
|
23
23
|
|
|
24
24
|
res.status(200).json({ data: findOneUserData, message: 'findOne' });
|
|
25
25
|
} catch (error) {
|
|
@@ -29,8 +29,8 @@ class UsersController {
|
|
|
29
29
|
|
|
30
30
|
public createUser = async (req: Request, res: Response, next: NextFunction) => {
|
|
31
31
|
try {
|
|
32
|
-
const userData:
|
|
33
|
-
const createUserData: User = await this.
|
|
32
|
+
const userData: User = req.body;
|
|
33
|
+
const createUserData: User = await this.user.createUser(userData);
|
|
34
34
|
|
|
35
35
|
res.status(201).json({ data: createUserData, message: 'created' });
|
|
36
36
|
} catch (error) {
|
|
@@ -41,8 +41,8 @@ class UsersController {
|
|
|
41
41
|
public updateUser = async (req: Request, res: Response, next: NextFunction) => {
|
|
42
42
|
try {
|
|
43
43
|
const userId: string = req.params.id;
|
|
44
|
-
const userData:
|
|
45
|
-
const updateUserData: User = await this.
|
|
44
|
+
const userData: User = req.body;
|
|
45
|
+
const updateUserData: User = await this.user.updateUser(userId, userData);
|
|
46
46
|
|
|
47
47
|
res.status(200).json({ data: updateUserData, message: 'updated' });
|
|
48
48
|
} catch (error) {
|
|
@@ -53,7 +53,7 @@ class UsersController {
|
|
|
53
53
|
public deleteUser = async (req: Request, res: Response, next: NextFunction) => {
|
|
54
54
|
try {
|
|
55
55
|
const userId: string = req.params.id;
|
|
56
|
-
const deleteUserData: User = await this.
|
|
56
|
+
const deleteUserData: User = await this.user.deleteUser(userId);
|
|
57
57
|
|
|
58
58
|
res.status(200).json({ data: deleteUserData, message: 'deleted' });
|
|
59
59
|
} catch (error) {
|
|
@@ -61,5 +61,3 @@ class UsersController {
|
|
|
61
61
|
}
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
|
-
|
|
65
|
-
export default UsersController;
|
|
@@ -1,9 +1,20 @@
|
|
|
1
|
-
import { IsEmail, IsString } from 'class-validator';
|
|
1
|
+
import { IsEmail, IsString, IsNotEmpty, MinLength, MaxLength } from 'class-validator';
|
|
2
2
|
|
|
3
3
|
export class CreateUserDto {
|
|
4
4
|
@IsEmail()
|
|
5
5
|
public email: string;
|
|
6
6
|
|
|
7
7
|
@IsString()
|
|
8
|
+
@IsNotEmpty()
|
|
9
|
+
@MinLength(9)
|
|
10
|
+
@MaxLength(32)
|
|
8
11
|
public password: string;
|
|
9
12
|
}
|
|
13
|
+
|
|
14
|
+
export class UpdateUserDto {
|
|
15
|
+
@IsString()
|
|
16
|
+
@IsNotEmpty()
|
|
17
|
+
@MinLength(9)
|
|
18
|
+
@MaxLength(32)
|
|
19
|
+
public password: string;
|
|
20
|
+
}
|
|
@@ -1,19 +1,27 @@
|
|
|
1
1
|
import { NextFunction, Response } from 'express';
|
|
2
2
|
import { verify } from 'jsonwebtoken';
|
|
3
3
|
import { SECRET_KEY } from '@config';
|
|
4
|
-
import { HttpException } from '@exceptions/
|
|
4
|
+
import { HttpException } from '@exceptions/httpException';
|
|
5
5
|
import { DataStoredInToken, RequestWithUser } from '@interfaces/auth.interface';
|
|
6
|
-
import
|
|
6
|
+
import { UserModel } from '@models/users.model';
|
|
7
7
|
|
|
8
|
-
const
|
|
8
|
+
const getAuthorization = (req) => {
|
|
9
|
+
const coockie = req.cookies['Authorization'];
|
|
10
|
+
if (coockie) return coockie;
|
|
11
|
+
|
|
12
|
+
const header = req.header('Authorization');
|
|
13
|
+
if (header) return header.split('Bearer ')[1];
|
|
14
|
+
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export const AuthMiddleware = async (req: RequestWithUser, res: Response, next: NextFunction) => {
|
|
9
19
|
try {
|
|
10
|
-
const Authorization =
|
|
20
|
+
const Authorization = getAuthorization(req);
|
|
11
21
|
|
|
12
22
|
if (Authorization) {
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const userId = verificationResponse._id;
|
|
16
|
-
const findUser = await userModel.findById(userId);
|
|
23
|
+
const { _id } = (await verify(Authorization, SECRET_KEY)) as DataStoredInToken;
|
|
24
|
+
const findUser = await UserModel.findById(_id);
|
|
17
25
|
|
|
18
26
|
if (findUser) {
|
|
19
27
|
req.user = findUser;
|
|
@@ -29,4 +37,3 @@ const authMiddleware = async (req: RequestWithUser, res: Response, next: NextFun
|
|
|
29
37
|
}
|
|
30
38
|
};
|
|
31
39
|
|
|
32
|
-
export default authMiddleware;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { NextFunction, Request, Response } from 'express';
|
|
2
|
-
import { HttpException } from '@exceptions/
|
|
2
|
+
import { HttpException } from '@exceptions/httpException';
|
|
3
3
|
import { logger } from '@utils/logger';
|
|
4
4
|
|
|
5
|
-
const
|
|
5
|
+
export const ErrorMiddleware = (error: HttpException, req: Request, res: Response, next: NextFunction) => {
|
|
6
6
|
try {
|
|
7
7
|
const status: number = error.status || 500;
|
|
8
8
|
const message: string = error.message || 'Something went wrong';
|
|
@@ -13,5 +13,3 @@ const errorMiddleware = (error: HttpException, req: Request, res: Response, next
|
|
|
13
13
|
next(error);
|
|
14
14
|
}
|
|
15
15
|
};
|
|
16
|
-
|
|
17
|
-
export default errorMiddleware;
|
|
@@ -1,25 +1,27 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { HttpException } from '@exceptions/
|
|
1
|
+
import { plainToInstance } from 'class-transformer';
|
|
2
|
+
import { validateOrReject, ValidationError } from 'class-validator';
|
|
3
|
+
import { NextFunction, Request, Response } from 'express';
|
|
4
|
+
import { HttpException } from '@exceptions/httpException';
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
6
|
+
/**
|
|
7
|
+
* @name ValidationMiddleware
|
|
8
|
+
* @description Allows use of decorator and non-decorator based validation
|
|
9
|
+
* @param type dto
|
|
10
|
+
* @param skipMissingProperties When skipping missing properties
|
|
11
|
+
* @param whitelist Even if your object is an instance of a validation class it can contain additional properties that are not defined
|
|
12
|
+
* @param forbidNonWhitelisted If you would rather to have an error thrown when any non-whitelisted properties are present
|
|
13
|
+
*/
|
|
14
|
+
export const ValidationMiddleware = (type: any, skipMissingProperties = false, whitelist = false, forbidNonWhitelisted = false) => {
|
|
15
|
+
return (req: Request, res: Response, next: NextFunction) => {
|
|
16
|
+
const dto = plainToInstance(type, req.body);
|
|
17
|
+
validateOrReject(dto, { skipMissingProperties, whitelist, forbidNonWhitelisted })
|
|
18
|
+
.then(() => {
|
|
19
|
+
req.body = dto;
|
|
20
|
+
next();
|
|
21
|
+
})
|
|
22
|
+
.catch((errors: ValidationError[]) => {
|
|
16
23
|
const message = errors.map((error: ValidationError) => Object.values(error.constraints)).join(', ');
|
|
17
24
|
next(new HttpException(400, message));
|
|
18
|
-
}
|
|
19
|
-
next();
|
|
20
|
-
}
|
|
21
|
-
});
|
|
25
|
+
});
|
|
22
26
|
};
|
|
23
27
|
};
|
|
24
|
-
|
|
25
|
-
export default validationMiddleware;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { model, Schema, Document } from 'mongoose';
|
|
2
2
|
import { User } from '@interfaces/users.interface';
|
|
3
3
|
|
|
4
|
-
const
|
|
4
|
+
const UserSchema: Schema = new Schema({
|
|
5
5
|
email: {
|
|
6
6
|
type: String,
|
|
7
7
|
required: true,
|
|
@@ -13,6 +13,4 @@ const userSchema: Schema = new Schema({
|
|
|
13
13
|
},
|
|
14
14
|
});
|
|
15
15
|
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
export default userModel;
|
|
16
|
+
export const UserModel = model<User & Document>('User', UserSchema);
|
|
@@ -1,24 +1,22 @@
|
|
|
1
1
|
import { Router } from 'express';
|
|
2
|
-
import AuthController from '@controllers/auth.controller';
|
|
2
|
+
import { AuthController } from '@controllers/auth.controller';
|
|
3
3
|
import { CreateUserDto } from '@dtos/users.dto';
|
|
4
4
|
import { Routes } from '@interfaces/routes.interface';
|
|
5
|
-
import
|
|
6
|
-
import
|
|
5
|
+
import { AuthMiddleware } from '@middlewares/auth.middleware';
|
|
6
|
+
import { ValidationMiddleware } from '@middlewares/validation.middleware';
|
|
7
7
|
|
|
8
|
-
class AuthRoute implements Routes {
|
|
8
|
+
export class AuthRoute implements Routes {
|
|
9
9
|
public path = '/';
|
|
10
10
|
public router = Router();
|
|
11
|
-
public
|
|
11
|
+
public auth = new AuthController();
|
|
12
12
|
|
|
13
13
|
constructor() {
|
|
14
14
|
this.initializeRoutes();
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
private initializeRoutes() {
|
|
18
|
-
this.router.post(`${this.path}signup`,
|
|
19
|
-
this.router.post(`${this.path}login`,
|
|
20
|
-
this.router.post(`${this.path}logout`,
|
|
18
|
+
this.router.post(`${this.path}signup`, ValidationMiddleware(CreateUserDto, 'body'), this.auth.signUp);
|
|
19
|
+
this.router.post(`${this.path}login`, ValidationMiddleware(CreateUserDto, 'body'), this.auth.logIn);
|
|
20
|
+
this.router.post(`${this.path}logout`, AuthMiddleware, this.auth.logOut);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
|
-
|
|
24
|
-
export default AuthRoute;
|
|
@@ -1,25 +1,23 @@
|
|
|
1
1
|
import { Router } from 'express';
|
|
2
|
-
import
|
|
2
|
+
import { UserController } from '@controllers/users.controller';
|
|
3
3
|
import { CreateUserDto } from '@dtos/users.dto';
|
|
4
4
|
import { Routes } from '@interfaces/routes.interface';
|
|
5
|
-
import
|
|
5
|
+
import { ValidationMiddleware } from '@middlewares/validation.middleware';
|
|
6
6
|
|
|
7
|
-
class
|
|
7
|
+
export class UserRoute implements Routes {
|
|
8
8
|
public path = '/users';
|
|
9
9
|
public router = Router();
|
|
10
|
-
public
|
|
10
|
+
public user = new UserController();
|
|
11
11
|
|
|
12
12
|
constructor() {
|
|
13
13
|
this.initializeRoutes();
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
private initializeRoutes() {
|
|
17
|
-
this.router.get(`${this.path}`, this.
|
|
18
|
-
this.router.get(`${this.path}/:id`, this.
|
|
19
|
-
this.router.post(`${this.path}`,
|
|
20
|
-
this.router.put(`${this.path}/:id`,
|
|
21
|
-
this.router.delete(`${this.path}/:id`, this.
|
|
17
|
+
this.router.get(`${this.path}`, this.user.getUsers);
|
|
18
|
+
this.router.get(`${this.path}/:id`, this.user.getUserById);
|
|
19
|
+
this.router.post(`${this.path}`, ValidationMiddleware(CreateUserDto, 'body'), this.user.createUser);
|
|
20
|
+
this.router.put(`${this.path}/:id`, ValidationMiddleware(CreateUserDto, 'body', true), this.user.updateUser);
|
|
21
|
+
this.router.delete(`${this.path}/:id`, this.user.deleteUser);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
|
|
25
|
-
export default UsersRoute;
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import App from '@/app';
|
|
2
|
-
import AuthRoute from '@routes/auth.route';
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import validateEnv from '@utils/validateEnv';
|
|
1
|
+
import { App } from '@/app';
|
|
2
|
+
import { AuthRoute } from '@routes/auth.route';
|
|
3
|
+
import { UserRoute } from '@routes/users.route';
|
|
4
|
+
import { ValidateEnv } from '@utils/validateEnv';
|
|
6
5
|
|
|
7
|
-
|
|
6
|
+
ValidateEnv();
|
|
8
7
|
|
|
9
|
-
const app = new App([new
|
|
8
|
+
const app = new App([new UserRoute(), new AuthRoute()]);
|
|
10
9
|
|
|
11
10
|
app.listen();
|
|
@@ -1,63 +1,52 @@
|
|
|
1
1
|
import { hash, compare } from 'bcrypt';
|
|
2
2
|
import { sign } from 'jsonwebtoken';
|
|
3
|
+
import { Service } from 'typedi';
|
|
3
4
|
import { SECRET_KEY } from '@config';
|
|
4
|
-
import {
|
|
5
|
-
import { HttpException } from '@exceptions/HttpException';
|
|
5
|
+
import { HttpException } from '@exceptions/httpException';
|
|
6
6
|
import { DataStoredInToken, TokenData } from '@interfaces/auth.interface';
|
|
7
7
|
import { User } from '@interfaces/users.interface';
|
|
8
|
-
import
|
|
9
|
-
import { isEmpty } from '@utils/util';
|
|
8
|
+
import { UserModel } from '@models/users.model';
|
|
10
9
|
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
const createToken = (user: User): TokenData => {
|
|
11
|
+
const dataStoredInToken: DataStoredInToken = { _id: user._id };
|
|
12
|
+
const expiresIn: number = 60 * 60;
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
return { expiresIn, token: sign(dataStoredInToken, SECRET_KEY, { expiresIn }) };
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
const createCookie = (tokenData: TokenData): string => {
|
|
18
|
+
return `Authorization=${tokenData.token}; HttpOnly; Max-Age=${tokenData.expiresIn};`;
|
|
19
|
+
}
|
|
16
20
|
|
|
17
|
-
|
|
18
|
-
|
|
21
|
+
@Service()
|
|
22
|
+
export class AuthService {
|
|
23
|
+
public async signup(userData: User): Promise<User> {
|
|
24
|
+
const findUser: User = await UserModel.findOne({ email: userData.email });
|
|
25
|
+
if (findUser) throw new HttpException(409, `This email ${userData.email} already exists`);
|
|
19
26
|
|
|
20
27
|
const hashedPassword = await hash(userData.password, 10);
|
|
21
|
-
const createUserData: User = await
|
|
28
|
+
const createUserData: User = await UserModel.create({ ...userData, password: hashedPassword });
|
|
22
29
|
|
|
23
30
|
return createUserData;
|
|
24
31
|
}
|
|
25
32
|
|
|
26
|
-
public async login(userData:
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
const findUser: User = await this.users.findOne({ email: userData.email });
|
|
30
|
-
if (!findUser) throw new HttpException(409, `You're email ${userData.email} not found`);
|
|
33
|
+
public async login(userData: User): Promise<{ cookie: string; findUser: User }> {
|
|
34
|
+
const findUser: User = await UserModel.findOne({ email: userData.email });
|
|
35
|
+
if (!findUser) throw new HttpException(409, `This email ${userData.email} was not found`);
|
|
31
36
|
|
|
32
37
|
const isPasswordMatching: boolean = await compare(userData.password, findUser.password);
|
|
33
|
-
if (!isPasswordMatching) throw new HttpException(409, "
|
|
38
|
+
if (!isPasswordMatching) throw new HttpException(409, "Password is not matching");
|
|
34
39
|
|
|
35
|
-
const tokenData =
|
|
36
|
-
const cookie =
|
|
40
|
+
const tokenData = createToken(findUser);
|
|
41
|
+
const cookie = createCookie(tokenData);
|
|
37
42
|
|
|
38
43
|
return { cookie, findUser };
|
|
39
44
|
}
|
|
40
45
|
|
|
41
46
|
public async logout(userData: User): Promise<User> {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
const findUser: User = await this.users.findOne({ email: userData.email, password: userData.password });
|
|
45
|
-
if (!findUser) throw new HttpException(409, `You're email ${userData.email} not found`);
|
|
47
|
+
const findUser: User = await UserModel.findOne({ email: userData.email, password: userData.password });
|
|
48
|
+
if (!findUser) throw new HttpException(409, `This email ${userData.email} was not found`);
|
|
46
49
|
|
|
47
50
|
return findUser;
|
|
48
51
|
}
|
|
49
|
-
|
|
50
|
-
public createToken(user: User): TokenData {
|
|
51
|
-
const dataStoredInToken: DataStoredInToken = { _id: user._id };
|
|
52
|
-
const secretKey: string = SECRET_KEY;
|
|
53
|
-
const expiresIn: number = 60 * 60;
|
|
54
|
-
|
|
55
|
-
return { expiresIn, token: sign(dataStoredInToken, secretKey, { expiresIn }) };
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
public createCookie(tokenData: TokenData): string {
|
|
59
|
-
return `Authorization=${tokenData.token}; HttpOnly; Max-Age=${tokenData.expiresIn};`;
|
|
60
|
-
}
|
|
61
52
|
}
|
|
62
|
-
|
|
63
|
-
export default AuthService;
|