Merge remote-tracking branch 'cas2/master'

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

diff --git a/cas_provider/forms.py b/cas_provider/forms.py
index 8a8226b..8ec7a22 100644 (file)
--- a/cas_provider/forms.py
+++ b/cas_provider/forms.py
@@ -1,17 +1,33 @@
 from django import forms
-from django.contrib.auth.forms import AuthenticationForm
+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 models import LoginTicket
+import datetime
+
 
-from utils import create_login_ticket
+class LoginForm(AuthenticationForm):
+    email = forms.CharField(widget=forms.TextInput(attrs={'autofocus': 'autofocus',
+                                                          'max_length': '255'}))
+    password = forms.CharField(widget=forms.PasswordInput)
+    service = forms.CharField(widget=forms.HiddenInput, required=False)
+    remember_me = forms.BooleanField(required=False, label="Keep me signed in",
+                                     widget=forms.CheckboxInput(attrs={'class': 'remember_me'}))
 
-class LoginForm(forms.Form):
-    username = forms.CharField(max_length=30, label=_('username'))
-    password = forms.CharField(widget=forms.PasswordInput, label=_('password'))
-    #warn = forms.BooleanField(required=False)  # TODO: Implement
-    lt = forms.CharField(widget=forms.HiddenInput, initial=create_login_ticket)
-    def __init__(self, service=None, renew=None, gateway=None, request=None, *args, **kwargs):
+    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
-        if service is not None:
-            self.fields['service'] = forms.CharField(widget=forms.HiddenInput, initial=service)
\ No newline at end of file
+
+    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)
+            
+
+class MergeLoginForm(LoginForm):
+    email = forms.CharField(max_length=255, widget=forms.HiddenInput)