diff --git a/README.md b/README.md index 850ffa577..d2dbc9892 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,6 @@ export NOTIFY_JOB_QUEUE='[unique-to-environment]-notify-jobs-queue' # NOTE uniqu export NOTIFICATION_QUEUE_PREFIX='[unique-to-environment]-notification_development' # NOTE unique prefix export SECRET_KEY='dev-notify-secret-key' export SQLALCHEMY_DATABASE_URI='postgresql://localhost/notification_api' -export TWILIO_ACCOUNT_SID=[contact team member for account sid] -export TWILIO_AUTH_TOKEN=[contact team member for auth token] export VERIFY_CODE_FROM_EMAIL_ADDRESS='no-reply@notify.works' export MMG_API_KEY=mmg=secret-key export STATSD_ENABLED=True diff --git a/app/models.py b/app/models.py index fcce4e950..7a035e94e 100644 --- a/app/models.py +++ b/app/models.py @@ -185,11 +185,10 @@ class Template(db.Model, Versioned): MMG_PROVIDER = "mmg" -TWILIO_PROVIDER = "twilio" FIRETEXT_PROVIDER = "firetext" SES_PROVIDER = 'ses' -SMS_PROVIDERS = [MMG_PROVIDER, TWILIO_PROVIDER, FIRETEXT_PROVIDER] +SMS_PROVIDERS = [MMG_PROVIDER, FIRETEXT_PROVIDER] EMAIL_PROVIDERS = [SES_PROVIDER] PROVIDERS = SMS_PROVIDERS + EMAIL_PROVIDERS diff --git a/config.py b/config.py index 1a8c1c09f..2195f7732 100644 --- a/config.py +++ b/config.py @@ -88,8 +88,6 @@ class Config(object): Queue('email-registration-verification', Exchange('default'), routing_key='email-registration-verification'), Queue('research-mode', Exchange('default'), routing_key='research-mode') ] - TWILIO_ACCOUNT_SID = os.getenv('TWILIO_ACCOUNT_SID') - TWILIO_AUTH_TOKEN = os.getenv('TWILIO_AUTH_TOKEN') FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY") LOADTESTING_NUMBER = os.getenv('LOADTESTING_NUMBER') LOADTESTING_API_KEY = os.getenv("LOADTESTING_API_KEY") diff --git a/config_live.py b/config_live.py index 5a5d1c973..8149b724d 100644 --- a/config_live.py +++ b/config_live.py @@ -14,7 +14,6 @@ class Live(Config): VERIFY_CODE_FROM_EMAIL_ADDRESS = os.environ['LIVE_VERIFY_CODE_FROM_EMAIL_ADDRESS'] NOTIFY_EMAIL_DOMAIN = os.environ['LIVE_NOTIFY_EMAIL_DOMAIN'] FIRETEXT_API_KEY = os.getenv("LIVE_FIRETEXT_API_KEY") - TWILIO_AUTH_TOKEN = os.getenv('LIVE_TWILIO_AUTH_TOKEN') MMG_API_KEY = os.environ['LIVE_MMG_API_KEY'] CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload' STATSD_ENABLED = True diff --git a/config_staging.py b/config_staging.py index a2b46539b..7c7d094f2 100644 --- a/config_staging.py +++ b/config_staging.py @@ -14,7 +14,6 @@ class Staging(Config): VERIFY_CODE_FROM_EMAIL_ADDRESS = os.environ['STAGING_VERIFY_CODE_FROM_EMAIL_ADDRESS'] NOTIFY_EMAIL_DOMAIN = os.environ['STAGING_NOTIFY_EMAIL_DOMAIN'] FIRETEXT_API_KEY = os.getenv("STAGING_FIRETEXT_API_KEY") - TWILIO_AUTH_TOKEN = os.getenv('STAGING_TWILIO_AUTH_TOKEN') MMG_API_KEY = os.environ['STAGING_MMG_API_KEY'] CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload' FROM_NUMBER = os.getenv('STAGING_FROM_NUMBER') diff --git a/environment_test.sh b/environment_test.sh index c03892e9e..d202e5534 100644 --- a/environment_test.sh +++ b/environment_test.sh @@ -12,8 +12,6 @@ export NOTIFICATION_QUEUE_PREFIX='notification_development-test' export SECRET_KEY='secret-key' export SQLALCHEMY_DATABASE_URI='postgresql://localhost/test_notification_api' export VERIFY_CODE_FROM_EMAIL_ADDRESS='no-reply@notify.works' -export TWILIO_ACCOUNT_SID="test" -export TWILIO_AUTH_TOKEN="test" export FIRETEXT_API_KEY="Firetext" export NOTIFY_EMAIL_DOMAIN="test.notify.com" export MMG_API_KEY='mmg-secret-key'