Fix for #10

Author: dmuth

lib/apis/methods.py

@@ -3,6 +3,7 @@
 #
 
 import json
+from urllib.parse import parse_qs
 
 from fastapi import APIRouter
 from fastapi import FastAPI, Header, Request
@@ -47,9 +48,17 @@ async def get(request: Request):
 async def post(request: Request):
 
     data = data_default
+    content_type = request.headers.get("Content-Type", "application/x-www-form-urlencoded")
 
     try:
-        data = await request.json()
+        if content_type == "application/json":
+            data = await request.json()
+
+        else:
+            # Assume that it was a normal form submission
+            body = await request.body()
+            data = parse_qs(body)
+
     except json.decoder.JSONDecodeError as e:
         logger.warning(f"{__name__}:post(): Caught error deserializing JSON: {e}")
 

lib/fastapi.py

@@ -2,7 +2,7 @@
 #
 # Store our app version here.
 #
-app_version = "0.0.46"
+app_version = "0.0.47"
 
 tags_metadata = [
     {

tests/test_methods.py

@@ -19,38 +19,51 @@ def test_get():
 
 def test_post():
 
+    headers_json = {"Content-Type": "application/json"}
+    headers_form = {"Content-Type": "application/x-www-form-urlencoded"}
+
     data = {}
-    response = client.post("/post", json = json.dumps(data))
+    response = client.post("/post", json = json.dumps(data), headers = headers_json)
     assert response.status_code == 200
     assert response.json()["source"]["ip"] == "testclient"
     assert response.json()["headers"]["host"] == "testserver"
     data = json.loads(response.json()["data"])
     assert data == {}
 
     data = "broken json"
-    response = client.post("/post", json = json.dumps(data))
+    response = client.post("/post", json = json.dumps(data), headers = headers_json)
     assert response.status_code == 200
     assert response.json()["source"]["ip"] == "testclient"
     assert response.json()["headers"]["host"] == "testserver"
     data = json.loads(response.json()["data"])
     assert data == "broken json"
 
     data = { "cheetah": "chirp", "goat": "bleat" }
-
-    response = client.post("/post", json = json.dumps(data))
+    response = client.post("/post", json = json.dumps(data), headers = headers_json)
     assert response.status_code == 200
     assert response.json()["source"]["ip"] == "testclient"
     assert response.json()["headers"]["host"] == "testserver"
     data = json.loads(response.json()["data"])
     assert data["cheetah"] == "chirp"
 
     data = [ data ]
-
-    response = client.post("/post", json = json.dumps(data))
+    response = client.post("/post", json = json.dumps(data), headers = headers_json)
     assert response.status_code == 200
     data = json.loads(response.json()["data"])
     assert data[0]["cheetah"] == "chirp"
 
+    #
+    # Test regular form data
+    #
+    form_data = "birthyear=1905&press=%20OK%20"
+    response = client.post("/post", data = form_data, headers = headers_form)
+    assert response.status_code == 200
+    assert response.json()["source"]["ip"] == "testclient"
+    assert response.json()["headers"]["host"] == "testserver"
+    data = response.json()["data"]
+    assert data["birthyear"][0] == "1905"
+    assert data["press"][0] == " OK "
+
 
 def test_put():