scim2-client 0.4.3__py3-none-any.whl → 0.5.1__py3-none-any.whl

scim2_client/client.py

@@ -265,7 +265,6 @@ class SCIMClient:
         if raise_scim_errors is None:
             raise_scim_errors = self.raise_scim_errors
 
-        self._check_status_codes(status_code, expected_status_codes)
         self._check_content_types(headers)
 
         # In addition to returning an HTTP response code, implementers MUST return
@@ -283,6 +282,7 @@ class SCIMClient:
             check_response_payload = self.check_response_payload
 
         if not check_response_payload:
+            self._check_status_codes(status_code, expected_status_codes)
             return response_payload
 
         if (
@@ -294,6 +294,8 @@ class SCIMClient:
                 raise SCIMResponseErrorObject(obj=error.detail, source=error)
             return error
 
+        self._check_status_codes(status_code, expected_status_codes)
+
         if not expected_types:
             return response_payload
 

scim2_client/engines/werkzeug.py

@@ -37,8 +37,10 @@ class TestSCIMClient(BaseSyncSCIMClient):
     This client avoids to perform real HTTP requests and directly execute the server code instead.
     This allows to dynamically catch the exceptions if something gets wrong.
 
-    :param client: A WSGI application instance that will be used to send requests.
+    :param client: An optional custom :class:`Werkzeug test Client <werkzeug.test.Client>`.
+        If :data:`None` a default client is initialized.
     :param scim_prefix: The scim root endpoint in the application.
+    :param environ: Additional parameters that will be passed to every request.
     :param resource_models: A tuple of :class:`~scim2_models.Resource` types expected to be handled by the SCIM client.
         If a request payload describe a resource that is not in this list, an exception will be raised.
     :param check_request_payload: If :data:`False`,
@@ -54,9 +56,14 @@ class TestSCIMClient(BaseSyncSCIMClient):
 
         from scim2_client.engines.werkzeug import TestSCIMClient
         from scim2_models import User, Group
+        from werkzeug.test import Client
 
         scim_provider = myapp.create_app()
-        testclient = TestSCIMClient(app=scim_provider, resource_models=(User, Group))
+        testclient = TestSCIMClient(
+            app=Client(scim_provider),
+            environ={"base_url": "/scim/v2"},
+            resource_models=(User, Group),
+        )
 
         request_user = User(user_name="foo", display_name="bar")
         response_user = scim_client.create(request_user)
@@ -66,10 +73,18 @@ class TestSCIMClient(BaseSyncSCIMClient):
     # avoid making Pytest believe this is a test class
     __test__ = False
 
-    def __init__(self, app, *args, scim_prefix: str = "", **kwargs):
+    def __init__(
+        self,
+        client: Client,
+        environ: Optional[dict] = None,
+        scim_prefix: str = "",
+        *args,
+        **kwargs,
+    ):
         super().__init__(*args, **kwargs)
-        self.client = Client(app)
+        self.client = client
         self.scim_prefix = scim_prefix
+        self.environ = environ or {}
 
     def make_url(self, url: Optional[str]) -> str:
         url = url or ""
@@ -103,9 +118,8 @@ class TestSCIMClient(BaseSyncSCIMClient):
             **kwargs,
         )
 
-        response = self.client.post(
-            self.make_url(req.url), json=req.payload, **req.request_kwargs
-        )
+        environ = {**self.environ, **req.request_kwargs}
+        response = self.client.post(self.make_url(req.url), json=req.payload, **environ)
 
         with handle_response_error(req.payload):
             return self.check_response(
@@ -143,8 +157,9 @@ class TestSCIMClient(BaseSyncSCIMClient):
         )
 
         query_string = urlencode(req.payload, doseq=False) if req.payload else None
+        environ = {**self.environ, **req.request_kwargs}
         response = self.client.get(
-            self.make_url(req.url), query_string=query_string, **req.request_kwargs
+            self.make_url(req.url), query_string=query_string, **environ
         )
 
         with handle_response_error(req.payload):
@@ -178,9 +193,8 @@ class TestSCIMClient(BaseSyncSCIMClient):
             **kwargs,
         )
 
-        response = self.client.post(
-            self.make_url(req.url), json=req.payload, **req.request_kwargs
-        )
+        environ = {**self.environ, **req.request_kwargs}
+        response = self.client.post(self.make_url(req.url), json=req.payload, **environ)
 
         with handle_response_error(response):
             return self.check_response(
@@ -213,7 +227,8 @@ class TestSCIMClient(BaseSyncSCIMClient):
             **kwargs,
         )
 
-        response = self.client.delete(self.make_url(req.url), **req.request_kwargs)
+        environ = {**self.environ, **req.request_kwargs}
+        response = self.client.delete(self.make_url(req.url), **environ)
 
         with handle_response_error(response):
             return self.check_response(
@@ -244,9 +259,8 @@ class TestSCIMClient(BaseSyncSCIMClient):
             **kwargs,
         )
 
-        response = self.client.put(
-            self.make_url(req.url), json=req.payload, **req.request_kwargs
-        )
+        environ = {**self.environ, **req.request_kwargs}
+        response = self.client.put(self.make_url(req.url), json=req.payload, **environ)
 
         with handle_response_error(response):
             return self.check_response(

{scim2_client-0.4.3.dist-info → scim2_client-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: scim2-client
-Version: 0.4.3
+Version: 0.5.1
 Summary: Pythonically build SCIM requests and parse SCIM responses
 Project-URL: documentation, https://scim2-client.readthedocs.io
 Project-URL: repository, https://github.com/python-scim/scim2-client

{scim2_client-0.4.3.dist-info → scim2_client-0.5.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 scim2_client/__init__.py,sha256=l0pyBLiTpFA68ao98PqQLT_Xx0mw8BHumwrIHYCWa_M,845
-scim2_client/client.py,sha256=ySG8sLOqOxzsW1CF2uR1UO_uuUef8sgUhfiWFviu-Wo,46293
+scim2_client/client.py,sha256=Ti7LNwCSa_98GK6_LkG-X0GFMf5HQ1KQ4gOubUc16to,46367
 scim2_client/errors.py,sha256=FVmRXsaZLn1VZhJ3dSDs4IqycuU92AEun9JWWMseVO8,4397
 scim2_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scim2_client/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scim2_client/engines/httpx.py,sha256=L39ZZHjqe43uIQpgh_r_maqM2gkf3_Rk6d8MeNe57gk,17781
-scim2_client/engines/werkzeug.py,sha256=mVpK0GjmD4fu0jI0W2zqrn7GjBFZ0AjNk2gBO5415Gk,10230
-scim2_client-0.4.3.dist-info/METADATA,sha256=YHWHLDbgqOKPjlVU6Ab-WEFrCZOrXnVrzixgZ4_6kzw,16961
-scim2_client-0.4.3.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-scim2_client-0.4.3.dist-info/licenses/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-scim2_client-0.4.3.dist-info/RECORD,,
+scim2_client/engines/werkzeug.py,sha256=DmUBWytoWPehcrgBpGzlRJLCT7mrAW_VWSQ6BHylwCo,10800
+scim2_client-0.5.1.dist-info/METADATA,sha256=eJVaMV-MJtKvkH3V9LyPw8hpMy_6-1W_tKCOpLFtP3A,16961
+scim2_client-0.5.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+scim2_client-0.5.1.dist-info/licenses/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+scim2_client-0.5.1.dist-info/RECORD,,