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

Update to config to pull out from email address.

Browse Source
This commit is contained in:
Nicholas Staples
2016-02-16 11:10:02 +00:00
parent 025a6fb47e
commit 20650a91e0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/user/rest.py
View File

@@ -1,5 +1,5 @@
from datetime import datetime from datetime import datetime
from flask import (jsonify, request, abort, Blueprint) from flask import (jsonify, request, abort, Blueprint, current_app)
from sqlalchemy.exc import DataError from sqlalchemy.exc import DataError
from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.orm.exc import NoResultFound
from app.dao.services_dao import get_model_services from app.dao.services_dao import get_model_services
@@ -141,7 +141,7 @@ def send_user_code(user_id):
email = user.email_address if verify_code.get('to', None) is None else verify_code.get('to') email = user.email_address if verify_code.get('to', None) is None else verify_code.get('to')
notification = { notification = {
'to_address': email, 'to_address': email,
'from_address': 'notify@digital.cabinet-office.gov.uk', 'from_address': current_app.config['VERIFY_CODE_FROM_EMAIL_ADDRESS'],
'subject': 'Verification code', 'subject': 'Verification code',
'body': secret_code} 'body': secret_code}
add_notification_to_queue(api_user['client'], 'admin', 'email', notification) add_notification_to_queue(api_user['client'], 'admin', 'email', notification)

3
config.py
View File

@@ -20,6 +20,7 @@ class Config(object):
NOTIFY_JOB_QUEUE = os.getenv('NOTIFY_JOB_QUEUE', 'notify-jobs-queue') NOTIFY_JOB_QUEUE = os.getenv('NOTIFY_JOB_QUEUE', 'notify-jobs-queue')
# Notification Queue names are a combination of a prefx plus a name # Notification Queue names are a combination of a prefx plus a name
NOTIFICATION_QUEUE_PREFIX = 'notification' NOTIFICATION_QUEUE_PREFIX = 'notification'
VERIFY_CODE_FROM_EMAIL_ADDRESS = 'notify@digital.cabinet-office.gov.uk'
class Development(Config): class Development(Config):
@@ -31,6 +32,7 @@ class Development(Config):
DELIVERY_CLIENT_USER_NAME = 'dev-notify-delivery' DELIVERY_CLIENT_USER_NAME = 'dev-notify-delivery'
DELIVERY_CLIENT_SECRET = 'dev-notify-secret-key' DELIVERY_CLIENT_SECRET = 'dev-notify-secret-key'
NOTIFICATION_QUEUE_PREFIX = 'notification_development' NOTIFICATION_QUEUE_PREFIX = 'notification_development'
VERIFY_CODE_FROM_EMAIL_ADDRESS = 'notify-tests-preview@digital.cabinet-office.gov.uk'
class Test(Development): class Test(Development):
@@ -40,6 +42,7 @@ class Test(Development):
class Preview(Config): class Preview(Config):
NOTIFICATION_QUEUE_PREFIX = 'notification_preview' NOTIFICATION_QUEUE_PREFIX = 'notification_preview'
VERIFY_CODE_FROM_EMAIL_ADDRESS = 'notify-tests-preview@digital.cabinet-office.gov.uk'
class Staging(Config): class Staging(Config):