express-generator-typescript 2.1.10 → 2.1.12

package/lib/project-files/spec/support/login-agent.ts

@@ -1,7 +1,7 @@
 import bcrypt from 'bcrypt';
 import { SuperTest, Test, Response } from 'supertest';
 
-import User, { UserRoles } from '@models/user-model';
+import User, { UserRoles } from '@models/User';
 import userRepo from '@repos/user-repo';
 
 

package/lib/project-files/spec/tests/auth.spec.ts

@@ -5,8 +5,8 @@ import logger from 'jet-logger';
 
 import app from '@server';
 import userRepo from '@repos/user-repo';
-import envVars from '@shared/env-vars';
-import User, { UserRoles } from '@models/user-model';
+import EnvVars from '@shared/EnvVars';
+import User, { UserRoles } from '@models/User';
 import authRoutes from '@routes/auth-routes';
 import { pwdSaltRounds } from 'spec/support/login-agent';
 import { UnauthorizedError } from '@shared/errors';
@@ -78,7 +78,7 @@ describe('auth-router', () => {
           !!err && logger.err(err);
           expect(res.status).toBe(OK);
           const cookie = res.headers['set-cookie'][0];
-          expect(cookie).toContain(envVars.cookieProps.key);
+          expect(cookie).toContain(EnvVars.cookieProps.key);
           done();
         });
     });

package/lib/project-files/spec/tests/users.spec.ts

@@ -5,7 +5,7 @@ import logger from 'jet-logger';
 
 import app from '@server';
 import userRepo from '@repos/user-repo';
