Fix some bugs

This commit is contained in:
Patrick Jentsch
2020-02-19 16:36:55 +01:00
parent 75329382ab
commit 48685e4da6
6 changed files with 15 additions and 18 deletions

View File

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

View File

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