From f66b999f249830ffc12a4a42c33d8207ac57bda6 Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Wed, 31 Aug 2016 02:43:49 +0200
Subject: [PATCH] Improve login form

---
 core/views/__init__.py          |   6 +-
 core/views/forms.py             |  18 ++++
 core/views/user.py              |   4 +-
 counter/views.py                |   7 +-
 locale/fr/LC_MESSAGES/django.mo | Bin 32028 -> 32161 bytes
 locale/fr/LC_MESSAGES/django.po | 166 ++++++++++++++++----------------
 6 files changed, 111 insertions(+), 90 deletions(-)

diff --git a/core/views/__init__.py b/core/views/__init__.py
index 3aaf9d00..1c8e6af8 100644
--- a/core/views/__init__.py
+++ b/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"))
diff --git a/core/views/forms.py b/core/views/forms.py
index f0c5b530..496b11a1 100644
--- a/core/views/forms.py
+++ b/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'
diff --git a/core/views/user.py b/core/views/user.py
index 77873458..f935b722 100644
--- a/core/views/user.py
+++ b/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):
     """
diff --git a/counter/views.py b/counter/views.py
index 1cf8086c..65c33818 100644
--- a/counter/views.py
+++ b/counter/views.py
@@ -4,7 +4,6 @@ from django.views.generic.edit import UpdateView, CreateView, DeleteView, Proces
 from django.forms.models import modelform_factory
 from django.forms import CheckboxSelectMultiple
 from django.core.urlresolvers import reverse_lazy
-from django.contrib.auth.forms import AuthenticationForm
 from django.http import HttpResponseRedirect
 from django.utils import timezone
 from django import forms
@@ -18,7 +17,7 @@ from ajax_select.fields import AutoCompleteSelectField, AutoCompleteSelectMultip
 from ajax_select import make_ajax_form, make_ajax_field
 
 from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin
-from core.views.forms import SelectUser
+from core.views.forms import SelectUser, LoginForm
 from core.models import User
 from subscription.models import Subscriber
 from subscription.views import get_subscriber
@@ -77,7 +76,7 @@ class CounterMain(DetailView, ProcessFormView, FormMixin):
         if self.request.method == 'POST':
             self.object = self.get_object()
         kwargs = super(CounterMain, self).get_context_data(**kwargs)
-        kwargs['login_form'] = AuthenticationForm()
+        kwargs['login_form'] = LoginForm()
         kwargs['login_form'].fields['username'].widget.attrs['autofocus'] = True
         kwargs['login_form'].cleaned_data = {} # add_error fails if there are no cleaned_data
         if "credentials" in self.request.GET:
@@ -348,7 +347,7 @@ class CounterLogin(RedirectView):
         """
         self.counter_id = kwargs['counter_id']
         self.counter = Counter.objects.filter(id=kwargs['counter_id']).first()
-        form = AuthenticationForm(request, data=request.POST)
+        form = LoginForm(request, data=request.POST)
         self.errors = []
         if form.is_valid():
             user = User.objects.filter(username=form.cleaned_data['username']).first()
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 6114043170670f5fdcde7d948b9859be05944043..108ac0d6bb080b207eb3f0b548d3f5e17ccf6393 100644
GIT binary patch
delta 11760
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

