Make MyPy happy

Fixes for various type errors throw by mypy.

portal/api/auth.py

@@ -16,9 +16,9 @@ from .blueprint import bp
 def set_user_if_valid() -> None:
     if (
         not request.authorization
+        or request.authorization.type != "basic"
         or request.authorization.username is None
         or request.authorization.password is None
-        or request.authorization.type != "basic"
     ):
         g.user = None
         return
@@ -32,8 +32,8 @@ def set_user_if_valid() -> None:
 def set_key_if_valid() -> None:
     if (
         not request.authorization
-        or request.authorization.token is None
         or request.authorization.type != "bearer"
+        or request.authorization.token is None
     ):
         g.key = None
         return
@@ -53,7 +53,7 @@ def require_valid(credential_type: type[User | Key]) -> Callable:
 
     def decorator(route: Callable) -> Callable:
         @functools.wraps(route)
-        def protected_route(**kwargs: Any) -> ProblemResponse:
+        def protected_route(**kwargs: Any) -> Any:
             # Determine which credentials to use
             credentials = {User: g.user, Key: g.key}.get(credential_type)