Skip to content

Move JSON response body validation to middleware #1591

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

Merged
RobbeSneyders merged 10 commits into from
Oct 3, 2022
Merged

Move JSON response body validation to middleware #1591

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3903366
Extract boilerplate code into Routed base classes
RobbeSneyders Sep 16, 2022
927a144
Use typing_extensions for Python 3.7 Protocol support
RobbeSneyders Sep 16, 2022
24b5725
Use Mock instead of AsyncMock
RobbeSneyders Sep 16, 2022
141ba1c
Extract response validation to middleware
RobbeSneyders Sep 17, 2022
08ff765
Refactor Request validation to match Response validation
RobbeSneyders Sep 17, 2022
f4dcdbe
Factor out shared functionality
RobbeSneyders Sep 18, 2022
88a003f
Fix typo in TextResponseBodyValidator class name
RobbeSneyders Sep 23, 2022
4212e2b
Merge branch 'main' into feature/response-validation
RobbeSneyders Sep 26, 2022
c996561
Fix string formatting
RobbeSneyders Sep 26, 2022
dde3dd3
Use correct schema to check nullability in response validation
RobbeSneyders Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use Mock instead of AsyncMock
  • Loading branch information
@RobbeSneyders
RobbeSneyders committed Sep 18, 2022
commit 24b5725911f05bef16b315a4fc0330c035c17f5a
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def read_version(package):
'starlette>=0.15,<1',
'httpx>=0.15,<1',
'typing-extensions>=4,<5',
'mock>=3,<4'
]

swagger_ui_require = 'swagger-ui-bundle>=0.0.2,<0.1'
Expand Down
16 changes: 8 additions & 8 deletions tests/test_operation2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import math
import pathlib
import types
from unittest import mock

import mock
import pytest
from connexion.apis.flask_api import Jsonifier
from connexion.exceptions import InvalidSpecification
Expand Down Expand Up @@ -425,7 +425,7 @@ def test_operation_remote_token_info(security_handler_factory):
)

SecurityOperation(
next_app=mock.AsyncMock,
next_app=mock.Mock,
security_handler_factory=security_handler_factory,
security=[{"oauth": ["uid"]}],
security_schemes=SECURITY_DEFINITIONS_REMOTE,
Expand Down Expand Up @@ -495,7 +495,7 @@ def test_operation_local_security_oauth2(security_handler_factory):
security_handler_factory.verify_oauth = verify_oauth

SecurityOperation(
next_app=mock.AsyncMock,
next_app=mock.Mock,
security_handler_factory=security_handler_factory,
security=[{"oauth": ["uid"]}],
security_schemes=SECURITY_DEFINITIONS_LOCAL,
Expand All @@ -511,7 +511,7 @@ def test_operation_local_security_duplicate_token_info(security_handler_factory)
security_handler_factory.verify_oauth = verify_oauth

SecurityOperation(
next_app=mock.AsyncMock,
next_app=mock.Mock,
security_handler_factory=security_handler_factory,
security=[{"oauth": ["uid"]}],
security_schemes=SECURITY_DEFINITIONS_BOTH,
Expand Down Expand Up @@ -548,7 +548,7 @@ def test_multi_body(api):

def test_no_token_info(security_handler_factory):
SecurityOperation(
next_app=mock.AsyncMock,
next_app=mock.Mock,
security_handler_factory=security_handler_factory,
security=[{"oauth": ["uid"]}],
security_schemes=SECURITY_DEFINITIONS_WO_INFO,
Expand All @@ -569,7 +569,7 @@ def return_api_key_name(func, in_, name):
security = [{"key1": [], "key2": []}]

SecurityOperation(
next_app=mock.AsyncMock,
next_app=mock.Mock,
security_handler_factory=security_handler_factory,
security=security,
security_schemes=SECURITY_DEFINITIONS_2_KEYS,
Expand All @@ -594,7 +594,7 @@ def test_multiple_oauth_in_and(security_handler_factory, caplog):
security = [{"oauth_1": ["uid"], "oauth_2": ["uid"]}]

SecurityOperation(
next_app=mock.AsyncMock,
next_app=mock.Mock,
security_handler_factory=security_handler_factory,
security=security,
security_schemes=SECURITY_DEFINITIONS_2_OAUTH,
Expand Down Expand Up @@ -691,7 +691,7 @@ def test_oauth_scopes_in_or(security_handler_factory):
security = [{"oauth": ["myscope"]}, {"oauth": ["myscope2"]}]

SecurityOperation(
next_app=mock.AsyncMock,
next_app=mock.Mock,
security_handler_factory=security_handler_factory,
security=security,
security_schemes=SECURITY_DEFINITIONS_LOCAL,
Expand Down