mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
fix(users.validate): fix type hints
Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
parent
3b878da59a
commit
703d655a5e
1 changed files with 7 additions and 10 deletions
|
@ -6,8 +6,6 @@ out of form data from /account/register or /account/{username}/edit.
|
||||||
All functions in this module raise aurweb.exceptions.ValidationError
|
All functions in this module raise aurweb.exceptions.ValidationError
|
||||||
when encountering invalid criteria and return silently otherwise.
|
when encountering invalid criteria and return silently otherwise.
|
||||||
"""
|
"""
|
||||||
from typing import List, Optional, Tuple
|
|
||||||
|
|
||||||
from fastapi import Request
|
from fastapi import Request
|
||||||
from sqlalchemy import and_
|
from sqlalchemy import and_
|
||||||
|
|
||||||
|
@ -22,8 +20,7 @@ from aurweb.models.ssh_pub_key import get_fingerprint
|
||||||
logger = logging.get_logger(__name__)
|
logger = logging.get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
def invalid_fields(E: str = str(), U: str = str(), **kwargs) \
|
def invalid_fields(E: str = str(), U: str = str(), **kwargs) -> None:
|
||||||
-> Optional[Tuple[bool, List[str]]]:
|
|
||||||
if not E or not U:
|
if not E or not U:
|
||||||
raise ValidationError(["Missing a required field."])
|
raise ValidationError(["Missing a required field."])
|
||||||
|
|
||||||
|
@ -31,15 +28,15 @@ def invalid_fields(E: str = str(), U: str = str(), **kwargs) \
|
||||||
def invalid_suspend_permission(request: Request = None,
|
def invalid_suspend_permission(request: Request = None,
|
||||||
user: models.User = None,
|
user: models.User = None,
|
||||||
J: bool = False,
|
J: bool = False,
|
||||||
**kwargs) \
|
**kwargs) -> None:
|
||||||
-> Optional[Tuple[bool, List[str]]]:
|
|
||||||
if not request.user.is_elevated() and J != bool(user.InactivityTS):
|
if not request.user.is_elevated() and J != bool(user.InactivityTS):
|
||||||
raise ValidationError([
|
raise ValidationError([
|
||||||
"You do not have permission to suspend accounts."])
|
"You do not have permission to suspend accounts."])
|
||||||
|
|
||||||
|
|
||||||
def invalid_username(request: Request = None, U: str = str(), _=None,
|
def invalid_username(request: Request = None, U: str = str(),
|
||||||
**kwargs):
|
_: l10n.Translator = None,
|
||||||
|
**kwargs) -> None:
|
||||||
if not util.valid_username(U):
|
if not util.valid_username(U):
|
||||||
username_min_len = config.getint("options", "username_min_len")
|
username_min_len = config.getint("options", "username_min_len")
|
||||||
username_max_len = config.getint("options", "username_max_len")
|
username_max_len = config.getint("options", "username_max_len")
|
||||||
|
@ -201,8 +198,8 @@ def invalid_account_type(T: int = None, request: Request = None,
|
||||||
f" {name}.")
|
f" {name}.")
|
||||||
|
|
||||||
|
|
||||||
def invalid_captcha(captcha_salt: str = None, captcha: str = None, **kwargs) \
|
def invalid_captcha(captcha_salt: str = None, captcha: str = None,
|
||||||
-> None:
|
**kwargs) -> None:
|
||||||
if captcha_salt and captcha_salt not in get_captcha_salts():
|
if captcha_salt and captcha_salt not in get_captcha_salts():
|
||||||
raise ValidationError(["This CAPTCHA has expired. Please try again."])
|
raise ValidationError(["This CAPTCHA has expired. Please try again."])
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue