softmax-cli 0.26.9__tar.gz → 0.26.10__tar.gz

{softmax_cli-0.26.9/src/softmax_cli.egg-info → softmax_cli-0.26.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: softmax-cli
-Version: 0.26.9
+Version: 0.26.10
 Summary: Softmax CLI — authentication and account tools
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11

{softmax_cli-0.26.9 → softmax_cli-0.26.10}/src/softmax/cli.py

@@ -101,7 +101,10 @@ def login_cmd(
     if user_token is not None:
         api_server = None if is_default_server else login_server
         try:
-            fetch_cogames_whoami(api_server=api_server, token=user_token)
+            whoami = fetch_cogames_whoami(api_server=api_server, token=user_token)
+            if whoami.subject_type == "anonymous":
+                console.print("Saved token is no longer valid. Re-authenticating...", style="yellow")
+                user_token = None
         except httpx.HTTPStatusError as exc:
             if exc.response.status_code == 401:
                 console.print("Saved token is no longer valid. Re-authenticating...", style="yellow")
@@ -195,6 +198,9 @@ def status_cmd(
         raise typer.Exit(1)
 
     session = fetch_cogames_whoami(api_server=server, token=token)
+    if session.subject_type == "anonymous":
+        console.print("[red]Token is invalid or expired.[/red] Run [cyan]softmax login[/cyan] to re-authenticate.")
+        raise typer.Exit(1)
     console.print("[green]Authenticated[/green]")
     console.print(f"user_email: {session.user_email}")
     console.print(f"subject_type: {session.subject_type}")

{softmax_cli-0.26.9 → softmax_cli-0.26.10/src/softmax_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: softmax-cli
-Version: 0.26.9
+Version: 0.26.10
 Summary: Softmax CLI — authentication and account tools
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11

{softmax_cli-0.26.9 → softmax_cli-0.26.10}/tests/test_auth_login.py

@@ -290,3 +290,60 @@ def test_save_token_raises_for_malformed_storage_section(
             server="https://softmax.com/api",
             token="abc",
         )
+
+
+def test_status_fails_for_anonymous_session(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path,
+) -> None:
+    monkeypatch.setenv("HOME", str(tmp_path))
+    save_token(token_kind=TokenKind.COGAMES, server="https://softmax.com/api", token="bad-token")
+
+    class FakeResponse:
+        def raise_for_status(self) -> None:
+            return None
+
+        def json(self) -> dict[str, object]:
+            return {
+                "user_email": "unknown",
+                "is_softmax_team_member": False,
+                "is_softmax_admin": False,
+                "subject_type": "anonymous",
+                "subject_id": None,
+                "owner_user_id": None,
+                "scopes": [],
+            }
+
+    monkeypatch.setattr("softmax.auth.httpx.get", lambda *args, **kwargs: FakeResponse())
+
+    result = runner.invoke(app, ["status"])
+    assert result.exit_code == 1
+    assert "invalid or expired" in result.stdout
+
+
+def test_login_detects_anonymous_whoami_as_invalid_token(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path,
+) -> None:
+    monkeypatch.setenv("HOME", str(tmp_path))
+    save_token(token_kind=TokenKind.COGAMES_USER, server="https://softmax.com/api", token="stale-token")
+
+    class FakeResponse:
+        def raise_for_status(self) -> None:
+            return None
+
+        def json(self) -> dict[str, object]:
+            return {
+                "user_email": "unknown",
+                "is_softmax_team_member": False,
+                "is_softmax_admin": False,
+                "subject_type": "anonymous",
+                "subject_id": None,
+                "owner_user_id": None,
+                "scopes": [],
+            }
+
+    monkeypatch.setattr("softmax.auth.httpx.get", lambda *args, **kwargs: FakeResponse())
+
+    result = runner.invoke(app, ["login", "--no-browser"])
+    assert "no longer valid" in result.stdout