♻️ Improve how we handle invalid tokens

Shortcake-Parent: isolate-tests-from-config

Author: patrick91

src/fastapi_cloud_cli/commands/logs.py

@@ -16,7 +16,7 @@
 )
 from fastapi_cloud_cli.utils.apps import AppConfig, get_app_config
 from fastapi_cloud_cli.utils.auth import Identity
-from fastapi_cloud_cli.utils.cli import get_rich_toolkit
+from fastapi_cloud_cli.utils.cli import get_rich_toolkit, handle_invalid_token_error
 
 logger = logging.getLogger(__name__)
 
@@ -87,18 +87,15 @@ def _process_log_stream(
         toolkit.print_line()
         return
     except StreamLogError as e:
-        error_msg = str(e)
-        if "HTTP 401" in error_msg or "HTTP 403" in error_msg:
-            toolkit.print(
-                "The specified token is not valid. Use [blue]`fastapi login`[/] to generate a new token.",
-            )
-        elif "HTTP 404" in error_msg:
+        if e.status_code in (401, 403):
+            toolkit.print(handle_invalid_token_error())
+        elif e.status_code == 404:
             toolkit.print(
                 "App not found. Make sure to use the correct account.",
             )
         else:
             toolkit.print(
-                f"[red]Error:[/] {escape(error_msg)}",
+                f"[red]Error:[/] {escape(str(e))}",
             )
         raise typer.Exit(1) from None
     except (TooManyRetriesError, TimeoutError):

src/fastapi_cloud_cli/utils/api.py

@@ -32,7 +32,9 @@
 class StreamLogError(Exception):
     """Raised when there's an error streaming logs (build or app logs)."""
 
-    pass
+    def __init__(self, message: str, *, status_code: Optional[int] = None) -> None:
+        super().__init__(message)
+        self.status_code = status_code
 
 
 class TooManyRetriesError(Exception):
@@ -100,7 +102,8 @@ def _backoff() -> None:
             except Exception:
                 error_detail = "(response body unavailable)"
             raise StreamLogError(
-                f"HTTP {error.response.status_code}: {error_detail}"
+                f"HTTP {error.response.status_code}: {error_detail}",
+                status_code=error.response.status_code,
             ) from error
 
 

src/fastapi_cloud_cli/utils/cli.py

@@ -10,7 +10,7 @@
 from rich_toolkit.progress import Progress
 from rich_toolkit.styles import MinimalStyle, TaggedStyle
 
-from .auth import Identity
+from .auth import Identity, delete_auth_config
 
 logger = logging.getLogger(__name__)
 
@@ -68,6 +68,20 @@ def get_rich_toolkit(minimal: bool = False) -> RichToolkit:
     return RichToolkit(theme=theme)
 
 
+def handle_invalid_token_error() -> str:
+    identity = Identity()
+
+    message = "The specified token is not valid. "
+
+    if identity.auth_mode == "user":
+        delete_auth_config()
+        message += "Use `fastapi login` to generate a new token."
+    else:
+        message += "Make sure to use a valid token."
+
+    return message
+
+
 @contextlib.contextmanager
 def handle_http_errors(
     progress: Progress,
@@ -91,14 +105,7 @@ def handle_http_errors(
             logger.debug(e.response.json())  # pragma: no cover
 
         if isinstance(e, HTTPStatusError) and e.response.status_code in (401, 403):
-            message = "The specified token is not valid. "
-
-            identity = Identity()
-
-            if identity.auth_mode == "user":
-                message += "Use `fastapi login` to generate a new token."
-            else:
-                message += "Make sure to use a valid token."
+            message = handle_invalid_token_error()
 
         else:
             message = (