From bf979128ab38b73d5ff4a7b25e5e36b65599db01 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Fri, 12 Mar 2021 15:57:46 +0000 Subject: [PATCH] use new check api endpoints for validating invite tokens added in https://github.com/alphagov/notifications-api/pull/3171 --- app/notify_client/invite_api_client.py | 2 +- app/notify_client/org_invite_api_client.py | 2 +- tests/app/models/test_user.py | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/notify_client/invite_api_client.py b/app/notify_client/invite_api_client.py index cf6b83e71..f77b9f5c1 100644 --- a/app/notify_client/invite_api_client.py +++ b/app/notify_client/invite_api_client.py @@ -56,7 +56,7 @@ class InviteApiClient(NotifyAdminAPIClient): ]) 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): data = {'status': 'cancelled'} diff --git a/app/notify_client/org_invite_api_client.py b/app/notify_client/org_invite_api_client.py index 53b7bf772..23c1d7b99 100644 --- a/app/notify_client/org_invite_api_client.py +++ b/app/notify_client/org_invite_api_client.py @@ -34,7 +34,7 @@ class OrgInviteApiClient(NotifyAdminAPIClient): )['data'] 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'] def cancel_invited_user(self, org_id, invited_user_id): diff --git a/tests/app/models/test_user.py b/tests/app/models/test_user.py index 25bce1bf0..8bc2d24ea 100644 --- a/tests/app/models/test_user.py +++ b/tests/app/models/test_user.py @@ -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): - fake_id = str(uuid.uuid4()) - session_dict = {'invited_user_id': fake_id} + session_dict = {'invited_user_id': USER_ONE_ID} mocker.patch.dict('app.models.user.session', values=session_dict, clear=True) 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(