express-generator-typescript 2.4.2 → 2.4.4

package/lib/project-files/src/repos/database.json

@@ -1 +1 @@
-{"users":[{"name":"Sean Maxwell","email":"sean.maxwell@gmail.com","pwdHash":"$2b$12$1mE2OI9hMS/rgH9Mi0s85OM2V5gzm7aF3gJIWH1y0S1MqVBueyjsy","role":1,"id":159123164363},{"name":"Gordan Freeman","email":"gordan.freeman@halflife.com","pwdHash":"$2b$12$1mE2OI9hMS/rgH9Mi0s85OM2V5gzm7aF3gJIWH1y0S1MqVBueyjsy","role":0,"id":906524522143},{"name":"John Smith","email":"jsmith@yahoo.com","pwdHash":"$2b$12$1mE2OI9hMS/rgH9Mi0s85OM2V5gzm7aF3gJIWH1y0S1MqVBueyjsy","role":0,"id":357437875835},{"id":75800032258,"name":"asdf","email":"asdfasdf","role":0}]}
+{"users":[{"name":"Sean Maxwell","email":"sean.maxwell@gmail.com","pwdHash":"$2b$12$1mE2OI9hMS/rgH9Mi0s85OM2V5gzm7aF3gJIWH1y0S1MqVBueyjsy","role":1,"id":159123164363},{"name":"Gordan Freeman","email":"gordan.freeman@halflife.com","pwdHash":"$2b$12$1mE2OI9hMS/rgH9Mi0s85OM2V5gzm7aF3gJIWH1y0S1MqVBueyjsy","role":0,"id":906524522143},{"name":"John Smith","email":"jsmith@yahoo.com","pwdHash":"$2b$12$1mE2OI9hMS/rgH9Mi0s85OM2V5gzm7aF3gJIWH1y0S1MqVBueyjsy","role":0,"id":357437875835}]}

package/lib/project-files/src/server.ts

@@ -34,12 +34,12 @@ app.use(express.urlencoded({extended: true}));
 app.use(cookieParser(EnvVars.CookieProps.Secret));
 
 // Show routes called in console during development
