Merge pull request #269 from elementar/koa-multipart-body

NoNameProvided · web-flow · commit 23a3af74cb18 · 2017-09-01T13:58:42.000+02:00
Koa multipart body
diff --git a/src/driver/koa/KoaDriver.ts b/src/driver/koa/KoaDriver.ts
@@ -111,6 +111,8 @@ export class KoaDriver extends BaseDriver implements Driver {
                 .forEach(param => {
                     defaultMiddlewares.push(multer(param.extraOptions).array(param.name));
                 });
+
+            defaultMiddlewares.push(this.fixMulterRequestAssignment);
         }
 
         // user used middlewares
@@ -411,4 +413,21 @@ export class KoaDriver extends BaseDriver implements Driver {
         }
     }
 
+    /**
+     * This middleware fixes a bug on koa-multer implementation.
+     *
+     * This bug should be fixed by koa-multer PR #15: https://github.com/koa-modules/multer/pull/15
+     */
+    private async fixMulterRequestAssignment(ctx: any, next: Function) {
+        if ("request" in ctx) {
+            if (ctx.req.body) ctx.request.body = ctx.req.body;
+            if (ctx.req.file) ctx.request.file = ctx.req.file;
+            if (ctx.req.files) {
+                ctx.request.files = ctx.req.files;
+                ctx.files = ctx.req.files;
+            }
+        }
+
+        return await next();
+    }
 }
diff --git a/test/functional/action-params.spec.ts b/test/functional/action-params.spec.ts
@@ -240,6 +240,18 @@ describe("action parameters", () => {
                 return `<html><body>${uploadedFileName}</body></html>`;
             }
 
+            @Post("/files-with-body")
+            postFileWithBody(@UploadedFile("myfile") file: any, @Body() body: any): any {
+                uploadedFileName = file.originalname;
+                return `<html><body>${uploadedFileName} - ${JSON.stringify(body)}</body></html>`;
+            }
+
+            @Post("/files-with-body-param")
+            postFileWithBodyParam(@UploadedFile("myfile") file: any, @BodyParam("p1") p1: string): any {
+                uploadedFileName = file.originalname;
+                return `<html><body>${uploadedFileName} - ${p1}</body></html>`;
+            }
+
             @Post("/files-with-limit")
             postFileWithLimit(@UploadedFile("myfile", { options: { limits: { fileSize: 2 } } }) file: any): any {
                 return `<html><body>${file.originalname}</body></html>`;
@@ -682,6 +694,49 @@ describe("action parameters", () => {
         });
     });
 
+    describe("@UploadedFile with @Body should return both the file and the body", () => {
+        const requestOptions = {
+            formData: {
+                myfile: {
+                    value: "hello world",
+                    options: {
+                        filename: "hello-world.txt",
+                        contentType: "image/text"
+                    }
+                },
+                anotherField: "hi",
+                andOther: "hello",
+            }
+        };
+
+        assertRequest([3001, 3002], "post", "files-with-body", undefined, requestOptions, response => {
+            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>hello-world.txt - {"anotherField":"hi","andOther":"hello"}</body></html>`);
+        });
+    });
+
+    describe("@UploadedFile with @BodyParam should return both the file and the body param", () => {
+        const requestOptions = {
+            formData: {
+                myfile: {
+                    value: "hello world",
+                    options: {
+                        filename: "hello-world.txt",
+                        contentType: "image/text"
+                    }
+                },
+                p1: "hi, i'm a param",
+            }
+        };
+
+        assertRequest([3001, 3002], "post", "files-with-body-param", undefined, requestOptions, response => {
+            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>hello-world.txt - hi, i'm a param</body></html>");
+        });
+    });
+
     describe("@UploadedFile with passed uploading options (limit) should throw an error", () => {
         const validRequestOptions = {
             formData: {
