darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 00:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tests not completed

Browse Source
This commit is contained in:
venusbb
2017-08-14 11:56:12 +01:00
parent ef1ec17789
commit 9d446bc942
3 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/main/views/service_settings.py
View File

@@ -359,21 +359,34 @@ def service_set_sms_sender(service_id):
@login_required
@user_has_permissions('manage_settings', admin_override=True)
def service_set_inbound_number(service_id):
inbound_number = inbound_number_client.get_inbound_sms_number_for_service(service_id)
new_number = False
if inbound_number['data'] == '' or inbound_number['data'] is None:
inbound_number = inbound_number_client.get_available_inbound_number(service_id)
inbound_number = inbound_number_client.get_inbound_sms_number_for_service(service_id)
if inbound_number['data'] is None:
inbound_number = inbound_number_client.get_available_inbound_number()
# if (inbound_number['data'] is None):
if (inbound_number['data'] is []):
# either return 404 or 400 or return a message to the html
new_number = True
if request.method == 'POST':
switch_service_permissions(current_service['id'], 'inbound_sms')
if new_number:
inbound_number_client.activate_inbound_sms_service(service_id, inbound_number['data']['id'])
return redirect(url_for('.service_settings', service_id=service_id))
else:
inbound_number_client.reactivate_inbound_sms_service(inbound_number['data']['id'])
return redirect(url_for('.service_settings', service_id=service_id))
try:
switch_service_permissions(current_service['id'], 'inbound_sms')
if new_number:
inbound_number_client.activate_inbound_sms_service(service_id, inbound_number['data']['id'])
return redirect(url_for('.service_settings', service_id=service_id))
else:
inbound_number_client.reactivate_inbound_sms_service(inbound_number['data']['id'])
return redirect(url_for('.service_settings', service_id=service_id))
except HTTPError as e:
raise e
return render_template(
'views/service-settings/confirm-inbound-number.html',

17
app/notify_client/inbound_number_client.py
View File

@@ -11,20 +11,25 @@ class InboundNumberClient(NotifyAdminAPIClient):
self.api_key = app.config['ADMIN_CLIENT_SECRET']
def get_all_inbound_sms_number_service(self):
endpoint = '/inbound_number'
return self.get(endpoint)
return self.get('/inbound_number')
def get_inbound_sms_number_for_service(self, service_id):
return self.get('/inbound_number/service/{}'.format(service_id))
def activate_inbound_sms_service(self, service_id, inbound_number_id):
return self.post(url='/inbound_number/{}/service/{}'.format(inbound_number_id, service_id), data={})
# def activate_inbound_sms_service(self, service_id, inbound_number_id):
# return self.post(url='/inbound_number/{}/service/{}'.format(inbound_number_id, service_id), data={})
def reactivate_inbound_sms_service(self, inbound_number_id):
try:
catch:
return self.post(url='/inbound_number/{}/on'.format(inbound_number_id), data={})
def deactivate_inbound_sms_permission(self, inbound_number_id):
return self.post(url='/inbound_number/{}/off'.format(inbound_number_id), data={})
def get_available_inbound_number(self):
return self.get(url='/inbound_number/available'.format())
# def get_available_inbound_number(self):
# return self.get(url='/inbound_number/available'.format())