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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slack-objects
-Version: 0.0.8
+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.8 → 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.8'
-__version_tuple__ = version_tuple = (0, 0, 8)
+__version__ = version = '0.0.9'
+__version_tuple__ = version_tuple = (0, 0, 9)
 
-__commit_id__ = commit_id = 'g41dd54231'
+__commit_id__ = commit_id = 'g82c79f1f4'

{slack_objects-0.0.8 → 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.8 → 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.8
+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.8 → 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.8 → 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."""