svc-infra 0.1.184__tar.gz → 0.1.186__tar.gz

{svc_infra-0.1.184 → svc_infra-0.1.186}/PKG-INFO

@@ -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 → svc_infra-0.1.186}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "svc-infra"
-version = "0.1.184"
+version = "0.1.186"
 description = "Infrastructure for building and deploying prod-ready services"
 authors = ["Ali Khatami <aliikhatami94@gmail.com>"]
 license = "MIT"

svc_infra-0.1.186/src/svc_infra/auth/user_default.py

@@ -0,0 +1,92 @@
+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 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.")
+            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/src/svc_infra/auth/user_default.py

@@ -1,53 +0,0 @@
-from typing import Any, Dict
-from fastapi import HTTPException
-from fastapi_users.password import PasswordHelper
-from sqlalchemy import func
-
-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):
-    class _Svc(ServiceWithHooks):
-        async def create(self, session, 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)
-    return _Svc(repo, pre_create=_user_pre_create, pre_update=_user_pre_update)