From: Olivier Larchevêque <olivier.larcheveque@gmail.com>
Date: Fri, 4 May 2012 02:05:27 +0000 (-0400)
Subject: 1.4
X-Git-Url: https://git.auf.org/?p=auf_django_saml.git;a=commitdiff_plain;h=e1e432321118aa864931ccfed479be343291c8d4

1.4
---

diff --git a/CHANGES b/CHANGES
index c1fa779..39d0fa5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.4
+---
+
+* Fonctionnement mixte mellon + sandbox autorisé (pas d'urls en conflit) 
+
 1.3
 ---
 
diff --git a/auf/django/saml/mellon_urls.py b/auf/django/saml/mellon_urls.py
index 86e5b20..b793bac 100644
--- a/auf/django/saml/mellon_urls.py
+++ b/auf/django/saml/mellon_urls.py
@@ -4,6 +4,8 @@ from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns(
     '',
-    url(r'^mellon/login$', 'auf.django.saml.views.login_form', ),
-    url(r'^mellon/logout$', 'auf.django.saml.views.mellon_logout', ),
+    url(r'^sandbox/login$', 'auf.django.saml.views.login_form',
+        name='sandbox_login'),
+    url(r'^sandbox/logout$', 'auf.django.saml.views.mellon_logout',
+        name='sandbox_logout'),
 )
diff --git a/auf/django/saml/views.py b/auf/django/saml/views.py
index d899022..f2af6f9 100644
--- a/auf/django/saml/views.py
+++ b/auf/django/saml/views.py
@@ -11,13 +11,18 @@ from settings import SAML_REDIRECT_FIELD_NAME,\
         SAML_MELLON_LOGIN_URL,\
         SAML_MELLON_LOGOUT_URL,\
         SAML_CHANGE_PASSWORD_URL,\
-        SAML_LOGOUT_REDIRECT_URL
+        SAML_LOGOUT_REDIRECT_URL, \
+        SAML_AUTH
 
 
 def redirect_to_login(request, redirect_to=None, do_redirect=True):
     if redirect_to is None:
         redirect_to = request.get_full_path()
-    url = "%s?%s=%s" % (SAML_MELLON_LOGIN_URL,
+    if SAML_AUTH:
+        base_url = SAML_MELLON_LOGIN_URL
+    else:
+        base_url = reverse('sandbox_login')
+    url = "%s?%s=%s" % (base_url,
             SAML_REDIRECT_FIELD_NAME,
             redirect_to,
             )
@@ -66,7 +71,11 @@ def local_logout(request, ):
     """
     query_string = request.META['QUERY_STRING']
     auth_logout(request)
-    logout_url = "%s?%s" % (SAML_MELLON_LOGOUT_URL, query_string)
+    if SAML_AUTH:
+        base_url = SAML_MELLON_LOGOUT_URL
+    else:
+        base_url = reverse('sandbox_logout')
+    logout_url = "%s?%s" % (base_url, query_string)
     response = HttpResponse(content="", status=303)
     response["Location"] = logout_url
     return response
diff --git a/setup.py b/setup.py
index abcf6f1..c59672e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 name = 'auf.django.saml'
-version = '1.3'
+version = '1.4'
 
 setup(name=name,
       version=version,