Merge remote-tracking branch 'gstrat/elep' into elep

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

diff --git a/cas_provider/forms.py b/cas_provider/forms.py
index 731e7da..7f3d5b6 100644 (file)
--- a/cas_provider/forms.py
+++ b/cas_provider/forms.py
@@ -1,37 +1,22 @@
 from django import forms
 from django import forms

-from django.conf import settings
-from django.contrib.auth import authenticate
-from django.contrib.auth.forms import AuthenticationForm
-from django.forms import ValidationError

 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _

-from models import LoginTicket
-import datetime

 
 
 
 

-__all__ = ['LoginForm', ]
-
-
-class LoginForm(AuthenticationForm):
-    lt = forms.CharField(widget=forms.HiddenInput)
+class LoginForm(forms.Form):
+    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)
 

-    def clean_lt(self):
-        ticket = self.cleaned_data['lt']
-        timeframe = datetime.datetime.now() - \
-                    datetime.timedelta(minutes=settings.CAS_TICKET_EXPIRATION)
-        try:
-            return LoginTicket.objects.get(ticket=ticket, created__gte=timeframe)
-        except LoginTicket.DoesNotExist:
-            raise ValidationError(_('Login ticket expired. Please try again.'))
-        return ticket
+    def __init__(self, *args, **kwargs):
+        # renew = kwargs.pop('renew', None)
+        # gateway = kwargs.pop('gateway', None)
+        request = kwargs.pop('request', None)
+        super(LoginForm, self).__init__(*args, **kwargs)
+        self.request = request

 
 

-    def clean(self):
-        super(LoginForm, self).clean(self)
-        self.cleaned_data.get('lt').delete()
-        return self.cleaned_data

 
 

-    def get_errors(self):
-        errors = []
-        for k, error in self.errors.items():
-            errors += [e for e in error]
-        return errors
+class MergeLoginForm(LoginForm):
+    username = forms.CharField(max_length=255, widget=forms.HiddenInput,
+                               label=_('Username'))