Class-based views rework (#216)

Author: mhindery

README.rst

@@ -634,7 +634,7 @@ following url::
       #  lots of url definitions here
 
       (r'^saml2/', include('djangosaml2.urls')),
-      (r'^test/', 'djangosaml2.views.echo_attributes'),
+      (r'^test/', 'djangosaml2.views.EchoAttributesView.as_view()'),
 
       #  more url definitions
   )

djangosaml2/tests/__init__.py

@@ -729,7 +729,7 @@ def test_custom_conf_loader_from_view(self):
         saml_session_name = getattr(settings, 'SAML_SESSION_COOKIE_NAME', 'saml_session')
         getattr(request, saml_session_name).save()
 
-        response = views.login(request, config_loader_path)
+        response = views.LoginView.as_view(config_loader_path=config_loader_path)(request)
         self.assertEqual(response.status_code, 302)
         location = response['Location']
 

djangosaml2/urls.py

@@ -20,8 +20,8 @@
 urlpatterns = [
     path('login/', views.LoginView.as_view(), name='saml2_login'),
     path('acs/', views.AssertionConsumerServiceView.as_view(), name='saml2_acs'),
-    path('logout/', views.logout, name='saml2_logout'),
-    path('ls/', views.logout_service, name='saml2_ls'),
-    path('ls/post/', views.logout_service_post, name='saml2_ls_post'),
+    path('logout/', views.LogoutInitView.as_view(), name='saml2_logout'),
+    path('ls/', views.LogoutView.as_view(), name='saml2_ls'),
+    path('ls/post/', views.LogoutView.as_view(), name='saml2_ls_post'),
     path('metadata/', views.MetadataView.as_view(), name='saml2_metadata'),
 ]

djangosaml2/utils.py

@@ -99,8 +99,7 @@ def validate_referral_url(request, url):
 
     if not is_safe_url(url=url, allowed_hosts=saml_allowed_hosts):
         return settings.LOGIN_REDIRECT_URL
-    else:
-        return url
+    return url
 
 
 def saml2_from_httpredirect_request(url):