diracx-db 0.0.1a42__py3-none-any.whl → 0.0.1a43__py3-none-any.whl

diracx/db/sql/auth/db.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
 import secrets
-from uuid import UUID, uuid4
 
 from sqlalchemy import insert, select, update
 from sqlalchemy.exc import IntegrityError, NoResultFound
+from uuid_utils import UUID, uuid7
 
 from diracx.core.exceptions import (
     AuthorizationError,
@@ -126,7 +126,7 @@ class AuthDB(BaseSQLDB):
         code_challenge_method: str,
         redirect_uri: str,
     ) -> str:
-        uuid = str(uuid4())
+        uuid = str(uuid7())
 
         stmt = insert(AuthorizationFlows).values(
             uuid=uuid,
@@ -199,7 +199,6 @@ class AuthDB(BaseSQLDB):
         self,
         jti: UUID,
         subject: str,
-        preferred_username: str,
         scope: str,
     ) -> None:
         """Insert a refresh token in the DB as well as user attributes
@@ -209,7 +208,6 @@ class AuthDB(BaseSQLDB):
         stmt = insert(RefreshTokens).values(
             jti=str(jti),
             sub=subject,
-            preferred_username=preferred_username,
             scope=scope,
         )
         await self.conn.execute(stmt)

diracx/db/sql/auth/schema.py

@@ -97,6 +97,5 @@ class RefreshTokens(Base):
 
     # User attributes bound to the refresh token
     sub = Column("Sub", String(256), index=True)
-    preferred_username = Column("PreferredUsername", String(255))
 
     __table_args__ = (Index("index_status_sub", status, sub),)

diracx/db/sql/dummy/db.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from uuid import UUID
-
 from sqlalchemy import func, insert, select
+from uuid_utils import UUID
 
 from diracx.db.sql.utils import BaseSQLDB, apply_search_filters
 

{diracx_db-0.0.1a42.dist-info → diracx_db-0.0.1a43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-db
-Version: 0.0.1a42
+Version: 0.0.1a43
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -14,5 +14,6 @@ Requires-Dist: diracx-core
 Requires-Dist: opensearch-py[async]
 Requires-Dist: pydantic>=2.10
 Requires-Dist: sqlalchemy[aiomysql,aiosqlite]>=2
+Requires-Dist: uuid-utils
 Provides-Extra: testing
 Requires-Dist: diracx-testing; extra == "testing"

{diracx_db-0.0.1a42.dist-info → diracx_db-0.0.1a43.dist-info}/RECORD

@@ -7,10 +7,10 @@ diracx/db/os/job_parameters.py,sha256=W-2O0cnq91iExcQAEqnCKuA9Ko_6MQaTGALGG8ziQ-
 diracx/db/os/utils.py,sha256=V4T-taos64SFNcorfIr7mq5l5y88K6TzyCj1YqWk8VI,11562
 diracx/db/sql/__init__.py,sha256=JYu0b0IVhoXy3lX2m2r2dmAjsRS7IbECBUMEDvX0Te4,391
 diracx/db/sql/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diracx/db/sql/auth/db.py,sha256=O9sp-AKobQ4X4IF2WaJKig-8LU8Ra9Syn5jW8JNLRU4,9030
-diracx/db/sql/auth/schema.py,sha256=9wcciEsXO7lzviYI1npxIYPqLewcSLwGmZwj6jY23GY,3239
+diracx/db/sql/auth/db.py,sha256=QJtBqMrhOf97UvMG0WpyjsgIRiu19v04FoDzXAyXtT0,8952
+diracx/db/sql/auth/schema.py,sha256=x2PEbmM_bNPdZUN5BMGMrdSmX8zkDeJ3P9XfhLBGBTs,3173
 diracx/db/sql/dummy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diracx/db/sql/dummy/db.py,sha256=whcF02IjFQTwe1l4iTHtCkg2XukEaLHpLeHYNGMuGGw,1645
+diracx/db/sql/dummy/db.py,sha256=IW4FzG7ERKbhZvC32KL7Rodu2u-zKAf8BryO4VAdJew,1650
 diracx/db/sql/dummy/schema.py,sha256=9zI53pKlzc6qBezsyjkatOQrNZdGCjwgjQ8Iz_pyAXs,789
 diracx/db/sql/job/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 diracx/db/sql/job/db.py,sha256=PTivVrSl4hrOTgy77WECunPJUJiYzGhSlqO0wYwEuE8,11909
@@ -31,8 +31,8 @@ diracx/db/sql/utils/__init__.py,sha256=QkvpqBuIAgkAOywAssYzdxSzUQVZlSUumK7mPxotX
 diracx/db/sql/utils/base.py,sha256=7UxHBNLOSjdrIdslMKW4C_c5H9-6Y1BEimxscri2poE,12367
 diracx/db/sql/utils/functions.py,sha256=iLqlUIQ6SrDUtDEnZ5szaFbdcINJW15KNbCdGXss6kc,3055
 diracx/db/sql/utils/types.py,sha256=yU-tXsu6hFGPsr9ba1n3ZjGPnHQI_06lbpkTeDCWJtg,1287
-diracx_db-0.0.1a42.dist-info/METADATA,sha256=NNz43axgCrr04xIjsB9_R01F3es1n4Ktmyiql_agKQc,644
-diracx_db-0.0.1a42.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-diracx_db-0.0.1a42.dist-info/entry_points.txt,sha256=UPqhLvb9gui0kOyWeI_edtefcrHToZmQt1p76vIwujo,317
-diracx_db-0.0.1a42.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_db-0.0.1a42.dist-info/RECORD,,
+diracx_db-0.0.1a43.dist-info/METADATA,sha256=BKxluFcc0GKsDdtqG_LLgLhyaJ8TPzqNEzhnIQl2Cn8,670
+diracx_db-0.0.1a43.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+diracx_db-0.0.1a43.dist-info/entry_points.txt,sha256=UPqhLvb9gui0kOyWeI_edtefcrHToZmQt1p76vIwujo,317
+diracx_db-0.0.1a43.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_db-0.0.1a43.dist-info/RECORD,,