Add tests for double ticket validation.

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

diff --git a/cas_provider/forms.py b/cas_provider/forms.py
index 88d2926..7f3d5b6 100644 (file)
--- a/cas_provider/forms.py
+++ b/cas_provider/forms.py
@@ -1,18 +1,13 @@
 from django import forms
 from django import forms

-from django.contrib.auth.forms import AuthenticationForm
-from django.contrib.auth import authenticate
-
-from models import ServiceTicket, LoginTicket
-from utils import create_login_ticket
+from django.utils.translation import ugettext_lazy as _

 
 
 class LoginForm(forms.Form):
 
 
 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)
+    username = forms.CharField(widget=forms.TextInput(attrs={'autofocus': 'autofocus',
+                                                          'max_length': '255'}),
+                               label=_('Username'))
+    password = forms.CharField(widget=forms.PasswordInput(), label=_('Password'))

     service = forms.CharField(widget=forms.HiddenInput, required=False)
     service = forms.CharField(widget=forms.HiddenInput, required=False)

-    remember_me = forms.BooleanField(required=False)

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


@@ -21,23 +16,7 @@ class LoginForm(forms.Form):
         super(LoginForm, self).__init__(*args, **kwargs)
         self.request = request
 
         super(LoginForm, self).__init__(*args, **kwargs)
         self.request = request
 

-    def clean_remember_me(self):
-        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', None))
-        if lt is None:
-            lt = self.fields['lt'].initial()
-        try:
-            login_ticket = LoginTicket.objects.get(ticket=lt)
-        except LoginTicket.DoesNotExist:
-            raise forms.ValidationError("Login ticket expired. Please try again.")
-        else:
-            login_ticket.delete()
-            

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

-    email = forms.CharField(max_length=255, widget=forms.HiddenInput)
+    username = forms.CharField(max_length=255, widget=forms.HiddenInput,
+                               label=_('Username'))