express-generator-typescript 2.0.7 → 2.0.9

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

@@ -15,7 +15,7 @@ import { UnauthorizedError } from '@shared/errors';
 // **** Variables **** //
 
 // Misc
-const authPath = '/api/auth',
+const authPath = ('/api' + paths.basePath),
   loginPath = `${authPath}${paths.login}`,
   logoutPath = `${authPath}${paths.logout}`,
   { BAD_REQUEST, OK, UNAUTHORIZED } = StatusCodes;

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

@@ -14,7 +14,7 @@ import { ParamMissingError, UserNotFoundError } from '@shared/errors';
 // **** Variables **** //
 
 // Misc
-const usersPath = '/api/users',
+const usersPath = ('/api' + userPaths.basePath),
   getUsersPath = `${usersPath}${userPaths.get}`,
   addUsersPath = `${usersPath}${userPaths.add}`,
   updateUserPath = `${usersPath}${userPaths.update}`,

package/lib/project-files/src/models/user-model.ts

@@ -1,10 +1,13 @@
-// **** Types **** //
+// **** Variables **** //
 
 export enum UserRoles {
   Standard,
   Admin,
 }
 
+
+// **** Types **** //
+
 export interface IUser {
   id: number;
   name: string;

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

@@ -1,15 +1,16 @@
 import { Router } from 'express';
 import { adminMw } from './middleware';
-import authRouter from './auth-router';
-import userRouter from './user-router';
+
+import authRouter, { p as authPaths } from './auth-router';
+import userRouter, { p as userPaths } from './user-router';
 
 
 // Init
 const apiRouter = Router();
 
 // Add api routes
-apiRouter.use('/auth', authRouter);
-apiRouter.use('/users', adminMw, userRouter);
+apiRouter.use(authPaths.basePath, authRouter);
+apiRouter.use(userPaths.basePath, adminMw, userRouter);
 
 
 // **** Export default **** //

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

@@ -24,6 +24,7 @@ const { OK } = StatusCodes;
 
 // Paths
 export const p = {
+  basePath: '/auth',
   login: '/login',
   logout: '/logout',
 } as const;

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

@@ -15,6 +15,7 @@ const router = Router(),
 
 // Paths
 export const p = {
+  basePath: '/users',
   get: '/all',
   add: '/add',
   update: '/update',

package/package.json

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