Skip to content

Accept extension of JSON content-type #6583

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
lmazuel merged 3 commits into from
Jul 31, 2019
Merged

Accept extension of JSON content-type #6583

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09cf31a
Accept extension of JSON content-type
lmazuel Jul 31, 2019
e25c193
Adding text/something+json test
lmazuel Jul 31, 2019
b0abc4c
Support digit
lmazuel Jul 31, 2019
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
9 changes: 4 additions & 5 deletions sdk/core/azure-core/azure/core/pipeline/policies/universal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,9 @@ def on_response(self, request, response):
class ContentDecodePolicy(SansIOHTTPPolicy):
"""Policy for decoding unstreamed response content.
"""
JSON_MIMETYPES = [
'application/json',
'text/json' # Because we're open minded people...
]
# Accept "text" because we're open minded people...
JSON_REGEXP = re.compile(r'^(application|text)/([a-z+.]+\+)?json$')

# Name used in context
CONTEXT_NAME = "deserialized_data"

Expand Down Expand Up @@ -301,7 +300,7 @@ def deserialize_from_text(cls, response, content_type=None):
if content_type is None:
return data

if content_type in cls.JSON_MIMETYPES:
if cls.JSON_REGEXP.match(content_type):
try:
return json.loads(data_as_str)
except ValueError as err:
Expand Down
12 changes: 12 additions & 0 deletions sdk/core/azure-core/tests/test_universal_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,18 @@ def body(self):
result = response.context["deserialized_data"]
assert result["success"] is True

# Simple JSON with complex content_type
response = build_response(b'{"success": true}', content_type="application/vnd.microsoft.appconfig.kv+json")
raw_deserializer.on_response(None, response)
result = response.context["deserialized_data"]
assert result["success"] is True

# Simple JSON with complex content_type, v2
response = build_response(b'{"success": true}', content_type="text/vnd.microsoft.appconfig.kv+json")
raw_deserializer.on_response(None, response)
result = response.context["deserialized_data"]
assert result["success"] is True

# For compat, if no content-type, decode JSON
response = build_response(b'"data"')
raw_deserializer.on_response(None, response)
Expand Down