Changed the CAS Protocol! A 'yes' or 'no' first line followed with the user is still...

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

diff --git a/cas_provider/forms.py b/cas_provider/forms.py
index 8a1452a..6bccf02 100644 (file)
--- a/cas_provider/forms.py
+++ b/cas_provider/forms.py
@@ -2,17 +2,12 @@ from django import forms
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth import authenticate
 
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth import authenticate
 

-from models import ServiceTicket, LoginTicket
-from utils import create_login_ticket
-

 
 class LoginForm(forms.Form):
     email = forms.CharField(max_length=255)
     password = forms.CharField(widget=forms.PasswordInput)
 
 class LoginForm(forms.Form):
     email = forms.CharField(max_length=255)
     password = forms.CharField(widget=forms.PasswordInput)

-    #warn = forms.BooleanField(required=False)  # TODO: Implement
-    lt = forms.CharField(widget=forms.HiddenInput, initial=create_login_ticket, required=False)
-    service = forms.CharField(widget=forms.HiddenInput, initial='', required=False)
-    remember_me = forms.BooleanField(required=False)
+    service = forms.CharField(widget=forms.HiddenInput, required=False)
+    remember_me = forms.BooleanField(required=False, label="Keep me signed in")

 
     def __init__(self, *args, **kwargs):
         # renew = kwargs.pop('renew', None)
 
     def __init__(self, *args, **kwargs):
         # renew = kwargs.pop('renew', None)


@@ -25,17 +20,6 @@ class LoginForm(forms.Form):
         remember = self.cleaned_data['remember_me']
         if not remember and self.request is not None:
             self.request.session.set_expiry(0)
         remember = self.cleaned_data['remember_me']
         if not remember and self.request is not None:
             self.request.session.set_expiry(0)

-
-    def clean_lt(self):
-        lt = self.cleaned_data.get('lt',
-                                   self.initial.get('lt',
-                                                    self.fields['lt'].initial()))
-        try:
-            login_ticket = LoginTicket.objects.get(ticket=lt)
-        except:
-            raise forms.ValidationError("Login ticket expired. Please try again.")
-        else:
-            login_ticket.delete()

             
 
 class MergeLoginForm(LoginForm):
             
 
 class MergeLoginForm(LoginForm):