heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allows you to use your username or email to login

Browse Source
This commit is contained in:
Jessica T 2013-04-12 22:07:44 +01:00
parent 36748921c2
commit b2c8dbcf85
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/auth/forms.py
View File

@ -64,9 +64,9 @@ class RegistrationForm(wtforms.Form):
class LoginForm(wtforms.Form): class LoginForm(wtforms.Form):
username = wtforms.TextField( username = wtforms.TextField(
_('Username'), _('Username or Email'),
[wtforms.validators.Required(), [wtforms.validators.Required(),
normalize_user_or_email_field(allow_email=False)]) normalize_user_or_email_field()])
password = wtforms.PasswordField( password = wtforms.PasswordField(
_('Password'), _('Password'),
[wtforms.validators.Required(), [wtforms.validators.Required(),

12
mediagoblin/auth/views.py
View File

@ -25,7 +25,7 @@ from mediagoblin.auth import lib as auth_lib
from mediagoblin.auth import forms as auth_forms from mediagoblin.auth import forms as auth_forms
from mediagoblin.auth.lib import send_verification_email, \ from mediagoblin.auth.lib import send_verification_email, \
send_fp_verification_email send_fp_verification_email
from sqlalchemy import or_
def email_debug_message(request): def email_debug_message(request):
""" """
@ -113,8 +113,16 @@ def login(request):
login_failed = False login_failed = False
if request.method == 'POST': if request.method == 'POST':
username = login_form.data['username']
if login_form.validate(): 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): if user and user.check_login(login_form.password.data):
# set up login in session # set up login in session