typescript-express-starter 6.0.0 → 6.3.0

package/lib/typeorm/src/services/auth.service.ts

@@ -1,37 +1,34 @@
-import bcrypt from 'bcrypt';
+import { compare, hash } from 'bcrypt';
 import config from 'config';
-import jwt from 'jsonwebtoken';
-import { getRepository } from 'typeorm';
+import { sign } from 'jsonwebtoken';
+import { EntityRepository, Repository } from 'typeorm';
 import { CreateUserDto } from '@dtos/users.dto';
-import { UserEntity } from '@entity/users.entity';
+import { UserEntity } from '@entities/users.entity';
 import { HttpException } from '@exceptions/HttpException';
 import { DataStoredInToken, TokenData } from '@interfaces/auth.interface';
 import { User } from '@interfaces/users.interface';
 import { isEmpty } from '@utils/util';
 
-class AuthService {
-  public users = UserEntity;
-
+@EntityRepository()
+class AuthService extends Repository<UserEntity> {
   public async signup(userData: CreateUserDto): Promise<User> {
     if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
 
-    const userRepository = getRepository(this.users);
-    const findUser: User = await userRepository.findOne({ where: { email: userData.email } });
+    const findUser: User = await UserEntity.findOne({ where: { email: userData.email } });
     if (findUser) throw new HttpException(409, `You're email ${userData.email} already exists`);
 
-    const hashedPassword = await bcrypt.hash(userData.password, 10);
-    const createUserData: User = await userRepository.save({ ...userData, password: hashedPassword });
+    const hashedPassword = await hash(userData.password, 10);
+    const createUserData: User = await UserEntity.create({ ...userData, password: hashedPassword }).save();
     return createUserData;
   }
 
   public async login(userData: CreateUserDto): Promise<{ cookie: string; findUser: User }> {
     if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
 
-    const userRepository = getRepository(this.users);
-    const findUser: User = await userRepository.findOne({ where: { email: userData.email } });
+    const findUser: User = await UserEntity.findOne({ where: { email: userData.email } });
     if (!findUser) throw new HttpException(409, `You're email ${userData.email} not found`);
 
-    const isPasswordMatching: boolean = await bcrypt.compare(userData.password, findUser.password);
+    const isPasswordMatching: boolean = await compare(userData.password, findUser.password);
     if (!isPasswordMatching) throw new HttpException(409, "You're password not matching");
 
     const tokenData = this.createToken(findUser);
@@ -43,8 +40,7 @@ class AuthService {
   public async logout(userData: User): Promise<User> {
     if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
 
-    const userRepository = getRepository(this.users);
-    const findUser: User = await userRepository.findOne({ where: { email: userData.email, password: userData.password } });
+    const findUser: User = await UserEntity.findOne({ where: { email: userData.email, password: userData.password } });
     if (!findUser) throw new HttpException(409, "You're not user");
 
     return findUser;
@@ -55,7 +51,7 @@ class AuthService {
     const secretKey: string = config.get('secretKey');
     const expiresIn: number = 60 * 60;
 
-    return { expiresIn, token: jwt.sign(dataStoredInToken, secretKey, { expiresIn }) };
+    return { expiresIn, token: sign(dataStoredInToken, secretKey, { expiresIn }) };
   }
 
   public createCookie(tokenData: TokenData): string {

package/lib/typeorm/src/services/users.service.ts

@@ -1,25 +1,22 @@
-import bcrypt from 'bcrypt';
-import { getRepository } from 'typeorm';
+import { hash } from 'bcrypt';
+import { EntityRepository, Repository } from 'typeorm';
 import { CreateUserDto } from '@dtos/users.dto';
-import { UserEntity } from '@entity/users.entity';
+import { UserEntity } from '@entities/users.entity';
 import { HttpException } from '@exceptions/HttpException';
 import { User } from '@interfaces/users.interface';
 import { isEmpty } from '@utils/util';
 
-class UserService {
-  public users = UserEntity;
-
+@EntityRepository()
+class UserService extends Repository<UserEntity> {
   public async findAllUser(): Promise<User[]> {
-    const userRepository = getRepository(this.users);
-    const users: User[] = await userRepository.find();
+    const users: User[] = await UserEntity.find();
     return users;
   }
 
   public async findUserById(userId: number): Promise<User> {
     if (isEmpty(userId)) throw new HttpException(400, "You're not userId");
 
-    const userRepository = getRepository(this.users);
-    const findUser: User = await userRepository.findOne({ where: { id: userId } });
+    const findUser: User = await UserEntity.findOne({ where: { id: userId } });
     if (!findUser) throw new HttpException(409, "You're not user");
 
     return findUser;
@@ -28,12 +25,11 @@ class UserService {
   public async createUser(userData: CreateUserDto): Promise<User> {
     if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
 
-    const userRepository = getRepository(this.users);
-    const findUser: User = await userRepository.findOne({ where: { email: userData.email } });
+    const findUser: User = await UserEntity.findOne({ where: { email: userData.email } });
     if (findUser) throw new HttpException(409, `You're email ${userData.email} already exists`);
 
-    const hashedPassword = await bcrypt.hash(userData.password, 10);
-    const createUserData: User = await userRepository.save({ ...userData, password: hashedPassword });
+    const hashedPassword = await hash(userData.password, 10);
+    const createUserData: User = await UserEntity.create({ ...userData, password: hashedPassword }).save();
 
     return createUserData;
   }
@@ -41,25 +37,23 @@ class UserService {
   public async updateUser(userId: number, userData: CreateUserDto): Promise<User> {
     if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
 
-    const userRepository = getRepository(this.users);
-    const findUser: User = await userRepository.findOne({ where: { id: userId } });
+    const findUser: User = await UserEntity.findOne({ where: { id: userId } });
     if (!findUser) throw new HttpException(409, "You're not user");
 
-    const hashedPassword = await bcrypt.hash(userData.password, 10);
-    await userRepository.update(userId, { ...userData, password: hashedPassword });
+    const hashedPassword = await hash(userData.password, 10);
+    await UserEntity.update(userId, { ...userData, password: hashedPassword });
 
-    const updateUser: User = await userRepository.findOne({ where: { id: userId } });
+    const updateUser: User = await UserEntity.findOne({ where: { id: userId } });
     return updateUser;
   }
 
   public async deleteUser(userId: number): Promise<User> {
     if (isEmpty(userId)) throw new HttpException(400, "You're not userId");
 
-    const userRepository = getRepository(this.users);
-    const findUser: User = await userRepository.findOne({ where: { id: userId } });
+    const findUser: User = await UserEntity.findOne({ where: { id: userId } });
     if (!findUser) throw new HttpException(409, "You're not user");
 
-    await userRepository.delete({ id: userId });
+    await UserEntity.delete({ id: userId });
     return findUser;
   }
 }

package/lib/typeorm/src/utils/logger.ts

@@ -1,14 +1,14 @@
 import config from 'config';
-import fs from 'fs';
-import path from 'path';
+import { existsSync, mkdirSync } from 'fs';
+import { join } from 'path';
 import winston from 'winston';
 import winstonDaily from 'winston-daily-rotate-file';
 
 // logs dir
-const logDir: string = path.join(__dirname, config.get('log.dir'));
+const logDir: string = join(__dirname, config.get('log.dir'));
 
-if (!fs.existsSync(logDir)) {
-  fs.mkdirSync(logDir);
+if (!existsSync(logDir)) {
+  mkdirSync(logDir);
 }
 
 // Define log format

package/lib/typeorm/src/utils/util.ts

@@ -9,7 +9,7 @@ export const isEmpty = (value: string | number | object): boolean => {
     return true;
   } else if (typeof value !== 'number' && value === '') {
     return true;
-  } else if (value === 'undefined' || value === undefined) {
+  } else if (typeof value === 'undefined' || value === undefined) {
     return true;
   } else if (value !== null && typeof value === 'object' && !Object.keys(value).length) {
     return true;

package/lib/typeorm/tsconfig.json

@@ -13,7 +13,7 @@
     "pretty": true,
     "sourceMap": true,
     "declaration": true,
-    "outDir": "./dist",
+    "outDir": "dist",
     "allowJs": true,
     "noEmit": false,
     "esModuleInterop": true,
@@ -25,7 +25,7 @@
       "@controllers/*": ["controllers/*"],
       "@databases": ["databases"],
       "@dtos/*": ["dtos/*"],
-      "@entity/*": ["entity/*"],
+      "@entities/*": ["entities/*"],
       "@exceptions/*": ["exceptions/*"],
       "@interfaces/*": ["interfaces/*"],
       "@middlewares/*": ["middlewares/*"],
@@ -35,5 +35,5 @@
     }
   },
   "include": ["src/**/*.ts", "src/**/*.json", ".env"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules", "src/http", "src/logs", "src/tests"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-express-starter",
-  "version": "6.0.0",
+  "version": "6.3.0",
   "description": "Quick and Easy TypeScript Express Starter",
   "author": "AGUMON <ljlm0402@gmail.com>",
   "license": "MIT",
@@ -8,12 +8,12 @@
     "typescript",
     "express",
     "routing-controllers",
+    "routing-controllers-openapi",
     "sequelize",
     "mongoose",
     "typeorm",
     "knex",
     "prisma",
-    "querybuilder",
     "jest",
     "nodemon",
     "jsonwebtoken",
@@ -31,7 +31,8 @@
     "mysql",
     "mariadb",
     "mongodb",
-    "postgresql"
+    "postgresql",
+    "swc"
   ],
   "main": "bin/cli.js",
   "bin": {
@@ -49,6 +50,13 @@
     "ora": "^4.0.3"
   },
   "devDependencies": {},
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "node": ">= 10.13.0",
+    "npm": ">= 6.11.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ljlm0402/typescript-express-starter.git"
@@ -57,4 +65,4 @@
     "url": "https://github.com/ljlm0402/typescript-express-starter/issues"
   },
   "homepage": "https://github.com/ljlm0402/typescript-express-starter#readme"
-}
+}