slack-objects 0.0.7__tar.gz → 0.0.9__tar.gz

{slack_objects-0.0.7 → slack_objects-0.0.9}/.github/copilot-instructions.md

@@ -1,4 +1,5 @@
 # Copilot Instructions
 
 ## Project Guidelines
-- Follow Unix philosophy: build small, composable functions where higher-level methods leverage lower-level primitives. Don't mix concerns (e.g., don't embed identifier resolution inside a SCIM CRUD method). Keep signatures consistent across sibling methods.
+- Follow Unix philosophy: build small, composable functions where higher-level methods leverage lower-level primitives. Don't mix concerns (e.g., don't embed identifier resolution inside a SCIM CRUD method). Keep signatures consistent across sibling methods.
+- Prefer consistency with the `Users.is_active`/`is_active_scim` pattern when structuring related methods (separate explicit SCIM method from higher-level orchestration).

{slack_objects-0.0.7 → slack_objects-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slack-objects
-Version: 0.0.7
+Version: 0.0.9
 Summary: Opinionated, testable Python wrappers for Slack’s Web, Admin, and SCIM APIs, organized by object domain (users, conversations, messages, files, workspaces, and IdP groups). Designed for automation and administration workflows.
 Author-email: "Marcos E. Mercado" <marcos_elias@hotmail.com>
 Keywords: slack,objects,classes,slack objects,utilities,slack utilities,slack object types,slack types,types

{slack_objects-0.0.7 → slack_objects-0.0.9}/src/slack_objects/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.7'
-__version_tuple__ = version_tuple = (0, 0, 7)
+__version__ = version = '0.0.9'
+__version_tuple__ = version_tuple = (0, 0, 9)
 
-__commit_id__ = commit_id = 'g654a737d1'
+__commit_id__ = commit_id = 'g82c79f1f4'

{slack_objects-0.0.7 → slack_objects-0.0.9}/src/slack_objects/config.py

@@ -38,6 +38,9 @@ class SlackObjectsConfig:
 	user_token: Optional[str] = field(default=None, repr=False)
 	scim_token: Optional[str] = field(default=None, repr=False)
 
+	# Workspace ID — required for org-wide tokens when calling workspace-scoped Web APIs
+	team_id: Optional[str] = None
+
 	default_rate_tier: RateTier = RateTier.TIER_2
 
 	auth_idp_groups_read_access: dict[str, list[str]] = field(default_factory=dict)
@@ -59,6 +62,7 @@ class SlackObjectsConfig:
 			f"bot_token={_mask(self.bot_token)}, "
 			f"user_token={_mask(self.user_token)}, "
 			f"scim_token={_mask(self.scim_token)}, "
+			f"team_id={self.team_id}, "
 			f"default_rate_tier={self.default_rate_tier}, "
 			f"auth_idp_groups_read_access={self.auth_idp_groups_read_access}, "
 			f"auth_idp_groups_write_access={self.auth_idp_groups_write_access}, "

{slack_objects-0.0.7 → slack_objects-0.0.9}/src/slack_objects/idp_groups.py

@@ -20,6 +20,7 @@ Design decisions
 - SCIM REST calls are centralized in ScimMixin._scim_request(); all public methods call endpoint wrappers.
 - Uses an injectable `requests.Session` (`scim_session`) so tests can pass a fake session.
 - Keeps legacy output shapes: lists of dicts for groups and members.
+- This module is SCIM-only. For Slack-native usergroups, see ``usergroups.py``.
 """
 
 from dataclasses import dataclass, field
@@ -58,6 +59,15 @@ class IDP_groups(ScimMixin, SlackObjectBase):
             scim_session=self.scim_session,
         )
 
+    # ---------- identifier resolution ----------
+
+    def _resolve_group_id(self, group_id: Optional[str] = None) -> str:
+        """Resolve group_id from argument or bound instance value."""
+        gid = group_id or self.group_id
+        if not gid:
+            raise ValueError("group_id is required (passed or bound)")
+        return gid
+
     # ---------- endpoint wrappers (only these call _scim_request) ----------
 
     def _scim_groups_list(self, *, count: int = 1000, start_index: Optional[int] = None) -> ScimResponse:
@@ -122,21 +132,20 @@ class IDP_groups(ScimMixin, SlackObjectBase):
 
     def get_members(self, group_id: Optional[str] = None) -> List[Dict[str, str]]:
         """
-        Return the members of a group as a list of dicts `{'value': <user_id>, 'display': <name>}`.
+        Return group members via SCIM (GET Groups/{id}) as a list of dicts `{'value': <user_id>, 'display': <name>}`.
 
-        If `group_id` omitted, uses bound `self.group_id`. Raises ValueError if none provided.
+        This module is SCIM-only. For Slack-native usergroups, see
+        ``Usergroups.get_members()`` in ``usergroups.py``.
         """
-        gid = group_id or self.group_id
-        if not gid:
-            raise ValueError("get_members requires group_id (passed or bound)")
-
+        gid = self._resolve_group_id(group_id)
         scim_resp = self._scim_group_get(gid)
-        # In the legacy scripts, group members are at `members` in the response body
         return scim_resp.data.get("members", [])
 
     def is_member(self, user_id: str, group_id: Optional[str] = None) -> bool:
         """
-        Return True if `user_id` is a member of `group_id`.
+        Return True if ``user_id`` is a member of ``group_id`` (via SCIM).
+
+        Higher-level convenience that composes on ``get_members()``.
         Preserves legacy semantics (scans the members list).
         """
         members = self.get_members(group_id=group_id)

slack_objects-0.0.9/src/slack_objects/usergroups.py

@@ -0,0 +1,105 @@
+from __future__ import annotations
+
+"""
+slack_objects.usergroups
+========================
+
+Usergroups helper for the `slack-objects` package.
+
+Purpose
+-------
+Manage Slack-native user groups via the Web API (usergroups.*).
+These are distinct from IdP (SCIM) groups managed in ``idp_groups.py``.
+
+Design decisions
+----------------
+- Only calls the Slack Web API via SlackApiCaller; no SCIM dependency.
+- Keeps the same output shape as IDP_groups members
+  (``[{'value': <user_id>, 'display': ''}]``) so callers can swap sources.
+"""
+
+from dataclasses import dataclass
+from typing import Any, Dict, List, Optional
+
+from .base import SlackObjectBase
+from .config import RateTier
+
+
+@dataclass
+class Usergroups(SlackObjectBase):
+    """
+    Slack-native usergroups helper.
+
+    Factory usage:
+        slack = SlackObjectsClient(cfg)
+        ug = slack.usergroups()              # unbound
+        bound = slack.usergroups("S0614TZR7") # bound to a usergroup_id
+    """
+    usergroup_id: Optional[str] = None
+
+    # ---------- factory ----------
+
+    def with_usergroup(self, usergroup_id: str) -> "Usergroups":
+        """Return a new instance bound to a particular usergroup_id, sharing cfg/client/logger/api."""
+        return Usergroups(
+            cfg=self.cfg,
+            client=self.client,
+            logger=self.logger,
+            api=self.api,
+            usergroup_id=usergroup_id,
+        )
+
+    # ---------- identifier resolution ----------
+
+    def _resolve_usergroup_id(self, usergroup_id: Optional[str] = None) -> str:
+        """Resolve usergroup_id from argument or bound instance value."""
+        ugid = usergroup_id or self.usergroup_id
+        if not ugid:
+            raise ValueError("usergroup_id is required (passed or bound)")
+        return ugid
+
+    # ---------- endpoint wrappers (only these call self.api.call) ----------
+
+    def _usergroups_list(self, **kwargs: Any) -> Dict[str, Any]:
+        """Wrapper for usergroups.list."""
+        if self.cfg.team_id:
+            kwargs.setdefault("team_id", self.cfg.team_id)
+        return self.api.call(self.client, "usergroups.list", rate_tier=RateTier.TIER_2, **kwargs)
+
+    def _usergroups_users_list(self, usergroup_id: str) -> Dict[str, Any]:
+        """Wrapper for usergroups.users.list."""
+        kwargs: Dict[str, Any] = {"usergroup": usergroup_id}
+        if self.cfg.team_id:
+            kwargs["team_id"] = self.cfg.team_id
+        return self.api.call(self.client, "usergroups.users.list", rate_tier=RateTier.TIER_2, **kwargs)
+
+    # ---------- public helpers ----------
+
+    def get_usergroups(self) -> List[Dict[str, Any]]:
+        """Return all usergroups visible to the bot token (usergroups.list)."""
+        resp = self._usergroups_list()
+        return resp.get("usergroups", [])
+
+    def get_members(self, usergroup_id: Optional[str] = None) -> List[Dict[str, str]]:
+        """
+        Return members of a Slack usergroup via the Web API (usergroups.users.list).
+
+        Returns the same shape as ``IDP_groups.get_members_scim()`` —
+        ``[{'value': <user_id>, 'display': ''}]`` — so callers can swap
+        sources without changing downstream code.
+
+        Requires the ``usergroups:read`` bot scope.
+        For org-wide tokens, ``cfg.team_id`` must be set.
+        """
+        ugid = self._resolve_usergroup_id(usergroup_id)
+        resp = self._usergroups_users_list(ugid)
+        users = resp.get("users", [])
+        return [{"value": uid, "display": ""} for uid in users]
+
+    def is_member(self, user_id: str, usergroup_id: Optional[str] = None) -> bool:
+        """Return True if ``user_id`` is a member of the usergroup."""
+        members = self.get_members(usergroup_id=usergroup_id)
+        for member in members:
+            if member.get("value") == user_id:
+                return True
+        return False

{slack_objects-0.0.7 → slack_objects-0.0.9}/src/slack_objects/users.py

@@ -268,7 +268,11 @@ class Users(ScimMixin, SlackObjectBase):
         if not uid:
             raise ValueError("is_active_scim requires user_id (passed or bound)")
 
-        scim_resp = self._scim_request(path=f"Users/{uid}", method="GET")
+        scim_resp = self._scim_request(
+            path=f"Users/{uid}",
+            method="GET",
+            raise_for_status=False,
+        )
         if not scim_resp.ok:
             return False
         return bool(scim_resp.data.get("active", False))
@@ -511,15 +515,27 @@ class Users(ScimMixin, SlackObjectBase):
 
         identifier = identifier.strip()
 
+        # Normalize: strip leading '@' so "@U1234" falls into the user-ID
+        # path and "@alice" falls into the username path — no special stage needed.
+        if identifier.startswith("@"):
+            identifier = identifier.removeprefix("@")
+
         # ── 1. Slack user ID ──────────────────────────────────────
         if self._looks_like_user_id(identifier):
-            resp = self.get_user_info(identifier)
-            if resp.get("ok"):
-                return identifier
+            try:
+                resp = self.get_user_info(identifier)
+                if resp.get("ok"):
+                    return identifier
+            except SlackApiError:
+                pass  # expected for deactivated / not-found users
 
             # Slow path: SCIM (active + deactivated)
             self.logger.info("Web API miss for %s — falling back to SCIM lookup", identifier)
-            scim_resp = self._scim_request(path=f"Users/{identifier}", method="GET")
+            scim_resp = self._scim_request(
+                path=f"Users/{identifier}",
+                method="GET",
+                raise_for_status=False,
+            )
             if scim_resp.ok and scim_resp.data.get("id"):
                 return scim_resp.data["id"]
 
@@ -528,12 +544,9 @@ class Users(ScimMixin, SlackObjectBase):
         # ── 2. Email address ──────────────────────────────────────
         if EMAIL_RE.match(identifier):
             # Fast path: Web API (active users only)
-            try:
-                uid = self.get_user_id_from_email(identifier)
-                if uid:
-                    return uid
-            except SlackApiError:
-                pass  # expected for deactivated / not-found users
+            uid = self.get_user_id_from_email(identifier)
+            if uid:
+                return uid
 
             # Slow path: SCIM (active + deactivated)
             self.logger.info("Web API miss for %s — falling back to SCIM search", identifier)
@@ -543,32 +556,9 @@ class Users(ScimMixin, SlackObjectBase):
 
             raise LookupError(f"No user found for email: {identifier}")
 
-        # ── 3. @username handle ───────────────────────────────────
-        if identifier.startswith("@"):
-            stripped = identifier.removeprefix("@")
-
-            # The caller may have passed "@U1234" — recognise the ID
-            # and verify via the cheaper Web API instead of SCIM.
-            if self._looks_like_user_id(stripped):
-                resp = self.get_user_info(stripped)
-                if resp.get("ok"):
-                    return stripped
-
-                # Slow path: SCIM (active + deactivated)
-                self.logger.info("Web API miss for %s — falling back to SCIM lookup", stripped)
-                scim_resp = self._scim_request(path=f"Users/{stripped}", method="GET")
-                if scim_resp.ok and scim_resp.data.get("id"):
-                    return scim_resp.data["id"]
-
-                raise LookupError(f"No user found for user ID: {stripped}")
-
-            uid = self._first_scim_user_id(self.scim_search_user_by_username(stripped))
-            if uid:
-                return uid
-
-            raise LookupError(f"No user found for username: @{stripped}")
-
-        # ── 4. Bare string — try as username via SCIM ─────────────
+        # ── 3. Bare string / username — SCIM only ─────────────────
+        # No Web API endpoint exists for username lookup; SCIM is the
+        # only option. This also handles "@alice" (already stripped above).
         uid = self._first_scim_user_id(self.scim_search_user_by_username(identifier))
         if uid:
             return uid

{slack_objects-0.0.7 → slack_objects-0.0.9}/src/slack_objects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slack-objects
-Version: 0.0.7
+Version: 0.0.9
 Summary: Opinionated, testable Python wrappers for Slack’s Web, Admin, and SCIM APIs, organized by object domain (users, conversations, messages, files, workspaces, and IdP groups). Designed for automation and administration workflows.
 Author-email: "Marcos E. Mercado" <marcos_elias@hotmail.com>
 Keywords: slack,objects,classes,slack objects,utilities,slack utilities,slack object types,slack types,types

{slack_objects-0.0.7 → slack_objects-0.0.9}/src/slack_objects.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ src/slack_objects/idp_groups.py
 src/slack_objects/messages.py
 src/slack_objects/rate_limits.py
 src/slack_objects/scim_base.py
+src/slack_objects/usergroups.py
 src/slack_objects/users.py
 src/slack_objects/workspaces.py
 src/slack_objects.egg-info/PKG-INFO
@@ -49,6 +50,7 @@ tests/Smoke/idp_groups_smoke_test.py
 tests/Smoke/messages_smoke_test.py
 tests/Smoke/run_all_smoke.py
 tests/Smoke/security_smoke_test.py
+tests/Smoke/usergroups_smoke_test.py
 tests/Smoke/users_smoke_test.py
 tests/Smoke/workspaces_smoke_test.py
 tests/UnitTests/config_unit_test.py
@@ -57,6 +59,7 @@ tests/UnitTests/files_unit_test.py
 tests/UnitTests/idp_groups_unit_test.py
 tests/UnitTests/messages_unit_test.py
 tests/UnitTests/rate_limits_unit_test.py
+tests/UnitTests/usergroups_test.py
 tests/UnitTests/users_unit_test.py
 tests/UnitTests/workspaces_unit_test.py
 tests/Users/conftest_live.py

{slack_objects-0.0.7 → slack_objects-0.0.9}/tests/Smoke/_smoke_harness.py

@@ -190,6 +190,21 @@ class FakeWebClient:
                 "offset": "",
             }
 
+        # ---------------------------
+        # Usergroups
+        # ---------------------------
+        if method == "usergroups.list":
+            return {
+                "ok": True,
+                "usergroups": [
+                    {"id": "S0614TZR7", "name": "Team Admins", "handle": "admins"},
+                    {"id": "S0615ABC8", "name": "Developers", "handle": "devs"},
+                ],
+            }
+
+        if method == "usergroups.users.list":
+            return {"ok": True, "users": ["U1", "U2"]}
+
         # Default: ok True
         return {"ok": True}
 

{slack_objects-0.0.7 → slack_objects-0.0.9}/tests/Smoke/run_all_smoke.py

@@ -15,6 +15,7 @@ from tests.Smoke.idp_groups_smoke_test import main as idp_main
 from tests.Smoke.workspaces_smoke_test import main as workspaces_main
 from tests.Smoke.api_caller_smoke_test import main as api_caller_main
 from tests.Smoke.security_smoke_test import main as security_main
+from tests.Smoke.usergroups_smoke_test import main as usergroups_main
 
 
 def main() -> None:
@@ -26,6 +27,7 @@ def main() -> None:
     workspaces_main()
     api_caller_main()
     security_main()
+    usergroups_main()
     print("\n✅ All smoke tests completed successfully.")
 
 

slack_objects-0.0.9/tests/Smoke/usergroups_smoke_test.py

@@ -0,0 +1,58 @@
+from __future__ import annotations
+
+import logging
+
+from slack_objects.config import SlackObjectsConfig, RateTier
+from slack_objects.usergroups import Usergroups
+
+from tests.Smoke._smoke_harness import (
+    FakeWebClient,
+    FakeApiCaller,
+    CallSpec,
+    run_smoke,
+)
+
+
+def main() -> None:
+    logging.basicConfig(level=logging.INFO)
+    logger = logging.getLogger("smoke.usergroups")
+
+    cfg = SlackObjectsConfig(
+        bot_token="xoxb-fake",
+        default_rate_tier=RateTier.TIER_4,
+    )
+
+    client = FakeWebClient()
+    api = FakeApiCaller(cfg)
+
+    ug = Usergroups(
+        cfg=cfg,
+        client=client,
+        api=api,
+        logger=logger,
+    )
+
+    bound = ug.with_usergroup("S0614TZR7")
+
+    specs = [
+        # Factory helper
+        CallSpec("with_usergroup()", lambda: ug.with_usergroup("S0614TZR7")),
+
+        # Listing
+        CallSpec("get_usergroups()", lambda: ug.get_usergroups()),
+
+        # Members
+        CallSpec("get_members(by arg)", lambda: ug.get_members("S0614TZR7")),
+        CallSpec("get_members(bound)", lambda: bound.get_members()),
+
+        # Membership check
+        CallSpec("is_member(hit)", lambda: ug.is_member(user_id="U1", usergroup_id="S0614TZR7")),
+        CallSpec("is_member(miss)", lambda: ug.is_member(user_id="U_UNKNOWN", usergroup_id="S0614TZR7")),
+        CallSpec("is_member(bound)", lambda: bound.is_member(user_id="U2")),
+    ]
+
+    run_smoke("Usergroups smoke (all public methods)", specs)
+
+
+if __name__ == "__main__":
+    main()

{slack_objects-0.0.7 → slack_objects-0.0.9}/tests/Smoke/users_smoke_test.py

@@ -169,6 +169,8 @@ def main() -> None:
 
         # Identifier resolution
         CallSpec("resolve_user_id(user_id)", lambda: bound.resolve_user_id("U1")),
+        CallSpec("resolve_user_id(email)", lambda: bound.resolve_user_id("found@example.com")),
+        CallSpec("resolve_user_id(@username)", lambda: bound.resolve_user_id("@testuser")),
     ]
 
     run_smoke("Users smoke (all public methods)", specs)

slack_objects-0.0.9/tests/UnitTests/usergroups_test.py

@@ -0,0 +1,192 @@
+"""
+Unit tests for slack_objects.usergroups
+=======================================
+
+All Slack API calls are mocked via ``api.call`` to test logic in isolation.
+
+Run:  python -m pytest tests/UnitTests/usergroups_test.py -v --tb=short
+"""
+
+from __future__ import annotations
+
+import logging
+from unittest.mock import MagicMock
+
+import pytest
+
+from slack_objects.config import SlackObjectsConfig, RateTier
+from slack_objects.api_caller import SlackApiCaller
+from slack_objects.usergroups import Usergroups
+
+
+# ---------- helpers ----------
+
+def _make_usergroups(
+    *,
+    usergroup_id: str | None = None,
+    team_id: str | None = None,
+) -> tuple[Usergroups, MagicMock]:
+    """Return a ``Usergroups`` instance with a mocked ``api.call``."""
+    cfg = SlackObjectsConfig(bot_token="xoxb-fake", team_id=team_id)
+    client = MagicMock()
+    api = MagicMock(spec=SlackApiCaller)
+    ug = Usergroups(
+        cfg=cfg,
+        client=client,
+        api=api,
+        logger=logging.getLogger("test"),
+        usergroup_id=usergroup_id,
+    )
+    return ug, api.call
+
+
+# ---------- factory ----------
+
+class TestWithUsergroup:
+    def test_returns_new_bound_instance(self):
+        ug, _ = _make_usergroups()
+        bound = ug.with_usergroup("S0614TZR7")
+        assert bound.usergroup_id == "S0614TZR7"
+        assert bound is not ug
+
+    def test_shares_cfg_and_api(self):
+        ug, _ = _make_usergroups()
+        bound = ug.with_usergroup("S0614TZR7")
+        assert bound.cfg is ug.cfg
+        assert bound.api is ug.api
+        assert bound.client is ug.client
+
+
+# ---------- identifier resolution ----------
+
+class TestResolveUsergroupId:
+    def test_uses_passed_value(self):
+        ug, _ = _make_usergroups(usergroup_id="SBOUND")
+        assert ug._resolve_usergroup_id("SPASSED") == "SPASSED"
+
+    def test_falls_back_to_bound(self):
+        ug, _ = _make_usergroups(usergroup_id="SBOUND")
+        assert ug._resolve_usergroup_id() == "SBOUND"
+
+    def test_raises_when_missing(self):
+        ug, _ = _make_usergroups()
+        with pytest.raises(ValueError, match="usergroup_id is required"):
+            ug._resolve_usergroup_id()
+
+
+# ---------- endpoint wrappers ----------
+
+class TestUsergroupsList:
+    def test_injects_team_id_when_configured(self):
+        ug, mock_call = _make_usergroups(team_id="T1234")
+        mock_call.return_value = {"ok": True, "usergroups": []}
+        ug._usergroups_list()
+        _, kwargs = mock_call.call_args
+        assert kwargs.get("team_id") == "T1234"
+
+    def test_omits_team_id_when_not_configured(self):
+        ug, mock_call = _make_usergroups(team_id=None)
+        mock_call.return_value = {"ok": True, "usergroups": []}
+        ug._usergroups_list()
+        _, kwargs = mock_call.call_args
+        assert "team_id" not in kwargs
+
+    def test_does_not_override_explicit_team_id(self):
+        ug, mock_call = _make_usergroups(team_id="TCFG")
+        mock_call.return_value = {"ok": True, "usergroups": []}
+        ug._usergroups_list(team_id="TEXPLICIT")
+        _, kwargs = mock_call.call_args
+        assert kwargs.get("team_id") == "TEXPLICIT"
+
+
+class TestUsergroupsUsersList:
+    def test_injects_team_id_when_configured(self):
+        ug, mock_call = _make_usergroups(team_id="T1234")
+        mock_call.return_value = {"ok": True, "users": []}
+        ug._usergroups_users_list("S123")
+        _, kwargs = mock_call.call_args
+        assert kwargs.get("team_id") == "T1234"
+        assert kwargs.get("usergroup") == "S123"
+
+    def test_omits_team_id_when_not_configured(self):
+        ug, mock_call = _make_usergroups(team_id=None)
+        mock_call.return_value = {"ok": True, "users": []}
+        ug._usergroups_users_list("S123")
+        _, kwargs = mock_call.call_args
+        assert "team_id" not in kwargs
+
+
+# ---------- get_usergroups ----------
+
+class TestGetUsergroups:
+    def test_returns_usergroups_list(self):
+        ug, mock_call = _make_usergroups()
+        mock_call.return_value = {
+            "ok": True,
+            "usergroups": [
+                {"id": "S1", "name": "admins"},
+                {"id": "S2", "name": "devs"},
+            ],
+        }
+        result = ug.get_usergroups()
+        assert len(result) == 2
+        assert result[0]["id"] == "S1"
+
+    def test_returns_empty_list_on_missing_key(self):
+        ug, mock_call = _make_usergroups()
+        mock_call.return_value = {"ok": True}
+        assert ug.get_usergroups() == []
+
+
+# ---------- get_members ----------
+
+class TestGetMembers:
+    def test_returns_correct_shape(self):
+        ug, mock_call = _make_usergroups(usergroup_id="S123")
+        mock_call.return_value = {"ok": True, "users": ["U1", "U2", "U3"]}
+        members = ug.get_members()
+        assert members == [
+            {"value": "U1", "display": ""},
+            {"value": "U2", "display": ""},
+            {"value": "U3", "display": ""},
+        ]
+
+    def test_accepts_explicit_usergroup_id(self):
+        ug, mock_call = _make_usergroups()
+        mock_call.return_value = {"ok": True, "users": ["U9"]}
+        members = ug.get_members(usergroup_id="SEXPLICIT")
+        assert members == [{"value": "U9", "display": ""}]
+
+    def test_empty_users(self):
+        ug, mock_call = _make_usergroups(usergroup_id="S123")
+        mock_call.return_value = {"ok": True, "users": []}
+        assert ug.get_members() == []
+
+    def test_raises_without_usergroup_id(self):
+        ug, _ = _make_usergroups()
+        with pytest.raises(ValueError, match="usergroup_id is required"):
+            ug.get_members()
+
+
+# ---------- is_member ----------
+
+class TestIsMember:
+    def test_true_when_present(self):
+        ug, mock_call = _make_usergroups(usergroup_id="S123")
+        mock_call.return_value = {"ok": True, "users": ["U1", "U2"]}
+        assert ug.is_member("U2") is True
+
+    def test_false_when_absent(self):
+        ug, mock_call = _make_usergroups(usergroup_id="S123")
+        mock_call.return_value = {"ok": True, "users": ["U1", "U2"]}
+        assert ug.is_member("U999") is False
+
+    def test_accepts_explicit_usergroup_id(self):
+        ug, mock_call = _make_usergroups()
+        mock_call.return_value = {"ok": True, "users": ["UTARGET"]}
+        assert ug.is_member("UTARGET", usergroup_id="SEXPLICIT") is True
+
+    def test_raises_without_usergroup_id(self):
+        ug, _ = _make_usergroups()
+        with pytest.raises(ValueError, match="usergroup_id is required"):
+            ug.is_member("U1")

{slack_objects-0.0.7 → slack_objects-0.0.9}/tests/UnitTests/users_unit_test.py

@@ -3,6 +3,7 @@ from typing import Any, Dict, Optional
 from unittest.mock import MagicMock
 
 import pytest
+from slack_sdk.errors import SlackApiError
 
 from slack_objects.client import SlackObjectsClient
 from slack_objects.config import SlackObjectsConfig, RateTier, USER_ID_RE
@@ -182,6 +183,9 @@ class TestResolveUserId:
         )
         with pytest.raises(LookupError, match="No user found for user ID"):
             users.resolve_user_id("U00GHOST")
+        users._scim_request.assert_called_once_with(
+            path="Users/U00GHOST", method="GET", raise_for_status=False,
+        )
 
     def test_email_active_user(self):
         """Active user email resolves via Web API (fast path)."""
@@ -221,7 +225,7 @@ class TestResolveUserId:
         scim_resp = ScimResponse(ok=True, status_code=200, data={"Resources": []}, text="")
         users.scim_search_user_by_username = MagicMock(return_value=scim_resp)
 
-        with pytest.raises(LookupError, match="No user found for username"):
+        with pytest.raises(LookupError, match="No user found for identifier"):
             users.resolve_user_id("@ghost")
 
     def test_bare_username(self):
@@ -258,6 +262,43 @@ class TestResolveUserId:
         )
         with pytest.raises(LookupError, match="No user found for user ID"):
             users.resolve_user_id("@U00GHOST")
+        users._scim_request.assert_called_once_with(
+            path="Users/U00GHOST", method="GET", raise_for_status=False,
+        )
+
+    def test_user_id_slack_api_error_falls_back_to_scim(self):
+        """SlackApiError from users.info falls through to SCIM lookup."""
+        users = _make_users()
+        users.get_user_info = MagicMock(
+            side_effect=SlackApiError("users_not_found", response=MagicMock())
+        )
+        scim_resp = ScimResponse(
+            ok=True, status_code=200,
+            data={"id": "USCIM", "userName": "scim-user", "active": True},
+            text="",
+        )
+        users._scim_request = MagicMock(return_value=scim_resp)
+
+        assert users.resolve_user_id("USCIM") == "USCIM"
+        users._scim_request.assert_called_once_with(
+            path="Users/USCIM", method="GET", raise_for_status=False,
+        )
+
+    def test_user_id_slack_api_error_and_scim_miss_raises(self):
+        """SlackApiError + SCIM miss still raises LookupError."""
+        users = _make_users()
+        users.get_user_info = MagicMock(
+            side_effect=SlackApiError("users_not_found", response=MagicMock())
+        )
+        users._scim_request = MagicMock(
+            return_value=ScimResponse(ok=False, status_code=404, data={}, text="")
+        )
+        with pytest.raises(LookupError, match="No user found for user ID"):
+            users.resolve_user_id("U00GHOST")
+        users._scim_request.assert_called_once_with(
+            path="Users/U00GHOST", method="GET", raise_for_status=False,
+        )
+
 
 # ═══════════════════════════════════════════════════════════════════════════
 # is_user_authorized
@@ -373,7 +414,9 @@ class TestIsActiveScim:
             return_value=ScimResponse(ok=True, status_code=200, data={"id": "U_OTHER", "active": True}, text=""),
         )
         assert bound.is_active_scim(user_id="U_OTHER") is True
-        bound._scim_request.assert_called_once_with(path="Users/U_OTHER", method="GET")
+        bound._scim_request.assert_called_once_with(
+            path="Users/U_OTHER", method="GET", raise_for_status=False,
+        )
 
     def test_no_user_id_raises(self):
         """Unbound instance with no user_id raises ValueError."""