scim2-server 0.8.1__tar.gz → 0.8.2__tar.gz

{scim2_server-0.8.1 → scim2_server-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: scim2-server
-Version: 0.8.1
+Version: 0.8.2
 Summary: SCIM server core for any storage and web framework
 Keywords: scim,scim2,provisioning,rfc7643,rfc7644
 Author: Yaal Coop, Christian Friedrich Coors

{scim2_server-0.8.1 → scim2_server-0.8.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "scim2-server"
-version = "0.8.1"
+version = "0.8.2"
 description = "SCIM server core for any storage and web framework"
 readme = "README.md"
 keywords = [
@@ -80,6 +80,7 @@ doc = [
 ]
 
 [tool.uv]
+required-version = ">=0.12.13"
 exclude-newer = "14 days"
 
 [tool.uv.exclude-newer-package]
@@ -198,6 +199,10 @@ uv_resolution = "lowest-direct"
 
 [tool.tox.env.doc]
 dependency_groups = ["doc"]
+extras = [
+    "cursor",
+    "testing",
+]
 commands = [[
     "sphinx-build",
     "-W",

{scim2_server-0.8.1 → scim2_server-0.8.2}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "scim2-server"
-version = "0.8.1"
+version = "0.8.2"
 description = "SCIM server core for any storage and web framework"
 authors = [
     {name="Yaal Coop", email="contact@yaal.coop"},
@@ -77,6 +77,7 @@ doc = [
 ]
 
 [tool.uv]
+required-version = ">=0.12.13"
 exclude-newer = "14 days"
 exclude-newer-package = { scim2-models = false, scim2-client = false, scim2-server = false, scim2-cli = false, scim2-tester = false, pytest-scim2-server = false }
 
@@ -181,6 +182,7 @@ uv_resolution = "lowest-direct"
 
 [tool.tox.env.doc]
 dependency_groups = ["doc"]
+extras = ["cursor", "testing"]
 commands = [
     ["sphinx-build", "-W", "--keep-going", "--builder", "html", "doc", "build/sphinx/html"],
 ]

{scim2_server-0.8.1 → scim2_server-0.8.2}/scim2_server/testing.py

@@ -29,6 +29,7 @@ from typing import Union
 from typing import cast
 
 import pytest
+from pydantic import ValidationError
 from scim2_models import Context
 from scim2_models import InvalidFilterException
 from scim2_models import InvalidPathException
@@ -232,6 +233,18 @@ class ScimStorageContract:
             for user_name in user_names
         ]
 
+    def create_group(
+        self,
+        storage: ScimStorage,
+        group_type: ResourceType,
+        group_model: Any,
+        member: Any,
+    ) -> Any:
+        return storage.create(
+            group_type,
+            group_model(display_name="admins", members=[{"value": member.id}]),
+        )
+
     def test_create_fills_the_identifier_and_the_meta(
         self, storage: Any, user_type: ResourceType, user_model: Any
     ) -> None:
@@ -497,8 +510,8 @@ class ScimStorageContract:
         group_model: Any,
     ) -> None:
         """A search on a resource type returns its resources only, and counts them."""
-        self.create_users(storage, user_type, user_model, "alice", "bob")
-        storage.create(group_type, group_model(display_name="admins"))
+        users = self.create_users(storage, user_type, user_model, "alice", "bob")
+        self.create_group(storage, group_type, group_model, users[0])
 
         page = self.search(storage, [user_type], self.search_request([user_model]))
 
@@ -594,8 +607,8 @@ class ScimStorageContract:
     ) -> None:
         """A search on several resource types returns their resources as one collection."""
         self.require(self.supports_root_search, "searching at the root")
-        self.create_users(storage, user_type, user_model, "alice")
-        storage.create(group_type, group_model(display_name="admins"))
+        (user,) = self.create_users(storage, user_type, user_model, "alice")
+        self.create_group(storage, group_type, group_model, user)
 
         page = self.search(
             storage,
@@ -621,8 +634,8 @@ class ScimStorageContract:
         """An attribute a resource type does not declare matches none of its resources."""
         self.require(self.supports_root_search, "searching at the root")
         self.require(self.announces(provider, "filter"), "filtering")
-        self.create_users(storage, user_type, user_model, "alice")
-        storage.create(group_type, group_model(display_name="admins"))
+        (user,) = self.create_users(storage, user_type, user_model, "alice")
+        self.create_group(storage, group_type, group_model, user)
 
         page = self.search(
             storage,
@@ -640,6 +653,21 @@ class ScimStorageContract:
         """
         return SEARCH_USERS
 
+    def search_request_or_skip(
+        self, models: list[type[Resource[Any]]], **parameters: Any
+    ) -> SearchRequest[Any]:
+        """Build a search request, and skip the current test when the models do not declare an attribute of the filter or the sort."""
+        try:
+            return self.search_request(models, **parameters)
+        except ValidationError as exception:
+            errors = exception.errors()
+            if any(
+                error["type"] not in ("scim_invalidFilter", "scim_invalidPath")
+                for error in errors
+            ):
+                raise
+            pytest.skip(f"The models refuse the search: {errors[0]['msg']}")
+
     def search_or_skip(
         self,
         storage: Any,
@@ -666,7 +694,7 @@ class ScimStorageContract:
         for user in self.search_users():
             storage.create(user_type, user_model.model_validate(user))
         stored = self.search(storage, [user_type], self.search_request([user_model]))
-        search_request = self.search_request([user_model], filter=scim_filter)
+        search_request = self.search_request_or_skip([user_model], filter=scim_filter)
 
         page = self.search_or_skip(storage, [user_type], search_request)
 
@@ -694,7 +722,7 @@ class ScimStorageContract:
         for user in self.search_users():
             storage.create(user_type, user_model.model_validate(user))
         stored = self.search(storage, [user_type], self.search_request([user_model]))
-        search_request = self.search_request(
+        search_request = self.search_request_or_skip(
             [user_model], sort_by=sort_by, sort_order=sort_order
         )
 
@@ -743,6 +771,7 @@ class ScimStorageContract:
         self, storage: Any, user_type: ResourceType, user_model: Any
     ) -> None:
         """Following the next cursors returns every resource once, count by count."""
+        self.require(storage.supports_cursors, "cursor pagination")
         names = ["alice", "bob", "carol", "dave", "erin"]
         self.create_users(storage, user_type, user_model, *names)
 
@@ -763,6 +792,7 @@ class ScimStorageContract:
         user_model: Any,
     ) -> None:
         """The pages of a sorted search follow each other in the sort order."""
+        self.require(storage.supports_cursors, "cursor pagination")
         self.require(self.announces(provider, "sort"), "sorting")
         self.create_users(
             storage, user_type, user_model, "dave", "alice", "carol", "bob"
@@ -795,7 +825,9 @@ class ScimStorageContract:
         user_model: Any,
     ) -> None:
         """Resources with the same sort value, or without one, are returned once, even across pages."""
+        self.require(storage.supports_cursors, "cursor pagination")
         self.require(self.announces(provider, "sort"), "sorting")
+        self.require("nick_name" in user_model.model_fields, "nickName")
         for user_name, nick_name in [
             ("alice", "twin"),
             ("bob", None),
@@ -821,6 +853,7 @@ class ScimStorageContract:
         self, storage: Any, user_type: ResourceType, user_model: Any
     ) -> None:
         """Following the previous cursors from the last page returns the same pages, back to the first."""
+        self.require(storage.supports_cursors, "cursor pagination")
         self.create_users(
             storage, user_type, user_model, "alice", "bob", "carol", "dave", "erin"
         )
@@ -839,6 +872,7 @@ class ScimStorageContract:
         self, storage: Any, user_type: ResourceType, user_model: Any, deleted: str
     ) -> None:
         """Deleting a resource already returned does not skip nor repeat the next ones."""
+        self.require(storage.supports_cursors, "cursor pagination")
         self.create_users(
             storage, user_type, user_model, "alice", "bob", "carol", "dave", "erin"
         )
@@ -860,6 +894,7 @@ class ScimStorageContract:
         self, storage: Any, user_type: ResourceType, user_model: Any
     ) -> None:
         """Creating a resource between two pages does not skip nor repeat the existing ones."""
+        self.require(storage.supports_cursors, "cursor pagination")
         self.create_users(
             storage, user_type, user_model, "alice", "bob", "carol", "dave", "erin"
         )
@@ -881,6 +916,7 @@ class ScimStorageContract:
         self, storage: Any, user_type: ResourceType, user_model: Any
     ) -> None:
         """Deleting the first resource of a page does not change the page before it."""
+        self.require(storage.supports_cursors, "cursor pagination")
         self.create_users(
             storage, user_type, user_model, "alice", "bob", "carol", "dave", "erin"
         )
@@ -920,9 +956,10 @@ class ScimStorageContract:
         group_model: Any,
     ) -> None:
         """A cursor pages the resources of several resource types as one collection."""
+        self.require(storage.supports_cursors, "cursor pagination")
         self.require(self.supports_root_search, "searching at the root")
         users = self.create_users(storage, user_type, user_model, "alice", "bob")
-        group = storage.create(group_type, group_model(display_name="admins"))
+        group = self.create_group(storage, group_type, group_model, users[0])
 
         pages = self.walk(
             storage,