Authorization via with_route

src/cpl-api/cpl/api/__init__.py

@@ -1,8 +1,5 @@
 from cpl.dependency.service_collection import ServiceCollection as _ServiceCollection
 
-from .error import APIError, AlreadyExists, EndpointNotImplemented, Forbidden, NotFound, Unauthorized
-from .logger import APILogger
-from .settings import ApiSettings
 
 def add_api(collection: _ServiceCollection):
     try:

src/cpl-api/cpl/api/abc/__init__.py

@@ -1 +0,0 @@
-from .asgi_middleware_abc import ASGIMiddleware

src/cpl-api/cpl/api/application/__init__.py

@@ -1 +0,0 @@
-from .web_app import WebApp

src/cpl-api/cpl/api/application/web_app.py

@@ -33,7 +33,6 @@ _logger = APILogger("API")
 
 PolicyInput = Union[dict[str, PolicyResolver], Policy]
 
-
 class WebApp(ApplicationABC):
     def __init__(self, services: ServiceProviderABC):
         super().__init__(services, [auth, api])

src/cpl-api/cpl/api/middleware/__init__.py

@@ -1,4 +0,0 @@
-from .authentication import AuthenticationMiddleware
-from .authorization import AuthorizationMiddleware
-from .logging import LoggingMiddleware
-from .request import RequestMiddleware

src/cpl-api/cpl/api/middleware/authorization.py

@@ -53,13 +53,9 @@ class AuthorizationMiddleware(ASGIMiddleware):
 
             if rule["permissions"]:
                 if match == ValidationMatch.all and not all(p in perm_names for p in rule["permissions"]):
-                    return await Forbidden(f"missing permissions: {rule["permissions"]}").asgi_response(
-                        scope, receive, send
-                    )
+                    return await Forbidden(f"missing permissions: {rule["permissions"]}").asgi_response(scope, receive, send)
                 if match == ValidationMatch.any and not any(p in perm_names for p in rule["permissions"]):
-                    return await Forbidden(f"missing permissions: {rule["permissions"]}").asgi_response(
-                        scope, receive, send
-                    )
+                    return await Forbidden(f"missing permissions: {rule["permissions"]}").asgi_response(scope, receive, send)
 
             for policy_name in rule["policies"]:
                 policy = self._policies.get(policy_name)
@@ -70,4 +66,4 @@ class AuthorizationMiddleware(ASGIMiddleware):
                 if not await policy.resolve(user):
                     return await Forbidden(f"policy {policy.name} failed").asgi_response(scope, receive, send)
 
-        return await self._call_next(scope, receive, send)
+        return await self._call_next(scope, receive, send)

src/cpl-api/cpl/api/model/__init__.py

@@ -1,3 +0,0 @@
-from .api_route import ApiRoute
-from .policy import Policy
-from .validation_match import ValidationMatch

src/cpl-api/cpl/api/model/api_route.py

@@ -7,7 +7,13 @@ from cpl.api.typing import HTTPMethods
 
 class ApiRoute:
 
-    def __init__(self, path: str, fn: Callable, method: HTTPMethods, **kwargs):
+    def __init__(
+        self,
+        path: str,
+        fn: Callable,
+        method: HTTPMethods,
+        **kwargs
+    ):
         self._path = path
         self._fn = fn
         self._method = method

src/cpl-api/cpl/api/registry/__init__.py

@@ -1,2 +0,0 @@
-from .policy import PolicyRegistry
-from .route import RouteRegistry

src/cpl-api/cpl/api/router.py

@@ -41,13 +41,7 @@ class Router:
         return inner
 
     @classmethod
-    def authorize(
-        cls,
-        roles: list[str | Enum] = None,
-        permissions: list[str | Enum] = None,
-        policies: list[str] = None,
-        match: ValidationMatch = None,
-    ):
+    def authorize(cls, roles: list[str | Enum]=None, permissions: list[str | Enum]=None, policies: list[str]=None, match: ValidationMatch=None):
         """
         Decorator to mark a route as requiring authorization.
         Usage:
@@ -91,15 +85,15 @@ class Router:
         return inner
 
     @classmethod
-    def route(cls, path: str, method: HTTPMethods, registry: RouteRegistry = None, **kwargs):
+    def route(cls, path: str, method: HTTPMethods, registry: RouteRegistry=None, **kwargs):
         if not registry:
             from cpl.api.model.api_route import ApiRoute
             from cpl.dependency.service_provider_abc import ServiceProviderABC
-
             routes = ServiceProviderABC.get_global_service(RouteRegistry)
         else:
             routes = registry
 
+
         def inner(fn):
             routes.add(ApiRoute(path, fn, method, **kwargs))
             setattr(fn, "_route_path", path)
@@ -144,9 +138,7 @@ class Router:
 
         from cpl.api.model.api_route import ApiRoute
         from cpl.dependency.service_provider_abc import ServiceProviderABC
-
         routes = ServiceProviderABC.get_global_service(RouteRegistry)
-
         def inner(fn):
             path = getattr(fn, "_route_path", None)
             if path is None:
@@ -155,7 +147,7 @@ class Router:
             route = routes.get(path)
             if route is None:
                 raise ValueError(f"Cannot override a route that does not exist: {path}")
-
+            
             routes.add(ApiRoute(path, fn, route.method, **route.kwargs))
             setattr(fn, "_route_path", path)
             return fn

src/cpl-api/cpl/api/typing.py

@@ -16,4 +16,4 @@ PartialMiddleware = Union[
     Middleware,
     Callable[[ASGIApp], ASGIApp],
 ]
-PolicyResolver = Callable[[AuthUser], bool | Awaitable[bool]]
+PolicyResolver = Callable[[AuthUser], bool | Awaitable[bool]]