Revert "Process SNS request triggered by a DVLA S3 update"

This commit is contained in:
Imdad Ahad
2017-05-12 17:21:07 +01:00
committed by GitHub
parent c1e41e7dc8
commit 7a10a91262
8 changed files with 44 additions and 240 deletions

View File

@@ -13,8 +13,9 @@ from app.clients.email.aws_ses import get_aws_responses
from app.dao import (
notifications_dao
)
from app.notifications.process_client_response import validate_callback_data
from app.notifications.utils import autoconfirm_subscription
from app.notifications.utils import confirm_subscription
ses_callback_blueprint = Blueprint('notifications_ses_callback', __name__)
@@ -31,12 +32,14 @@ def process_ses_response():
try:
ses_request = json.loads(request.data)
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
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
errors = validate_callback_data(data=ses_request, fields=['Message'], client_name=client_name)
if errors: