mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-03 20:02:47 +00:00 
			
		
		
		
	Enable login by username.
This commit is contained in:
		@@ -6,8 +6,7 @@ from ..models import User
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class LoginForm(FlaskForm):
 | 
			
		||||
    email = StringField('Email', validators=[DataRequired(), Length(1, 64),
 | 
			
		||||
                                             Email()])
 | 
			
		||||
    login = StringField('Login', validators=[DataRequired(), Length(1, 64)])
 | 
			
		||||
    password = PasswordField('Password', validators=[DataRequired()])
 | 
			
		||||
    remember_me = BooleanField('Keep me logged in')
 | 
			
		||||
    submit = SubmitField('Log In')
 | 
			
		||||
@@ -46,3 +45,9 @@ class PasswordResetRequestForm(FlaskForm):
 | 
			
		||||
    email = StringField('Email', validators=[DataRequired(), Length(1, 64),
 | 
			
		||||
                                             Email()])
 | 
			
		||||
    submit = SubmitField('Reset Password')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ChangeProfileForm(FlaskForm):
 | 
			
		||||
    email = StringField('Email', validators=[DataRequired(), Length(1, 64),
 | 
			
		||||
                                             Email()])
 | 
			
		||||
    submit = SubmitField('Submit')
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@ from flask import flash, redirect, render_template, request, url_for
 | 
			
		||||
from flask_login import current_user, login_required, login_user, logout_user
 | 
			
		||||
from . import auth
 | 
			
		||||
from .. import db
 | 
			
		||||
from .forms import LoginForm, PasswordResetForm, PasswordResetRequestForm, RegistrationForm
 | 
			
		||||
from .forms import ChangeProfileForm, LoginForm, PasswordResetForm, PasswordResetRequestForm, RegistrationForm
 | 
			
		||||
from ..email import send_email
 | 
			
		||||
from ..models import User
 | 
			
		||||
 | 
			
		||||
@@ -11,7 +11,9 @@ from ..models import User
 | 
			
		||||
def login():
 | 
			
		||||
    form = LoginForm()
 | 
			
		||||
    if form.validate_on_submit():
 | 
			
		||||
        user = User.query.filter_by(email=form.email.data).first()
 | 
			
		||||
        user = User.query.filter_by(email=form.login.data).first()
 | 
			
		||||
        if user is None:
 | 
			
		||||
            user = User.query.filter_by(username=form.login.data).first()
 | 
			
		||||
        if user is not None and user.verify_password(form.password.data):
 | 
			
		||||
            login_user(user, form.remember_me.data)
 | 
			
		||||
            next = request.args.get('next')
 | 
			
		||||
@@ -85,7 +87,7 @@ def resend_confirmation():
 | 
			
		||||
    send_email(current_user.email, 'Confirm Your Account', 'auth/email/confirm',
 | 
			
		||||
               user=current_user, token=token)
 | 
			
		||||
    flash('A new confirmation email has benn sent to you by email.')
 | 
			
		||||
    return redirect(url_for('main.index'))
 | 
			
		||||
    return redirect(url_for('maind.index'))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@auth.route('/reset', methods=['GET', 'POST'])
 | 
			
		||||
@@ -121,3 +123,14 @@ def password_reset(token):
 | 
			
		||||
            return redirect(url_for('main.index'))
 | 
			
		||||
    return render_template('auth/reset_password.html.j2', form=form,
 | 
			
		||||
                           title='Password Reset')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@auth.route('/profile', methods=['GET', 'POST'])
 | 
			
		||||
@login_required
 | 
			
		||||
def profile():
 | 
			
		||||
    form = ChangeProfileForm()
 | 
			
		||||
    if form.validate_on_submit():
 | 
			
		||||
        flash('It\'s just a test, nothing changed.')
 | 
			
		||||
        return redirect(url_for('auth.profile'))
 | 
			
		||||
    return render_template('auth/profile.html.j2', form=form,
 | 
			
		||||
                           title='Profile')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user