Skip to content

media type deserialize form urlencoded #302

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.

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
merged 1 commit into from
Mar 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion openapi_core/deserializing/media_types/factories.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from openapi_core.deserializing.media_types.util import json_loads
from openapi_core.deserializing.media_types.util import json_loads, form_loads

from openapi_core.deserializing.media_types.deserializers import (
PrimitiveDeserializer,
Expand All @@ -9,6 +9,7 @@ class MediaTypeDeserializersFactory(object):

MEDIA_TYPE_DESERIALIZERS = {
'application/json': json_loads,
'application/x-www-form-urlencoded': form_loads,
}

def __init__(self, custom_deserializers=None):
Expand Down
5 changes: 5 additions & 0 deletions openapi_core/deserializing/media_types/util.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
from json import loads

from six import binary_type
from six.moves.urllib.parse import parse_qsl


def json_loads(value):
# python 3.5 doesn't support binary input fix
if isinstance(value, (binary_type, )):
value = value.decode()
return loads(value)


def form_loads(value):
return dict(parse_qsl(value))
88 changes: 0 additions & 88 deletions tests/unit/deserializing/test_deserialize.py

This file was deleted.

64 changes: 64 additions & 0 deletions tests/unit/deserializing/test_media_types_deserializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import pytest

from openapi_core.deserializing.exceptions import DeserializeError
from openapi_core.deserializing.media_types.factories import (
MediaTypeDeserializersFactory,
)
from openapi_core.schema.media_types.models import MediaType


class TestMediaTypeDeserializer(object):

@pytest.fixture
def deserializer_factory(self):
def create_deserializer(media_type, custom_deserializers=None):
return MediaTypeDeserializersFactory(
custom_deserializers=custom_deserializers).create(media_type)
return create_deserializer

def test_json_empty(self, deserializer_factory):
media_type = MediaType('application/json')
value = ''

with pytest.raises(DeserializeError):
deserializer_factory(media_type)(value)

def test_json_empty_object(self, deserializer_factory):
media_type = MediaType('application/json')
value = "{}"

result = deserializer_factory(media_type)(value)

assert result == {}

def test_form_urlencoded_empty(self, deserializer_factory):
media_type = MediaType('application/x-www-form-urlencoded')
value = ''

result = deserializer_factory(media_type)(value)

assert result == {}

def test_form_urlencoded_simple(self, deserializer_factory):
media_type = MediaType('application/x-www-form-urlencoded')
value = 'param1=test'

result = deserializer_factory(media_type)(value)

assert result == {'param1': 'test'}

def test_custom_simple(self, deserializer_factory):
custom_mimetype = 'application/custom'
media_type = MediaType(custom_mimetype)
value = "{}"

def custom_deserializer(value):
return 'custom'
custom_deserializers = {
custom_mimetype: custom_deserializer,
}

result = deserializer_factory(
media_type, custom_deserializers=custom_deserializers)(value)

assert result == 'custom'
42 changes: 42 additions & 0 deletions tests/unit/deserializing/test_parameters_deserializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import pytest

from openapi_core.deserializing.parameters.factories import (
ParameterDeserializersFactory,
)
from openapi_core.deserializing.parameters.exceptions import (
EmptyParameterValue,
)
from openapi_core.schema.parameters.models import Parameter


class TestParameterDeserializer(object):

@pytest.fixture
def deserializer_factory(self):
def create_deserializer(param):
return ParameterDeserializersFactory().create(param)
return create_deserializer

def test_deprecated(self, deserializer_factory):
param = Parameter('param', 'query', deprecated=True)
value = 'test'

with pytest.warns(DeprecationWarning):
result = deserializer_factory(param)(value)

assert result == value

def test_query_empty(self, deserializer_factory):
param = Parameter('param', 'query')
value = ''

with pytest.raises(EmptyParameterValue):
deserializer_factory(param)(value)

def test_query_valid(self, deserializer_factory):
param = Parameter('param', 'query')
value = 'test'

result = deserializer_factory(param)(value)

assert result == value