sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-11-15 01:05:42 +00:00
Code Issues Projects Releases Wiki Activity

Allow username for login

Browse Source
This commit is contained in:
Patrick Jentsch 2020-02-20 09:45:38 +01:00
parent ba3f9ec214
commit 50746ab821
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/auth/forms.py
View File

@ -6,7 +6,7 @@ from wtforms.validators import DataRequired, Email, EqualTo, Length, Regexp
class LoginForm(FlaskForm): class LoginForm(FlaskForm):
email = StringField('Email', validators=[DataRequired(), Email()]) user = StringField('Email or username', validators=[DataRequired()])
password = PasswordField('Password', validators=[DataRequired()]) password = PasswordField('Password', validators=[DataRequired()])
remember_me = BooleanField('Keep me logged in') remember_me = BooleanField('Keep me logged in')
submit = SubmitField('Log In') submit = SubmitField('Log In')

6
app/auth/views.py
View File

@ -30,14 +30,16 @@ def login():
return redirect(url_for('main.dashboard')) return redirect(url_for('main.dashboard'))
login_form = LoginForm(prefix='login-form') login_form = LoginForm(prefix='login-form')
if login_form.validate_on_submit(): if login_form.validate_on_submit():
user = User.query.filter_by(email=login_form.email.data).first() user = User.query.filter_by(username=login_form.user.data).first()
if user is None:
user = User.query.filter_by(email=login_form.user.data).first()
if user is not None and user.verify_password(login_form.password.data): if user is not None and user.verify_password(login_form.password.data):
login_user(user, login_form.remember_me.data) login_user(user, login_form.remember_me.data)
next = request.args.get('next') next = request.args.get('next')
if next is None or not next.startswith('/'): if next is None or not next.startswith('/'):
next = url_for('main.dashboard') next = url_for('main.dashboard')
return redirect(next) return redirect(next)
flash('Invalid email or password.') flash('Invalid email/username or password.')
return render_template('auth/login.html.j2', login_form=login_form, return render_template('auth/login.html.j2', login_form=login_form,
title='nopaque') title='nopaque')

6
app/main/views.py
View File

@ -9,11 +9,13 @@ from . import main
def index(): def index():
login_form = LoginForm(prefix='login-form') login_form = LoginForm(prefix='login-form')
if login_form.validate_on_submit(): if login_form.validate_on_submit():
user = User.query.filter_by(email=login_form.email.data).first() user = User.query.filter_by(username=login_form.user.data).first()
if user is None:
user = User.query.filter_by(email=login_form.user.data).first()
if user is not None and user.verify_password(login_form.password.data): if user is not None and user.verify_password(login_form.password.data):
login_user(user, login_form.remember_me.data) login_user(user, login_form.remember_me.data)
return redirect(url_for('main.dashboard')) return redirect(url_for('main.dashboard'))
flash('Invalid email or password.') flash('Invalid email/username or password.')
return render_template('main/index.html.j2', login_form=login_form, return render_template('main/index.html.j2', login_form=login_form,
title='nopaque') title='nopaque')

6
app/templates/auth/login.html.j2
View File

@ -14,9 +14,9 @@
{{ login_form.hidden_tag() }} {{ login_form.hidden_tag() }}
<div class="input-field"> <div class="input-field">
<i class="material-icons prefix">person</i> <i class="material-icons prefix">person</i>
{{ login_form.email(class='validate') }} {{ login_form.user(class='validate') }}
{{ login_form.email.label }} {{ login_form.user.label }}
{% for error in login_form.email.errors %} {% for error in login_form.user.errors %}
<span class="helper-text red-text">{{ error }}</span> <span class="helper-text red-text">{{ error }}</span>
{% endfor %} {% endfor %}
</div> </div>

6
app/templates/main/index.html.j2
View File

@ -100,9 +100,9 @@
{{ login_form.hidden_tag() }} {{ login_form.hidden_tag() }}
<div class="input-field"> <div class="input-field">
<i class="material-icons prefix">person</i> <i class="material-icons prefix">person</i>
{{ login_form.email(class='validate') }} {{ login_form.user(class='validate') }}
{{ login_form.email.label }} {{ login_form.user.label }}
{% for error in login_form.email.errors %} {% for error in login_form.user.errors %}
<span class="helper-text red-text">{{ error }}</span> <span class="helper-text red-text">{{ error }}</span>
{% endfor %} {% endfor %}
</div> </div>