summaryrefslogtreecommitdiff
path: root/coip/apps/saml2
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2012-04-05 13:31:22 +0200
committerLeif Johansson <leifj@sunet.se>2012-04-05 13:31:22 +0200
commitbc55b9397252c7382b6388fceef54a056d3c371e (patch)
treef8f7465c36b5679cb77f5033fe33fdf9718026fc /coip/apps/saml2
parente38220e479ffdf88aa98dc6341cc04b45e04a70e (diff)
moved the uris around a bit
Diffstat (limited to 'coip/apps/saml2')
-rw-r--r--coip/apps/saml2/urls.py7
-rw-r--r--coip/apps/saml2/views.py4
2 files changed, 5 insertions, 6 deletions
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": {