fix: flask mimetype check (#349)

* fix flask mimetype check Signed-off-by: Nino <[email protected]> * format Signed-off-by: Nino <[email protected]> --------- Signed-off-by: Nino <[email protected]>
0b01001001 · Oct 2, 2023 · 41c54b8 · 41c54b8
1 parent eb6a554
commit 41c54b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "spectree"
-version = "1.2.4"
+version = "1.2.5"
 dynamic = []
 description = "generate OpenAPI document and validate request&response with Python annotations."
 readme = "README.md"

diff --git a/spectree/plugins/flask_plugin.py b/spectree/plugins/flask_plugin.py
@@ -144,12 +144,9 @@ def request_validation(self, request, query, json, form, headers, cookies):
         req_headers = dict(iter(request.headers)) or {}
         req_cookies = get_multidict_items(request.cookies) or {}
         has_data = request.method not in ("GET", "DELETE")
-        use_json = json and has_data and request.mimetype == "application/json"
-        use_form = (
-            form
-            and has_data
-            and any([x in request.mimetype for x in self.FORM_MIMETYPE])
-        )
+        # flask Request.mimetype is already normalized
+        use_json = json and has_data and request.mimetype not in self.FORM_MIMETYPE
+        use_form = form and has_data and request.mimetype in self.FORM_MIMETYPE
 
         request.context = Context(
             query.parse_obj(req_query) if query else None,

diff --git a/tests/flask_imports/dry_plugin_flask.py b/tests/flask_imports/dry_plugin_flask.py
@@ -160,6 +160,12 @@ def test_flask_validate_post_data(client, fragment):
     assert resp.status_code == 200, resp.json
     assert resp.json["score"] == sorted(resp.json["score"], reverse=False)
 
+    # POST without body
+    resp = client.post(
+        f"/api/{fragment}/flask?order=0",
+    )
+    assert resp.status_code == 422, resp.content
+
 
 def test_flask_no_response(client):
     resp = client.get("/api/no_response")