express-generator-typescript 2.4.8 → 2.4.11

package/lib/project-files/spec/support/Paths.ts

@@ -4,7 +4,7 @@
 
 import jetPaths from 'jet-paths';
 
-import Paths from '@src/constants/Paths';
+import Paths from '@src/common/Paths';
 
 
 export default jetPaths(Paths);

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

@@ -7,7 +7,7 @@ import app from '@src/server';
 
 import UserRepo from '@src/repos/UserRepo';
 import User, { IUser } from '@src/models/User';
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
 import { USER_NOT_FOUND_ERR } from '@src/services/UserService';
 
 import Paths from 'spec/support/Paths';

package/lib/project-files/src/{other/classes.ts → common/RouteError.ts}

@@ -1,14 +1,10 @@
-/**
- * Miscellaneous shared classes go here.
- */
-
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
 
 
 /**
  * Error with status code and message
  */
-export class RouteError extends Error {
+class RouteError extends Error {
 
   public status: HttpStatusCodes;
 
@@ -17,3 +13,8 @@ export class RouteError extends Error {
     this.status = status;
   }
 }
+
+
+// **** Export default **** //
+
+export default RouteError;

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

@@ -1,7 +1,7 @@
 import './pre-start'; // Must be the first import
 import logger from 'jet-logger';
 
-import EnvVars from '@src/constants/EnvVars';
+import EnvVars from '@src/common/EnvVars';
 import server from './server';
 
 

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

@@ -1,4 +1,4 @@
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
 
 import UserService from '@src/services/UserService';
 import { IUser } from '@src/models/User';

package/lib/project-files/src/routes/{api.ts → index.ts}

@@ -1,7 +1,7 @@
 import { Router } from 'express';
 import jetValidator from 'jet-validator';
 
-import Paths from '../constants/Paths';
+import Paths from '../common/Paths';
 import User from '@src/models/User';
 import UserRoutes from './UserRoutes';
 

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

@@ -11,14 +11,13 @@ import logger from 'jet-logger';
 
 import 'express-async-errors';
 
-import BaseRouter from '@src/routes/api';
-import Paths from '@src/constants/Paths';
+import BaseRouter from '@src/routes';
 
-import EnvVars from '@src/constants/EnvVars';
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
-
-import { NodeEnvs } from '@src/constants/misc';
-import { RouteError } from '@src/other/classes';
+import Paths from '@src/common/Paths';
+import EnvVars from '@src/common/EnvVars';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
+import RouteError from '@src/common/RouteError';
+import { NodeEnvs } from '@src/common/misc';
 
 
 // **** Variables **** //
@@ -65,7 +64,7 @@ app.use((
 });
 
 
-// ** Front-End Content ** //
+// **** Front-End Content **** //
 
 // Set views directory (html)
 const viewsDir = path.join(__dirname, 'views');

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

@@ -1,7 +1,8 @@
+import RouteError from '@src/common/RouteError';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
+
 import UserRepo from '@src/repos/UserRepo';
 import { IUser } from '@src/models/User';
-import { RouteError } from '@src/other/classes';
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
 
 
 // **** Variables **** //

package/lib/project-files-auth/spec/support/Paths.ts

@@ -4,7 +4,7 @@
 
 import jetPaths from 'jet-paths';
 
-import Paths from '@src/constants/Paths';
+import Paths from '@src/common/Paths';
 
 
 export default jetPaths(Paths);

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

@@ -8,8 +8,8 @@ import PwdUtil from '@src/util/PwdUtil';
 import User, { UserRoles } from '@src/models/User';
 import { Errors } from '@src/services/AuthService';
 
-import EnvVars from '@src/constants/EnvVars';
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
+import EnvVars from '@src/common/EnvVars';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
 
 import Paths from 'spec/support/Paths';
 import apiCb from 'spec/support/apiCb';

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

@@ -7,7 +7,7 @@ import app from '@src/server';
 
 import UserRepo from '@src/repos/UserRepo';
 import User, { IUser } from '@src/models/User';
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
 import { USER_NOT_FOUND_ERR } from '@src/services/UserService';
 
 import Paths from 'spec/support/Paths';
@@ -51,7 +51,7 @@ describe('UserRouter', () => {
 
     // Success
     it('should return a JSON object with all the users and a status code ' + 
-    `of "${HttpStatusCodes.OK}" if the request was successful.`, (done) => {
+    `of "${HttpStatusCodes.OK}" if the request was successful.`, done => {
       // Add spy
       const data = getDummyUsers();
       spyOn(UserRepo, 'getAll').and.resolveTo(data);
@@ -79,7 +79,7 @@ describe('UserRouter', () => {
 
     // Test add user success
     it(`should return a status code of "${HttpStatusCodes.CREATED}" if the ` + 
-    'request was successful.', (done) => {
+    'request was successful.', done => {
       // Spy
       spyOn(UserRepo, 'add').and.resolveTo();
       // Call api
@@ -92,7 +92,7 @@ describe('UserRouter', () => {
     // Missing param
     it(`should return a JSON object with an error message of "${ERROR_MSG}" ` + 
     `and a status code of "${HttpStatusCodes.BAD_REQUEST}" if the user ` + 
-    'param was missing.', (done) => {
+    'param was missing.', done => {
       // Call api
       callApi(null, res => {
         expect(res.status).toBe(HttpStatusCodes.BAD_REQUEST);
@@ -117,7 +117,7 @@ describe('UserRouter', () => {
 
     // Success
     it(`should return a status code of "${HttpStatusCodes.OK}" if the ` + 
-    'request was successful.', (done) => {
+    'request was successful.', done => {
       // Setup spies
       spyOn(UserRepo, 'update').and.resolveTo();
       spyOn(UserRepo, 'persists').and.resolveTo(true);
@@ -131,7 +131,7 @@ describe('UserRouter', () => {
     // Param missing
     it(`should return a JSON object with an error message of "${ERROR_MSG}" ` +
     `and a status code of "${HttpStatusCodes.BAD_REQUEST}" if the user ` + 
-    'param was missing.', (done) => {
+    'param was missing.', done => {
       // Call api
       callApi(null, res => {
         expect(res.status).toBe(HttpStatusCodes.BAD_REQUEST);

package/lib/project-files-auth/src/{other/classes.ts → common/RouteError.ts}

@@ -1,14 +1,10 @@
-/**
- * Miscellaneous shared classes go here.
- */
-
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
 
 
 /**
  * Error with status code and message
  */
-export class RouteError extends Error {
+class RouteError extends Error {
 
   public status: HttpStatusCodes;
 
@@ -17,3 +13,8 @@ export class RouteError extends Error {
     this.status = status;
   }
 }
+
+
+// **** Export default **** //
+
+export default RouteError;

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

@@ -1,7 +1,7 @@
 import './pre-start'; // Must be the first import
 import logger from 'jet-logger';
 
-import EnvVars from '@src/constants/EnvVars';
+import EnvVars from '@src/common/EnvVars';
 import server from './server';
 
 

package/lib/project-files-auth/src/public/scripts/users.js

@@ -130,3 +130,9 @@ function deleteUser(ele) {
     .delete('/api/users/delete/' + id)
     .then(() => displayUsers());
 }
+
+function logoutUser() {
+  Http
+    .get('/api/auth/logout')
+    .then(() => window.location.href = '/');
+}

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

@@ -1,4 +1,4 @@
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
 import SessionUtil from '@src/util/SessionUtil';
 import AuthService from '@src/services/AuthService';
 

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

@@ -1,4 +1,4 @@
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
 
 import UserService from '@src/services/UserService';
 import { IUser } from '@src/models/User';

package/lib/project-files-auth/src/routes/{api.ts → index.ts}

@@ -1,9 +1,10 @@
 import { Router } from 'express';
 import jetValidator from 'jet-validator';
 
-import adminMw from './middleware/adminMw';
-import Paths from '../constants/Paths';
+import Paths from '@src/common/Paths';
 import User from '@src/models/User';
+
+import adminMw from './middleware/adminMw';
 import AuthRoutes from './AuthRoutes';
 import UserRoutes from './UserRoutes';
 
@@ -14,7 +15,7 @@ const apiRouter = Router(),
   validate = jetValidator();
 
 
-// **** Setup AuthRouter **** //
+// **** Add AuthRouter **** //
 
 const authRouter = Router();
 

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

@@ -5,7 +5,7 @@
 import { Request, Response, NextFunction } from 'express';
 import { JwtPayload } from 'jsonwebtoken';
 
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
 
 import SessionUtil from '@src/util/SessionUtil';
 import { ISessionUser, UserRoles } from '@src/models/User';

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

@@ -11,14 +11,14 @@ import logger from 'jet-logger';
 
 import 'express-async-errors';
 
-import BaseRouter from '@src/routes/api';
-import Paths from '@src/constants/Paths';
+import BaseRouter from '@src/routes';
 
-import EnvVars from '@src/constants/EnvVars';
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
+import Paths from '@src/common/Paths';
+import EnvVars from '@src/common/EnvVars';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
+import { NodeEnvs } from '@src/common/misc';
 
-import { NodeEnvs } from '@src/constants/misc';
-import { RouteError } from '@src/other/classes';
+import RouteError from '@src/common/RouteError';
 
 
 // **** Variables **** //

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

@@ -3,8 +3,9 @@ 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 HttpStatusCodes from '@src/common/HttpStatusCodes';
+import RouteError from '@src/common/RouteError';
+
 import { IUser } from '@src/models/User';
 
 

package/lib/project-files-auth/src/services/UserService.ts

@@ -1,7 +1,8 @@
+import RouteError from '@src/common/RouteError';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
+
 import UserRepo from '@src/repos/UserRepo';
 import { IUser } from '@src/models/User';
-import { RouteError } from '@src/other/classes';
-import HttpStatusCodes from '@src/constants/HttpStatusCodes';
 
 
 // **** Variables **** //
@@ -33,7 +34,6 @@ async function updateOne(user: IUser): Promise<void> {
   if (!persists) {
     throw new RouteError(HttpStatusCodes.NOT_FOUND, USER_NOT_FOUND_ERR);
   }
-  // Return user
   return UserRepo.update(user);
 }
 
@@ -45,7 +45,6 @@ async function _delete(id: number): Promise<void> {
   if (!persists) {
     throw new RouteError(HttpStatusCodes.NOT_FOUND, USER_NOT_FOUND_ERR);
   }
-  // Delete user
   return UserRepo.delete(id);
 }
 

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

@@ -1,10 +1,9 @@
 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';
+import HttpStatusCodes from '@src/common/HttpStatusCodes';
+import RouteError from '@src/common/RouteError';
+import EnvVars from '@src/common/EnvVars';
 
 
 // **** Variables **** //
@@ -32,6 +31,23 @@ function getSessionData<T>(req: Request): Promise<string | T | undefined> {
   return _decode(jwt);
 }
 
+/**
+ * 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) => {
+      if (!!err) {
+        const err = new RouteError(HttpStatusCodes.UNAUTHORIZED, 
+          Errors.Validation);
+        return rej(err);
+      } else {
+        return res(decoded as T);
+      }
+    });
+  });
+}
+
 /**
  * Add a JWT to the response 
  */
@@ -49,37 +65,23 @@ async function addSessionData(
   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 || '');
+      return (err ? rej(err) : res(token ?? ''));
     });
   });
 }
 
 /**
- * Decrypt JWT and extract client data.
+ * Remove cookie
  */
-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);
-    });
-  });
+function clearCookie(res: Response): Response {
+  const { Key, Options } = EnvVars.CookieProps;
+  return res.clearCookie(Key, Options);
 }
 
 

package/package.json

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