From b0ae6395000be12936aa9cc85a14cce68bdba949 Mon Sep 17 00:00:00 2001 From: apiyo Date: Thu, 11 Apr 2024 18:18:43 +0300 Subject: [PATCH] When an odk token expires is nil, deactivate and replace --- .../api/tests/viewsets/test_connect_viewset.py | 18 ++++++++++++++++++ onadata/apps/api/viewsets/connect_viewset.py | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/onadata/apps/api/tests/viewsets/test_connect_viewset.py b/onadata/apps/api/tests/viewsets/test_connect_viewset.py index b2b309b755..88a9e23b35 100644 --- a/onadata/apps/api/tests/viewsets/test_connect_viewset.py +++ b/onadata/apps/api/tests/viewsets/test_connect_viewset.py @@ -603,6 +603,24 @@ def test_retrieve_odk_token(self): self.assertEqual(response.data["odk_token"], odk_token) self.assertEqual(response.data["expires"], expires) + def test_deactivate_token_when_expires_is_None(self): + """ + Test that when a token's .expires field is nil, it will be deactivated + and a new one created in it's place + """ + view = ConnectViewSet.as_view({"post": "odk_token", "get": "odk_token"}) + + # Create an active tokens + token = ODKToken.objects.create(user=self.user) + ODKToken.objects.filter(pk=token.pk).update(expires=None) + + request = self.factory.get("/", **self.extra) + request.session = self.client.session + response = view(request) + self.assertEqual(response.status_code, 200) + self.assertEqual(len(ODKToken.objects.filter(status=ODKToken.ACTIVE)), 1) + self.assertNotEqual(response.data["odk_token"], token.raw_key) + def test_deactivates_multiple_active_odk_token(self): """ Test that the viewset deactivates tokens when two or more are diff --git a/onadata/apps/api/viewsets/connect_viewset.py b/onadata/apps/api/viewsets/connect_viewset.py index 549a26fe55..b981a28681 100644 --- a/onadata/apps/api/viewsets/connect_viewset.py +++ b/onadata/apps/api/viewsets/connect_viewset.py @@ -180,7 +180,9 @@ def odk_token(self, request, *args, **kwargs): user=user, status=ODKToken.ACTIVE ) - if not created and timezone.now() > token.expires: + if not token.expires or ( + not created and timezone.now() > token.expires + ): token.status = ODKToken.INACTIVE token.save() token = ODKToken.objects.create(user=user)