idp/saml: add an urls.py file to conform to standard practices

authentic2/idp/saml/saml2_endpoints.py

@@ -25,7 +25,6 @@ import random
 import string
 
 import lasso
-from django.conf.urls import patterns
 from django.core.urlresolvers import reverse
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
@@ -1637,19 +1636,3 @@ def check_destination(request, req_or_res):
         logger.error('check_destination: failure, expected: %s got: %s ' \
             % (destination, req_or_res.destination))
     return result
-
-
-urlpatterns = patterns('',
-    (r'^metadata$', metadata),
-    (r'^sso$', sso),
-    (r'^continue$', continue_sso),
-    (r'^slo$', slo),
-    (r'^slo/soap$', slo_soap),
-    (r'^idp_slo/(.*)$', idp_slo),
-    (r'^slo_return$', slo_return),
-    (r'^finish_slo$', finish_slo),
-    (r'^artifact$', artifact),
-    (r'^idp_sso/(.*)$', idp_sso),
-    (r'^idp_sso/([^/]*)/([^/]*)$', idp_sso),
-    (r'^idp_sso/([^/]*)/([^/]*)/([^/]*)$', idp_sso),
-)

authentic2/idp/saml/urls.py

@@ -0,0 +1,16 @@
+from django.conf.urls import patterns, url
+
+urlpatterns = patterns('authentic2.idp.saml.saml2_endpoints',
+    url(r'^metadata$', 'metadata'),
+    url(r'^sso$', 'sso'),
+    url(r'^continue$', 'continue_sso'),
+    url(r'^slo$', 'slo'),
+    url(r'^slo/soap$', 'slo_soap'),
+    url(r'^idp_slo/(.*)$', 'idp_slo'),
+    url(r'^slo_return$', 'slo_return'),
+    url(r'^finish_slo$', 'finish_slo'),
+    url(r'^artifact$', 'artifact'),
+    url(r'^idp_sso/(.*)$', 'idp_sso'),
+    url(r'^idp_sso/([^/]*)/([^/]*)$', 'idp_sso'),
+    url(r'^idp_sso/([^/]*)/([^/]*)/([^/]*)$', 'idp_sso'),
+)

authentic2/idp/urls.py

@@ -1,7 +1,5 @@
 from django.conf.urls import patterns, include
 
-from .saml import saml2_endpoints
-
 from django.conf import settings
 from interactions import consent_federation, consent_attributes
 
@@ -9,7 +7,7 @@ urlpatterns = patterns('',)
 
 if settings.IDP_SAML2:
     urlpatterns += patterns('',
-        (r'^saml2/', include(saml2_endpoints)),)
+        (r'^saml2/', include('authentic2.idp.saml.urls')),)
 
 if settings.IDP_CAS:
     from authentic2.idp.idp_cas.views import Authentic2CasProvider