Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Internal Server Error when receiving invalid JSON. #81

Merged
merged 10 commits into from Oct 28, 2019
Merged

Internal Server Error when receiving invalid JSON. #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1792e63
Exception handling for receiving invalid JSON when content type is ap…
AutumnalDream Oct 25, 2019
4b2b1b3
Test for invalid json
AutumnalDream Oct 25, 2019
eaabdd8
Return JSONResponse and changed test to reflect that.
AutumnalDream Oct 25, 2019
0a7dc3c
my bad -- didn't black it
AutumnalDream Oct 25, 2019
3f225e2
ignore flake8 check for invalid escape sequence
AutumnalDream Oct 25, 2019
71d5550
Use another type of invalid JSON that doesn't require ignoring warnings
AutumnalDream Oct 27, 2019
e7fc62e
Rename project to tartiflette-asgi (#82)
florimondmanca Oct 27, 2019
33db285
Release 0.7.0
florimondmanca Oct 27, 2019
e1edb14
Update compatibility note
florimondmanca Oct 27, 2019
8cf1091
Merge branch 'master' into fix/json-decode-error
AutumnalDream Oct 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion tartiflette_asgi/endpoints.py
View file
Open in desktop
@@ -1,4 +1,6 @@
import typing
import json


from starlette.background import BackgroundTasks
from starlette.datastructures import QueryParams
Expand Down Expand Up @@ -37,7 +39,10 @@ async def post(self, request: Request) -> Response:
content_type = request.headers.get("Content-Type", "")

if "application/json" in content_type:
data = await request.json()
try:
data = await request.json()
except json.JSONDecodeError:
return JSONResponse({"error": "Invalid JSON."}, 400)
elif "application/graphql" in content_type:
body = await request.body()
data = {"query": body.decode()}
Expand Down
8 changes: 8 additions & 0 deletions tests/test_graphql_api.py
View file
Open in desktop
Expand Up @@ -27,6 +27,14 @@ def test_post_json(client: TestClient):
assert response.json() == {"data": {"hello": "Hello stranger"}}


def test_post_invalid_json(client: TestClient):
response = client.post(
"/", data="{test", headers={"content-type": "application/json"}
)
assert response.status_code == 400
assert response.json() == {"error": "Invalid JSON."}


def test_post_graphql(client: TestClient):
response = client.post(
"/", data="{ hello }", headers={"content-type": "application/graphql"}
Expand Down