cylera-cli 1.3.0__tar.gz → 1.3.2__tar.gz

{cylera_cli-1.3.0 → cylera_cli-1.3.2}/PKG-INFO

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

{cylera_cli-1.3.0 → cylera_cli-1.3.2}/cylera.py

@@ -362,28 +362,40 @@ def switchorg(
     try:
         with get_client() as client:
             org_api = Organization(client)
-            result = org_api.switch_organization(organization_id)
-            print_json(result)
-
-            current: dict[str, Any] = {}
-            for attempt in range(2):
-                print("Waiting for switch to take effect...", file=sys.stderr)
-                time.sleep(5)
-                current = org_api.get_organization()
-                if str(current.get("id", "")) == str(organization_id):
-                    print(
-                        f"Confirmed: now in org {current.get('name', organization_id)!r}",
-                        file=sys.stderr,
-                    )
-                    return
-                if attempt == 0:
-                    print("Not yet active, retrying...", file=sys.stderr)
-
-            print(
-                f"Warning: switch may still be pending. "
-                f"Current org: {current.get('name', 'unknown')!r}",
-                file=sys.stderr,
+            # 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] = {}
+        for attempt in range(2):
+            print("Waiting for switch to take effect...", file=sys.stderr)
+            time.sleep(5)
+            # A new client each time: a token from before the switch keeps
+            # acting on the old organization, and one from a WorkOS sign-in
+            # can't be renewed in place, so it has to be exchanged again.
+            with get_client() as client:
+                current = Organization(client).get_organization()
+            if target_name is not None and current.get("name") == target_name:
+                print(
+                    f"Confirmed: now in org {target_name!r}",
+                    file=sys.stderr,
+                )
+                return
+            if attempt == 0:
+                print("Not yet active, retrying...", file=sys.stderr)
+
+        print(
+            f"Warning: switch may still be pending. "
+            f"Current org: {current.get('name', 'unknown')!r}",
+            file=sys.stderr,
+        )
     except CyleraAPIError as e:
         print(f"API error: {e}", file=sys.stderr)
         raise typer.Exit(1)

{cylera_cli-1.3.0 → cylera_cli-1.3.2}/cylera_cli.egg-info/PKG-INFO

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

{cylera_cli-1.3.0 → cylera_cli-1.3.2}/pyproject.toml

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