diracx-cli 0.0.1a42__tar.gz → 0.0.1a44__tar.gz

{diracx_cli-0.0.1a42 → diracx_cli-0.0.1a44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-cli
-Version: 0.0.1a42
+Version: 0.0.1a44
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

{diracx_cli-0.0.1a42 → diracx_cli-0.0.1a44}/src/diracx/cli/auth.py

@@ -124,7 +124,9 @@ async def logout():
 
             # Revoke refresh token
             try:
-                await api.auth.revoke_refresh_token(credentials.refresh_token)
+                await api.auth.revoke_refresh_token_by_refresh_token(
+                    client_id=api.client_id, refresh_token=credentials.refresh_token
+                )
             except Exception as e:
                 print(f"Error revoking the refresh token {e!r}")
                 pass
@@ -132,6 +134,9 @@ async def logout():
             # Remove credentials
             credentials_path.unlink(missing_ok=True)
             print(f"Removed credentials from {credentials_path}")
+        else:
+            print("You are not connected to DiracX, or your credentials are missing.")
+            return
     print("\nLogout successful!")
 
 

{diracx_cli-0.0.1a42 → diracx_cli-0.0.1a44}/src/diracx/cli/utils.py

@@ -7,6 +7,7 @@ from functools import wraps
 
 import typer
 from azure.core.exceptions import ClientAuthenticationError
+from httpx import ConnectError
 from rich import print
 
 
@@ -22,6 +23,10 @@ class AsyncTyper(typer.Typer):
                         ":x: [bold red]You are not authenticated. Log in with:[/bold red] "
                         "[bold] dirac login [OPTIONS] [VO] [/bold]"
                     )
+                except ConnectError:
+                    print(
+                        ":x: [bold red]Please configure a valid DiracX server.[/bold red]"
+                    )
 
             self.command(*args, **kwargs)(sync_func)
             return async_func

{diracx_cli-0.0.1a42 → diracx_cli-0.0.1a44}/src/diracx_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-cli
-Version: 0.0.1a42
+Version: 0.0.1a44
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

{diracx_cli-0.0.1a42 → diracx_cli-0.0.1a44}/tests/test_login.py

@@ -31,8 +31,11 @@ async def test_logout(monkeypatch, capfd, cli_env, with_cli_login):
     # Rerun the logout command, it should not fail
     await cli.auth.logout()
     captured = capfd.readouterr()
-    assert "Removed credentials from" not in captured.out
-    assert "Logout successful!" in captured.out
+    assert (
+        "You are not connected to DiracX, or your credentials are missing."
+        in captured.out
+    )
+    assert "Login successful!" not in captured.out
     assert captured.err == ""
 
     # Ensure the credentials file still does not exist