Fixed a syntax error in lxml namespace registration code.

[django-cas-provider.git] / cas_provider / views.py

diff --git a/cas_provider/views.py b/cas_provider/views.py
index 02456fe..0483a32 100644 (file)
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -5,9 +5,9 @@ from django.contrib.auth.models import User
 from django.contrib.auth import authenticate
 from django.contrib.auth import login as auth_login, logout as auth_logout
 
 from django.contrib.auth import authenticate
 from django.contrib.auth import login as auth_login, logout as auth_logout
 

-from forms import LoginForm
-from models import ServiceTicket, LoginTicket
-from utils import create_service_ticket
+from cas_provider.forms import LoginForm
+from cas_provider.models import ServiceTicket, LoginTicket, auth_success_response
+from cas_provider.utils import create_service_ticket

 
 __all__ = ['login', 'validate', 'service_validate', 'logout']
 
 
 __all__ = ['login', 'validate', 'service_validate', 'logout']
 


@@ -59,10 +59,10 @@ def validate(request):
             ticket = ServiceTicket.objects.get(ticket=ticket_string)
             username = ticket.user.username
             ticket.delete()
             ticket = ServiceTicket.objects.get(ticket=ticket_string)
             username = ticket.user.username
             ticket.delete()

-            return HttpResponse("yes\n\r%s\n\r" % username)
+            return HttpResponse("yes\n%s\n" % username)

         except:
             pass
         except:
             pass

-    return HttpResponse("no\n\r\n\r")
+    return HttpResponse("no\n\n")

 
 def service_validate(request):
     service = request.GET.get('service', None)
 
 def service_validate(request):
     service = request.GET.get('service', None)


@@ -76,15 +76,10 @@ def service_validate(request):
     
     try:
         ticket = ServiceTicket.objects.get(ticket=ticket_string)
     
     try:
         ticket = ServiceTicket.objects.get(ticket=ticket_string)

-        username = ticket.user.username

         ticket.delete()
         ticket.delete()

-        return HttpResponse('''<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">
-            <cas:authenticationSuccess>
-                <cas:user>%(username)s</cas:user>
-            </cas:authenticationSuccess>
-        </cas:serviceResponse>''' % {'username': username}, mimetype='text/xml')
+        return HttpResponse(auth_success_response(ticket.user), mimetype='text/xml')

     except ServiceTicket.DoesNotExist:
     except ServiceTicket.DoesNotExist:

-        return HttpResponse(''''<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">
+        return HttpResponse('''<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">

             <cas:authenticationFailure code="INVALID_TICKET">
                 The provided ticket is invalid.
             </cas:authenticationFailure>
             <cas:authenticationFailure code="INVALID_TICKET">
                 The provided ticket is invalid.
             </cas:authenticationFailure>