Merge pull request #6 from skip-pay/tda/chore/django_bump

chore: Django bump to <=5.0

Author: Formulka

.github/workflows/django.yml

@@ -13,17 +13,8 @@ jobs:
       max-parallel: 4
       matrix:
         include:
-          - python-version: 3.7
-            django-version: Django==3.1
-
-          - python-version: 3.7
-            django-version: Django==3.2
-
-          - python-version: 3.8
-            django-version: Django==3.1
-
-          - python-version: 3.8
-            django-version: Django==3.2
+          - python-version: 3.11
+            django-version: Django==4.2
 
     steps:
     - uses: actions/checkout@v2

auth_token/contrib/common/default/views.py

@@ -60,11 +60,7 @@ class TokenLogoutView(LogoutView):
     @method_decorator(never_cache)
     def dispatch(self, request, *args, **kwargs):
         logout(request)
-        next_page = self.get_next_page()
-        if next_page:
-            # Redirect to this page until the session has been cleared.
-            return HttpResponseRedirect(next_page)
-        return super(LogoutView, self).dispatch(request, *args, **kwargs)
+        return super().dispatch(request, *args, **kwargs)
 
 
 class InputLogMixin:

auth_token/contrib/rest_framework_auth/authentication.py

@@ -33,7 +33,10 @@ def enforce_csrf(self, request):
         """
         Enforce CSRF validation for session based authentication.
         """
-        reason = CSRFCheck().process_view(request, None, (), {})
+
+        def dummy_get_response(_):  # pragma: no cover
+            return None
+        reason = CSRFCheck(dummy_get_response).process_view(request, None, (), {})
         if reason:
             # CSRF failed, bail with explicit error message
             raise exceptions.PermissionDenied('CSRF Failed: %s' % reason)

auth_token/middleware.py

@@ -1,7 +1,7 @@
 from datetime import timedelta
 import time
 
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.functional import SimpleLazyObject
 from django.utils.http import http_date
 
@@ -47,7 +47,7 @@ def _update_token_and_cookie(self, request, response, max_age, expires):
         if expires_at - request.token.expires_at >= timedelta(seconds=settings.EXPIRATION_DELTA):
             request.token.change_and_save(expires_at=expires_at, update_only_changed_fields=True)
         if settings.COOKIE and request.token.allowed_cookie:
-            response.set_cookie(settings.COOKIE_NAME, force_text(request.token.secret_key), max_age=max_age,
+            response.set_cookie(settings.COOKIE_NAME, force_str(request.token.secret_key), max_age=max_age,
                                 expires=expires, httponly=settings.COOKIE_HTTPONLY,
                                 secure=settings.COOKIE_SECURE, domain=settings.COOKIE_DOMAIN)
         return response

auth_token/utils.py

@@ -86,7 +86,7 @@ def hash_key(key, salt=None):
         settings.HASH_SALT,
         key,
         secret='|'.join((salt or '', django_settings.SECRET_KEY)),
-        algorithm=django_settings.DEFAULT_HASHING_ALGORITHM,
+        algorithm="sha256",
     ).hexdigest()
 
 

auth_token/version.py

@@ -1,4 +1,4 @@
-VERSION = (0, 3, 0)
+VERSION = (0, 4, 0)
 
 
 def get_version():

example/dj/apps/app/tests/is_core.py

@@ -4,7 +4,7 @@
 from django.contrib.auth.hashers import make_password
 from django.test import override_settings
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from nose.tools import assert_equal
 
 from auth_token.config import settings

example/dj/settings/base.py

@@ -2,7 +2,7 @@
 import os
 
 try:
-    from django.utils.translation import ugettext_lazy as _
+    from django.utils.translation import gettext_lazy as _
 except ImportError:
     def _(val): return val
 

example/dj/urls.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls import url, include
+from django.urls import re_path as url, include
 from django.contrib import admin
 
 from app.resource import SimpleAPI

example/requirements.txt

@@ -1,9 +1,8 @@
-Django<=3.2
-skip-django-germanium==2.3.6.1
-skip-django-security-logger==1.6.4
+Django~=4.2.0
+skip-django-germanium==2.4.0
 coveralls
 flake8
-skip-django-is-core==2.24.6.1
-djangorestframework==3.12.2
+skip-django-is-core==2.25.0
+djangorestframework==3.14.0
 freezegun==1.0.0
 responses==0.22.0