rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a bug where malformed JSON payloads prevented default param values from returning

Browse source
This commit is contained in:
Joel Collins 2019-01-29 13:54:32 +00:00
parent bda946bcc9
commit cc36aa7593
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openflexure_microscope/api/utilities.py
View file

@ -11,6 +11,7 @@ class JsonPayload:
# Try to load as json # Try to load as json
try: try:
self.json = request.get_json() #: dict: Dictionary representation of request JSON self.json = request.get_json() #: dict: Dictionary representation of request JSON
# If malformed JSON is passed, make an empty dictionary
except BadRequest as e: except BadRequest as e:
logging.error(e) logging.error(e)
self.json = {} self.json = {}
@ -33,9 +34,9 @@ class JsonPayload:
default: Value to return if no matching key-value pair is found. default: Value to return if no matching key-value pair is found.
convert: Converter function. By passing a type, the value will be converted to that type. **Use with caution!** convert: Converter function. By passing a type, the value will be converted to that type. **Use with caution!**
""" """
# If no JSON payload exists, return early # If no JSON payload exists, make an empty dictionary
if not self.json: if not self.json:
return None self.json = {}
if key in self.json: if key in self.json:
val = self.json[key] val = self.json[key]
@ -44,7 +45,6 @@ class JsonPayload:
if convert: if convert:
val = convert(val) val = convert(val)
return val return val