Fix cleanPost(): koa-body 4.0.0+ puts files in ctx.request.files rath…

…er than ctx.request.body.files
chrisveness · Jun 19, 2020 · 9490766 · 9490766
1 parent 1599b58
commit 9490766
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/app-admin/app-admin.js b/app-admin/app-admin.js
@@ -83,15 +83,10 @@ app.use(async function handleErrors(ctx, next) {
 
 // clean up post data - trim & convert blank fields to null
 app.use(async function cleanPost(ctx, next) {
-    if (ctx.request.body !== undefined) {
-        // koa-body puts multipart/form-data form fields in request.body.{fields,files}
-        const multipart = 'fields' in ctx.request.body && 'files' in ctx.request.body;
-        const body =  multipart ? ctx.request.body.fields : ctx.request.body;
-        for (const key in body) {
-            if (typeof body[key] == 'string') {
-                body[key] = body[key].trim();
-                if (body[key] == '') body[key] = null;
-            }
+    for (const key in ctx.request.body) {
+        if (typeof ctx.request.body[key] == 'string') {
+            ctx.request.body[key] = ctx.request.body[key].trim();
+            if (ctx.request.body[key] == '') ctx.request.body[key] = null;
         }
     }
     await next();

diff --git a/app-www/app-www.js b/app-www/app-www.js
@@ -70,15 +70,10 @@ app.use(async function handleErrors(ctx, next) {
 
 // clean up post data - trim & convert blank fields to null
 app.use(async function cleanPost(ctx, next) {
-    if (ctx.request.body !== undefined) {
-        // koa-body puts multipart/form-data form fields in request.body.{fields,files}
-        const multipart = 'fields' in ctx.request.body && 'files' in ctx.request.body;
-        const body =  multipart ? ctx.request.body.fields : ctx.request.body;
-        for (const key in body) {
-            if (typeof body[key] == 'string') {
-                body[key] = body[key].trim();
-                if (body[key] == '') body[key] = null;
-            }
+    for (const key in ctx.request.body) {
+        if (typeof ctx.request.body[key] == 'string') {
+            ctx.request.body[key] = ctx.request.body[key].trim();
+            if (ctx.request.body[key] == '') ctx.request.body[key] = null;
         }
     }
     await next();