Use naive datetimes

Had issues with Django serving me naive datetimes from
the DateTimeFields which
could not be compared to the timezone aware datetimes objects
i was otherwise operating with

python/nav/web/api/v1/views.py

@@ -16,7 +16,7 @@
 # pylint: disable=R0903, R0901, R0904
 """Views for the NAV API"""
 
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 import logging
 
 from IPy import IP
@@ -1186,8 +1186,8 @@ def post(self, request):
         new_claims = decode_token(refresh_token)
         new_hash = hash_token(refresh_token)
         db_token.hash = new_hash
-        db_token.expires = datetime.fromtimestamp(new_claims['exp'], tz=timezone.utc)
-        db_token.activates = datetime.fromtimestamp(new_claims['nbf'], tz=timezone.utc)
+        db_token.expires = datetime.fromtimestamp(new_claims['exp'])
+        db_token.activates = datetime.fromtimestamp(new_claims['nbf'])
         db_token.save()
 
         response_data = {

tests/integration/jwt_refresh_endpoint_test.py

@@ -1,6 +1,6 @@
 from typing import Generator
 import pytest
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 
 from unittest.mock import Mock, patch
 
@@ -27,7 +27,7 @@ def test_token_not_in_database_should_be_rejected(db, api_client, url):
 def test_inactive_token_should_be_rejected(db, api_client, url):
     token = generate_refresh_token()
     # Set expiry date in the past
-    now = datetime.now(tz=timezone.utc)
+    now = datetime.now()
     db_token = JWTRefreshToken(
         name="testtoken",
         hash=hash_token(token),
@@ -53,8 +53,8 @@ def test_valid_token_should_be_accepted(db, api_client, url):
     db_token = JWTRefreshToken(
         name="testtoken",
         hash=hash_token(token),
-        expires=datetime.fromtimestamp(data['exp'], tz=timezone.utc),
-        activates=datetime.fromtimestamp(data['nbf'], tz=timezone.utc),
+        expires=datetime.fromtimestamp(data['exp']),
+        activates=datetime.fromtimestamp(data['nbf']),
     )
     db_token.save()
     response = api_client.post(
@@ -74,8 +74,8 @@ def test_valid_token_should_be_replaced_by_new_token_in_db(db, api_client, url):
     db_token = JWTRefreshToken(
         name="testtoken",
         hash=token_hash,
-        expires=datetime.fromtimestamp(data['exp'], tz=timezone.utc),
-        activates=datetime.fromtimestamp(data['nbf'], tz=timezone.utc),
+        expires=datetime.fromtimestamp(data['exp']),
+        activates=datetime.fromtimestamp(data['nbf']),
     )
     db_token.save()
     response = api_client.post(
@@ -98,8 +98,8 @@ def test_should_include_access_and_refresh_token_in_response(db, api_client, url
     db_token = JWTRefreshToken(
         name="testtoken",
         hash=hash_token(token),
-        expires=datetime.fromtimestamp(data['exp'], tz=timezone.utc),
-        activates=datetime.fromtimestamp(data['nbf'], tz=timezone.utc),
+        expires=datetime.fromtimestamp(data['exp']),
+        activates=datetime.fromtimestamp(data['nbf']),
     )
     db_token.save()
     response = api_client.post(