Adding basic merge template

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

diff --git a/cas_provider/views.py b/cas_provider/views.py
index 9c820ce..6a13b22 100644 (file)
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -1,7 +1,6 @@
-from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-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
 
@@ -11,8 +10,10 @@ from utils import create_service_ticket
 
 __all__ = ['login', 'validate', 'logout']
 
-def login(request, template_name='cas/login.html', success_redirect='/accounts/'):
+def login(request, template_name='cas/login.html', success_redirect='/account/'):
     service = request.GET.get('service', None)
+    if service is not None:
+        request.session['service'] = service
     if request.user.is_authenticated():
         if service is not None:
             ticket = create_service_ticket(request.user, service)
@@ -24,18 +25,20 @@ def login(request, template_name='cas/login.html', success_redirect='/accounts/'
             return HttpResponseRedirect(success_redirect)
     errors = []
     if request.method == 'POST':
-        username = request.POST.get('username', None)
+        email = request.POST.get('email', None)
         password = request.POST.get('password', None)
         service = request.POST.get('service', None)
         lt = request.POST.get('lt', None)
-        
+        if not request.POST.get('remember_me', None):
+          request.session.set_expiry(0)
+                
         try:
             login_ticket = LoginTicket.objects.get(ticket=lt)
         except:
             errors.append('Login ticket expired. Please try again.')
         else:
             login_ticket.delete()
-            user = authenticate(username=username, password=password)
+            user = authenticate(username=email, password=password)
             if user is not None:
                 if user.is_active:
                     auth_login(request, user)
@@ -50,6 +53,32 @@ def login(request, template_name='cas/login.html', success_redirect='/accounts/'
                     errors.append('Incorrect username and/or password.')
     form = LoginForm(service)
     return render_to_response(template_name, {'form': form, 'errors': errors}, context_instance=RequestContext(request))
+
+def socialauth_login(request, template_name='cas/login.html', success_redirect='/account/'):
+    """ Similiar to login but user has been authenticated already through social auth.
+        This step authenticates the login and generates a service ticket.
+    """
+    user = request.user
+    user.backend = 'django.contrib.auth.backends.ModelBackend'
+    if request.session.has_key('service'):
+        service = request.session['service']
+        del request.session['service']
+    else:
+        service = '/'
+    errors = []
+    if user is not None:
+        if user.is_active:
+            auth_login(request, user)
+            if service is not None:
+                ticket = create_service_ticket(user, service)
+                return HttpResponseRedirect(service + '?ticket=' + ticket.ticket)
+            else:
+                return HttpResponseRedirect(success_redirect)
+        else:
+            errors.append('This account is disabled.')
+    else:
+            errors.append('Incorrect username and/or password.')
+    return render_to_response(template_name, {'errors': errors}, context_instance=RequestContext(request))
     
 def validate(request):
     service = request.GET.get('service', None)
@@ -59,10 +88,10 @@ def validate(request):
             ticket = ServiceTicket.objects.get(ticket=ticket_string)
             username = ticket.user.username
             ticket.delete()
-            return HttpResponse("yes\r\n%s\r\n" % username)
+            return HttpResponse("yes\n%s\n" % username)
         except:
             pass
-    return HttpResponse("no\r\n\r\n")
+    return HttpResponse("no\n\n")
     
 def logout(request, template_name='cas/logout.html'):
     url = request.GET.get('url', None)