svc-infra 0.1.184__py3-none-any.whl → 0.1.186__py3-none-any.whl

svc_infra/auth/user_default.py

@@ -2,52 +2,91 @@ from typing import Any, Dict
 from fastapi import HTTPException
 from fastapi_users.password import PasswordHelper
 from sqlalchemy import func
+from sqlalchemy.exc import IntegrityError
 
 from svc_infra.api.fastapi.db.service_hooks import ServiceWithHooks
 from svc_infra.api.fastapi.db.repository import Repository
 
 _pwd = PasswordHelper()
 
-def _user_pre_create(data: Dict[str, Any]) -> Dict[str, Any]:
-    data = dict(data)
-    # normalize + map fields
-    if "password" in data:
-        data["password_hash"] = _pwd.hash(data.pop("password"))
-    if "metadata" in data:
-        data["extra"] = data.pop("metadata")
-
-    # BEFORE insert: application-level guard (nice error)
-    # case-insensitive email; handle tenant/null logic the same way as your unique index
-    email = data.get("email")
-    tenant_id = data.get("tenant_id")
-    if email:
-        where = [func.lower(Repository.model.email) == func.lower(email)]
-        if tenant_id is None:
-            where.append(Repository.model.tenant_id.is_(None))
-        else:
-            where.append(Repository.model.tenant_id == tenant_id)
-
-        # use a small “exists” helper on the repo if you have it
-        async def _exists(session):
-            return await Repository.exists(session, where=where)
-
-        data["_precreate_exists_check"] = _exists  # stash callable for service.create to run
-
-    return data
-
-def _user_pre_update(data: Dict[str, Any]) -> Dict[str, Any]:
-    data = dict(data)
-    if "password" in data:
-        data["password_hash"] = _pwd.hash(data.pop("password"))
-    if "metadata" in data:
-        data["extra"] = data.pop("metadata")
-    return data
-
 def make_default_user_service(repo: Repository):
+    Model = repo.model  # capture the mapped class
+
+    def _user_pre_create(data: Dict[str, Any]) -> Dict[str, Any]:
+        data = dict(data)
+        # normalize + map fields
+        if "password" in data:
+            data["password_hash"] = _pwd.hash(data.pop("password"))
+        if "metadata" in data:
+            data["extra"] = data.pop("metadata")
+        data.setdefault("roles", [])
+
+        # attach existence checker (case-insensitive email, tenant scoped)
+        email = data.get("email")
+        tenant_id = data.get("tenant_id")
+        if email is not None:
+            where = [func.lower(Model.email) == func.lower(email)]
+            if hasattr(Model, "tenant_id"):
+                if tenant_id is None:
+                    where.append(Model.tenant_id.is_(None))
+                else:
+                    where.append(Model.tenant_id == tenant_id)
+
+            async def _exists(session):
+                return await repo.exists(session, where=where)
+
+            data["_precreate_exists_check"] = _exists
+        return data
+
+    def _user_pre_update(data: Dict[str, Any]) -> Dict[str, Any]:
+        data = dict(data)
+        if "password" in data:
+            data["password_hash"] = _pwd.hash(data.pop("password"))
+        if "metadata" in data:
+            data["extra"] = data.pop("metadata")
+
+        # optional: protect email change too
+        email = data.get("email")
+        tenant_id = data.get("tenant_id")
+        if email is not None:
+            where = [func.lower(Model.email) == func.lower(email)]
+            if hasattr(Model, "tenant_id"):
+                if tenant_id is None:
+                    where.append(Model.tenant_id.is_(None))
+                else:
+                    where.append(Model.tenant_id == tenant_id)
+
+            async def _exists(session):
+                return await repo.exists(session, where=where)
+
+            data["_preupdate_exists_check"] = _exists
+        return data
+
     class _Svc(ServiceWithHooks):
         async def create(self, session, data):
+            # IMPORTANT: run pre_create first
+            data = await self.pre_create(data)
             exists_cb = data.pop("_precreate_exists_check", None)
             if exists_cb and await exists_cb(session):
                 raise HTTPException(status_code=409, detail="User with this email already exists.")
