diff options
| -rw-r--r-- | mediagoblin/auth/forms.py | 4 | ||||
| -rw-r--r-- | mediagoblin/auth/views.py | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py index 8f091d21..5484c178 100644 --- a/mediagoblin/auth/forms.py +++ b/mediagoblin/auth/forms.py @@ -64,9 +64,9 @@ class RegistrationForm(wtforms.Form): class LoginForm(wtforms.Form): username = wtforms.TextField( - _('Username'), + _('Username or Email'), [wtforms.validators.Required(), - normalize_user_or_email_field(allow_email=False)]) + normalize_user_or_email_field()]) password = wtforms.PasswordField( _('Password'), [wtforms.validators.Required(), diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index 354b48c1..dc408911 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -25,7 +25,7 @@ from mediagoblin.auth import lib as auth_lib from mediagoblin.auth import forms as auth_forms from mediagoblin.auth.lib import send_verification_email, \ send_fp_verification_email - +from sqlalchemy import or_ def email_debug_message(request): """ @@ -113,8 +113,16 @@ def login(request): login_failed = False if request.method == 'POST': + + username = login_form.data['username'] + if login_form.validate(): - user = User.query.filter_by(username=login_form.data['username']).first() + user = User.query.filter( + or_( + User.username == username, + User.email == username, + + )).first() if user and user.check_login(login_form.password.data): # set up login in session |