darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 15:31:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

We no longer have guaranteed access to a request context

Browse Source
This commit is contained in:
Athanasios Voutsadakis
2017-08-04 12:16:25 +01:00
committed by Richard Chapman
parent 865cb6656e
commit 892eaede13
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/notifications/notifications_ses_callback.py
View File

@@ -28,7 +28,11 @@ register_errors(ses_callback_blueprint)
@ses_callback_blueprint.route('/notifications/email/ses', methods=['POST']) @ses_callback_blueprint.route('/notifications/email/ses', methods=['POST'])
def sns_callback_handler(): def sns_callback_handler():
process_ses_response(json.loads(request.data)) errors, status, kwargs = process_ses_response(json.loads(request.data))
if errors:
raise InvalidRequest(errors, status)
return jsonify(**kwargs), status
def process_ses_response(ses_request): def process_ses_response(ses_request):
@@ -37,18 +41,16 @@ def process_ses_response(ses_request):
subscribed_topic = autoconfirm_subscription(ses_request) subscribed_topic = autoconfirm_subscription(ses_request)
if subscribed_topic: if subscribed_topic:
current_app.logger.info("Automatically subscribed to topic: {}".format(subscribed_topic)) current_app.logger.info("Automatically subscribed to topic: {}".format(subscribed_topic))
return jsonify( return [], 200, {'result': "success", 'message': "SES callback succeeded"}
result="success", message="SES callback succeeded"
), 200
errors = validate_callback_data(data=ses_request, fields=['Message'], client_name=client_name) errors = validate_callback_data(data=ses_request, fields=['Message'], client_name=client_name)
if errors: if errors:
raise InvalidRequest(errors, status_code=400) return errors, 400, {}
ses_message = json.loads(ses_request['Message']) ses_message = json.loads(ses_request['Message'])
errors = validate_callback_data(data=ses_message, fields=['notificationType'], client_name=client_name) errors = validate_callback_data(data=ses_message, fields=['notificationType'], client_name=client_name)
if errors: if errors:
raise InvalidRequest(errors, status_code=400) return errors, 400, {}
notification_type = ses_message['notificationType'] notification_type = ses_message['notificationType']
if notification_type == 'Bounce': if notification_type == 'Bounce':
@@ -60,7 +62,7 @@ def process_ses_response(ses_request):
aws_response_dict = get_aws_responses(notification_type) aws_response_dict = get_aws_responses(notification_type)
except KeyError: except KeyError:
error = "{} callback failed: status {} not found".format(client_name, notification_type) error = "{} callback failed: status {} not found".format(client_name, notification_type)
raise InvalidRequest(error, status_code=400) return error, 400, {}
notification_status = aws_response_dict['notification_status'] notification_status = aws_response_dict['notification_status']
@@ -73,7 +75,7 @@ def process_ses_response(ses_request):
if not notification: if not notification:
error = "SES callback failed: notification either not found or already updated " \ error = "SES callback failed: notification either not found or already updated " \
"from sending. Status {} for notification reference {}".format(notification_status, reference) "from sending. Status {} for notification reference {}".format(notification_status, reference)
raise InvalidRequest(error, status_code=404) return error, 404, {}
if not aws_response_dict['success']: if not aws_response_dict['success']:
current_app.logger.info( current_app.logger.info(
@@ -98,14 +100,12 @@ def process_ses_response(ses_request):
create_outcome_notification_statistic_tasks(notification) create_outcome_notification_statistic_tasks(notification)
return jsonify( return [], 200, {'result': "success", 'message': "SES callback succeeded"}
result="success", message="SES callback succeeded"
), 200
except KeyError: except KeyError:
message = "SES callback failed: messageId missing" error = "SES callback failed: messageId missing"
raise InvalidRequest(message, status_code=400) return error, 400, {}
except ValueError as ex: except ValueError:
error = "{} callback failed: invalid json".format(client_name) error = "{} callback failed: invalid json".format(client_name)
raise InvalidRequest(error, status_code=400) return error, 400, {}