Merge pull request #87 from DarkflameUniverse/fix/empty-play-key

fix: don't break on empty play key
This commit is contained in:
Aaron Kimbrell 2024-01-07 15:00:26 -06:00 committed by GitHub
commit 2e4bd04d09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -22,17 +22,17 @@ from app.models import PlayKey
def validate_play_key(form, field): def validate_play_key(form, field):
"""Validates a field for a valid phone number """Validates a field for a valid play kyey
Args: Args:
form: REQUIRED, the field's parent form form: REQUIRED, the field's parent form
field: REQUIRED, the field with data field: REQUIRED, the field with data
Returns: Returns:
None, raises ValidationError if failed None, raises ValidationError if failed
""" """
# jank to get the fireign key that we need back into the field # jank to get the foreign key that we need back into the field
if current_app.config["REQUIRE_PLAY_KEY"]: if current_app.config["REQUIRE_PLAY_KEY"]:
field.data = PlayKey.key_is_valid(key_string=field.data) field.data = PlayKey.key_is_valid(key_string=field.data)
return return True
class CustomRecaptcha(Recaptcha): class CustomRecaptcha(Recaptcha):
def __call__(self, form, field): def __call__(self, form, field):
@ -49,10 +49,7 @@ class CustomUserManager(UserManager):
class CustomRegisterForm(RegisterForm): class CustomRegisterForm(RegisterForm):
play_key_id = StringField( play_key_id = StringField(
'Play Key', 'Play Key',
validators=[ validators=[validate_play_key]
Optional(),
validate_play_key,
]
) )
recaptcha = RecaptchaField( recaptcha = RecaptchaField(
validators=[CustomRecaptcha()] validators=[CustomRecaptcha()]