swagger

Author: hemadnap

readme.md

@@ -1,5 +1,5 @@
 [![Build](https://img.shields.io/badge/build-passing-green.svg?style=flat-square)](http://tocausan.github.io)
-[![Build](https://img.shields.io/badge/version-0.2.1-D07183.svg?style=flat-square)](http://tocausan.github.io)
+[![Build](https://img.shields.io/badge/version-0.3.0-D07183.svg?style=flat-square)](http://tocausan.github.io)
 
 # express-api-ts
 

src/app.ts

@@ -8,7 +8,6 @@ import * as bodyParser from 'body-parser';
 import * as helmet from 'helmet';
 import {Config} from './config';
 import {Routes} from './routes';
-import {Swagger} from "./routes/swagger";
 
 const port = normalizePort(Config.api.port);
 
@@ -18,7 +17,6 @@ const App = express()
     .use(bodyParser.urlencoded({extended: false}))
     .use(cookieParser())
     .set('port', port)
-    .use('/', Swagger)
     .use('/', Routes)
     .use(helmet())
     .disable('x-powered-by');

src/routes/index.ts

@@ -3,6 +3,7 @@ import {Config} from '../config';
 import {HeaderMiddleware, ValidationMiddleware} from '../middlewares';
 import {ErrorController, AuthController, UserController, ProfileController} from '../controllers';
 import {PopulationServices} from "../services";
+import Swagger from "./swagger";
 
 const baseUrl = Config.api.path,
     memberUrl = baseUrl + '/member',
@@ -12,6 +13,7 @@ const baseUrl = Config.api.path,
 if (process.env.ENV === 'dev') PopulationServices.default();
 
 export const Routes = express.Router()
+    .use('/', Swagger)
 
     .all('/*', [HeaderMiddleware.enableCORS])
     .get('/', (req: express.Request, res: express.Response) => {

src/routes/swagger.json

@@ -1,8 +1,8 @@
 {
   "swagger": "2.0",
   "info": {
-    "version": "0.1.0",
-    "title": "webpack-express-typescript-swagger-api"
+    "version": "0.3.0",
+    "title": "express-api-ts"
   },
   "host": "localhost:3000",
   "basePath": "/api/v1",
@@ -446,7 +446,7 @@
             "type": "string"
           },
           "language": {
-            "type": "string"
+            "type": "integer"
           },
           "role": {
             "type": "integer"

src/routes/swagger.ts

@@ -1,13 +1,17 @@
-import * as express from "express";
+import {Router} from "express";
 
 const swaggerUi = require('swagger-ui-express'),
-    swaggerDocument = require("./swagger.json"),
-    swaggerJSDoc = require('swagger-jsdoc');
+    swaggerDocument = require("./swagger.json");
 
-export const Swagger = express.Router()
-    .use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument))
+const Swagger = Router();
 
-    .get('/swagger.json', (req, res) => {
+if (process.env.ENV === 'dev') {
+    Swagger.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
+
+    Swagger.get('/swagger.json', (req, res) => {
         res.setHeader('Content-Type', 'application/json');
         res.send(JSON.stringify(swaggerDocument, null, 2));
-    });
+    });
+}
+
+export default Swagger;

src/services/user.ts

@@ -44,7 +44,7 @@ export const UserServices = {
 
         updateUser: async (username: string, update: any): Promise<User> => {
             const user: User = await UserServices.getUser(username);
-            return new User(await (DbClient.findOneAndUpdate(Config.database.collections.users, {_id: user.id}, update)))
+            return await (DbClient.findOneAndUpdate(Config.database.collections.users, {_id: user.id}, update));
         },
 
         deleteUser: async (username: string): Promise<void> => {