mammoth-cli 2.2.80__tar.gz → 2.2.81__tar.gz

{mammoth_cli-2.2.80 → mammoth_cli-2.2.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mammoth-cli
-Version: 2.2.80
+Version: 2.2.81
 Summary: Command-line interface for the Mammoth Analytics platform
 Project-URL: homepage, https://mammoth.io
 Project-URL: repository, https://github.com/EdgeMetric/mammothsdk

{mammoth_cli-2.2.80 → mammoth_cli-2.2.81}/mammoth_cli/__init__.py

@@ -6,7 +6,7 @@ not implement a second HTTP client and does not call private SDK members.
 
 from __future__ import annotations
 
-__version__ = "2.2.80"
+__version__ = "2.2.81"
 
 # The versioned machine output envelope contract.
 SCHEMA_VERSION = 1

{mammoth_cli-2.2.80 → mammoth_cli-2.2.81}/mammoth_cli/commands/auth.py

@@ -382,6 +382,24 @@ def _login_server_prefix(profile_name: str, server_prefix: str | None) -> str |
     return existing.server_prefix if existing is not None else None
 
 
+def _warn_signed_out_profiles(
+    profile_name: str, base_url: str, session: credentials.OAuthSession
+) -> None:
+    """Warn about other profiles whose session this login just replaced on the server."""
+    others: dict[str, tuple[str, credentials.OAuthSession | None]] = {}
+    for name in profiles.list_profile_names():
+        record = profiles.get_profile(name)
+        credential = credentials.load_credential(name)
+        if name != profile_name and record is not None and credential is not None:
+            others[name] = (resolve_base_url(record.server_prefix), credential.oauth)
+    for name in oauth.signed_out_profiles(base_url, session, others):
+        typer.echo(
+            f'Warning: Profile "{name}" used the same Mammoth sign-in and is now signed out; '
+            f"sign it in again or remove it with mammoth auth logout --profile {name}.",
+            err=True,
+        )
+
+
 def _run_oauth_login(
     invocation: Invocation,
     *,
@@ -426,6 +444,7 @@ def _run_oauth_login(
         interactive=interactive,
         oauth=session,
     )
+    _warn_signed_out_profiles(profile_name, base_url, session)
     typer.echo(
         f"Signed in to workspace {workspace_id}. Credential stored in {storage_used} "
         f'(profile "{profile_name}"). The token refreshes automatically.',
@@ -752,8 +771,13 @@ def _revoke_oauth_connection(profile_name: str, warnings: list[str]) -> None:
             session = oauth.refresh_session(profile_name, base_url)
         problem = oauth.revoke_grant(base_url, session)
     except CliError as exc:
-        problem = f"Could not revoke the connection on the server: {exc.message}"
-    if problem is not None:
+        if exc.code == oauth.CODE_LOGIN_EXPIRED:
+            problem = oauth.GRANT_ALREADY_ENDED
+        else:
+            problem = f"Could not revoke the connection on the server: {exc.message}"
+    if problem == oauth.GRANT_ALREADY_ENDED:
+        typer.echo(f"{problem} Local credentials are still removed.", err=True)
+    elif problem is not None:
         warnings.append(problem)
         typer.echo(f"Warning: {problem} Local credentials are still removed.", err=True)
 

{mammoth_cli-2.2.80 → mammoth_cli-2.2.81}/mammoth_cli/context/oauth.py

@@ -643,9 +643,41 @@ def revoke_grant(base_url: str, session: OAuthSession) -> str | None:
         status = sdk_oauth.revoke_grant(base_url, session.grant_id, session.access)
     except sdk_oauth.OAuthTransportError:
         return "Could not reach Mammoth to revoke the connection on the server."
+    return revoke_status_note(status)
+
+
+#: Said when the server no longer knows this sign-in (another login rotated it, or it was removed).
+GRANT_ALREADY_ENDED = "This sign-in was already ended on the server; nothing to revoke."
+
+
+def revoke_status_note(status: int) -> str | None:
+    """Map a revoke response status to None (revoked), the already-ended note, or a warning."""
     if status in (200, 204):
         return None
+    if status in (401, 404):
+        return GRANT_ALREADY_ENDED
     return (
         f"Mammoth did not revoke the connection on the server (HTTP {status}). "
         "Remove it under Settings -> Connected apps."
     )
+
+
+def signed_out_profiles(
+    new_base_url: str,
+    new_session: OAuthSession,
+    others: dict[str, tuple[str, OAuthSession | None]],
+) -> list[str]:
+    """Names of other profiles on the same server that share the new session's grant.
+
+    The server keeps one connection per user and client, so a new login rotates the
+    tokens those profiles hold. ``others`` maps profile name to (base_url, session).
+    """
+    if new_session.grant_id is None:
+        return []
+    return sorted(
+        name
+        for name, (base_url, session) in others.items()
+        if base_url == new_base_url
+        and session is not None
+        and session.grant_id == new_session.grant_id
+    )

{mammoth_cli-2.2.80 → mammoth_cli-2.2.81}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mammoth-cli"
-version = "2.2.80"
+version = "2.2.81"
 description = "Command-line interface for the Mammoth Analytics platform"
 authors = [{name = "Mammoth Analytics", email = "support@mammoth.io"}]
 readme = "README.md"