sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-12 00:50:40 +00:00
Code Issues Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Patrick Jentsch
2020-02-19 16:58:56 +01:00
parent 48685e4da6
commit ba3f9ec214
6 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/auth/forms.py
View File

@ -23,10 +23,14 @@ class RegistrationForm(FlaskForm):
)
password = PasswordField(
'Password',
validators=[DataRequired(),
EqualTo('password2', message='Passwords must match.')]
validators=[DataRequired(), EqualTo('password_confirmation',
message='Passwords must match.')]
)
password_confirmation = PasswordField(
'Password confirmation',
validators=[DataRequired(), EqualTo('password',
message='Passwords must match.')]
)
password2 = PasswordField('Confirm password', validators=[DataRequired()])
submit = SubmitField('Register')
def validate_email(self, field):
@ -40,12 +44,12 @@ class RegistrationForm(FlaskForm):
class ResetPasswordForm(FlaskForm):
password = PasswordField(
'New Password',
validators=[DataRequired(),
EqualTo('password2', message='Passwords must match')]
'New password',
validators=[DataRequired(), EqualTo('password_confirmation',
message='Passwords must match.')]
)
password2 = PasswordField(
'Confirm password',
password_confirmation = PasswordField(
'Password confirmation',
validators=[DataRequired(),
EqualTo('password', message='Passwords must match.')]
)

8
app/auth/views.py
View File

@ -26,6 +26,8 @@ def before_request():
@auth.route('/login', methods=['GET', 'POST'])
def login():
if current_user.is_authenticated:
return redirect(url_for('main.dashboard'))
login_form = LoginForm(prefix='login-form')
if login_form.validate_on_submit():
user = User.query.filter_by(email=login_form.email.data).first()
@ -111,7 +113,9 @@ def resend_confirmation():
def reset_password_request():
if current_user.is_authenticated:
return redirect(url_for('main.dashboard'))
reset_password_request_form = ResetPasswordRequestForm()
reset_password_request_form = ResetPasswordRequestForm(
prefix='reset-password-request-form'
)
if reset_password_request_form.validate_on_submit():
submitted_email = reset_password_request_form.email.data
user = User.query.filter_by(email=submitted_email.lower()).first()
@ -133,7 +137,7 @@ def reset_password_request():
def reset_password(token):
if current_user.is_authenticated:
return redirect(url_for('main.dashboard'))
reset_password_form = ResetPasswordForm()
reset_password_form = ResetPasswordForm(prefix='reset-password-form')
if reset_password_form.validate_on_submit():
if User.reset_password(token, reset_password_form.password.data):
db.session.commit()