fix style app/forms.py

This commit is contained in:
Trent Palmer 2025-02-09 16:48:06 -08:00
parent 29afdd025c
commit 86d482691b

View File

@ -2,7 +2,9 @@
from flask_wtf import FlaskForm
from wtforms import StringField, PasswordField, BooleanField, SubmitField
from wtforms.validators import DataRequired, Email, Optional, Regexp, ValidationError, EqualTo, Length
from wtforms.validators import (
DataRequired, Email, Optional, Regexp, ValidationError, EqualTo, Length
)
from flask_wtf.file import FileField, FileAllowed, FileRequired
from app.models import Contributor, EmailWhiteList
from zxcvbn import zxcvbn
@ -13,17 +15,38 @@ class ConfirmPhotoDelete(FlaskForm):
class GetTotp(FlaskForm):
totp_code = StringField('6-Digit Code?', validators=[DataRequired(), Length(min=6, max=6, message="6 Digits")], render_kw={'autofocus': True})
totp_code = StringField(
'6-Digit Code?',
validators=[DataRequired(), Length(min=6, max=6, message="6 Digits")],
render_kw={'autofocus': True},
)
submit = SubmitField('OK')
class ConfirmTotp(FlaskForm):
totp_code = StringField('6-Digit Code?', validators=[DataRequired(), Length(min=6, max=6, message="Rescan And Try Again")], render_kw={'autofocus': True})
totp_code = StringField(
'6-Digit Code?',
validators=[
DataRequired(),
Length(min=6, max=6, message="Rescan And Try Again"),
],
render_kw={'autofocus': True},
)
submit = SubmitField('Enable 2FA')
class EditProfile(FlaskForm):
username = StringField('Username', validators=[DataRequired(), Regexp('^[a-zA-Z0-9]+$', message='letters and digits only (no spaces)')], render_kw={'autofocus': True})
username = StringField(
'Username',
validators=[
DataRequired(),
Regexp(
'^[a-zA-Z0-9]+$',
message='letters and digits only (no spaces)',
),
],
render_kw={'autofocus': True},
)
email = StringField('Email', validators=[Optional(), Email()])
password = PasswordField('Confirm Password', validators=[DataRequired()])
submit = SubmitField('Update Name/Email')
@ -44,7 +67,10 @@ class EditProfile(FlaskForm):
class LoginForm(FlaskForm):
username = StringField('Username', validators=[Optional()], render_kw={'autofocus': True})
username = StringField(
'Username',
validators=[Optional()], render_kw={'autofocus': True},
)
email = StringField('Email', validators=[Optional(), Email()])
password = PasswordField('Password', validators=[DataRequired()])
remember_me = BooleanField('Remember Me')
@ -52,8 +78,15 @@ class LoginForm(FlaskForm):
class ResetPasswordForm(FlaskForm):
password = PasswordField('Password', validators=[DataRequired(), Length(min=15, )], render_kw={'autofocus': True})
password2 = PasswordField('Repeat Password', validators=[DataRequired(), EqualTo('password')])
password = PasswordField(
'Password',
validators=[DataRequired(), Length(min=15, )],
render_kw={'autofocus': True},
)
password2 = PasswordField(
'Repeat Password',
validators=[DataRequired(), EqualTo('password')],
)
submit = SubmitField('Request Password Reset')
def validate_password(self, password):
@ -62,10 +95,26 @@ class ResetPasswordForm(FlaskForm):
class RegistrationForm(FlaskForm):
username = StringField('Username', validators=[DataRequired(), Regexp('^[a-zA-Z0-9]+$', message='letters and digits only (no spaces)')], render_kw={'autofocus': True})
username = StringField(
'Username',
validators=[
DataRequired(),
Regexp(
'^[a-zA-Z0-9]+$',
message='letters and digits only (no spaces)',
),
],
render_kw={'autofocus': True},
)
email = StringField('Email', validators=[DataRequired(), Email()])
password = PasswordField('Password', validators=[DataRequired(), Length(min=15, )])
password2 = PasswordField('Repeat Password', validators=[DataRequired(), EqualTo('password')])
password = PasswordField(
'Password',
validators=[DataRequired(), Length(min=15, )],
)
password2 = PasswordField(
'Repeat Password',
validators=[DataRequired(), EqualTo('password')],
)
submit = SubmitField('Register')
def validate_password(self, password):
@ -78,7 +127,9 @@ class RegistrationForm(FlaskForm):
raise ValidationError('Please use a different username.')
def validate_email(self, email):
white_listed_user = EmailWhiteList.query.filter_by(email=email.data).first()
white_listed_user = EmailWhiteList.query.filter_by(
email=email.data,
).first()
if white_listed_user is None:
raise ValidationError('This email address is not authorized.')
user = Contributor.query.filter_by(email=email.data).first()
@ -87,14 +138,28 @@ class RegistrationForm(FlaskForm):
class ResetPasswordRequestForm(FlaskForm):
email = StringField('Email', validators=[DataRequired(), Email()], render_kw={'autofocus': True})
email = StringField(
'Email',
validators=[DataRequired(), Email()],
render_kw={'autofocus': True},
)
submit = SubmitField('Request Password Reset')
class ChangePassword(FlaskForm):
password = PasswordField('Confirm Password', validators=[DataRequired()], render_kw={'autofocus': True})
new_password = PasswordField('New Password', validators=[DataRequired(), Length(min=15, )])
new_password2 = PasswordField('Repeat New Password', validators=[DataRequired(), EqualTo('new_password')])
password = PasswordField(
'Confirm Password',
validators=[DataRequired()],
render_kw={'autofocus': True},
)
new_password = PasswordField(
'New Password',
validators=[DataRequired(), Length(min=15, )],
)
new_password2 = PasswordField(
'Repeat New Password',
validators=[DataRequired(), EqualTo('new_password')],
)
submit = SubmitField('Save')
def validate_password(self, password):