darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-05 02:41:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don’t re-expire old keys

Browse Source 
If a key has already been expired we don’t want to lose the information
about when that happened by giving it a new expiry date.
This commit is contained in:
Chris Hill-Scott
2021-07-30 11:56:51 +01:00
parent 43bcb56ff4
commit 132411be24
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/app/service/test_rest.py
View File

@@ -4172,6 +4172,7 @@ def test_set_as_broadcast_service_removes_user_permissions(
assert service_user.get_permissions(service_id=sample_service_full_permissions.id) == ['send_emails']
@freeze_time('2021-12-21')
def test_set_as_broadcast_service_revokes_api_keys(
admin_request,
broadcast_organisation,
@@ -4179,7 +4180,10 @@ def test_set_as_broadcast_service_revokes_api_keys(
sample_service_full_permissions,
):
api_key_1 = create_api_key(service=sample_service)
api_key_2 = create_api_key(service=sample_service_full_permissions)
api_key_2 = create_api_key(service=sample_service)
api_key_3 = create_api_key(service=sample_service_full_permissions)
api_key_2.expiry_date = datetime.utcnow() - timedelta(days=365)
admin_request.post(
'service.set_as_broadcast_service',
@@ -4190,5 +4194,12 @@ def test_set_as_broadcast_service_revokes_api_keys(
'provider_restriction': 'all',
}
)
assert api_key_1.expiry_date < datetime.utcnow()
assert api_key_2.expiry_date is None
# This key should have a new expiry date
assert api_key_1.expiry_date.isoformat().startswith('2021-12-21')
# This key keeps its old expiry date
assert api_key_2.expiry_date.isoformat().startswith('2020-12-21')
# This key is from a different service
assert api_key_3.expiry_date is None