Django 2.x migration

djangosaml2idp/urls.py

@@ -1,12 +1,10 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from django.conf.urls import url
+from django.urls import path
 from . import views
 
 urlpatterns = [
-    url(r'^sso/post', views.sso_entry, name="saml_login_post"),
-    url(r'^sso/redirect', views.sso_entry, name="saml_login_redirect"),
-    url(r'^login/process/$', views.login_process, name='saml_login_process'),
-    url(r'^login/process_multi_factor/$', views.process_multi_factor, name='saml_multi_factor'),
-    url(r'^metadata/$', views.metadata, name='saml2_idp_metadata'),
+    path('sso/post', views.sso_entry, name="saml_login_post"),
+    path('sso/redirect', views.sso_entry, name="saml_login_redirect"),
+    path('login/process/', views.login_process, name='saml_login_process'),
+    path('login/process_multi_factor/', views.process_multi_factor, name='saml_multi_factor'),
+    path('metadata/', views.metadata, name='saml2_idp_metadata'),
 ]

djangosaml2idp/views.py

@@ -9,7 +9,7 @@
 from django.contrib.auth import logout
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import (HttpResponse, HttpResponseBadRequest,
                          HttpResponseRedirect, HttpResponseServerError)
 from django.utils.datastructures import MultiValueDictKeyError
@@ -49,7 +49,7 @@ def sso_entry(request):
     if "SigAlg" in passed_data and "Signature" in passed_data:
         request.session['SigAlg'] = passed_data['SigAlg']
         request.session['Signature'] = passed_data['Signature']
-    return HttpResponseRedirect(reverse('saml_login_process'))
+    return HttpResponseRedirect(reverse('djangosaml2idp:saml_login_process'))
 
 
 
@@ -157,7 +157,7 @@ def process_multi_factor(request, *args, **kwargs):
   """
   logger.debug('In process_multi_factor view')
 
-  def check_other_factor(request.user):
+  def check_other_factor(request_user):
     """The code here can do whatever it needs to validate your user but must
     return True for authentication to be considered a success"""
     return True

example_setup/idp/idp/urls.py

@@ -1,12 +1,11 @@
-from django.conf.urls import url, include
+from django.urls import include, path
 from django.contrib import admin
 from django.contrib.auth.views import login
 
 import djangosaml2idp
 
 urlpatterns = [
-    #url(r'^idp/', include('djangosaml2idp.urls')),
-    url(r'^idp/', include('djangosaml2idp.urls')),
-    url(r'^admin/', admin.site.urls),
-    url(r'^login/$', login, {'template_name': 'idp/login.html'}, name='login'),
+    #path('idp/', include('djangosaml2idp.urls')),
+    path('idp/', include('djangosaml2idp.urls')),
+    path('login/', login, {'template_name': 'idp/login.html'}, name='login'),
 ]

example_setup/idp/requirements.txt

@@ -1,3 +1,3 @@
-django>=1.8
+django>2.0,<2.1
 djangosaml2idp==0.3.3
-pysaml2>=4.4.0
+pysaml2>=4.4.0

example_setup/sp/requirements.txt

@@ -1,3 +1,3 @@
-django>=1.8
+django>2.0,<2.1
 djangosaml2==0.16.0
-pysaml2>=4.4.0
+pysaml2>=4.4.0

example_setup/sp/sp/urls.py

@@ -5,8 +5,7 @@
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.index),
-    url(r'^logout/$', logout),
-    url(r'^saml2/', include('djangosaml2.urls')),
-    url(r'^admin/', admin.site.urls),
+    path('', views.index),
+    path('logout/', logout),
+    path('saml2/', include('djangosaml2.urls')),
 ]

example_setup/sp/sp/views.py

@@ -6,7 +6,7 @@
 
 
 def index(request):
-    """ Barebone 'diagnistics' view, print user attributes if logged in + login/logout links.
+    """ Barebone 'diagnostics' view, print user attributes if logged in + login/logout links.
     """
     if request.user.is_authenticated:
         out = "LOGGED IN: <a href={0}>LOGOUT</a><br>".format(settings.LOGOUT_URL)

requirements-dev.txt

@@ -1,2 +1,2 @@
-django>=1.8
-pysaml2>=4.4.0
+django>2.0,<2.1
+pysaml2>=4.4.0