darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-16 20:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into async-job-stats

Browse Source 
Conflicts:
	app/notifications/notifications_ses_callback.py
This commit is contained in:
Martyn Inglis
2017-05-17 09:49:43 +01:00
parent a5dae0bebd c4964d8cf4
commit 83a1b1526e
25 changed files with 713 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/notifications/notifications_ses_callback.py
View File

@@ -15,7 +15,7 @@ from app.dao import (
)
from app.celery.statistics_tasks import create_outcome_notification_statistic_tasks
from app.notifications.process_client_response import validate_callback_data
from app.notifications.utils import confirm_subscription
from app.notifications.utils import autoconfirm_subscription
ses_callback_blueprint = Blueprint('notifications_ses_callback', __name__)
@@ -32,14 +32,12 @@ def process_ses_response():
try:
ses_request = json.loads(request.data)
if ses_request.get('Type') == 'SubscriptionConfirmation':
current_app.logger.info("SNS subscription confirmation url: {}".format(ses_request['SubscribeURL']))
subscribed_topic = confirm_subscription(ses_request)
if subscribed_topic:
current_app.logger.info("Automatically subscribed to topic: {}".format(subscribed_topic))
return jsonify(
result="success", message="SES callback succeeded"
), 200
subscribed_topic = autoconfirm_subscription(ses_request)
if subscribed_topic:
current_app.logger.info("Automatically subscribed to topic: {}".format(subscribed_topic))
return jsonify(
result="success", message="SES callback succeeded"
), 200
errors = validate_callback_data(data=ses_request, fields=['Message'], client_name=client_name)
if errors: