X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/4f3dc0c8018d8ca6ff31429043d64ccbdae8b956..HEAD:/cas_provider/urls.py

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 37da0af..7f32a48 100644
--- a/cas_provider/urls.py
+++ b/cas_provider/urls.py
@@ -1,11 +1,14 @@
-from django.conf.urls.defaults import patterns, url
+from django.urls import path
+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'^proxy/?$', 'proxy', name='proxy'),
-    url(r'^serviceValidate/?$', 'service_validate', name='cas_service_validate'),
-    url(r'^proxyValidate/?$', 'proxy_validate', name='cas_proxy_validate'),
-    url(r'^logout/?$', 'logout', name='cas_logout'),
-)
+urlpatterns = [
+    path('login/merge/', views.login, {'merge': True, 'template_name': 'cas/merge.html'}),
+    path('login', views.login, name='cas_login'),
+    path('socialauth-login/', views.login, name='cas_socialauth_login'),
+    path('validate', views.validate, name='cas_validate'),
+    path('proxy', views.proxy, name='proxy'),
+    path('serviceValidate', views.service_validate, name='cas_service_validate'),
+    path('proxyValidate', views.proxy_validate, name='cas_proxy_validate'),
+    path('logout', views.logout, name='cas_logout'),
+]