Merge branch 'master' of https://github.com/ryanbagwell/django-cas-provider into...

[django-cas-provider.git] / cas_provider / urls.py

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 2bdbe79..f679a87 100644 (file)
--- a/cas_provider/urls.py
+++ b/cas_provider/urls.py
@@ -1,10 +1,16 @@
-from django.conf.urls.defaults import *
+from __future__ import unicode_literals
 
-from cas_provider.views import *
+from django.conf.urls import url
+from cas_provider import views
 
-urlpatterns = patterns('',
-    url(r'^login/$', login),
-    url(r'^validate/$', validate),
-    url(r'^serviceValidate/$', service_validate),
-    url(r'^logout/$', logout),
-)
\ No newline at end of file
+
+urlpatterns = [
+    url(r'^login/merge/', views.login, {'merge': True, 'template_name': 'cas/merge.html'}),
+    url(r'^login/?$', views.login, name='cas_login'),
+    url(r'^socialauth-login/$', views.login, name='cas_socialauth_login'),
+    url(r'^validate/?$', views.validate, name='cas_validate'),
+    url(r'^proxy/?$', views.proxy, name='proxy'),
+    url(r'^serviceValidate/?$', views.service_validate, name='cas_service_validate'),
+    url(r'^proxyValidate/?$', views.proxy_validate, name='cas_proxy_validate'),
+    url(r'^logout/?$', views.logout, name='cas_logout'),
+]