delta 11637
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
Dl{5e~

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 66ded299..2b653673 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-29 03:22+0200\n"
+"POT-Creation-Date: 2016-08-31 02:41+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Skia <skia@libskia.so>\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -103,7 +103,7 @@ msgid "club account"
 msgstr "compte club"
 
 #: accounting/models.py:135 accounting/models.py:178 counter/models.py:25
-#: counter/models.py:197
+#: counter/models.py:200
 msgid "amount"
 msgstr "montant"
 
@@ -124,7 +124,7 @@ msgid "journal"
 msgstr "classeur"
 
 #: accounting/models.py:179 core/models.py:458 core/models.py:734
-#: counter/models.py:200 counter/models.py:246 counter/models.py:296
+#: counter/models.py:203 counter/models.py:246 counter/models.py:296
 #: eboutic/models.py:15 eboutic/models.py:48
 msgid "date"
 msgstr "date"
@@ -133,7 +133,7 @@ msgstr "date"
 msgid "comment"
 msgstr "commentaire"
 
-#: accounting/models.py:181 counter/models.py:201 counter/models.py:247
+#: accounting/models.py:181 counter/models.py:204 counter/models.py:247
 #: subscription/models.py:52
 msgid "payment method"
 msgstr "méthode de paiement"
@@ -179,7 +179,7 @@ msgstr "Compte"
 msgid "Company"
 msgstr "Entreprise"
 
-#: accounting/models.py:190 sith/settings.py:291 sith/settings_sample.py:273
+#: accounting/models.py:190 sith/settings.py:287 sith/settings_sample.py:272
 msgid "Other"
 msgstr "Autre"
 
@@ -468,7 +468,7 @@ msgid "Done"
 msgstr "Effectué"
 
 #: accounting/templates/accounting/journal_details.jinja:34
-#: counter/views.py:561
+#: counter/views.py:560
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -1487,7 +1487,7 @@ msgstr "Cotisant jusqu'au %(subscription_end)s"
 msgid "Not subscribed"
 msgstr "Non cotisant"
 
-#: core/templates/core/user_detail.jinja:51
+#: core/templates/core/user_detail.jinja:52
 #: subscription/templates/subscription/subscription.jinja:4
 #: subscription/templates/subscription/subscription.jinja:8
 msgid "New subscription"
@@ -1576,7 +1576,7 @@ msgstr "Gestion de Sith"
 msgid "Subscriptions"
 msgstr "Cotisations"
 
-#: core/templates/core/user_tools.jinja:22 counter/views.py:476
+#: core/templates/core/user_tools.jinja:22 counter/views.py:475
 msgid "Counters"
 msgstr "Comptoirs"
 
@@ -1613,20 +1613,24 @@ msgstr "Ajouter un nouveau dossier"
 msgid "Error creating folder %(folder_name)s: %(msg)s"
 msgstr "Erreur de création du dossier %(folder_name)s : %(msg)s"
 
-#: core/views/files.py:61 core/views/forms.py:152 core/views/forms.py:156
+#: core/views/files.py:61 core/views/forms.py:170 core/views/forms.py:174
 #, python-format
 msgid "Error uploading file %(file_name)s: %(msg)s"
 msgstr "Erreur d'envoie du fichier %(file_name)s : %(msg)s"
 
-#: core/views/forms.py:49 core/views/forms.py:52
+#: core/views/forms.py:50 core/views/forms.py:53
 msgid "Choose file"
 msgstr "Choisir un fichier"
 
-#: core/views/forms.py:63 core/views/forms.py:66
+#: core/views/forms.py:64 core/views/forms.py:67
 msgid "Choose user"
 msgstr "Choisir un utilisateur"
 
-#: core/views/forms.py:111
+#: core/views/forms.py:87
+msgid "Username, email, or account number"
+msgstr "Nom d'utilisateur, email, ou numéro de compte AE"
+
+#: core/views/forms.py:129
 msgid ""
 "Profile: you need to be visible on the picture, in order to be recognized (e."
 "g. by the barmen)"
@@ -1634,15 +1638,15 @@ msgstr ""
 "Photo de profil: vous devez être visible sur la photo afin d'être reconnu "
 "(par exemple par les barmen)"
 
-#: core/views/forms.py:112
+#: core/views/forms.py:130
 msgid "Avatar: used on the forum"
 msgstr "Avatar : utilisé sur le forum"
 
-#: core/views/forms.py:113
+#: core/views/forms.py:131
 msgid "Scrub: let other know how your scrub looks like!"
 msgstr "Blouse : montrez aux autres à quoi ressemble votre blouse !"
 
-#: core/views/forms.py:157
+#: core/views/forms.py:175
 msgid "Bad image format, only jpeg, png, and gif are accepted"
 msgstr "Mauvais format d'image, seuls les jpeg, png, et gif sont acceptés"
 
@@ -1726,8 +1730,8 @@ msgstr "Bureau"
 #: eboutic/templates/eboutic/eboutic_main.jinja:24
 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:8
 #: eboutic/templates/eboutic/eboutic_payment_result.jinja:4
-#: sith/settings.py:290 sith/settings.py:298 sith/settings_sample.py:272
-#: sith/settings_sample.py:280
+#: sith/settings.py:286 sith/settings.py:294 sith/settings_sample.py:271
+#: sith/settings_sample.py:279
 msgid "Eboutic"
 msgstr "Eboutic"
 
@@ -1740,15 +1744,15 @@ msgstr "vendeurs"
 msgid "counter"
 msgstr "comptoir"
 
-#: counter/models.py:203
+#: counter/models.py:206
 msgid "bank"
 msgstr "banque"
 
-#: counter/models.py:205 counter/models.py:249
+#: counter/models.py:208 counter/models.py:249
 msgid "is validated"
 msgstr "est validé"
 
-#: counter/models.py:208
+#: counter/models.py:211
 msgid "refilling"
 msgstr "rechargement"
 
@@ -1764,9 +1768,9 @@ msgstr "quantité"
 msgid "Sith account"
 msgstr "Compte utilisateur"
 
-#: counter/models.py:248 sith/settings.py:283 sith/settings.py:288
-#: sith/settings.py:310 sith/settings_sample.py:265
-#: sith/settings_sample.py:270 sith/settings_sample.py:292
+#: counter/models.py:248 sith/settings.py:279 sith/settings.py:284
+#: sith/settings.py:306 sith/settings_sample.py:264
+#: sith/settings_sample.py:269 sith/settings_sample.py:291
 msgid "Credit card"
 msgstr "Carte bancaire"
 
@@ -1937,93 +1941,93 @@ msgstr "Nouveau type de produit"
 msgid "There is no product types in this website."
 msgstr "Il n'y a pas de types de produit dans ce site web."
 
-#: counter/views.py:36
+#: counter/views.py:35
 msgid "Select user"
 msgstr "Choisir un utilisateur"
 
-#: counter/views.py:52
+#: counter/views.py:51
 msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
-#: counter/views.py:84
+#: counter/views.py:83
 msgid "Bad credentials"
 msgstr "Mauvais identifiants"
 
-#: counter/views.py:86
+#: counter/views.py:85
 msgid "User is not subscriber"
 msgstr "L'utilisateur n'est pas cotisant."
 
-#: counter/views.py:261
+#: counter/views.py:260
 msgid "END"
 msgstr "FIN"
 
-#: counter/views.py:263
+#: counter/views.py:262
 msgid "CAN"
 msgstr "ANN"
 
-#: counter/views.py:293
+#: counter/views.py:292
 msgid "You have not enough money to buy all the basket"
 msgstr "Vous n'avez pas assez d'argent pour acheter le panier"
 
-#: counter/views.py:473
+#: counter/views.py:472
 msgid "Parent product"
 msgstr "Produit parent"
 
-#: counter/views.py:474
+#: counter/views.py:473
 msgid "Buying groups"
 msgstr "Groupes d'achat"
 
-#: counter/views.py:541
+#: counter/views.py:540
 msgid "10 cents"
 msgstr "10 centimes"
 
-#: counter/views.py:542
+#: counter/views.py:541
 msgid "20 cents"
 msgstr "20 centimes"
 
-#: counter/views.py:543
+#: counter/views.py:542
 msgid "50 cents"
 msgstr "50 centimes"
 
-#: counter/views.py:544
+#: counter/views.py:543
 msgid "1 euro"
 msgstr "1 €"
 
-#: counter/views.py:545
+#: counter/views.py:544
 msgid "2 euros"
 msgstr "2 €"
 
-#: counter/views.py:546
+#: counter/views.py:545
 msgid "5 euros"
 msgstr "5 €"
 
-#: counter/views.py:547
+#: counter/views.py:546
 msgid "10 euros"
 msgstr "10 €"
 
-#: counter/views.py:548
+#: counter/views.py:547
 msgid "20 euros"
 msgstr "20 €"
 
-#: counter/views.py:549
+#: counter/views.py:548
 msgid "50 euros"
 msgstr "50 €"
 
-#: counter/views.py:550
+#: counter/views.py:549
 msgid "100 euros"
 msgstr "100 €"
 
-#: counter/views.py:551 counter/views.py:553 counter/views.py:555
-#: counter/views.py:557 counter/views.py:559
+#: counter/views.py:550 counter/views.py:552 counter/views.py:554
+#: counter/views.py:556 counter/views.py:558
 msgid "Check amount"
 msgstr "Montant du chèque"
 
-#: counter/views.py:552 counter/views.py:554 counter/views.py:556
-#: counter/views.py:558 counter/views.py:560
+#: counter/views.py:551 counter/views.py:553 counter/views.py:555
+#: counter/views.py:557 counter/views.py:559
 msgid "Check quantity"
 msgstr "Nombre de chèque"
 
-#: counter/views.py:562
+#: counter/views.py:561
 msgid "Emptied"
 msgstr "Coffre vidé"
 
@@ -2175,12 +2179,12 @@ msgid "Washing and drying"
 msgstr "Lavage et séchage"
 
 #: launderette/templates/launderette/launderette_book.jinja:26
-#: sith/settings.py:424 sith/settings_sample.py:406
+#: sith/settings.py:420 sith/settings_sample.py:405
 msgid "Washing"
 msgstr "Lavage"
 
 #: launderette/templates/launderette/launderette_book.jinja:30
-#: sith/settings.py:424 sith/settings_sample.py:406
+#: sith/settings.py:420 sith/settings_sample.py:405
 msgid "Drying"
 msgstr "Séchage"
 
@@ -2235,116 +2239,116 @@ msgstr "L'utilisateur n'a pas réservé de créneau"
 msgid "Token not found"
 msgstr "Jeton non trouvé"
 
-#: sith/settings.py:174 sith/settings_sample.py:161
+#: sith/settings.py:174 sith/settings_sample.py:160
 msgid "English"
 msgstr "Anglais"
 
-#: sith/settings.py:175 sith/settings_sample.py:162
+#: sith/settings.py:175 sith/settings_sample.py:161
 msgid "French"
 msgstr "Français"
 
-#: sith/settings.py:280 sith/settings.py:287 sith/settings.py:308
-#: sith/settings_sample.py:262 sith/settings_sample.py:269
-#: sith/settings_sample.py:290
+#: sith/settings.py:276 sith/settings.py:283 sith/settings.py:304
+#: sith/settings_sample.py:261 sith/settings_sample.py:268
+#: sith/settings_sample.py:289
 msgid "Check"
 msgstr "Chèque"
 
-#: sith/settings.py:281 sith/settings.py:289 sith/settings.py:309
-#: sith/settings_sample.py:263 sith/settings_sample.py:271
-#: sith/settings_sample.py:291
+#: sith/settings.py:277 sith/settings.py:285 sith/settings.py:305
+#: sith/settings_sample.py:262 sith/settings_sample.py:270
+#: sith/settings_sample.py:290
 msgid "Cash"
 msgstr "Espèces"
 
-#: sith/settings.py:282 sith/settings_sample.py:264
+#: sith/settings.py:278 sith/settings_sample.py:263
 msgid "Transfert"
 msgstr "Virement"
 
-#: sith/settings.py:295 sith/settings_sample.py:277
+#: sith/settings.py:291 sith/settings_sample.py:276
 msgid "Belfort"
 msgstr "Belfort"
 
-#: sith/settings.py:296 sith/settings_sample.py:278
+#: sith/settings.py:292 sith/settings_sample.py:277
 msgid "Sevenans"
 msgstr "Sevenans"
 
-#: sith/settings.py:297 sith/settings_sample.py:279
+#: sith/settings.py:293 sith/settings_sample.py:278
 msgid "Montbéliard"
 msgstr "Montbéliard"
 
-#: sith/settings.py:337 sith/settings_sample.py:319
+#: sith/settings.py:333 sith/settings_sample.py:318
 msgid "One semester"
 msgstr "Un semestre, 15 €"
 
-#: sith/settings.py:342 sith/settings_sample.py:324
+#: sith/settings.py:338 sith/settings_sample.py:323
 msgid "Two semesters"
 msgstr "Deux semestres, 28 €"
 
-#: sith/settings.py:347 sith/settings_sample.py:329
+#: sith/settings.py:343 sith/settings_sample.py:328
 msgid "Common core cursus"
 msgstr "Cursus tronc commun, 45 €"
 
-#: sith/settings.py:352 sith/settings.py:357 sith/settings_sample.py:334
-#: sith/settings_sample.py:339
+#: sith/settings.py:348 sith/settings.py:353 sith/settings_sample.py:333
+#: sith/settings_sample.py:338
 msgid "Branch cursus"
 msgstr "Cursus branche, 45 €"
 
-#: sith/settings.py:362 sith/settings_sample.py:344
+#: sith/settings.py:358 sith/settings_sample.py:343
 msgid "Honorary member"
 msgstr "Membre honoraire, 0 €"
 
-#: sith/settings.py:367 sith/settings_sample.py:349
+#: sith/settings.py:363 sith/settings_sample.py:348
 msgid "Assidu member"
 msgstr "Membre d'Assidu, 0 €"
 
-#: sith/settings.py:372 sith/settings_sample.py:354
+#: sith/settings.py:368 sith/settings_sample.py:353
 msgid "Amicale/DOCEO member"
 msgstr "Membre de l'Amicale/DOCEO, 0 €"
 
-#: sith/settings.py:377 sith/settings_sample.py:359
+#: sith/settings.py:373 sith/settings_sample.py:358
 msgid "UT network member"
 msgstr "Cotisant du réseau UT, 0 €"
 
-#: sith/settings.py:382 sith/settings_sample.py:364
+#: sith/settings.py:378 sith/settings_sample.py:363
 msgid "CROUS member"
 msgstr "Membres du CROUS, 0 €"
 
-#: sith/settings.py:387 sith/settings_sample.py:369
+#: sith/settings.py:383 sith/settings_sample.py:368
 msgid "Sbarro/ESTA member"
 msgstr "Membre de Sbarro ou de l'ESTA, 15 €"
 
-#: sith/settings.py:395 sith/settings_sample.py:377
+#: sith/settings.py:391 sith/settings_sample.py:376
 msgid "President"
 msgstr "Président"
 
-#: sith/settings.py:396 sith/settings_sample.py:378
+#: sith/settings.py:392 sith/settings_sample.py:377
 msgid "Vice-President"
 msgstr "Vice-Président"
 
-#: sith/settings.py:397 sith/settings_sample.py:379
+#: sith/settings.py:393 sith/settings_sample.py:378
 msgid "Treasurer"
 msgstr "Trésorier"
 
-#: sith/settings.py:398 sith/settings_sample.py:380
+#: sith/settings.py:394 sith/settings_sample.py:379
 msgid "Communication supervisor"
 msgstr "Responsable com"
 
-#: sith/settings.py:399 sith/settings_sample.py:381
+#: sith/settings.py:395 sith/settings_sample.py:380
 msgid "Secretary"
 msgstr "Secrétaire"
 
-#: sith/settings.py:400 sith/settings_sample.py:382
+#: sith/settings.py:396 sith/settings_sample.py:381
 msgid "IT supervisor"
 msgstr "Responsable info"
 
-#: sith/settings.py:401 sith/settings_sample.py:383
+#: sith/settings.py:397 sith/settings_sample.py:382
 msgid "Board member"
 msgstr "Membre du bureau"
 
-#: sith/settings.py:402 sith/settings_sample.py:384
+#: sith/settings.py:398 sith/settings_sample.py:383
 msgid "Active member"
 msgstr "Membre actif"
 
-#: sith/settings.py:403 sith/settings_sample.py:385
+#: sith/settings.py:399 sith/settings_sample.py:384
 msgid "Curious"
 msgstr "Curieux"