bt-cli 0.4.30__tar.gz → 0.4.31__tar.gz

{bt_cli-0.4.30 → bt_cli-0.4.31}/CLAUDE.md

@@ -1,6 +1,6 @@
 # BT-CLI
 
-BeyondTrust Platform CLI for Password Safe, Entitle, PRA, and EPM Windows. **Version: 0.4.29**
+BeyondTrust Platform CLI for Password Safe, Entitle, PRA, and EPM Windows. **Version: 0.4.31**
 
 ## Setup
 

{bt_cli-0.4.30 → bt_cli-0.4.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bt-cli
-Version: 0.4.30
+Version: 0.4.31
 Summary: BeyondTrust Platform CLI (unofficial) - Password Safe, Entitle, PRA, EPM
 Author-email: Dave Grendysz <dgrendysz@beyondtrust.com>
 License: MIT

{bt_cli-0.4.30 → bt_cli-0.4.31}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bt-cli"
-version = "0.4.30"
+version = "0.4.31"
 description = "BeyondTrust Platform CLI (unofficial) - Password Safe, Entitle, PRA, EPM"
 readme = "README.md"
 requires-python = ">=3.9"

{bt_cli-0.4.30 → bt_cli-0.4.31}/src/bt_cli/__init__.py

@@ -1,3 +1,3 @@
 """BeyondTrust Unified Admin CLI."""
 
-__version__ = "0.4.30"
+__version__ = "0.4.31"

{bt_cli-0.4.30 → bt_cli-0.4.31}/src/bt_cli/pws/client/passwordsafe.py

@@ -821,16 +821,29 @@ class PasswordSafeMixin:
     ) -> list[dict[str, Any]]:
         """List user groups.
 
-        Args:
-            search: Optional name filter
-
-        Returns:
-            List of user group objects
+        /UserGroups does not support pagination. The ``name`` server-side
+        param is an exact match, so filtering is handled client-side.
         """
-        params = {}
+        result = self.get("/UserGroups")
+        if isinstance(result, list):
+            groups = result
+        elif isinstance(result, dict):
+            if "GroupID" in result:
+                groups = [result]
+            else:
+                groups = result.get("Data", result.get("results", []))
+        else:
+            groups = []
+
         if search:
-            params["name"] = search
-        return self.paginate("/UserGroups", params=params)
+            search_lower = search.lower()
+            groups = [
+                g for g in groups
+                if search_lower in (g.get("Name", "") or "").lower()
+                or search_lower in (g.get("Description", "") or "").lower()
+            ]
+
+        return groups
 
     def get_user_group(self: "PasswordSafeClient", group_id: int) -> dict[str, Any]:
         """Get a user group by ID.
@@ -848,13 +861,16 @@ class PasswordSafeMixin:
     ) -> list[dict[str, Any]]:
         """Get users in a user group.
 
-        Args:
-            group_id: User group ID
-
-        Returns:
-            List of user objects (includes ClientID, AccessPolicyID for API users)
+        /UserGroups/{id}/Users does not support pagination.
         """
-        return self.paginate(f"/UserGroups/{group_id}/Users")
+        result = self.get(f"/UserGroups/{group_id}/Users")
+        if isinstance(result, list):
+            return result
+        if isinstance(result, dict):
+            if "UserID" in result:
+                return [result]
+            return result.get("Data", result.get("results", []))
+        return []
 
     # =========================================================================
     # Users
@@ -864,20 +880,29 @@ class PasswordSafeMixin:
         self: "PasswordSafeClient",
         search: Optional[str] = None,
         limit: Optional[int] = None,
+        include_inactive: bool = False,
     ) -> list[dict[str, Any]]:
         """List users.
 
-        Args:
-            search: Optional username search filter (client-side filtering)
-            limit: Maximum number of results (None for all)
-
-        Returns:
-            List of user objects
+        /Users does not support pagination. The ``username`` server-side
+        param is an exact match (returns a single user dict or 404), so
+        searching is handled client-side across username/first/last/email.
         """
-        # API doesn't support server-side search, so we fetch all and filter client-side
-        users = self.paginate("/Users")
+        params: dict[str, Any] = {}
+        if include_inactive:
+            params["includeInactive"] = "true"
+
+        result = self.get("/Users", params=params)
+        if isinstance(result, list):
+            users = result
+        elif isinstance(result, dict):
+            if "UserID" in result:
+                users = [result]
+            else:
+                users = result.get("Data", result.get("results", []))
+        else:
+            users = []
 
-        # Apply client-side search filter
         if search:
             search_lower = search.lower()
             users = [
@@ -888,7 +913,6 @@ class PasswordSafeMixin:
                 or search_lower in (u.get("EmailAddress", "") or "").lower()
             ]
 
-        # Apply limit
         if limit is not None:
             users = users[:limit]
 

{bt_cli-0.4.30 → bt_cli-0.4.31}/src/bt_cli/pws/commands/users.py

@@ -179,23 +179,29 @@ def print_roles_table(roles: list[dict], title: str = "Roles") -> None:
 
 @app.command("list")
 def list_users(
-    search: Optional[str] = typer.Option(None, "--search", "-s", help="Search by username"),
+    search: Optional[str] = typer.Option(None, "--search", "-s", help="Search by username (also matches first/last/email)"),
     limit: int = typer.Option(50, "--limit", "-l", help="Maximum results (default: 50)"),
-    fetch_all: bool = typer.Option(False, "--all", help="Fetch all results (may be slow)"),
+    fetch_all: bool = typer.Option(False, "--all", help="Fetch all results"),
+    include_inactive: bool = typer.Option(False, "--include-inactive", help="Include inactive users"),
     output: str = typer.Option("table", "--output", "-o", help="Output format: table or json"),
 ) -> None:
     """List all users.
 
     Examples:
-        bt pws users list                    # First 50 users
-        bt pws users list --all              # All users
+        bt pws users list                    # First 50 active users
+        bt pws users list --all              # All active users
+        bt pws users list --include-inactive # Include inactive users
         bt pws users list -s "admin"         # Search by username
         bt pws users list -o json            # JSON output
     """
     try:
         with get_client() as client:
             client.authenticate()
-            users = client.list_users(search=search, limit=None if fetch_all else limit)
+            users = client.list_users(
+                search=search,
+                limit=None if fetch_all else limit,
+                include_inactive=include_inactive,
+            )
 
         if output == "json":
             console.print_json(json.dumps(users, default=str))