darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 17:45:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2881 from alphagov/make-inbound-search-post

Browse Source 
make inbound search a POST
This commit is contained in:
Leo Hemsted
2019-03-29 15:59:01 +00:00
committed by GitHub
parent c5208d712e 53cdbad2cc
commit 050a879ae1
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/dashboard.py
View File

@@ -20,7 +20,6 @@ from app import (
current_service, current_service,
format_date_numeric, format_date_numeric,
format_datetime_numeric, format_datetime_numeric,
inbound_number_client,
job_api_client, job_api_client,
service_api_client, service_api_client,
template_statistics_client, template_statistics_client,
@@ -244,9 +243,8 @@ def get_inbox_partials(service_id):
inbound_messages_data = service_api_client.get_most_recent_inbound_sms(service_id, page=page) inbound_messages_data = service_api_client.get_most_recent_inbound_sms(service_id, page=page)
inbound_messages = inbound_messages_data['data'] inbound_messages = inbound_messages_data['data']
if not inbound_messages: if not inbound_messages:
inbound_number = inbound_number_client.get_inbound_sms_number_for_service(service_id)['data']['number'] inbound_number = current_service.inbound_number
else: else:
inbound_number = None inbound_number = None
@@ -263,7 +261,6 @@ def get_inbox_partials(service_id):
inbound_number=inbound_number, inbound_number=inbound_number,
prev_page=prev_page, prev_page=prev_page,
next_page=next_page next_page=next_page
)} )}

2
app/notify_client/notification_api_client.py
View File

@@ -19,7 +19,7 @@ class NotificationApiClient(NotifyAdminAPIClient):
to=None, to=None,
include_one_off=None, include_one_off=None,
): ):
# TODO: if "to" is included, this should be a POST
params = { params = {
'page': page, 'page': page,
'page_size': page_size, 'page_size': page_size,

10
app/notify_client/service_api_client.py
View File

@@ -291,15 +291,13 @@ class ServiceAPIClient(NotifyAdminAPIClient):
def update_whitelist(self, service_id, data): def update_whitelist(self, service_id, data):
return self.put(url='/service/{}/whitelist'.format(service_id), data=data) return self.put(url='/service/{}/whitelist'.format(service_id), data=data)
def get_inbound_sms(self, service_id, user_number='', page=None): def get_inbound_sms(self, service_id, user_number=''):
return self.get( # POST prevents the user phone number leaking into our logs
return self.post(
'/service/{}/inbound-sms'.format( '/service/{}/inbound-sms'.format(
service_id, service_id,
), ),
params={ data={'user_number': user_number}
'user_number': user_number,
'page': page
}
) )
def get_most_recent_inbound_sms(self, service_id, page=None): def get_most_recent_inbound_sms(self, service_id, page=None):