express-generator-typescript 1.9.1 → 1.9.2

package/lib/auth-proj/src/index.ts

@@ -10,5 +10,5 @@ const serverStartMsg = 'Express server started on port: ';
 
 // Start server
 server.listen(envVars.port, () => {
-  logger.info(serverStartMsg + envVars.port);
+  logger.info(serverStartMsg + envVars.port.toString());
 });

package/lib/auth-proj/src/pre-start/env/development.env

@@ -3,7 +3,7 @@ NODE_ENV=development
 
 
 ## Server ##
-PORT=3000
+PORT=4000
 HOST=localhost
 
 

package/lib/auth-proj/src/repos/mock-orm.ts

@@ -1,24 +1,34 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+
 import jsonfile from 'jsonfile';
+import { IUser } from '@models/user-model';
 
 
-// **** Vars/Constants **** //
+// **** Variables **** //
 
 const dbFilePath = 'src/repos/database.json';
 
 
+// **** Types **** //
+
+interface IDb {
+  users: IUser[];
+}
+
+
 // **** Functions **** //
 
 /**
  * Fetch the json from the file.
  */
-function openDb(): Promise<Record<string, any>> {
+function openDb(): Promise<IDb> {
   return jsonfile.readFile(dbFilePath);
 }
 
 /**
  * Update the file.
  */
-function saveDb(db: Record<string, any>): Promise<void> {
+function saveDb(db: IDb): Promise<void> {
   return jsonfile.writeFile(dbFilePath, db);
 }
 

package/lib/auth-proj/src/routes/auth-router.ts

@@ -27,7 +27,7 @@ export const p = {
 router.post(p.login, async (req: Request, res: Response) => {
   // Check email and password present
   const { email, password } = req.body;
-  if (!(email && password)) {
+  if (!email || !password) {
     throw new ParamMissingError();
   }
   // Get jwt

package/lib/auth-proj/src/routes/middleware.ts

@@ -18,8 +18,9 @@ const jwtNotPresentErr = 'JWT not present in signed cookie.';
  * Middleware to verify if user is an admin.
  */
 export async function adminMw(req: Request, res: Response, next: NextFunction) {
+  // Try
   try {
-    // Get json-web-token
+    // Extract the token
     const jwt = req.signedCookies[envVars.cookieProps.key];
     if (!jwt) {
       throw Error(jwtNotPresentErr);
@@ -32,9 +33,14 @@ export async function adminMw(req: Request, res: Response, next: NextFunction) {
     } else {
       throw Error(jwtNotPresentErr);
     }
-  } catch (err) {
-    return res.status(UNAUTHORIZED).json({
-      error: err.message,
-    });
+  // Catch
+  } catch (err: unknown) {
+    let error;
+    if (typeof err === 'string') {
+      error = err;
+    } else if (err instanceof Error) {
+      error = err.message;
+    }
+    return res.status(UNAUTHORIZED).json({ error });
   }
-};
+}

package/lib/auth-proj/src/routes/user-router.ts

@@ -27,7 +27,7 @@ export const p = {
  */
 router.get(p.get, async (_: Request, res: Response) => {
   const users = await userService.getAll();
-  return res.status(OK).json({users});
+  return res.status(OK).json({ users });
 });
 
 /**

package/lib/auth-proj/src/server.ts

@@ -3,7 +3,7 @@ import morgan from 'morgan';
 import path from 'path';
 import helmet from 'helmet';
 import StatusCodes from 'http-status-codes';
-import express, { NextFunction, Request, Response } from 'express';
+import express, { Request, Response } from 'express';
 
 import 'express-async-errors';
 
@@ -41,7 +41,7 @@ if (envVars.nodeEnv === 'production') {
 app.use('/api', BaseRouter);
 
 // Error handling
-app.use((err: Error | CustomError, _: Request, res: Response, __: NextFunction) => {
+app.use((err: Error | CustomError, _: Request, res: Response) => {
   logger.err(err, true);
   const status = (err instanceof CustomError ? err.HttpStatus : StatusCodes.BAD_REQUEST);
   return res.status(status).json({

package/lib/auth-proj/src/shared/functions.ts

@@ -8,11 +8,11 @@ export function pErr(err?: Error): void {
   if (!!err) {
     logger.err(err);
   }
-};
+}
 
 /**
  * Get a random number between 1 and 1,000,000,000,000
  */
 export function getRandomInt(): number {
   return Math.floor(Math.random() * 1_000_000_000_000);
-};
+}

package/lib/auth-proj/src/types/express/index.d.ts

@@ -0,0 +1,22 @@
+import { IUser } from "@models/user-model";
+
+
+declare module 'express' {
+  export interface Request  {
+    signedCookies: Record<string, string>,
+    body: {
+      user?: IUser
+      email?: string;
+      password?: string;
+    };
+  }
+}
+
+// Put this back in the future for middleware stuff
+// declare global {
+//   namespace Express {
+//     export interface Response {
+//         sessionUser: IClientData;
+//     }
+//   }
+// }

package/package.json

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