Merge pull request #277 from 19majkel94/feature/content-typed-response

NoNameProvided · web-flow · commit 9a7b3e486a6a · 2017-09-08T08:50:20.000+02:00
Handle different content-type responses in JsonController
diff --git a/src/metadata/ActionMetadata.ts b/src/metadata/ActionMetadata.ts
@@ -174,6 +174,7 @@ export class ActionMetadata {
         const redirectHandler = responseHandlers.find(handler => handler.type === "redirect");
         const renderedTemplateHandler = responseHandlers.find(handler => handler.type === "rendered-template");
         const authorizedHandler = responseHandlers.find(handler => handler.type === "authorized");
+        const contentTypeHandler = responseHandlers.find(handler => handler.type === "content-type");
         const bodyParam = this.params.find(param => param.type === "body");
 
         if (classTransformerResponseHandler)
@@ -198,7 +199,10 @@ export class ActionMetadata {
         this.isBodyUsed = !!this.params.find(param => param.type === "body" || param.type === "body-param");
         this.isFilesUsed = !!this.params.find(param => param.type === "files");
         this.isFileUsed = !!this.params.find(param => param.type === "file");
-        this.isJsonTyped = this.controllerMetadata.type === "json";
+        this.isJsonTyped = (contentTypeHandler !== undefined 
+            ? /json/.test(contentTypeHandler.value)
+            : this.controllerMetadata.type === "json"
+        );
         this.fullRoute = this.buildFullRoute();
         this.headers = this.buildHeaders(responseHandlers);
 
diff --git a/test/functional/controller-methods.spec.ts b/test/functional/controller-methods.spec.ts
@@ -7,7 +7,14 @@ import {Head} from "../../src/decorator/Head";
 import {Delete} from "../../src/decorator/Delete";
 import {Patch} from "../../src/decorator/Patch";
 import {Put} from "../../src/decorator/Put";
-import { createExpressServer, createKoaServer, getMetadataArgsStorage, JsonController } from "../../src/index";
+import {ContentType} from "../../src/decorator/ContentType";
+import {JsonController} from "../../src/decorator/JsonController";
+import {UnauthorizedError} from "../../src/http-error/UnauthorizedError";
+import {
+    createExpressServer,
+    createKoaServer,
+    getMetadataArgsStorage,
+} from "../../src/index";
 import {assertRequest} from "./test-utils";
 const chakram = require("chakram");
 const expect = chakram.expect;
@@ -107,6 +114,27 @@ describe("controller methods", () => {
             }
         }
 
+        @JsonController("/json-controller")
+        class ContentTypeController {
+            @Get("/text-html")
+            @ContentType("text/html")
+            returnHtml(): string {
+                return "<html>Test</html>";
+            }
+
+            @Get("/text-plain")
+            @ContentType("text/plain")
+            returnString(): string {
+                return "Test";
+            }
+
+            @Get("/text-plain-error")
+            @ContentType("text/plain")
+            error(): never {
+                throw new UnauthorizedError();
+            }
+        }
+
     });
 
     let expressApp: any, koaApp: any;
@@ -262,5 +290,35 @@ describe("controller methods", () => {
         });
     });
 
+    describe("should respond with 200 and text/html even in json controller's method", () => {
+        assertRequest([3001, 3002], "get", "json-controller/text-html", response => {
+            expect(response).to.have.status(200);
+            expect(response).to.have.header("content-type", (contentType: string) => {
+                expect(contentType).to.match(/text\/html/);
+            });
+            expect(response.body).to.equals("<html>Test</html>");
+        });
+    });
+
+    describe("should respond with 200 and text/plain even in json controller's method", () => {
+        assertRequest([3001, 3002], "get", "json-controller/text-plain", response => {
+            expect(response).to.have.status(200);
+            expect(response).to.have.header("content-type", (contentType: string) => {
+                expect(contentType).to.match(/text\/plain/);
+            });
+            expect(response.body).to.equals("Test");
+        });
+    });
+
+    describe("should respond with 401 and text/html when UnauthorizedError throwed even in json controller's method", () => {
+        assertRequest([3001, 3002], "get", "json-controller/text-plain-error", response => {
+            expect(response).to.have.status(401);
+            expect(response).to.have.header("content-type", (contentType: string) => {
+                expect(contentType).to.match(/text\/plain/);
+            });
+            expect(response.body).to.match(/UnauthorizedError.HttpError/);
+        });
+    });
+
 
 });
