From c25a71e35218518c64cbacc3532548839b7c7aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Sat, 22 Dec 2018 07:40:56 +0400
Subject: [PATCH] :bug: Re-implement check for body as a workaround

while encode/starlette#287 is merged
---
 fastapi/routing.py                            |  11 +-
 .../test_request_forms/__init__.py            |   0
 .../test_request_forms/test_tutorial001.py    | 159 ++++++++++++++++++
 3 files changed, 166 insertions(+), 4 deletions(-)
 create mode 100644 tests/test_tutorial/test_request_forms/__init__.py
 create mode 100644 tests/test_tutorial/test_request_forms/test_tutorial001.py

diff --git a/fastapi/routing.py b/fastapi/routing.py
index fbd6a8d9c..964d61ee7 100644
--- a/fastapi/routing.py
+++ b/fastapi/routing.py
@@ -51,8 +51,7 @@ def get_app(
         try:
             body = None
             if body_field:
-                body_bytes = await request.body()
-                if body_bytes and is_body_form:
+                if is_body_form:
                     raw_body = await request.form()
                     body = {}
                     for field, value in raw_body.items():
@@ -60,8 +59,12 @@ def get_app(
                             body[field] = await value.read()
                         else:
                             body[field] = value
-                elif body_bytes:
-                    body = await request.json()
+                    if not body:
+                        body = None
+                else:
+                    body_bytes = await request.body()
+                    if body_bytes:
+                        body = await request.json()
         except Exception as e:
             logging.error("Error getting request body", e)
             raise HTTPException(
diff --git a/tests/test_tutorial/test_request_forms/__init__.py b/tests/test_tutorial/test_request_forms/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_tutorial/test_request_forms/test_tutorial001.py b/tests/test_tutorial/test_request_forms/test_tutorial001.py
new file mode 100644
index 000000000..610523e92
--- /dev/null
+++ b/tests/test_tutorial/test_request_forms/test_tutorial001.py
@@ -0,0 +1,159 @@
+import pytest
+from starlette.testclient import TestClient
+
+from request_forms.tutorial001 import app
+
+client = TestClient(app)
+
+openapi_schema = {
+    "openapi": "3.0.2",
+    "info": {"title": "Fast API", "version": "0.1.0"},
+    "paths": {
+        "/login/": {
+            "post": {
+                "responses": {
+                    "200": {
+                        "description": "Successful Response",
+                        "content": {"application/json": {"schema": {}}},
+                    },
+                    "422": {
+                        "description": "Validation Error",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/HTTPValidationError"
+                                }
+                            }
+                        },
+                    },
+                },
+                "summary": "Login Post",
+                "operationId": "login_login__post",
+                "requestBody": {
+                    "content": {
+                        "application/x-www-form-urlencoded": {
+                            "schema": {"$ref": "#/components/schemas/Body_login"}
+                        }
+                    },
+                    "required": True,
+                },
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "Body_login": {
+                "title": "Body_login",
+                "required": ["username", "password"],
+                "type": "object",
+                "properties": {
+                    "username": {"title": "Username", "type": "string"},
+                    "password": {"title": "Password", "type": "string"},
+                },
+            },
+            "ValidationError": {
+                "title": "ValidationError",
+                "required": ["loc", "msg", "type"],
+                "type": "object",
+                "properties": {
+                    "loc": {
+                        "title": "Location",
+                        "type": "array",
+                        "items": {"type": "string"},
+                    },
+                    "msg": {"title": "Message", "type": "string"},
+                    "type": {"title": "Error Type", "type": "string"},
+                },
+            },
+            "HTTPValidationError": {
+                "title": "HTTPValidationError",
+                "type": "object",
+                "properties": {
+                    "detail": {
+                        "title": "Detail",
+                        "type": "array",
+                        "items": {"$ref": "#/components/schemas/ValidationError"},
+                    }
+                },
+            },
+        }
+    },
+}
+
+
+def test_openapi_scheme():
+    response = client.get("/openapi.json")
+    assert response.status_code == 200
+    assert response.json() == openapi_schema
+
+
+item_id_not_int = {
+    "detail": [
+        {
+            "loc": ["path", "item_id"],
+            "msg": "value is not a valid integer",
+            "type": "type_error.integer",
+        }
+    ]
+}
+
+password_required = {
+    "detail": [
+        {
+            "loc": ["body", "password"],
+            "msg": "field required",
+            "type": "value_error.missing",
+        }
+    ]
+}
+username_required = {
+    "detail": [
+        {
+            "loc": ["body", "username"],
+            "msg": "field required",
+            "type": "value_error.missing",
+        }
+    ]
+}
+username_and_password_required = {
+    "detail": [
+        {
+            "loc": ["body", "username"],
+            "msg": "field required",
+            "type": "value_error.missing",
+        },
+        {
+            "loc": ["body", "password"],
+            "msg": "field required",
+            "type": "value_error.missing",
+        },
+    ]
+}
+
+
+@pytest.mark.parametrize(
+    "path,body,expected_status,expected_response",
+    [
+        (
+            "/login/",
+            {"username": "Foo", "password": "secret"},
+            200,
+            {"username": "Foo"},
+        ),
+        ("/login/", {"username": "Foo"}, 422, password_required),
+        ("/login/", {"password": "secret"}, 422, username_required),
+        ("/login/", None, 422, username_and_password_required),
+    ],
+)
+def test_post_body_form(path, body, expected_status, expected_response):
+    response = client.post(path, data=body)
+    print(response.text)
+    assert response.status_code == expected_status
+    assert response.json() == expected_response
+
+
+def test_post_body_json():
+    response = client.post("/login/", json={"username": "Foo", "password": "secret"})
+    print(response.text)
+    assert response.status_code == 422
+    assert response.json() == username_and_password_required