Handle 401/403

Author: patrick91

pyproject.toml

@@ -37,7 +37,7 @@ dependencies = [
     "rignore >= 0.5.1",
     "httpx >= 0.27.0",
     "pydantic >= 2.8.2",
-    "rich-toolkit >= 0.6.3",
+    "rich-toolkit >= 0.7.0",
     "pydantic >= 1.6.1",
 ]
 

src/fastapi_cli/commands/whoami.py

@@ -1,12 +1,12 @@
 import logging
 from typing import Any
 
-import httpx
-import typer
 from rich import print
+from rich_toolkit.progress import Progress
 
 from fastapi_cli.utils.api import APIClient
 from fastapi_cli.utils.auth import is_logged_in
+from fastapi_cli.utils.cli import handle_http_errors
 
 logger = logging.getLogger(__name__)
 
@@ -17,29 +17,10 @@ def whoami() -> Any:
         return
 
     with APIClient() as client:
-        try:
-            response = client.get("/users/me")
-        except httpx.ReadTimeout:
-            print(
-                "[red]Error[/]: The request to the FastAPI Cloud server timed out. Please try again later."
-            )
-            raise typer.Exit(code=1) from None
-
-        if response.status_code in (401, 403):
-            print(
-                "[red]Error[/]: The specified token is not valid. Use [blue]`fastapi login`[/] to generate a new token."
-            )
-            raise typer.Exit(code=1) from None
-
-        try:
-            response.raise_for_status()
-        except httpx.HTTPError as e:
-            logger.debug("Error: %s", e)
-
-            print(
-                "[red]Error[/]: Something went wrong while contacting the FastAPI Cloud server. Please try again later."
-            )
-            raise typer.Exit(code=1) from None
+        with Progress(title="⚡Fetching profile", transient=True) as progress:
+            with handle_http_errors(progress, message=""):
+                response = client.get("/users/me")
+                response.raise_for_status()
 
         data = response.json()
 

src/fastapi_cli/utils/cli.py

@@ -3,7 +3,7 @@
 from typing import Generator, Optional
 
 import typer
-from httpx import HTTPError, ReadTimeout
+from httpx import HTTPError, HTTPStatusError, ReadTimeout
 from rich_toolkit import RichToolkit, RichToolkitTheme
 from rich_toolkit.progress import Progress
 from rich_toolkit.styles import TaggedStyle
@@ -47,10 +47,14 @@ def handle_http_errors(
     except HTTPError as e:
         logger.debug(e)
 
-        message = (
-            message
-            or f"Something went wrong while contacting the FastAPI Cloud server. Please try again later. \n\n{e}"
-        )
+        if isinstance(e, HTTPStatusError) and e.response.status_code in (401, 403):
+            message = "The specified token is not valid. Use `fastapi login` to generate a new token."
+
+        else:
+            message = (
+                message
+                or f"Something went wrong while contacting the FastAPI Cloud server. Please try again later. \n\n{e}"
+            )
 
         progress.set_error(message)
 

tests/test_cli_deploy.py

@@ -72,6 +72,24 @@ def test_shows_error_when_trying_to_get_teams(
         assert "Error fetching teams. Please try again later" in result.output
 
 
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_handles_invalid_auth(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [ENTER]
+
+    respx_mock.get("/teams/").mock(return_value=Response(401))
+
+    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+        mock_getchar.side_effect = steps
+
+        result = runner.invoke(app, ["deploy"])
+
+        assert result.exit_code == 1
+
+        assert "The specified token is not valid" in result.output
+
+
 @pytest.mark.respx(base_url=settings.base_api_url)
 def test_shows_teams(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter