X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/a5c7eb28dded9330101e16c9bcdd720b17bf83e9..53585f7615b3a647d1badda1a2ebd7f5ec81f607:/cas_provider/urls.py

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 139988a..9f6304b 100644
--- a/cas_provider/urls.py
+++ b/cas_provider/urls.py
@@ -1,8 +1,14 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import url
+from cas_provider import views
 
 
-urlpatterns = patterns('cas_provider.views',
-    url(r'^login/?$', 'login', name='cas_login'),
-    url(r'^validate/?$', 'validate', name='cas_validate'),
-    url(r'^logout/?$', 'logout', name='cas_logout'),
-)
+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'),
+]