oxutils 0.4.1__tar.gz → 0.4.3__tar.gz

{oxutils-0.4.1 → oxutils-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oxutils
-Version: 0.4.1
+Version: 0.4.3
 Summary: Production-ready utilities for Django applications in the Oxiliere ecosystem
 Keywords: django,utilities,jwt,audit,logging,celery,structlog
 Author: Edimedia Mutoke

{oxutils-0.4.1 → oxutils-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oxutils"
-version = "0.4.1"
+version = "0.4.3"
 description = "Production-ready utilities for Django applications in the Oxiliere ecosystem"
 readme = "README.md"
 license = "LGPL-3.0-only"

{oxutils-0.4.1 → oxutils-0.4.3}/src/oxutils/__init__.py

@@ -15,7 +15,7 @@ This package provides:
 - Custom exceptions, enums, and type definitions
 """
 
-__version__ = "0.4.1"
+__version__ = "0.4.3"
 
 from oxutils.conf import AUDIT_MIDDLEWARE, UTILS_APPS
 from oxutils.settings import oxi_settings

{oxutils-0.4.1 → oxutils-0.4.3}/src/oxutils/oxiliere/middleware.py

@@ -99,8 +99,25 @@ class TenantMainMiddleware(MiddlewareMixin):
 
                 return HttpResponseBadRequest("Missing X-Organization-ID header")
         else:
-            # oxi_id present but no authenticated user
-            return self.no_tenant_found(request, oxi_id)
+            # oxi_id present but no authenticated user → fall back to system tenant
+            # (same behaviour as "no org header") — previously this raised Http404,
+            # which broke every route (including public ones) when the JWT token
+            # expired but the front-end still sent X-Organization-ID.
+            try:
+                from oxutils.oxiliere.caches import get_system_tenant
+
+                tenant = get_system_tenant()
+                # don't try to attach a tenant-user — the user is anonymous anyway
+                tenant.user = None
+            except Exception as e:
+                logger.error(
+                    "system_tenant_not_found",
+                    oxi_id=oxi_id,
+                    error=str(e),
+                )
+                from django.http import HttpResponseBadRequest
+
+                return HttpResponseBadRequest("Missing X-Organization-ID header")
 
         # ── Status guards ─────────────────────────────────────────────
         if tenant.is_deleted or not tenant.is_active:

oxutils-0.4.3/src/oxutils/permissions/__init__.py

@@ -0,0 +1 @@
+

{oxutils-0.4.1 → oxutils-0.4.3}/src/oxutils/permissions/checks.py

@@ -291,4 +291,40 @@ def check_permission_settings(app_configs, **kwargs):
                 )
             )
     
+    # Validate EXTRA_PERMISSIONS
+    if hasattr(settings, 'EXTRA_PERMISSIONS'):
+        extra = settings.EXTRA_PERMISSIONS
+        if not isinstance(extra, (list, tuple)):
+            errors.append(
+                Error(
+                    'EXTRA_PERMISSIONS must be a list or tuple',
+                    hint='Set EXTRA_PERMISSIONS = ["dotted.path.ToPermission", ...]',
+                    id='permissions.E019',
+                )
+            )
+        else:
+            from django.utils.module_loading import import_string
+
+            for path in extra:
+                if not isinstance(path, str):
+                    errors.append(
+                        Error(
+                            f'Each entry in EXTRA_PERMISSIONS must be a string, got {type(path).__name__}',
+                            hint='Use dotted paths like "myapp.permissions.MyPermission"',
+                            id='permissions.E020',
+                        )
+                    )
+                    continue
+                try:
+                    cls = import_string(path)
+                except ImportError:
+                    errors.append(
+                        Error(
+                            f'Cannot import "{path}" from EXTRA_PERMISSIONS',
+                            hint='Check that the module and class exist',
+                            id='permissions.E021',
+                        )
+                    )
+                    continue
+
     return errors

{oxutils-0.4.1 → oxutils-0.4.3}/src/oxutils/permissions/perms.py

@@ -1,8 +1,10 @@
+from functools import lru_cache
 from typing import Optional
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpRequest
+from django.utils.module_loading import import_string
 from ninja_extra.controllers import ControllerBase
 from ninja_extra.permissions import BasePermission
 
@@ -199,3 +201,59 @@ def access_manager(actions: str):
             )
 
     return ScopePermission(perm, context)
+
+
+@lru_cache(maxsize=1)
+def extra_permissions():
+    """
+    Return the list of permission instances defined in
+    ``EXTRA_PERMISSIONS`` (settings.py).
+
+    Each entry is a dotted path to an **already instantiated** permission
+    object (e.g. a module-level singleton).  The object is imported via
+    :func:`django.utils.module_loading.import_string` and returned as-is.
+
+    The result is cached via :func:`functools.lru_cache` so that
+    ``import_string`` is only called once per process.
+
+    Example::
+
+        # myapp/permissions.py
+        from ninja_extra.permissions import BasePermission
+
+        class IsPremium(BasePermission):
+            def has_permission(self, request, controller):
+                return request.user.is_premium
+
+        IsPremium = IsPremium()   # <-- singleton instance
+
+        # settings.py
+        EXTRA_PERMISSIONS = [
+            "myapp.permissions.IsPremium",
+        ]
+
+        # controller
+        from oxutils.permissions import extra_permissions
+
+        @api_controller(
+            "/api",
+            permissions=[*extra_permissions(), ScopePermission("articles:r")],
+        )
+        class MyController:
+            ...
+    """
+    paths = getattr(settings, "EXTRA_PERMISSIONS", [])
+    if not isinstance(paths, (list, tuple)):
+        raise ImproperlyConfigured(
+            "EXTRA_PERMISSIONS must be a list or tuple of dotted paths."
+        )
+    instances = []
+    for path in paths:
+        try:
+            instance = import_string(path)
+        except ImportError as exc:
+            raise ImproperlyConfigured(
+                f"Cannot import permission from EXTRA_PERMISSIONS: {path}"
+            ) from exc
+        instances.append(instance)
+    return instances