normalize forms

This commit is contained in:
Patrick Jentsch
2022-04-12 16:11:24 +02:00
parent 54b5635e9c
commit 99ddd2e3dd
17 changed files with 80 additions and 147 deletions

View File

@ -7,7 +7,7 @@ from wtforms import (
SubmitField,
ValidationError
)
from wtforms.validators import DataRequired, Email, EqualTo, Length, Regexp
from wtforms.validators import DataRequired, InputRequired, Email, EqualTo, Length, Regexp
from . import USERNAME_REGEX
@ -20,31 +20,18 @@ class LoginForm(FlaskForm):
class RegistrationForm(FlaskForm):
email = StringField('Email', validators=[DataRequired(), Email()])
username = StringField(
'Username',
username = StringField('Username',
validators=[
DataRequired(),
Length(1, 64),
InputRequired(),
Length(min=1, max=64),
Regexp(
USERNAME_REGEX,
message='Usernames must have only letters, numbers, dots or underscores' # noqa
)
]
)
password = PasswordField(
'Password',
validators=[
DataRequired(),
EqualTo('password_confirmation', message='Passwords must match')
]
)
password_confirmation = PasswordField(
'Password confirmation',
validators=[
DataRequired(),
EqualTo('password', message='Passwords must match')
]
)
password = PasswordField('Password', validators=[DataRequired(), EqualTo('password_confirmation', message='Passwords must match')])
password_confirmation = PasswordField('Password confirmation', validators=[DataRequired(), EqualTo('password', message='Passwords must match')])
submit = SubmitField('Register')
def validate_email(self, field):
@ -57,20 +44,8 @@ class RegistrationForm(FlaskForm):
class ResetPasswordForm(FlaskForm):
password = PasswordField(
'New password',
validators=[
DataRequired(),
EqualTo('password_confirmation', message='Passwords must match')
]
)
password_confirmation = PasswordField(
'Password confirmation',
validators=[
DataRequired(),
EqualTo('password', message='Passwords must match')
]
)
password = PasswordField('New password', validators=[DataRequired(), EqualTo('password_confirmation', message='Passwords must match')])
password_confirmation = PasswordField('Password confirmation', validators=[DataRequired(), EqualTo('password', message='Passwords must match')])
submit = SubmitField('Reset Password')