Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

This commit is contained in:
Stephan Porada
2019-07-08 14:05:04 +02:00
5 changed files with 35 additions and 11 deletions

View File

@ -1,5 +1,9 @@
from flask import flash, redirect, render_template, request, url_for
<<<<<<< HEAD
from flask_login import login_required, login_user, logout_user, current_user
=======
from flask_login import current_user, login_required, login_user, logout_user
>>>>>>> 1a973bfbc68dfea26a8b5360074480641cb34f31
from . import auth
from .. import db
from .forms import LoginForm, PasswordResetRequestForm, RegistrationForm
@ -47,6 +51,8 @@ def register():
@auth.route('/reset', methods=['GET', 'POST'])
def password_reset_request():
if not current_user.is_anonymous:
return redirect(url_for('main.index'))
form = PasswordResetRequestForm()
if form.validate_on_submit():
user = User.query.filter_by(email=form.email.data.lower()).first()
@ -58,4 +64,10 @@ def password_reset_request():
flash('An email with instructions to reset your password has been '
'sent to you.')
return redirect(url_for('auth.login'))
return render_template('auth/reset_password.html.j2', form=form, title='Password Reset')
return render_template('auth/reset_password.html.j2', form=form,
title='Password Reset')
@auth.route('/reset/<token>')
def password_reset(token):
return 'test'