darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-30 06:21:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to abstract inbound_sms perms check

Browse Source
This commit is contained in:
Ken Tsang
2017-07-05 15:08:53 +01:00
committed by venusbb
parent 3372fe6b18
commit 8b04039a5a
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/notifications/receive_notifications.py
View File

@@ -128,8 +128,7 @@ def fetch_potential_services(inbound_number, provider_name):
statsd_client.incr('inbound.{}.failed'.format(provider_name))
return False
str_permissions = [p.permission for p in potential_services[0].permissions]
if set([INBOUND_SMS_TYPE, SMS_TYPE]).issubset(set(str_permissions)) is False:
if not has_inbound_sms_permissions(potential_services[0].permissions):
current_app.logger.error(
'Service "{}" does not allow inbound SMS'.format(potential_services[0].id))
return False
@@ -137,6 +136,11 @@ def fetch_potential_services(inbound_number, provider_name):
return potential_services
def has_inbound_sms_permissions(permissions):
str_permissions = [p.permission for p in permissions]
return set([INBOUND_SMS_TYPE, SMS_TYPE]).issubset(set(str_permissions))
def strip_leading_forty_four(number):
if number.startswith('44'):
return number.replace('44', '0', 1)