Merge branch 'master' into fix/fileupload-auth

NoNameProvided · NoNameProvided · commit 49fee4708420 · 2017-08-13T16:09:52.000+02:00
diff --git a/src/driver/koa/KoaDriver.ts b/src/driver/koa/KoaDriver.ts
@@ -90,7 +90,9 @@ export class KoaDriver extends BaseDriver implements Driver {
                 };
 
                 if (isPromiseLike(checkResult)) {
-                    return checkResult.then(result => handleError(result));
+                    return checkResult
+                        .then(result => handleError(result))
+                        .catch(error => this.handleError(error, actionMetadata, action));
                 } else {
                     handleError(checkResult);
                 }
@@ -290,12 +292,10 @@ export class KoaDriver extends BaseDriver implements Driver {
     handleError(error: any, action: ActionMetadata | undefined, options: Action): any {
         if (this.isDefaultErrorHandlingEnabled) {
             const response: any = options.response;
-            console.log("ERROR: ", error);
 
             // set http status
             // note that we can't use error instanceof HttpError properly anymore because of new typescript emit process
             if (error.httpCode) {
-                console.log("setting status code: ", error.httpCode);
                 options.context.status = error.httpCode;
                 response.status = error.httpCode;
             } else {
diff --git a/test/functional/action-params.spec.ts b/test/functional/action-params.spec.ts
@@ -39,7 +39,7 @@ describe("action parameters", () => {
     let uploadedFilesFirstName: string;
     let uploadedFilesSecondName: string;
     let requestReq: any, requestRes: any;
-    
+
     beforeEach(() => {
         paramUserId = undefined;
         paramFirstId = undefined;
@@ -375,7 +375,6 @@ describe("action parameters", () => {
 
     describe("@Session(param) should allow to inject empty property", () => {
         assertRequest([3001, 3002], "get", "session-param-empty", response => {
-            console.log(response.body);
             expect(response).to.be.status(200);
             expect(response).to.have.header("content-type", "text/html; charset=utf-8");
             expect(response.body).to.be.equal("<html><body>true</body></html>");
@@ -829,7 +828,7 @@ describe("action parameters", () => {
         assertRequest([3001, 3002], "post", "photos-with-required", undefined, {}, response => {
             expect(response).to.be.status(400);
         });
-        
+
     });
 
 });
diff --git a/test/functional/auth-decorator.spec.ts b/test/functional/auth-decorator.spec.ts
@@ -127,4 +127,50 @@ describe("Authorized Decorators Http Status Code", function () {
         });
     });
 
+});
+
+describe("Authorization checker allows to throw", function() {
+  before(() => {
+    // reset metadata args storage
+    getMetadataArgsStorage().reset();
+
+    @JsonController()
+    class AuthController {
+      @Authorized()
+      @Get("/auth1")
+      auth1() {
+        return { test: "auth1" };
+      }
+
+    }
+  });
+
+  const serverOptions: RoutingControllersOptions = {
+    authorizationChecker: async (action: Action, roles?: string[]) => {
+      throw new Error('Custom Error');
+    }
+  };
+
+  let expressApp: any;
+  before(done => {
+    const server = createExpressServer(serverOptions);
+    expressApp = server.listen(3001, done);
+  });
+  after(done => expressApp.close(done));
+
+  let koaApp: any;
+  before(done => {
+    const server = createKoaServer(serverOptions);
+    koaApp = server.listen(3002, done);
+  });
+  after(done => koaApp.close(done));
+
+  describe("custom errors", () => {
+    assertRequest([3001, 3002], "get", "auth1", response => {
+      expect(response).to.have.status(500);
+      expect(response.body).to.have.property("name", "Error");
+      expect(response.body).to.have.property("message", "Custom Error");
+
+    });
+  });
 });
diff --git a/test/functional/express-error-handling.spec.ts b/test/functional/express-error-handling.spec.ts
@@ -18,7 +18,7 @@ describe("express error handling", () => {
         errorHandlerCalled = undefined;
         errorHandledSpecifically = undefined;
     });
-    
+
     before(() => {
 
         // reset metadata args storage
@@ -29,7 +29,7 @@ describe("express error handling", () => {
 
             error(error: any, request: any, response: any, next?: Function): any {
                 errorHandlerCalled = true;
-                console.log("ERROR HANDLED GLOBALLY: ", error);
+                // ERROR HANDLED GLOBALLY
                 next(error);
             }
 
@@ -39,7 +39,7 @@ describe("express error handling", () => {
 
             error(error: any, request: any, response: any, next?: Function): any {
                 errorHandledSpecifically = true;
-                console.log("ERROR HANDLED SPECIFICALLY: ", error);
+                // ERROR HANDLED SPECIFICALLY
                 next(error);
             }
 
@@ -48,7 +48,7 @@ describe("express error handling", () => {
         class SoftErrorHandler implements ExpressErrorMiddlewareInterface {
 
             error(error: any, request: any, response: any, next?: Function): any {
-                console.log("ERROR WAS IGNORED: ", error);
+                // ERROR WAS IGNORED
                 next();
             }
 
@@ -96,7 +96,7 @@ describe("express error handling", () => {
             photos() {
                 return "1234";
             }
-            
+
         }
     });
 
diff --git a/test/functional/express-global-before-error-handling.spec.ts b/test/functional/express-global-before-error-handling.spec.ts
@@ -31,7 +31,6 @@ describe("custom express global before middleware error handling", () => {
         @Middleware({ type: "before" })
         class GlobalBeforeMiddleware implements ExpressMiddlewareInterface {
             use(request: any, response: any, next?: Function): any {
-              console.log("GLOBAL BEFORE MIDDLEWARE CALLED");
               throw new CustomError();
             }
         }
diff --git a/test/functional/redirect-decorator.spec.ts b/test/functional/redirect-decorator.spec.ts
@@ -34,20 +34,17 @@ describe("dynamic redirect", function () {
             @Get("/template")
             @Redirect("/users/:owner")
             template() {
-                // console.log("/template");
                 return {owner: "pleerock", repo: "routing-controllers"};
             }
 
             @Get("/original")
             @Redirect("/users/pleerock")
             original() {
-                // console.log("/original");
             }
 
             @Get("/override")
             @Redirect("https://api.github.com")
             override() {
-                // console.log("/override");
                 return "/users/pleerock";
             }
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ describe("custom express global before middleware error handling", () => {`
`31`	`31`	`@Middleware({ type: "before" })`
`32`	`32`	`class GlobalBeforeMiddleware implements ExpressMiddlewareInterface {`
`33`	`33`	`use(request: any, response: any, next?: Function): any {`
`34`		`- console.log("GLOBAL BEFORE MIDDLEWARE CALLED");`
`35`	`34`	`throw new CustomError();`
`36`	`35`	`}`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,20 +34,17 @@ describe("dynamic redirect", function () {`
`34`	`34`	`@Get("/template")`
`35`	`35`	`@Redirect("/users/:owner")`
`36`	`36`	`template() {`
`37`		`- // console.log("/template");`
`38`	`37`	`return {owner: "pleerock", repo: "routing-controllers"};`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`@Get("/original")`
`42`	`41`	`@Redirect("/users/pleerock")`
`43`	`42`	`original() {`
`44`		`- // console.log("/original");`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`@Get("/override")`
`48`	`46`	`@Redirect("https://api.github.com")`
`49`	`47`	`override() {`
`50`		`- // console.log("/override");`
`51`	`48`	`return "/users/pleerock";`
`52`	`49`	`}`
`53`	`50`