Skip to content
This repository was archived by the owner on Jun 23, 2023. It is now read-only.

Commit bc85b0d

Browse files
committed
Fixed error responses.
1 parent 14d216a commit bc85b0d

1 file changed

Lines changed: 9 additions & 13 deletions

File tree

flask_op/views.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -232,19 +232,18 @@ def service_endpoint(endpoint):
232232
}), 400)
233233
else:
234234
if request.data:
235-
req_args = request.data \
236-
if isinstance(request.data, str) else \
237-
request.data.decode()
235+
if isinstance(request.data, str):
236+
req_args = request.data
237+
else:
238+
req_args = request.data.decode()
238239
else:
239240
req_args = dict([(k, v) for k, v in request.form.items()])
240241
try:
241242
req_args = endpoint.parse_request(req_args, **pr_args)
242243
except Exception as err:
243244
_log.error(err)
244-
return make_response(json.dumps({
245-
'error': 'invalid_request',
246-
'error_description': str(err)
247-
}), 400)
245+
err_msg = ResponseMessage(error='invalid_request', error_description=str(err))
246+
return make_response(err_msg.to_json(), 400)
248247

249248
_log.info('request: {}'.format(req_args))
250249
if isinstance(req_args, ResponseMessage) and 'error' in req_args:
@@ -258,17 +257,14 @@ def service_endpoint(endpoint):
258257
kwargs = {}
259258

260259
if isinstance(endpoint, AccessToken):
261-
args = endpoint.process_request(AccessTokenRequest(**req_args),
262-
**kwargs)
260+
args = endpoint.process_request(AccessTokenRequest(**req_args), **kwargs)
263261
else:
264262
args = endpoint.process_request(req_args, **kwargs)
265263
except Exception as err:
266264
message = traceback.format_exception(*sys.exc_info())
267265
_log.error(message)
268-
return make_response(json.dumps({
269-
'error': 'invalid_request',
270-
'error_description': str(err)
271-
}), 400)
266+
err_msg = ResponseMessage(error='invalid_request', error_description=str(err))
267+
return make_response(err_msg.to_json(), 400)
272268

273269
_log.info('Response args: {}'.format(args))
274270

0 commit comments

Comments
 (0)