diracx-testing 0.0.1a11__py3-none-any.whl → 0.0.1a13__py3-none-any.whl

diracx/testing/__init__.py

@@ -16,7 +16,7 @@ import pytest
 import requests
 
 if TYPE_CHECKING:
-    from diracx.routers.auth import AuthSettings
+    from diracx.routers.auth.utils import AuthSettings
     from diracx.routers.job_manager.sandboxes import SandboxStoreSettings
 
 # to get a string like this run:
@@ -69,11 +69,19 @@ def rsa_private_key_pem() -> str:
 
 
 @pytest.fixture(scope="session")
-def test_auth_settings(rsa_private_key_pem) -> AuthSettings:
-    from diracx.routers.auth import AuthSettings
+def fernet_key() -> str:
+    from cryptography.fernet import Fernet
+
+    return Fernet.generate_key().decode()
+
+
+@pytest.fixture(scope="session")
+def test_auth_settings(rsa_private_key_pem, fernet_key) -> AuthSettings:
+    from diracx.routers.auth.utils import AuthSettings
 
     yield AuthSettings(
         token_key=rsa_private_key_pem,
+        state_key=fernet_key,
         allowed_redirects=[
             "http://diracx.test.invalid:8000/api/docs/oauth2-redirect",
         ],
@@ -266,14 +274,13 @@ class ClientFactory:
     @contextlib.contextmanager
     def normal_user(self):
         from diracx.core.properties import NORMAL_USER
-        from diracx.routers.auth import create_token
+        from diracx.routers.auth.token import create_token
 
         with self.unauthenticated() as client:
             payload = {
                 "sub": "testingVO:yellow-sub",
                 "exp": datetime.now(tz=timezone.utc)
                 + timedelta(self.test_auth_settings.access_token_expire_minutes),
-                "aud": AUDIENCE,
                 "iss": ISSUER,
                 "dirac_properties": [NORMAL_USER],
                 "jti": str(uuid4()),
@@ -290,12 +297,11 @@ class ClientFactory:
     @contextlib.contextmanager
     def admin_user(self):
         from diracx.core.properties import JOB_ADMINISTRATOR
-        from diracx.routers.auth import create_token
+        from diracx.routers.auth.token import create_token
 
         with self.unauthenticated() as client:
             payload = {
                 "sub": "testingVO:yellow-sub",
-                "aud": AUDIENCE,
                 "iss": ISSUER,
                 "dirac_properties": [JOB_ADMINISTRATOR],
                 "jti": str(uuid4()),

{diracx_testing-0.0.1a11.dist-info → diracx_testing-0.0.1a13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-testing
-Version: 0.0.1a11
+Version: 0.0.1a13
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

diracx_testing-0.0.1a13.dist-info/RECORD

@@ -0,0 +1,6 @@
+diracx/testing/__init__.py,sha256=1g2BhfkyZAmI9Gbbkmgdm_zHSGbA8AAaBn_u8Ojrvws,19172
+diracx/testing/osdb.py,sha256=-EFZNyEY07Zq7HdQGZxS3H808Y94aaUhmo0x-Y8xo3Q,3592
+diracx_testing-0.0.1a13.dist-info/METADATA,sha256=84WVRmsbfMWSPzWBSqb9ZP2zR_XE1EryezYg7iPqdQQ,615
+diracx_testing-0.0.1a13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+diracx_testing-0.0.1a13.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_testing-0.0.1a13.dist-info/RECORD,,

{diracx_testing-0.0.1a11.dist-info → diracx_testing-0.0.1a13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

diracx_testing-0.0.1a11.dist-info/RECORD

@@ -1,6 +0,0 @@
-diracx/testing/__init__.py,sha256=wXrihINkyIbE2dn4XyKDeQO4cp8bKPkeUIi3ssod0qs,19026
-diracx/testing/osdb.py,sha256=-EFZNyEY07Zq7HdQGZxS3H808Y94aaUhmo0x-Y8xo3Q,3592
-diracx_testing-0.0.1a11.dist-info/METADATA,sha256=CS0qYe33WHfAI8HmzMHYkc_JN7OPsgLMdn3tCXcpc1Q,615
-diracx_testing-0.0.1a11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-diracx_testing-0.0.1a11.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_testing-0.0.1a11.dist-info/RECORD,,