Merge 99be8e5 into c270841

pallets-eco · Nov 14, 2018 · 7396d95 · 7396d95
2 parents c270841 + 99be8e5
commit 7396d95
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/flask_jwt/__init__.py b/flask_jwt/__init__.py
@@ -111,7 +111,13 @@ def _default_request_handler():
 
 
 def _default_auth_request_handler():
-    data = request.get_json()
+    data = dict()
+
+    try:
+        data = request.get_json()
+    except:
+        raise JWTError('Bad Request', 'Request payload must be in json format.')
+
     username = data.get(current_app.config.get('JWT_AUTH_USERNAME_KEY'), None)
     password = data.get(current_app.config.get('JWT_AUTH_PASSWORD_KEY'), None)
     criterion = [username, password, len(data) == 2]