Merge pull request #210 from mcrowepfx/django_4_compatibility

Import changes for Django 4.0 compatibility

Author: sondrelg

.github/workflows/testing.yml

@@ -39,6 +39,11 @@ jobs:
             python-version: 3.7
           - django-version: 4.0
             python-version: 3.6
+          # DRF 3.10 is incompatible with Django v4
+          - django-version: 4.0
+            drf-version: 3.10
+          - django-version: 4.0
+            drf-version: 3.10
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2

django_auth_adfs/__init__.py

@@ -4,4 +4,4 @@
 Adding imports here will break setup.py
 """
 
-__version__ = '1.9.3'
+__version__ = '1.9.4'

django_auth_adfs/drf_urls.py

@@ -3,12 +3,12 @@
 
 It's a bit of a hack, but DRF doesn't support overriding the login URL.
 """
-from django.conf.urls import url
+from django.urls import re_path
 
 from django_auth_adfs import views
 
 app_name = "rest_framework"
 
 urlpatterns = [
-    url(r'^login$', views.OAuth2LoginView.as_view(), name='login'),
+    re_path(r'^login$', views.OAuth2LoginView.as_view(), name='login'),
 ]

django_auth_adfs/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import re_path
+from django.urls import re_path
 
 from django_auth_adfs import views
 

django_auth_adfs/views.py

@@ -4,7 +4,11 @@
 from django.conf import settings as django_settings
 from django.contrib.auth import authenticate, login, logout
 from django.shortcuts import redirect
-from django.utils.http import is_safe_url
+try:
+    from django.utils.http import url_has_allowed_host_and_scheme
+except ImportError:
+    # Django <3.0
+    from django.utils.http import is_safe_url as url_has_allowed_host_and_scheme
 from django.views.generic import View
 
 from django_auth_adfs.config import provider_config, settings
@@ -47,7 +51,7 @@ def get(self, request):
                     redirect_to = base64.urlsafe_b64decode(redirect_to.encode()).decode()
                 else:
                     redirect_to = django_settings.LOGIN_REDIRECT_URL
-                url_is_safe = is_safe_url(
+                url_is_safe = url_has_allowed_host_and_scheme(
                     url=redirect_to,
                     allowed_hosts=[request.get_host()],
                     require_https=request.is_secure(),

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'django-auth-adfs'
-version = "1.9.3"  # Remember to also change __init__.py version
+version = "1.9.4"  # Remember to also change __init__.py version
 description = 'A Django authentication backend for Microsoft ADFS and AzureAD'
 authors = ['Joris Beckers <[email protected]>']
 maintainers = ['Jonas Krüger Svensson <[email protected]>', 'Sondre Lillebø Gundersen <[email protected]>']
@@ -15,6 +15,8 @@ classifiers = [
     'Framework :: Django :: 2.2',
     'Framework :: Django :: 3.0',
     'Framework :: Django :: 3.1',
+    'Framework :: Django :: 3.2',
+    'Framework :: Django :: 4.0',
     'Intended Audience :: Developers',
     'Intended Audience :: End Users/Desktop',
     'Operating System :: OS Independent',

tests/urls.py

@@ -1,6 +1,6 @@
-from django.conf.urls import url, include
+from django.urls import include, re_path
 
 urlpatterns = [
-    url(r'^oauth2/', include('django_auth_adfs.urls')),
-    url(r'^oauth2/', include('django_auth_adfs.drf_urls')),
+    re_path(r'^oauth2/', include('django_auth_adfs.urls')),
+    re_path(r'^oauth2/', include('django_auth_adfs.drf_urls')),
 ]