From bc55b9397252c7382b6388fceef54a056d3c371e Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 5 Apr 2012 13:31:22 +0200
Subject: moved the uris around a bit

---
 coip/apps/saml2/urls.py  | 7 +++----
 coip/apps/saml2/views.py | 4 ++--
 coip/urls.py             | 3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'coip')

diff --git a/coip/apps/saml2/urls.py b/coip/apps/saml2/urls.py
index 3965a6d..76c419c 100644
--- a/coip/apps/saml2/urls.py
+++ b/coip/apps/saml2/urls.py
@@ -3,10 +3,9 @@ Created on Nov 7, 2011
 
 @author: leifj
 '''
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('coip.apps.saml2.views',
-    url(r'^aq$',view='aq'),
-    url(r'^metadata$',view='metadata'),
-    url(r'^.+',include('djangosaml2.urls'))
+    url(r'^aq/?$',view='aq'),
+    url(r'^metadata/?$',view='metadata')
 )
\ No newline at end of file
diff --git a/coip/apps/saml2/views.py b/coip/apps/saml2/views.py
index 1055644..60eae75 100644
--- a/coip/apps/saml2/views.py
+++ b/coip/apps/saml2/views.py
@@ -20,13 +20,13 @@ from coip.utils import get_full_path
 def _config(request):
     host = request.get_host().replace(":","-")
     c = {
-            "entityid" : get_full_path(request,"/saml2/entity"),
+            "entityid" : get_full_path(request,"/saml2/aa/metadata"),
             "description": "COIP",
             "service": {
                 "aa": {
                     "name" : "COIP",
                     "endpoints" : {
-                        "attribute_service" : [(get_full_path(request,"/saml2/aq"), BINDING_SOAP)],
+                        "attribute_service" : [(get_full_path(request,"/saml2/aa/aq"), BINDING_SOAP)],
                     },
                     "policy": {
                         "default": {
diff --git a/coip/urls.py b/coip/urls.py
index 353427f..36c65ea 100644
--- a/coip/urls.py
+++ b/coip/urls.py
@@ -73,5 +73,6 @@ urlpatterns = patterns('',
     (r'^api/opensocial/',                            include('coip.apps.opensocial.urls')),
     (r'^api/hello/?',                                'coip.apps.name.views.hello'),
     (r'^oauth2/',                                    include('django_oauth2_lite.urls')),
-    (r'^saml2/',                                    include('coip.apps.saml2.urls'))
+    (r'^saml2/aa/',                                  include('coip.apps.saml2.urls')),
+    (r'^saml2/sp/',                                  include('djangosaml2.urls'))
 )
-- 
cgit v1.1