BUGFIX: Cannot set statuscode for express.js #94

lukeautry · May 19, 2017 · 804ed90 · 804ed90
1 parent d5808c5
commit 804ed90
Show file tree

Hide file tree

Showing 14 changed files with 440 additions and 20 deletions.
diff --git a/src/interfaces/controller.ts b/src/interfaces/controller.ts
@@ -1,6 +1,6 @@
 
 export class Controller {
-    private statusCode?: number  = undefined;
+    public statusCode?: number  = undefined;
 
     public getStatus() {
         return this.statusCode;

diff --git a/src/routeGeneration/templates/express.ts b/src/routeGeneration/templates/express.ts
@@ -96,11 +96,9 @@ export function RegisterRoutes(app: any) {
         return promise
             .then((data: any) => {
                 if (data) {
-                    response.json(data);
-                    response.status(statusCode || 200);
+                    response.status(statusCode || 200).json(data);;
                 } else {
-                    response.status(statusCode || 204);
-                    response.end();
+                    response.status(statusCode || 204).end();
                 }
             })
             .catch((error: any) => next(error));

diff --git a/tests/fixtures/controllers/testController.ts b/tests/fixtures/controllers/testController.ts
@@ -0,0 +1,42 @@
+import {
+    Route, Get, Controller
+} from '../../../src';
+import { TestModel } from '../../fixtures/testModel';
+import { ModelService } from '../services/modelService';
+
+@Route('Controller')
+export class TestController extends Controller {
+
+    @Get('normalStatusCode')
+    public async normalStatusCode(): Promise<TestModel> {
+        return Promise.resolve(new ModelService().getModel());
+    }
+
+    @Get('customNomalStatusCode')
+    public async customNomalStatusCode(): Promise<TestModel> {
+        const that = this;
+        const service = new ModelService();
+        const promise = service.getModelPromise();
+
+        return new Promise<TestModel>(resolve => {
+            that.statusCode = 201;
+            resolve(promise);
+        });
+    }
+
+    @Get('noContentStatusCode')
+    public async noContentStatusCode(): Promise<void> {
+        return Promise.resolve();
+    }
+
+    @Get('customNoContentStatusCode')
+    public async customNoContentStatusCode(): Promise<void> {
+        const that = this;
+        const promise = Promise.resolve();
+
+        return new Promise<void>(resolve => {
+            that.statusCode = 201;
+            resolve(promise);
+        });
+    }
+}
diff --git a/tests/fixtures/express/routes.ts b/tests/fixtures/express/routes.ts
@@ -10,6 +10,7 @@ import { MethodController } from './../controllers/methodController';
 import { ParameterController } from './../controllers/parameterController';
 import { SecurityTestController } from './../controllers/securityController';
 import { ValidateController } from './../controllers/validateController';
+import { TestController } from './../controllers/testController';
 import { set } from 'lodash';
 import { expressAuthentication } from './authentication';
 
@@ -1743,6 +1744,94 @@ export function RegisterRoutes(app: any) {
       }
       promiseHandler(promise, statusCode, response, next);
     });
+  app.get('/v1/Controller/normalStatusCode',
+    function(request: any, response: any, next: any) {
+      const args = {
+      };
+
+      let validatedArgs: any[] = [];
+      try {
+        validatedArgs = getValidatedArgs(args, request);
+      } catch (err) {
+        return next(err);
+      }
+
+      const controller = new TestController();
+
+
+      const promise = controller.normalStatusCode.apply(controller, validatedArgs);
+      let statusCode: any;
+      if (controller instanceof Controller) {
+        statusCode = (controller as Controller).getStatus();
+      }
+      promiseHandler(promise, statusCode, response, next);
+    });
+  app.get('/v1/Controller/customNomalStatusCode',
+    function(request: any, response: any, next: any) {
+      const args = {
+      };
+
+      let validatedArgs: any[] = [];
+      try {
+        validatedArgs = getValidatedArgs(args, request);
+      } catch (err) {
+        return next(err);
+      }
+
+      const controller = new TestController();
+
+
+      const promise = controller.customNomalStatusCode.apply(controller, validatedArgs);
+      let statusCode: any;
+      if (controller instanceof Controller) {
+        statusCode = (controller as Controller).getStatus();
+      }
+      promiseHandler(promise, statusCode, response, next);
+    });
+  app.get('/v1/Controller/noContentStatusCode',
+    function(request: any, response: any, next: any) {
+      const args = {
+      };
+
+      let validatedArgs: any[] = [];
+      try {
+        validatedArgs = getValidatedArgs(args, request);
+      } catch (err) {
+        return next(err);
+      }
+
+      const controller = new TestController();
+
+
+      const promise = controller.noContentStatusCode.apply(controller, validatedArgs);
+      let statusCode: any;
+      if (controller instanceof Controller) {
+        statusCode = (controller as Controller).getStatus();
+      }
+      promiseHandler(promise, statusCode, response, next);
+    });
+  app.get('/v1/Controller/customNoContentStatusCode',
+    function(request: any, response: any, next: any) {
+      const args = {
+      };
+
+      let validatedArgs: any[] = [];
+      try {
+        validatedArgs = getValidatedArgs(args, request);
+      } catch (err) {
+        return next(err);
+      }
+
+      const controller = new TestController();
+
+
+      const promise = controller.customNoContentStatusCode.apply(controller, validatedArgs);
+      let statusCode: any;
+      if (controller instanceof Controller) {
+        statusCode = (controller as Controller).getStatus();
+      }
+      promiseHandler(promise, statusCode, response, next);
+    });
 
   function authenticateMiddleware(name: string, scopes: string[] = []) {
     return (request: any, response: any, next: any) => {
@@ -1761,11 +1850,9 @@ export function RegisterRoutes(app: any) {
     return promise
       .then((data: any) => {
         if (data) {
-          response.json(data);
-          response.status(statusCode || 200);
+          response.status(statusCode || 200).json(data);;
         } else {
-          response.status(statusCode || 204);
-          response.end();
+          response.status(statusCode || 204).end();
         }
       })
       .catch((error: any) => next(error));

diff --git a/tests/fixtures/express/server.ts b/tests/fixtures/express/server.ts
@@ -11,6 +11,7 @@ import '../controllers/methodController';
 import '../controllers/parameterController';
 import '../controllers/securityController';
 import '../controllers/validateController';
+import '../controllers/testController';
 
 import { RegisterRoutes } from './routes';
 

diff --git a/tests/fixtures/hapi/routes.ts b/tests/fixtures/hapi/routes.ts
@@ -12,6 +12,7 @@ import { MethodController } from './../controllers/methodController';
 import { ParameterController } from './../controllers/parameterController';
 import { SecurityTestController } from './../controllers/securityController';
 import { ValidateController } from './../controllers/validateController';
+import { TestController } from './../controllers/testController';
 import { set } from 'lodash';
 import { hapiAuthentication } from './authentication';
 
@@ -1388,8 +1389,8 @@ export function RegisterRoutes(server: hapi.Server) {
       pre: [
         {
           method: authenticateMiddleware('api_key'
-          )        
-}
+          )
+        }
       ],
       handler: (request: any, reply) => {
         const args = {
@@ -1421,8 +1422,8 @@ export function RegisterRoutes(server: hapi.Server) {
         {
           method: authenticateMiddleware('tsoa_auth'
             , ["write:pets", "read:pets"]
-          )
-        }
+          )        
+}
       ],
       handler: (request: any, reply) => {
         const args = {
@@ -1720,8 +1721,8 @@ export function RegisterRoutes(server: hapi.Server) {
       pre: [
         {
           method: authenticateMiddleware('api_key'
-          )        
-}
+          )
+        }
       ],
       handler: (request: any, reply) => {
         const args = {
@@ -2029,6 +2030,110 @@ export function RegisterRoutes(server: hapi.Server) {
       }
     }
   });
+  server.route({
+    method: 'get',
+    path: '/v1/Controller/normalStatusCode',
+    config: {
+      handler: (request: any, reply) => {
+        const args = {
+        };
+
+        let validatedArgs: any[] = [];
+        try {
+          validatedArgs = getValidatedArgs(args, request);
+        } catch (err) {
+          return reply(err).code(err.status || 500);
+        }
+
+        const controller = new TestController();
+
+        const promise = controller.normalStatusCode.apply(controller, validatedArgs);
+        let statusCode: any;
+        if (controller instanceof Controller) {
+          statusCode = (controller as Controller).getStatus();
+        }
+        return promiseHandler(promise, statusCode, request, reply);
+      }
+    }
+  });
+  server.route({
+    method: 'get',
+    path: '/v1/Controller/customNomalStatusCode',
+    config: {
+      handler: (request: any, reply) => {
+        const args = {
+        };
+
+        let validatedArgs: any[] = [];
+        try {
+          validatedArgs = getValidatedArgs(args, request);
+        } catch (err) {
+          return reply(err).code(err.status || 500);
+        }
+
+        const controller = new TestController();
+
+        const promise = controller.customNomalStatusCode.apply(controller, validatedArgs);
+        let statusCode: any;
+        if (controller instanceof Controller) {
+          statusCode = (controller as Controller).getStatus();
+        }
+        return promiseHandler(promise, statusCode, request, reply);
+      }
+    }
+  });
+  server.route({
+    method: 'get',
+    path: '/v1/Controller/noContentStatusCode',
+    config: {
+      handler: (request: any, reply) => {
+        const args = {
+        };
+
+        let validatedArgs: any[] = [];
+        try {
+          validatedArgs = getValidatedArgs(args, request);
+        } catch (err) {
+          return reply(err).code(err.status || 500);
+        }
+
+        const controller = new TestController();
+
+        const promise = controller.noContentStatusCode.apply(controller, validatedArgs);
+        let statusCode: any;
+        if (controller instanceof Controller) {
+          statusCode = (controller as Controller).getStatus();
+        }
+        return promiseHandler(promise, statusCode, request, reply);
+      }
+    }
+  });
+  server.route({
+    method: 'get',
+    path: '/v1/Controller/customNoContentStatusCode',
+    config: {
+      handler: (request: any, reply) => {
+        const args = {
+        };
+
+        let validatedArgs: any[] = [];
+        try {
+          validatedArgs = getValidatedArgs(args, request);
+        } catch (err) {
+          return reply(err).code(err.status || 500);
+        }
+
+        const controller = new TestController();
+
+        const promise = controller.customNoContentStatusCode.apply(controller, validatedArgs);
+        let statusCode: any;
+        if (controller instanceof Controller) {
+          statusCode = (controller as Controller).getStatus();
+        }
+        return promiseHandler(promise, statusCode, request, reply);
+      }
+    }
+  });
 
   function authenticateMiddleware(name: string, scopes: string[] = []) {
     return (request: hapi.Request, reply: hapi.IReply) => {

diff --git a/tests/fixtures/hapi/server.ts b/tests/fixtures/hapi/server.ts
@@ -9,6 +9,7 @@ import '../controllers/methodController';
 import '../controllers/parameterController';
 import '../controllers/securityController';
 import '../controllers/validateController';
+import '../controllers/testController';
 
 import { RegisterRoutes } from './routes';
 

diff --git a/tests/fixtures/inversify/routes.ts b/tests/fixtures/inversify/routes.ts
@@ -120,11 +120,9 @@ export function RegisterRoutes(app: any) {
     return promise
       .then((data: any) => {
         if (data) {
-          response.json(data);
-          response.status(statusCode || 200);
+          response.status(statusCode || 200).json(data);;
         } else {
-          response.status(statusCode || 204);
-          response.end();
+          response.status(statusCode || 204).end();
         }
       })
       .catch((error: any) => next(error));