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

use new check api endpoints for validating invite tokens

Browse Source 
added in https://github.com/alphagov/notifications-api/pull/3171
This commit is contained in:
Leo Hemsted
2021-03-12 15:57:46 +00:00
parent 45297eae43
commit bf979128ab
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notify_client/invite_api_client.py
View File

@@ -56,7 +56,7 @@ class InviteApiClient(NotifyAdminAPIClient):
]) ])
def check_token(self, token): def check_token(self, token):
return self.get(url='/invite/service/{}'.format(token))['data'] return self.get(url='/invite/service/check/{}'.format(token))['data']
def cancel_invited_user(self, service_id, invited_user_id): def cancel_invited_user(self, service_id, invited_user_id):
data = {'status': 'cancelled'} data = {'status': 'cancelled'}

2
app/notify_client/org_invite_api_client.py
View File

@@ -34,7 +34,7 @@ class OrgInviteApiClient(NotifyAdminAPIClient):
)['data'] )['data']
def check_token(self, token): def check_token(self, token):
resp = self.get(url='/invite/organisation/{}'.format(token)) resp = self.get(url='/invite/organisation/check/{}'.format(token))
return resp['data'] return resp['data']
def cancel_invited_user(self, org_id, invited_user_id): def cancel_invited_user(self, org_id, invited_user_id):

5
tests/app/models/test_user.py
View File

@@ -113,13 +113,12 @@ def test_has_live_services_when_service_is_not_live(
def test_invited_user_from_session_uses_id(client, mocker, mock_get_invited_user_by_id): def test_invited_user_from_session_uses_id(client, mocker, mock_get_invited_user_by_id):
fake_id = str(uuid.uuid4()) session_dict = {'invited_user_id': USER_ONE_ID}
session_dict = {'invited_user_id': fake_id}
mocker.patch.dict('app.models.user.session', values=session_dict, clear=True) mocker.patch.dict('app.models.user.session', values=session_dict, clear=True)
assert InvitedUser.from_session().id == USER_ONE_ID assert InvitedUser.from_session().id == USER_ONE_ID
mock_get_invited_user_by_id.assert_called_once_with(fake_id) mock_get_invited_user_by_id.assert_called_once_with(USER_ONE_ID)
def test_invited_user_from_session_uses_id_even_if_obj_in_session( def test_invited_user_from_session_uses_id_even_if_obj_in_session(