chore: bump to canaille 0.0.54

Author: azmeuk

poetry.lock

@@ -31,7 +31,7 @@ documentation = "https://pytest-iam.readthedocs.io/en/latest/"
 
 [tool.poetry.dependencies]
 python = "^3.9"
-canaille = {version = ">=0.0.53,<1", extras = ["oidc"] }
+canaille = {version = ">=0.0.54,<1", extras = ["oidc"] }
 portpicker = ">=1.6.0"
 pytest = ">=7.0.0"
 faker = ">=21.0.0"

pyproject.toml

@@ -9,6 +9,7 @@
 import pytest
 from canaille import create_app
 from canaille.app import models
+from canaille.backends import Backend
 from canaille.core.models import Group
 from canaille.core.models import User
 from canaille.core.populate import fake_groups
@@ -22,17 +23,21 @@
 class Server:
     """A proxy object that is returned by the pytest fixture."""
 
-    #: The port on which the local http server listens
     port: int
+    """The port on which the local http server listens."""
 
-    #: The authorization server flask app
     app: Flask
+    """The authorization server flask app."""
 
-    #: The module containing the available model classes
     models: ModuleType
+    """The module containing the available model classes."""
 
-    def __init__(self, app, port: int):
+    backend: Backend
+    """The backend used to manage models."""
+
+    def __init__(self, app, port: int, backend: Backend):
         self.app = app
+        self.backend = backend
         self.port = port
         self.httpd = wsgiref.simple_server.make_server("localhost", port, app)
         self.models = models
@@ -92,8 +97,8 @@ def random_token(self, subject, client, **kwargs) -> Token:
                 lifetime=3600,
                 audience=[client],
             )
-            token.update(**kwargs)
-            token.save()
+            self.backend.update(token, **kwargs)
+            self.backend.save(token)
 
         return token
 
@@ -111,7 +116,7 @@ def consent(self, user, client=None):
         """
 
         with self.app.app_context():
-            clients = [client] if client else models.Client.query()
+            clients = [client] if client else self.backend.query(models.Client)
 
             consents = [
                 self.models.Consent(
@@ -125,7 +130,7 @@ def consent(self, user, client=None):
             ]
 
             for consent in consents:
-                consent.save()
+                self.backend.save(consent)
 
         if len(consents) > 1:
             return consents
@@ -187,7 +192,7 @@ def iam_server(iam_configuration) -> Server:
     app = create_app(
         config=iam_configuration, env_file=".pytest-iam.env", env_prefix="PYTEST_IAM_"
     )
-    server = Server(app, port)
+    server = Server(app, port, Backend.instance)
 
     server_thread = threading.Thread(target=server.httpd.serve_forever)
     server_thread.start()

pytest_iam/__init__.py

@@ -14,9 +14,9 @@ def client(iam_server):
         token_endpoint_auth_method="client_secret_basic",
         scope=["openid", "profile", "groups"],
     )
-    inst.save()
+    iam_server.backend.save(inst)
     yield inst
-    inst.delete()
+    iam_server.backend.delete(inst)
 
 
 @pytest.fixture
@@ -27,6 +27,6 @@ def user(iam_server):
         emails=["[email protected]"],
         password="password",
     )
-    inst.save()
+    iam_server.backend.save(inst)
     yield inst
-    inst.delete()
+    iam_server.backend.delete(inst)

tests/conftest.py

@@ -29,7 +29,7 @@ def test_client_dynamic_registration(iam_server):
     client_id = response.json()["client_id"]
     client_secret = response.json()["client_secret"]
 
-    client = iam_server.models.Client.get(client_id=client_id)
+    client = iam_server.backend.get(iam_server.models.Client, client_id=client_id)
     assert client.client_secret == client_secret
     client.delete()
 
@@ -51,7 +51,7 @@ def test_logs(iam_server, caplog):
     assert caplog.records[0].msg == "client registration endpoint request: POST: %s"
 
     client_id = response.json()["client_id"]
-    client = iam_server.models.Client.get(client_id=client_id)
+    client = iam_server.backend.get(iam_server.models.Client, client_id=client_id)
     client.delete()
 
 
@@ -101,12 +101,12 @@ def test_login_and_consent(iam_server, client, user, testclient):
     # authorization code request (already logged in an consented)
     res = requests.get(res.location, allow_redirects=False)
 
-    authorization = iam_server.models.AuthorizationCode.get()
+    authorization = iam_server.backend.get(iam_server.models.AuthorizationCode)
     assert authorization.client == client
 
     res = testclient.get(res.headers["Location"])
 
-    token = iam_server.models.Token.get()
+    token = iam_server.backend.get(iam_server.models.Token)
     assert token.client == client
 
     assert res.json["userinfo"]["sub"] == "user"