-if (EnvVars.NodeEnv === NodeEnvs.Dev) {
+if (EnvVars.NodeEnv === NodeEnvs.Dev.valueOf()) {
   app.use(morgan('dev'));
 }
 
 // Security
-if (EnvVars.NodeEnv === NodeEnvs.Production) {
+if (EnvVars.NodeEnv === NodeEnvs.Production.valueOf()) {
   app.use(helmet());
 }
 
@@ -54,7 +54,7 @@ app.use((
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   next: NextFunction,
 ) => {
-  if (EnvVars.NodeEnv !== NodeEnvs.Test) {
+  if (EnvVars.NodeEnv !== NodeEnvs.Test.valueOf()) {
     logger.err(err, true);
   }
   let status = HttpStatusCodes.BAD_REQUEST;

package/lib/project-files-auth/src/server.ts

@@ -34,12 +34,12 @@ app.use(express.urlencoded({extended: true}));
 app.use(cookieParser(EnvVars.CookieProps.Secret));
 
 // Show routes called in console during development
-if (EnvVars.NodeEnv === NodeEnvs.Dev) {
+if (EnvVars.NodeEnv === NodeEnvs.Dev.valueOf()) {
   app.use(morgan('dev'));
 }
 
 // Security
-if (EnvVars.NodeEnv === NodeEnvs.Production) {
+if (EnvVars.NodeEnv === NodeEnvs.Production.valueOf()) {
   app.use(helmet());
 }
 
@@ -54,7 +54,7 @@ app.use((
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   next: NextFunction,
 ) => {
-  if (EnvVars.NodeEnv !== NodeEnvs.Test) {
+  if (EnvVars.NodeEnv !== NodeEnvs.Test.valueOf()) {
     logger.err(err, true);
   }
   let status = HttpStatusCodes.BAD_REQUEST;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "Generate new Express applications similar to express-generate which but sets it up to use TypeScript instead",
   "scripts": {
     "express-generator-typescript": "node bin/cli.js",

package/lib/project-files/src/services/AuthService.ts

@@ -1,56 +0,0 @@
-import UserRepo from '@src/repos/UserRepo';
-
-import PwdUtil from '@src/util/PwdUtil';
-import { tick } from '@src/util/misc';
-
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
-import { RouteError } from '@src/other/classes';
-import { IUser } from '@src/models/User';
-
-
-// **** Variables **** //
-
-// Errors
-export const Errors = {
-  Unauth: 'Unauthorized',
-  EmailNotFound(email: string) {
-    return `User with email "${email}" not found`;
-  },
-} as const;
-
-
-// **** Functions **** //
-
-/**
- * Login a user.
- */
-async function login(email: string, password: string): Promise<IUser> {
-  // Fetch user
-  const user = await UserRepo.getOne(email);
-  if (!user) {
-    throw new RouteError(
-      HttpStatusCodes.UNAUTHORIZED,
-      Errors.EmailNotFound(email),
-    );
-  }
-  // Check password
-  const hash = (user.pwdHash ?? ''),
-    pwdPassed = await PwdUtil.compare(password, hash);
-  if (!pwdPassed) {
-    // If password failed, wait 500ms this will increase security
-    await tick(500);
-    throw new RouteError(
-      HttpStatusCodes.UNAUTHORIZED, 
-      Errors.Unauth,
-    );
-  }
-  // Return
-  return user;
-}
-
-
-// **** Export default **** //
-
-export default {
-  login,
-} as const;

package/lib/project-files/src/util/PwdUtil.ts

@@ -1,39 +0,0 @@
-import bcrypt from 'bcrypt';
-
-
-// **** Variables **** //
-
-const SALT_ROUNDS = 12;
-
-
-// **** Functions **** //
-
-/**
- * Get a hash from the password.
- */
-function getHash(pwd: string): Promise<string> {
-  return bcrypt.hash(pwd, SALT_ROUNDS);
-}
-
-/**
- * Useful for testing.
- */
-function hashSync(pwd: string): string {
-  return bcrypt.hashSync(pwd, SALT_ROUNDS);
-}
-
-/**
- * See if a password passes the hash.
- */
-function compare(pwd: string, hash: string): Promise<boolean> {
-  return bcrypt.compare(pwd, hash);
-}
-
-
-// **** Export Default **** //
-
-export default {
-  getHash,
-  hashSync,
-  compare,
-} as const;

package/lib/project-files/src/util/SessionUtil.ts

@@ -1,92 +0,0 @@
-import { Request, Response } from 'express';
-
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
-import { RouteError } from '@src/other/classes';
-import jsonwebtoken from 'jsonwebtoken';
-
-import EnvVars from '../constants/EnvVars';
-
-
-// **** Variables **** //
-
-// Errors
-const Errors = {
-  ParamFalsey: 'Param is falsey',
-  Validation: 'JSON-web-token validation failed.',
-} as const;
-
-// Options
-const Options = {
-  expiresIn: EnvVars.Jwt.Exp,
-};
-
-
-// **** Functions **** //
-
-/**
- * Get session data from request object (i.e. ISessionUser)
- */
-function getSessionData<T>(req: Request): Promise<string | T | undefined> {
-  const { Key } = EnvVars.CookieProps,
-    jwt = req.signedCookies[Key];
-  return _decode(jwt);
-}
-
-/**
- * Add a JWT to the response 
- */
-async function addSessionData(
-  res: Response,
-  data: string | object,
-): Promise<Response> {
-  if (!res || !data) {
-    throw new RouteError(HttpStatusCodes.BAD_REQUEST, Errors.ParamFalsey);
-  }
-  // Setup JWT
-  const jwt = await _sign(data),
-    { Key, Options } = EnvVars.CookieProps;
-  // Return
-  return res.cookie(Key, jwt, Options);
-}
-
-/**
- * Remove cookie
- */
-function clearCookie(res: Response): Response {
-  const { Key, Options } = EnvVars.CookieProps;
-  return res.clearCookie(Key, Options);
-}
-
-
-// **** Helper Functions **** //
-
-/**
- * Encrypt data and return jwt.
- */
-function _sign(data: string | object | Buffer): Promise<string> {
-  return new Promise((res, rej) => {
-    jsonwebtoken.sign(data, EnvVars.Jwt.Secret, Options, (err, token) => {
-      return err ? rej(err) : res(token || '');
-    });
-  });
-}
-
-/**
- * Decrypt JWT and extract client data.
- */
-function _decode<T>(jwt: string): Promise<string | undefined | T> {
-  return new Promise((res, rej) => {
-    jsonwebtoken.verify(jwt, EnvVars.Jwt.Secret, (err, decoded) => {
-      return err ? rej(Errors.Validation) : res(decoded as T);
-    });
-  });
-}
-
-
-// **** Export default **** //
-
-export default {
-  addSessionData,
-  getSessionData,
-  clearCookie,
-} as const;