cylera-cli 1.3.1__tar.gz → 1.3.3__tar.gz

{cylera_cli-1.3.1 → cylera_cli-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cylera-cli
-Version: 1.3.1
+Version: 1.3.3
 Summary: Command-line interface for the Cylera Partner API
 Author-email: Cylera <support@cylera.com>
 License-Expression: MIT

{cylera_cli-1.3.1 → cylera_cli-1.3.3}/cylera.py

@@ -287,7 +287,8 @@ def auth_login(
             open_browser=not no_browser)
         # Exchange before storing anything, so an account Cylera won't
         # accept isn't left half signed in.
-        token = cylera_auth.exchange_token(base_url, authentication["access_token"])
+        token = cylera_auth.exchange_token(
+            base_url, authentication["access_token"], authentication["user"]["email"], at_login=True)
     except CyleraLoginError as e:
         print(f"Error: {e}", file=sys.stderr)
         raise typer.Exit(1)
@@ -361,7 +362,16 @@ def switchorg(
     require_config()
     try:
         with get_client() as client:
-            result = Organization(client).switch_organization(organization_id)
+            org_api = Organization(client)
+            # GET /organization/ doesn't return the id switching takes (a
+            # mapping id, not the organization's), so the switch is
+            # confirmed by the target's name.
+            target_name = next(
+                (o.get("name") for o in org_api.get_available_organizations()
+                 if str(o.get("id")) == str(organization_id)),
+                None,
+            )
+            result = org_api.switch_organization(organization_id)
         print_json(result)
 
         current: dict[str, Any] = {}
@@ -373,9 +383,9 @@ def switchorg(
             # can't be renewed in place, so it has to be exchanged again.
             with get_client() as client:
                 current = Organization(client).get_organization()
-            if str(current.get("id", "")) == str(organization_id):
+            if target_name is not None and current.get("name") == target_name:
                 print(
-                    f"Confirmed: now in org {current.get('name', organization_id)!r}",
+                    f"Confirmed: now in org {target_name!r}",
                     file=sys.stderr,
                 )
                 return

{cylera_cli-1.3.1 → cylera_cli-1.3.3}/cylera_auth.py

@@ -134,8 +134,13 @@ def device_login(
     raise CyleraLoginError("The sign-in code expired. Run 'cylera auth login' again.")
 
 
-def exchange_token(base_url: str, workos_access_token: str) -> str:
-    """Exchange a WorkOS access token for a Cylera token."""
+def exchange_token(base_url: str, workos_access_token: str, email: str, at_login: bool = False) -> str:
+    """Exchange a WorkOS access token for a Cylera token.
+
+    email is the WorkOS account it was issued for, named if Cylera
+    refuses it. The exchange doesn't say why it refuses (no Cylera
+    account, not migrated yet, disabled), so the message doesn't guess.
+    """
     response = requests.post(
         f"{_key(base_url)}/auth/token_exchange",
         json={"token": workos_access_token},
@@ -145,9 +150,18 @@ def exchange_token(base_url: str, workos_access_token: str) -> str:
         raise CyleraLoginError(
             "This Cylera API doesn't support signing in through WorkOS yet.")
     if response.status_code == 401:
+        if at_login:
+            raise CyleraLoginError(
+                f"Cylera didn't accept the WorkOS account you signed in with ({email}).\n"
+                "If that's the wrong account, sign out of WorkOS in your browser, or open\n"
+                "the link in a private window with --no-browser. If it's yours, sign in to\n"
+                "the Cylera Portal once to finish setting up your account, or ask your\n"
+                "Cylera administrator for access."
+            )
         raise CyleraLoginError(
-            "Cylera refused your WorkOS sign-in. Sign in to the Cylera Portal "
-            "once to move your account to WorkOS, then try again."
+            f"Cylera no longer accepts the WorkOS account you signed in with ({email}).\n"
+            "Ask your Cylera administrator for access, or run 'cylera auth login' to\n"
+            "sign in with another account."
         )
     response.raise_for_status()
     return response.json()["token"]
@@ -185,4 +199,4 @@ def cylera_token(base_url: str) -> str:
         raise CyleraLoginError(f"WorkOS refresh failed: {response.text}")
     authentication = response.json()
     _store_login(base_url, {**login, "refresh_token": authentication["refresh_token"]})
-    return exchange_token(base_url, authentication["access_token"])
+    return exchange_token(base_url, authentication["access_token"], login["email"])

{cylera_cli-1.3.1 → cylera_cli-1.3.3}/cylera_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cylera-cli
-Version: 1.3.1
+Version: 1.3.3
 Summary: Command-line interface for the Cylera Partner API
 Author-email: Cylera <support@cylera.com>
 License-Expression: MIT

{cylera_cli-1.3.1 → cylera_cli-1.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cylera-cli"
-version = "1.3.1"
+version = "1.3.3"
 description = "Command-line interface for the Cylera Partner API"
 readme = "README.md"
 license = "MIT"