-import User, { IUser } from '@models/user-model';
+import User, { IUser } from '@models/User';
 import userRoutes from '@routes/user-routes';
 
 import {

package/lib/project-files/spec/types/supertest/index.d.ts

@@ -1,4 +1,4 @@
-import { IUser } from '@models/user-model';
+import { IUser } from '@models/User';
 import 'supertest';
 
 

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

@@ -1,11 +1,11 @@
 import './pre-start'; // Must be the first import
 import logger from 'jet-logger';
 
-import envVars from '@shared/env-vars';
+import EnvVars from '@shared/EnvVars';
 import server from './server';
 
 
 // **** Start server **** //
 
-const msg = ('Express server started on port: ' + envVars.port.toString());
-server.listen(envVars.port, () => logger.info(msg));
+const msg = ('Express server started on port: ' + EnvVars.port.toString());
+server.listen(EnvVars.port, () => logger.info(msg));

package/lib/project-files/src/repos/mock-orm.ts

@@ -2,7 +2,7 @@
 
 import jsonfile from 'jsonfile';
 
-import { IUser } from '@models/user-model';
+import { IUser } from '@models/User';
 
 
 // **** Variables **** //

package/lib/project-files/src/repos/user-repo.ts

@@ -1,5 +1,5 @@
-import { IUser } from '@models/user-model';
-import sharedFns from '@shared/functions';
+import { IUser } from '@models/User';
+import { getRandomInt } from '@shared/functions';
 import orm from './mock-orm';
 
 
@@ -44,7 +44,7 @@ async function getAll(): Promise<IUser[]> {
  */
 async function add(user: IUser): Promise<void> {
   const db = await orm.openDb();
-  user.id = sharedFns.getRandomInt();
+  user.id = getRandomInt();
   db.users.push(user);
   return orm.saveDb(db);
 }

package/lib/project-files/src/routes/api.ts

@@ -2,7 +2,7 @@ import { Router } from 'express';
 
 import adminMw from './middlware/adminMw';
 import validate from './middlware/validate';
-import User from '@models/user-model';
+import User from '@models/User';
 import authRoutes from './auth-routes';
 import userRoutes from './user-routes';
 

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

@@ -1,7 +1,7 @@
 import StatusCodes from 'http-status-codes';
 
 import authService from '@services/auth-service';
-import envVars from '@shared/env-vars';
+import EnvVars from '@shared/EnvVars';
 import { IReq, IRes } from '@shared/types';
 
 
@@ -35,7 +35,7 @@ async function login(req: IReq<ILoginReq>, res: IRes) {
   const { email, password } = req.body;
   // Add jwt to cookie
   const jwt = await authService.getJwt(email, password);
-  const { key, options } = envVars.cookieProps;
+  const { key, options } = EnvVars.cookieProps;
   res.cookie(key, jwt, options);
   // Return
   return res.status(OK).end();
@@ -45,7 +45,7 @@ async function login(req: IReq<ILoginReq>, res: IRes) {
  * Logout the user.
  */
 function logout(_: IReq, res: IRes) {
-  const { key, options } = envVars.cookieProps;
+  const { key, options } = EnvVars.cookieProps;
   res.clearCookie(key, options);
   return res.status(OK).end();
 }

package/lib/project-files/src/routes/middlware/adminMw.ts

@@ -6,9 +6,9 @@ import StatusCodes from 'http-status-codes';
 import { Request, Response, NextFunction } from 'express';
 import { JwtPayload } from 'jsonwebtoken';
 
-import envVars from '@shared/env-vars';
+import EnvVars from '@shared/EnvVars';
 import jwtUtil from '@util/jwt-util';
-import { IUser, UserRoles } from '@models/user-model';
+import { IUser, UserRoles } from '@models/User';
 
 
 // **** Variables **** //
@@ -39,7 +39,7 @@ async function adminMw(
 ) {
   try {
     // Extract the token
-    const cookieName = envVars.cookieProps.key,
+    const cookieName = EnvVars.cookieProps.key,
       jwt = req.signedCookies[cookieName];
     if (!jwt) {
       throw Error(jwtNotPresentErr);

package/lib/project-files/src/routes/user-routes.ts

@@ -1,7 +1,7 @@
 import StatusCodes from 'http-status-codes';
 
 import userService from '@services/user-service';
-import { IUser } from '@models/user-model';
+import { IUser } from '@models/User';
 import { IReq, IRes } from '@shared/types';
 
 

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

@@ -9,7 +9,7 @@ import 'express-async-errors';
 
 import BaseRouter from './routes/api';
 import logger from 'jet-logger';
-import envVars from '@shared/env-vars';
+import EnvVars from '@shared/EnvVars';
 import { CustomError } from '@shared/errors';
 
 import { NodeEnvs } from '@shared/enums';
@@ -24,15 +24,15 @@ const app = express();
 
 app.use(express.json());
 app.use(express.urlencoded({extended: true}));
-app.use(cookieParser(envVars.cookieProps.secret));
+app.use(cookieParser(EnvVars.cookieProps.secret));
 
 // Show routes called in console during development
-if (envVars.nodeEnv === NodeEnvs.Dev) {
+if (EnvVars.nodeEnv === NodeEnvs.Dev) {
   app.use(morgan('dev'));
 }
 
 // Security
-if (envVars.nodeEnv === NodeEnvs.Production) {
+if (EnvVars.nodeEnv === NodeEnvs.Production) {
   app.use(helmet());
 }
 
@@ -81,7 +81,7 @@ app.get('/', (_: Request, res: Response) => {
 
 // Redirect to login if not logged in.
 app.get('/users', (req: Request, res: Response) => {
-  const jwt = req.signedCookies[envVars.cookieProps.key];
+  const jwt = req.signedCookies[EnvVars.cookieProps.key];
   if (!jwt) {
     res.redirect('/');
   } else {

package/lib/project-files/src/services/user-service.ts

@@ -1,5 +1,5 @@
 import userRepo from '@repos/user-repo';
-import { IUser } from '@models/user-model';
+import { IUser } from '@models/User';
 import { UserNotFoundError } from '@shared/errors';
 
 

package/lib/project-files/src/shared/functions.ts

@@ -1,13 +1,6 @@
 /**
  * Get a random number between 1 and 1,000,000,000,000
  */
-function getRandomInt(): number {
+export function getRandomInt(): number {
   return Math.floor(Math.random() * 1_000_000_000_000);
 }
-
-
-// **** Export default **** //
-
-export default {
-  getRandomInt,
-} as const;

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

@@ -1,5 +1,5 @@
 import jsonwebtoken from 'jsonwebtoken';
-import envVars from '../shared/env-vars';
+import EnvVars from '../shared/EnvVars';
 
 
 // **** Variables **** //
@@ -11,7 +11,7 @@ const errors = {
 
 // Options
 const options = {
-  expiresIn: envVars.jwt.exp,
+  expiresIn: EnvVars.jwt.exp,
 };
 
 
@@ -22,7 +22,7 @@ const options = {
  */
 function sign(data: string | object | Buffer): Promise<string> {
   return new Promise((res, rej) => {
-    jsonwebtoken.sign(data, envVars.jwt.secret, options, (err, token) => {
+    jsonwebtoken.sign(data, EnvVars.jwt.secret, options, (err, token) => {
       return err ? rej(err) : res(token || '');
     });
   });
@@ -33,7 +33,7 @@ function sign(data: string | object | Buffer): Promise<string> {
  */
 function decode<T>(jwt: string): Promise<string | undefined | T> {
   return new Promise((res, rej) => {
-    jsonwebtoken.verify(jwt, envVars.jwt.secret, (err, decoded) => {
+    jsonwebtoken.verify(jwt, EnvVars.jwt.secret, (err, decoded) => {
       return err ? rej(errors.validation) : res(decoded as T);
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "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",