Merge branch 'Elassyo-master' into next

jotamorais · jotamorais · commit 8395465f278a · 2020-05-28T17:42:14.000-05:00
diff --git a/README.md b/README.md
@@ -733,7 +733,7 @@ There are set of prepared errors you can use:
 * UnauthorizedError
 
 
-You can also create and use your own errors by extending `HttpError` class.  
+You can also create and use your own errors by extending `HttpError` class.
 To define the data returned to the client, you could define a toJSON method in your error.
 
 ```typescript
@@ -755,7 +755,7 @@ class DbError extends HttpError {
         }
     }
 }
-``` 
+```
 
 #### Enable CORS
 
@@ -796,7 +796,7 @@ app.listen(3000);
 
 #### Default settings
 
-You can override default status code in routing-controllers options. 
+You can override default status code in routing-controllers options.
 
 ```typescript
 import "reflect-metadata";
@@ -809,9 +809,9 @@ const app = createExpressServer({
         //with this option, null will return 404 by default
         nullResultCode: 404,
 
-        //with this option, void or Promise<void> will return 204 by default 
+        //with this option, void or Promise<void> will return 204 by default
         undefinedResultCode: 204,
-        
+
         paramOptions: {
             //with this option, argument will be required by default
             required: true
@@ -1486,7 +1486,8 @@ export class QuestionController {
 | `@Patch(route: string\|RegExp)`                                | `@Patch("/users/:id") patch()`         | Methods marked with this decorator will register a request made with PATCH HTTP Method to a given route. In action options you can specify if action should response json or regular text response.               | `app.patch("/users/:id", patch)`     |
 | `@Delete(route: string\|RegExp)`                               | `@Delete("/users/:id") delete()`       | Methods marked with this decorator will register a request made with DELETE HTTP Method to a given route. In action options you can specify if action should response json or regular text response.              | `app.delete("/users/:id", delete)`   |
 | `@Head(route: string\|RegExp)`                                 | `@Head("/users/:id") head()`           | Methods marked with this decorator will register a request made with HEAD HTTP Method to a given route. In action options you can specify if action should response json or regular text response.                | `app.head("/users/:id", head)`       |
-| `@Method(methodName: string, route: string\|RegExp)`            | `@Method("move", "/users/:id") move()` | Methods marked with this decorator will register a request made with given `methodName` HTTP Method to a given route. In action options you can specify if action should response json or regular text response.  | `app.move("/users/:id", move)`       |
+| `@All(route: string\|RegExp)`                                  | `@All("/users/me") rewrite()`          | Methods marked with this decorator will register a request made with any HTTP Method to a given route. In action options you can specify if action should response json or regular text response.                 | `app.all("/users/me", rewrite)`      |
+| `@Method(methodName: string, route: string\|RegExp)`           | `@Method("move", "/users/:id") move()` | Methods marked with this decorator will register a request made with given `methodName` HTTP Method to a given route. In action options you can specify if action should response json or regular text response.  | `app.move("/users/:id", move)`       |
 
 #### Method Parameter Decorators
 
diff --git a/src/decorator/All.ts b/src/decorator/All.ts
@@ -0,0 +1,28 @@
+import {getMetadataArgsStorage} from "../index";
+
+/**
+ * Registers an action to be executed when a request comes on a given route.
+ * Must be applied on a controller action.
+ */
+export function All(route?: RegExp): Function;
+
+/**
+ * Registers an action to be executed when a request comes on a given route.
+ * Must be applied on a controller action.
+ */
+export function All(route?: string): Function;
+
+/**
+ * Registers an action to be executed when a request comes on a given route.
+ * Must be applied on a controller action.
+ */
+export function All(route?: string|RegExp): Function {
+    return function (object: Object, methodName: string) {
+        getMetadataArgsStorage().actions.push({
+            type: "all",
+            target: object.constructor,
+            method: methodName,
+            route: route
+        });
+    };
+}
diff --git a/src/driver/express/ExpressDriver.ts b/src/driver/express/ExpressDriver.ts
@@ -165,7 +165,7 @@ export class ExpressDriver extends BaseDriver {
             // This causes a double action execution on our side, which results in an unhandled rejection,
             // saying: "Can't set headers after they are sent".
             // The following line skips action processing when the request method does not match the action method.
-            if (request.method.toLowerCase() !== actionMetadata.type)
+            if (actionMetadata.type !== "all" && request.method.toLowerCase() !== actionMetadata.type)
                 return next();
 
             return executeCallback({request, response, next});
@@ -207,7 +207,7 @@ export class ExpressDriver extends BaseDriver {
 
             case "session-param":
                 return request.session[param.name];
-            
+
             case "session":
                 return request.session;
 
diff --git a/src/driver/koa/KoaDriver.ts b/src/driver/koa/KoaDriver.ts
@@ -255,11 +255,7 @@ export class KoaDriver extends BaseDriver {
             options.response.body = Buffer.from(result as any);
         }
         else { // send regular result
-            if (result instanceof Object) {
-                options.response.body = result;
-            } else {
-                options.response.body = result;
-            }
+            options.response.body = result;
         }
 
         // set http status code
@@ -329,24 +325,11 @@ export class KoaDriver extends BaseDriver {
         const middlewareFunctions: Function[] = [];
         uses.forEach(use => {
             if (use.middleware.prototype && use.middleware.prototype.use) { // if this is function instance of MiddlewareInterface
-                middlewareFunctions.push((context: any, next: (err?: any) => Promise<any>) => {
+                middlewareFunctions.push(async (context: any, next: (err?: any) => Promise<any>) => {
                     try {
-                        const useResult = (getFromContainer(use.middleware, { context } as Action) as KoaMiddlewareInterface).use(context, next);
-                        if (isPromiseLike(useResult)) {
-                            useResult.catch((error: any) => {
-                                this.handleError(error, undefined, {
-                                    request: context.req,
-                                    response: context.res,
-                                    context,
-                                    next
-                                });
-                                return error;
-                            });
-                        }
-
-                        return useResult;
+                        return await (getFromContainer(use.middleware) as KoaMiddlewareInterface).use(context, next);
                     } catch (error) {
-                        this.handleError(error, undefined, {
+                        return await this.handleError(error, undefined, {
                             request: context.request,
                             response: context.response,
                             context,
@@ -424,4 +407,4 @@ export class KoaDriver extends BaseDriver {
 
         return await next();
     }
-}
+}
diff --git a/src/index.ts b/src/index.ts
@@ -14,6 +14,7 @@ import {importClassesFromDirectories} from "./util/importClassesFromDirectories"
 
 export * from "./container";
 
+export * from "./decorator/All";
 export * from "./decorator/Authorized";
 export * from "./decorator/Body";
 export * from "./decorator/BodyParam";
diff --git a/src/metadata/types/ActionType.ts b/src/metadata/types/ActionType.ts
@@ -1,7 +1,8 @@
 /**
  * Controller action type.
  */
-export type ActionType = "checkout"
+export type ActionType = "all"
+    |"checkout"
     |"connect"
     |"copy"
     |"delete"
@@ -26,4 +27,4 @@ export type ActionType = "checkout"
     |"subscribe"
     |"trace"
     |"unlock"
-    |"unsubscribe";
+    |"unsubscribe";
diff --git a/test/functional/koa-middlewares.spec.ts b/test/functional/koa-middlewares.spec.ts
@@ -68,12 +68,19 @@ describe("koa middlewares", () => {
 
         class TestCustomMiddlewareWhichThrows implements KoaMiddlewareInterface {
 
-            use(request: any, response: any, next?: Function): any {
+            use(context: any, next?: Function): any {
                 throw new NotAcceptableError("TestCustomMiddlewareWhichThrows");
             }
 
         }
 
+        class TestCustomAsyncMiddlewareWhichThrows implements KoaMiddlewareInterface {
+
+            async use(context: any, next?: Function): Promise<any> {
+                throw new NotAcceptableError("TestCustomAsyncMiddlewareWhichThrows");
+            }
+
+        }
         @Controller()
         class KoaMiddlewareController {
 
@@ -127,9 +134,15 @@ describe("koa middlewares", () => {
                 return "1234";
             }
 
-            @Get("/customMiddlewareWichThrows")
+            @Get("/customMiddlewareWhichThrows")
             @UseBefore(TestCustomMiddlewareWhichThrows)
-            customMiddlewareWichThrows() {
+            customMiddlewareWhichThrows() {
+                return "1234";
+            }
+
+            @Get("/customAsyncMiddlewareWhichThrows")
+            @UseBefore(TestCustomAsyncMiddlewareWhichThrows)
+            TestCustomAsyncMiddlewareWhichThrows() {
                 return "1234";
             }
 
@@ -193,10 +206,17 @@ describe("koa middlewares", () => {
 
     it("should handle errors in custom middlewares", () => {
         return chakram
-            .get("http://127.0.0.1:3001/customMiddlewareWichThrows")
+            .get("http://127.0.0.1:3001/customMiddlewareWhichThrows")
             .then((response: any) => {
                 expect(response).to.have.status(406);
             });
     });
 
-});
+    it("should handle errors in custom async middlewares", () => {
+        return chakram
+            .get("http://127.0.0.1:3001/customAsyncMiddlewareWhichThrows")
+            .then((response: any) => {
+                expect(response).to.have.status(406);
+            });
+    });
+});
