express-generator-typescript 2.0.2 → 2.0.3

package/lib/express-generator-typescript.js

@@ -13,14 +13,27 @@ const fs = require('fs');
 
 // **** Variables **** //
 
+// Misc
 const prjFolder = './project-files';
 
+// ncp options
 const ncpOpts = {
   filter: (fileName) => {
     return !(fileName === 'package-lock.json' || fileName === 'node_modules');
   },
 };
 
+// Project-folder dependencies
+const dependencies = 'express dotenv http-status-codes morgan cookie-parser jet-logger ' +
+  'module-alias command-line-args express-async-errors helmet jsonfile bcrypt jsonwebtoken';
+
+// Project-folder development dependencies
+const devDependencies = 'ts-node typescript nodemon find jasmine supertest ' +
+  '@types/node @types/express @types/jasmine @types/find @types/morgan @types/cookie-parser ' +
+  '@types/supertest fs-extra tsconfig-paths @types/jsonfile @types/command-line-args ' +
+  '@typescript-eslint/eslint-plugin @typescript-eslint/parser eslint @types/fs-extra ' +
+  '@types/bcrypt @types/jsonwebtoken eslint-plugin-node';
+
 
 // **** Functions **** //
 
@@ -32,8 +45,7 @@ async function expressGenTs(destination, useYarn) {
     await copyProjectFiles(destination);
     updatePackageJson(destination);
     await renameGitigoreFile(destination);
-    const depStrings = getDepStrings();
-    downloadNodeModules(destination, depStrings, useYarn);
+    downloadNodeModules(destination, useYarn);
   } catch (err) {
     console.error(err);
   }
@@ -75,36 +87,19 @@ function renameGitigoreFile(destination) {
   });
 }
 
-/**
- * Setup dependency strings. This way gets you the latest version of everything.
- */
-function getDepStrings() {
-  let dependencies = 'express dotenv http-status-codes morgan cookie-parser jet-logger ' +
-    'module-alias command-line-args express-async-errors helmet jsonfile bcrypt ' + 
-    'jsonwebtoken';
-  let devDependencies = 'ts-node typescript nodemon find jasmine supertest ' +
-    '@types/node @types/express @types/jasmine @types/find @types/morgan ' +
-    '@types/cookie-parser @types/supertest fs-extra tsconfig-paths @types/jsonfile ' +
-    '@types/command-line-args @typescript-eslint/eslint-plugin @typescript-eslint/parser ' +
-    'eslint @types/fs-extra @types/bcrypt @types/jsonwebtoken ' + 
-    'eslint-plugin-node';
-  // Return
-  return { dependencies, devDependencies };
-}
-
 /**
  * Download the dependencies.
  */
-function downloadNodeModules(destination, depStrings, useYarn) {
+function downloadNodeModules(destination, useYarn) {
   const options = {cwd: destination};
   let downloadLibCmd;
   let downloadDepCmd;
   if (useYarn) {
-    downloadLibCmd = 'yarn add ' + depStrings.dependencies;
-    downloadDepCmd = 'yarn add ' + depStrings.devDependencies + ' -D';
+    downloadLibCmd = 'yarn add ' + dependencies;
+    downloadDepCmd = 'yarn add ' + devDependencies + ' -D';
   } else {
-    downloadLibCmd = 'npm i -s ' + depStrings.dependencies;
-    downloadDepCmd = 'npm i -D ' + depStrings.devDependencies;
+    downloadLibCmd = 'npm i -s ' + dependencies;
+    downloadDepCmd = 'npm i -D ' + devDependencies;
   }
   childProcess.execSync(downloadLibCmd, options);
   childProcess.execSync(downloadDepCmd, options);

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

@@ -1,10 +1,10 @@
 import StatusCodes from 'http-status-codes';
 import { Request, Response, NextFunction } from 'express';
+import { JwtPayload } from 'jsonwebtoken';
 
 import { IUser, UserRoles } from '@models/user-model';
 import envVars from 'src/shared/env-vars';
 import jwtUtil from '@util/jwt-util';
-import { JwtPayload } from 'jsonwebtoken';
 
 
 // **** Variables **** //
@@ -38,7 +38,7 @@ export async function adminMw(req: Request, res: Response, next: NextFunction) {
     }
     // Make sure user role is an admin
     const clientData = await jwtUtil.decode<ISessionUser>(jwt);
-    if (clientData.role === UserRoles.Admin) {
+    if (typeof clientData === 'object' && clientData.role === UserRoles.Admin) {
       res.locals.sessionUser = clientData;
       next();
     } else {

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

@@ -1,4 +1,4 @@
-import jsonwebtoken from 'jsonwebtoken';
+import jsonwebtoken, { JwtPayload } from 'jsonwebtoken';
 import envVars from '../shared/env-vars';
 
 
@@ -21,9 +21,9 @@ const options = {
  * Encrypt data and return jwt.
  */
 function sign(data: string | object | Buffer): Promise<string> {
-  return new Promise((resolve, reject) => {
+  return new Promise((res, rej) => {
     jsonwebtoken.sign(data, envVars.jwt.secret, options, (err, token) => {
-      return err ? reject(err) : resolve(token || '');
+      return err ? rej(err) : res(token || '');
     });
   });
 }
@@ -31,7 +31,7 @@ function sign(data: string | object | Buffer): Promise<string> {
 /**
  * Decrypt JWT and extract client data.
  */
-function decode<T>(jwt: string): Promise<T> {
+async function decode<T extends JwtPayload>(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);

package/package.json

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