Remove use of JSON in POST data

Co-Authored-By: codingjoe <[email protected]>

Author: symroe

s3file/middleware.py

@@ -1,4 +1,3 @@
-import json
 import logging
 import pathlib
 
@@ -14,9 +13,9 @@ def __init__(self, get_response):
         self.get_response = get_response
 
     def __call__(self, request):
-        file_fields = json.loads(request.POST.get("s3file", "[]"))
+        file_fields = request.POST.getlist("s3file")
         for field_name in file_fields:
-            paths = json.loads(request.POST.get(field_name, "[]"))
+            paths = request.POST.getlist(field_name)
             request.FILES.setlist(field_name, list(self.get_files_from_storage(paths)))
 
         if local_dev and request.path == "/__s3_mock__/":

s3file/static/s3file/js/s3file.js

@@ -88,14 +88,13 @@
       return request('POST', url, s3Form, fileInput, file, form)
     })
     Promise.all(promises).then(function (results) {
-      var keys = results.map(function (result) {
-        return parseURL(result)
+      results.forEach(function (result) {
+        var hiddenFileInput = document.createElement('input')
+        hiddenFileInput.type = 'hidden'
+        hiddenFileInput.name = name
+        hiddenFileInput.value = parseURL(result)
+        form.appendChild(hiddenFileInput)
       })
-      var hiddenFileInput = document.createElement('input')
-      hiddenFileInput.type = 'hidden'
-      hiddenFileInput.name = name
-      hiddenFileInput.value = JSON.stringify(keys)
-      form.appendChild(hiddenFileInput)
       fileInput.name = ''
       window.uploading -= 1
     }, function (err) {
@@ -120,13 +119,14 @@
     form.loaded = 0
     form.total = 0
     var inputs = Array.from(form.querySelectorAll('.s3file'))
-    var hiddenS3Input = document.createElement('input')
-    hiddenS3Input.type = 'hidden'
-    hiddenS3Input.name = 's3file'
-    form.appendChild(hiddenS3Input)
-    hiddenS3Input.value = JSON.stringify(inputs.map(function (input) {
-      return input.name
-    }))
+
+    inputs.forEach(function (input) {
+      var hiddenS3Input = document.createElement('input')
+      hiddenS3Input.type = 'hidden'
+      hiddenS3Input.name = 's3file'
+      hiddenS3Input.value = input.name
+      form.appendChild(hiddenS3Input)
+    })
     inputs.forEach(function (input) {
       window.uploading += 1
       uploadFiles(form, input, input.name)

tests/test_middleware.py

@@ -30,14 +30,32 @@ def test_process_request(self, rf):
         request = rf.post(
             "/",
             data={
-                "file": '["custom/location/tmp/s3file/s3_file.txt"]',
-                "s3file": '["file"]',
+                "file": "custom/location/tmp/s3file/s3_file.txt",
+                "s3file": "file",
             },
         )
         S3FileMiddleware(lambda x: None)(request)
         assert request.FILES.getlist("file")
         assert request.FILES.get("file").read() == b"s3file"
 
+    def test_process_request__multiple_files(self, rf):
+        storage.save("tmp/s3file/s3_file.txt", ContentFile(b"s3file"))
+        storage.save("tmp/s3file/s3_other_file.txt", ContentFile(b"other s3file"))
+        request = rf.post(
+            "/",
+            data={
+                "file": [
+                    "custom/location/tmp/s3file/s3_file.txt",
+                    "custom/location/tmp/s3file/s3_other_file.txt",
+                ],
+                "s3file": ["file", "other_file"],
+            },
+        )
+        S3FileMiddleware(lambda x: None)(request)
+        files = request.FILES.getlist("file")
+        assert files[0].read() == b"s3file"
+        assert files[1].read() == b"other s3file"
+
     def test_process_request__no_location(self, rf, settings):
         settings.AWS_LOCATION = ""
         uploaded_file = SimpleUploadedFile("uploaded_file.txt", b"uploaded")
@@ -48,16 +66,14 @@ def test_process_request__no_location(self, rf, settings):
 
         storage.save("tmp/s3file/s3_file.txt", ContentFile(b"s3file"))
         request = rf.post(
-            "/", data={"file": '["tmp/s3file/s3_file.txt"]', "s3file": '["file"]'}
+            "/", data={"file": "tmp/s3file/s3_file.txt", "s3file": "file"}
         )
         S3FileMiddleware(lambda x: None)(request)
         assert request.FILES.getlist("file")
         assert request.FILES.get("file").read() == b"s3file"
 
     def test_process_request__no_file(self, rf, caplog):
-        request = rf.post(
-            "/", data={"file": '["does_not_exist.txt"]', "s3file": '["file"]'}
-        )
+        request = rf.post("/", data={"file": "does_not_exist.txt", "s3file": "file"})
         S3FileMiddleware(lambda x: None)(request)
         assert not request.FILES.getlist("file")
         assert "File not found: does_not_exist.txt" in caplog.text