Merge pull request #92 from eadwinCode/refactor_auth_execution

Moved auth exception to happen under routecontext

Author: eadwinCode

ninja_extra/operation.py

@@ -178,14 +178,15 @@ def _prep_run(
             ROUTE_CONTEXT_VAR.set(None)
 
     def run(self, request: HttpRequest, **kw: Any) -> HttpResponseBase:
-        error = self._run_checks(request)
-        if error:
-            return error
         try:
             temporal_response = self.api.create_temporal_response(request)
             with self._prep_run(
                 request, temporal_response=temporal_response, **kw
             ) as ctx:
+                error = self._run_checks(request)
+                if error:
+                    return error
+
                 values = self._get_values(request, kw, temporal_response)
                 ctx.kwargs.update(values)
                 result = self.view_func(request, **values)
@@ -278,14 +279,15 @@ async def _prep_run(  # type:ignore
             ROUTE_CONTEXT_VAR.set(None)
 
     async def run(self, request: HttpRequest, **kw: Any) -> HttpResponseBase:  # type: ignore
-        error = await self._run_checks(request)
-        if error:
-            return error
         try:
             temporal_response = self.api.create_temporal_response(request)
             async with self._prep_run(
                 request, temporal_response=temporal_response, **kw
             ) as ctx:
+                error = await self._run_checks(request)
+                if error:
+                    return error
+
                 values = await self._get_values(request, kw, temporal_response)  # type: ignore
                 ctx.kwargs.update(values)
                 result = await self.view_func(request, **values)

ninja_extra/permissions/base.py

@@ -17,28 +17,34 @@
 
 
 class OperationHolderMixin:
-    def __and__(
-        self, other: Union[Type["BasePermission"], "BasePermission"]
+    def __and__(  # type:ignore[misc]
+        self: Union[Type["BasePermission"], "BasePermission"],
+        other: Union[Type["BasePermission"], "BasePermission"],
     ) -> "OperandHolder[AND]":
-        return OperandHolder(AND, self, other)  # type: ignore
+        return OperandHolder(AND, self, other)
 
-    def __or__(
-        self, other: Union[Type["BasePermission"], "BasePermission"]
+    def __or__(  # type:ignore[misc]
+        self: Union[Type["BasePermission"], "BasePermission"],
+        other: Union[Type["BasePermission"], "BasePermission"],
     ) -> "OperandHolder[OR]":
-        return OperandHolder(OR, self, other)  # type: ignore
+        return OperandHolder(OR, self, other)
 
-    def __rand__(
-        self, other: Union[Type["BasePermission"], "BasePermission"]
+    def __rand__(  # type:ignore[misc]
+        self: Union[Type["BasePermission"], "BasePermission"],
+        other: Union[Type["BasePermission"], "BasePermission"],
     ) -> "OperandHolder[AND]":  # pragma: no cover
-        return OperandHolder(AND, other, self)  # type: ignore
+        return OperandHolder(AND, other, self)
 
-    def __ror__(
-        self, other: Union[Type["BasePermission"], "BasePermission"]
+    def __ror__(  # type:ignore[misc]
+        self: Union[Type["BasePermission"], "BasePermission"],
+        other: Union[Type["BasePermission"], "BasePermission"],
     ) -> "OperandHolder[OR]":  # pragma: no cover
-        return OperandHolder(OR, other, self)  # type: ignore
+        return OperandHolder(OR, other, self)
 
-    def __invert__(self) -> "SingleOperandHolder[NOT]":
-        return SingleOperandHolder(NOT, self)  # type: ignore
+    def __invert__(  # type:ignore[misc]
+        self: Union[Type["BasePermission"], "BasePermission"]
+    ) -> "SingleOperandHolder[NOT]":
+        return SingleOperandHolder(NOT, self)
 
 
 class BasePermissionMetaclass(OperationHolderMixin, ABCMeta):

pyproject.toml

@@ -60,7 +60,7 @@ test = [
     "pytest-cov",
     "pytest-django",
     "pytest-asyncio",
-    "mypy == 1.5.1",
+    "mypy == 1.6.1",
     "ruff ==0.0.275",
     "black == 23.7.0",
     "injector >= 0.19.0",