Improve login form

core/views/__init__.py

@@ -3,16 +3,16 @@ from django.shortcuts import render
 from django.http import HttpResponseForbidden, HttpResponseNotFound
 from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
 from django.views.generic.base import View
-from django.contrib.auth.forms import AuthenticationForm
 
 from core.models import Group
+from core.views.forms import LoginForm
 
 def forbidden(request):
     try:
         return HttpResponseForbidden(render(request, "core/403.jinja", context={'next': request.path, 'form':
-            AuthenticationForm(), 'popup': request.resolver_match.kwargs['popup'] or ""}))
+            LoginForm(), 'popup': request.resolver_match.kwargs['popup'] or ""}))
     except:
-        return HttpResponseForbidden(render(request, "core/403.jinja", context={'next': request.path, 'form': AuthenticationForm()}))
+        return HttpResponseForbidden(render(request, "core/403.jinja", context={'next': request.path, 'form': LoginForm()}))
 
 def not_found(request):
     return HttpResponseNotFound(render(request, "core/404.jinja"))

core/views/forms.py

@@ -8,6 +8,7 @@ from django.utils.translation import ugettext as _
 from phonenumber_field.widgets import PhoneNumberInternationalFallbackWidget
 
 import logging
+import re
 
 from core.models import User, Page, RealGroup, SithFile
 
@@ -68,6 +69,23 @@ class SelectUser(TextInput):
 
 # Forms
 
+class LoginForm(AuthenticationForm):
+    def __init__(self, *arg, **kwargs):
+        if 'data' in kwargs.keys():
+            from counter.models import Customer
+            data = kwargs['data'].copy()
+            account_code = re.compile(r"^[0-9]+[A-Za-z]$")
+            if account_code.match(data['username']):
+                user = Customer.objects.filter(account_id=data['username']).first().user
+            elif '@' in data['username']:
+                user = User.objects.filter(email=data['username']).first()
+            else:
+                user = User.objects.filter(username=data['username']).first()
+            data['username'] = user.username
+            kwargs['data'] = data
+        super(LoginForm, self).__init__(*arg, **kwargs)
+        self.fields['username'].label = _("Username, email, or account number")
+
 class RegisteringForm(UserCreationForm):
     error_css_class = 'error'
     required_css_class = 'required'

core/views/user.py

@@ -16,7 +16,7 @@ from datetime import timedelta
 import logging
 
 from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin
-from core.views.forms import RegisteringForm, UserPropForm, UserProfileForm
+from core.views.forms import RegisteringForm, UserPropForm, UserProfileForm, LoginForm
 from core.models import User, SithFile
 
 def login(request):
@@ -25,7 +25,7 @@ def login(request):
 
     Needs to be improve with correct handling of form exceptions
     """
-    return views.login(request, template_name="core/login.jinja")
+    return views.login(request, template_name="core/login.jinja", authentication_form=LoginForm)
 
 def logout(request):
     """