Merge remote-tracking branch 'origin/main' into modal

Author: github-actions[bot]

exceptions/http_exceptions.py

@@ -1,5 +1,4 @@
 from fastapi import HTTPException, status
-from utils.core.enums import ValidPermissions
 
 class RateLimitError(HTTPException):
     """Raised when a client exceeds the allowed request rate."""
@@ -106,7 +105,7 @@ def __init__(self):
 class InvalidPermissionError(HTTPException):
     """Raised when a user attempts to assign an invalid permission to a role"""
 
-    def __init__(self, permission: ValidPermissions):
+    def __init__(self, permission: str):
         super().__init__(
             status_code=400,
             detail=f"Invalid permission: {permission}"
@@ -224,6 +223,33 @@ def __init__(self):
         )
 
 
+class MaxEmailsReachedError(HTTPException):
+    """Raised when an account already has the maximum number of email addresses."""
+    def __init__(self):
+        super().__init__(
+            status_code=400,
+            detail="Maximum number of email addresses reached"
+        )
+
+
+class EmailNotVerifiedError(HTTPException):
+    """Raised when attempting to promote an unverified email address."""
+    def __init__(self):
+        super().__init__(
+            status_code=400,
+            detail="Email address is not verified"
+        )
+
+
+class CannotRemovePrimaryEmailError(HTTPException):
+    """Raised when attempting to remove the primary email address."""
+    def __init__(self):
+        super().__init__(
+            status_code=400,
+            detail="Cannot remove primary email address"
+        )
+
+
 class InvitationProcessingError(HTTPException):
     """Raised when an error occurs during the processing of a valid invitation."""
     def __init__(self, detail: str = "Failed to process invitation. Please try again later."):

main.py

@@ -127,8 +127,10 @@ async def credentials_exception_handler(request: Request, exc: CredentialsError)
 # Handle NeedsNewTokens by setting new tokens and redirecting to same page
 @app.exception_handler(NeedsNewTokens)
 async def needs_new_tokens_handler(request: Request, exc: NeedsNewTokens):
+    # Preserve query string so GET routes with query params work after token refresh
+    redirect_url = str(request.url)
     response = RedirectResponse(
-        url=request.url.path, status_code=status.HTTP_307_TEMPORARY_REDIRECT)
+        url=redirect_url, status_code=status.HTTP_307_TEMPORARY_REDIRECT)
     response.set_cookie(
         key="access_token",
         value=exc.access_token,

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastapi-jinja2-postgres-webapp"
-version = "0.1.15"
+version = "0.1.16"
 description = "A template webapp with a pure-Python FastAPI backend, frontend templating with Jinja2, and a Postgres database to power user auth"
 readme = "README.md"
 package-mode = false