Context param provider can handle multipart uploads

uktrade · Jun 23, 2017 · 70b7743 · 70b7743
1 parent ca7000c
commit 70b7743
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/app/components/common/state/ContextParamProvider.java b/app/components/common/state/ContextParamProvider.java
@@ -4,6 +4,7 @@
 import static play.mvc.Controller.ctx;
 
 import org.apache.commons.lang3.StringUtils;
+import utils.common.UploadUtil;
 
 import java.util.Map;
 import java.util.Objects;
@@ -32,7 +33,12 @@ private static String getParamValueFromRequest(String paramName, boolean strict)
     }
     else {
       //Check POST params
-      Map<String, String[]> postParamMap = ctx().request().body().asFormUrlEncoded();
+      Map<String, String[]> postParamMap;
+      if (UploadUtil.isMultipartRequest(ctx().request())) {
+        postParamMap = ctx().request().body().asMultipartFormData().asFormUrlEncoded();
+      } else {
+        postParamMap = ctx().request().body().asFormUrlEncoded();
+      }
 
       if (postParamMap == null) {
         if (strict) {

diff --git a/app/utils/common/UploadUtil.java b/app/utils/common/UploadUtil.java
@@ -0,0 +1,11 @@
+package utils.common;
+
+import play.mvc.Http;
+
+public class UploadUtil {
+
+  public static boolean isMultipartRequest(Http.Request request) {
+    return "multipart/form-data".equals(request.contentType().orElse(""));
+  }
+
+}