-            return await super().create(session, data)
+            try:
+                return await self.repo.create(session, data)
+            except IntegrityError as e:
+                # race-safety / fallback
+                if "uq_users_tenant_id" in str(e.orig) or "ci_email" in str(e.orig):
+                    raise HTTPException(status_code=409, detail="User with this email already exists.") from e
+                raise
+
+        async def update(self, session, id_value, data):
+            data = await self.pre_update(data)
+            exists_cb = data.pop("_preupdate_exists_check", None)
+            if exists_cb and await exists_cb(session):
+                raise HTTPException(status_code=409, detail="User with this email already exists.")
+            try:
+                return await self.repo.update(session, id_value, data)
+            except IntegrityError as e:
+                if "uq_users_tenant_id" in str(e.orig) or "ci_email" in str(e.orig):
+                    raise HTTPException(status_code=409, detail="User with this email already exists.") from e
+                raise
+
     return _Svc(repo, pre_create=_user_pre_create, pre_update=_user_pre_update)

{svc_infra-0.1.184.dist-info → svc_infra-0.1.186.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: svc-infra
-Version: 0.1.184
+Version: 0.1.186
 Summary: Infrastructure for building and deploying prod-ready services
 License: MIT
 Keywords: fastapi,sqlalchemy,alembic,auth,infra,async,pydantic

{svc_infra-0.1.184.dist-info → svc_infra-0.1.186.dist-info}/RECORD

@@ -32,7 +32,7 @@ svc_infra/auth/integration.py,sha256=L230xUw7vRM0AJIZwNzufRQrfNTPRdczp4BPd_NILeo
 svc_infra/auth/oauth_router.py,sha256=JY3VQ9_0oS_a2gGg418IDG2TbK79sQWcpA9KPiOAfjY,4918
 svc_infra/auth/providers.py,sha256=fiw0ouuGKtwcwMY0Zw7cEv-CXNaUYDnqo_NmiWiB8Lc,3185
 svc_infra/auth/settings.py,sha256=wVCLQnpA9M6zfiWyUpSdn9fo4q-Z4WpVyC3KvkG3HYg,1742
-svc_infra/auth/user_default.py,sha256=1GKxiJNUFKKghtGiIQKdC_rD1cs4vVye0zUTSPMrrDg,2081
+svc_infra/auth/user_default.py,sha256=VXSpYGxABvHHYGvd7eXU7OPinhwQFr-oS-qeYIufYro,3856
 svc_infra/auth/users.py,sha256=4rlTCELU-po7bF7u6z02Bd8pXLGcLI2Adj0VjA-gg5E,2098
 svc_infra/cli/__init__.py,sha256=g47RSROuFW8LSsB6WFNSus5BnUl9z_DrPK9idYo3O6M,401
 svc_infra/cli/cmds/__init__.py,sha256=263YKSg73Ik-SQeilyGePdc663BYi4RfBrc0wMFxeoU,212
@@ -77,7 +77,7 @@ svc_infra/observability/templates/prometheus_rules.yml,sha256=sbVLm1h40FMkGSeWO4
 svc_infra/observability/tracing/__init__.py,sha256=TOs2yCicqBdo4OfOHTMmqeHsn7DBRu5EdvF2L5f31Y0,237
 svc_infra/observability/tracing/setup.py,sha256=21Ob276U4KZOs6M2o1O79wQXFHV0gY6YdMyjeqMrzMU,5042
 svc_infra/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-svc_infra-0.1.184.dist-info/METADATA,sha256=BCIRUX3U8Bva3-_m6s34h04-F3C2yamwc8BPtseu85M,4981
-svc_infra-0.1.184.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-svc_infra-0.1.184.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
-svc_infra-0.1.184.dist-info/RECORD,,
+svc_infra-0.1.186.dist-info/METADATA,sha256=HYc2VSpY0TqlTJxBLTfeqmallrOGoAqJvkUOF4cUjHM,4981
+svc_infra-0.1.186.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+svc_infra-0.1.186.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
+svc_infra-0.1.186.dist-info/RECORD,,