csrd-utils 0.3.68__tar.gz → 0.3.69__tar.gz

{csrd_utils-0.3.68 → csrd_utils-0.3.69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.3.68
+Version: 0.3.69
 Summary: CLI utilities for csrd service generation and feature augmentation
 Project-URL: Repository, https://github.com/csrd-api/fastapi-common
 Project-URL: Documentation, https://github.com/csrd-api/fastapi-common/tree/main/packages/utils

{csrd_utils-0.3.68 → csrd_utils-0.3.69}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "csrd-utils"
-version = "0.3.68"
+version = "0.3.69"
 description = "CLI utilities for csrd service generation and feature augmentation"
 license = { text = "MIT" }
 requires-python = ">=3.12"

csrd_utils-0.3.69/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/dependencies/__init__.py

@@ -0,0 +1,3 @@
+from .auth_service import VerifiedTokenDep, VerifiedTokenDepForRouter
+
+__all__ = ("VerifiedTokenDep", "VerifiedTokenDepForRouter")

{csrd_utils-0.3.68 → csrd_utils-0.3.69}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/dependencies/auth_service.py

@@ -1,9 +1,8 @@
 from typing import Annotated
 
 import httpx
-from fastapi import HTTPException, Security
+from fastapi import Depends, HTTPException, Security
 from fastapi.requests import Request
-from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 
 from csrd.auth import CallbackAuthenticator, create_bearer_dependency
 from csrd.models.claims import UserClaims
@@ -47,14 +46,15 @@ async def _remote_verify(_: Request, token: str) -> UserClaims:
 
 
 _authenticator = CallbackAuthenticator(callback=_remote_verify)
-_http_bearer_scheme = HTTPBearer()
+_bearer_dep = create_bearer_dependency(_authenticator, token_finder=find_token)
 
+# For route-level parameters: use as Depends(VerifiedTokenDep)
 VerifiedTokenDep = Annotated[
     UserClaims,
-    Security(create_bearer_dependency(_authenticator, token_finder=find_token)),
+    Security(_bearer_dep),
 ]
 
-# OpenAPI docs dependency to surface the Swagger "Authorize" button.
-BearerAuthDep = Annotated[HTTPAuthorizationCredentials, Security(_http_bearer_scheme)]
+# For router-level dependencies: use directly without Depends() wrapper
+VerifiedTokenDepForRouter = Depends(_bearer_dep)
 
-__all__ = ("BearerAuthDep", "VerifiedTokenDep")
+__all__ = ("VerifiedTokenDep", "VerifiedTokenDepForRouter")

{csrd_utils-0.3.68 → csrd_utils-0.3.69}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/views/unversioned/items_view.py

@@ -4,9 +4,9 @@ from datetime import UTC, datetime
 from fastapi import APIRouter, HTTPException
 from pydantic import BaseModel
 
-from ...dependencies import BearerAuthDep, VerifiedTokenDep
+from ...dependencies import VerifiedTokenDepForRouter
 
-router = APIRouter(prefix="/api", tags=["Items Endpoints"])
+router = APIRouter(prefix="/api", tags=["Items Endpoints"], dependencies=[VerifiedTokenDepForRouter])
 
 _ITEMS: dict[str, dict[str, str]] = {}
 
@@ -49,8 +49,6 @@ class ItemDeleteResponse(BaseModel):
 @router.post("/items", response_model=ItemResponse)
 async def create_item(
     payload: CreateItemRequest,
-    _auth: BearerAuthDep,
-    _verified: VerifiedTokenDep,
 ) -> ItemResponse:
     item_id = str(uuid.uuid4())
     created_at = datetime.now(UTC).isoformat()
@@ -60,12 +58,12 @@ async def create_item(
 
 
 @router.get("/items", response_model=ItemListResponse)
-async def list_items(_auth: BearerAuthDep, _verified: VerifiedTokenDep) -> ItemListResponse:
+async def list_items() -> ItemListResponse:
     return {"items": list(_ITEMS.values())}
 
 
 @router.get("/items/{entity_id}", response_model=ItemResponse)
-async def get_item(entity_id: str, _auth: BearerAuthDep, _verified: VerifiedTokenDep) -> ItemResponse:
+async def get_item(entity_id: str) -> ItemResponse:
     item = _ITEMS.get(entity_id)
     if item is None:
         raise HTTPException(status_code=404, detail="item not found")
@@ -76,8 +74,6 @@ async def get_item(entity_id: str, _auth: BearerAuthDep, _verified: VerifiedToke
 async def update_item(
     entity_id: str,
     payload: UpdateItemRequest,
-    _auth: BearerAuthDep,
-    _verified: VerifiedTokenDep,
 ) -> ItemUpdateResponse:
     item = _ITEMS.get(entity_id)
     if item is None:
@@ -90,8 +86,6 @@ async def update_item(
 async def upsert_item(
     entity_id: str,
     payload: UpdateItemRequest,
-    _auth: BearerAuthDep,
-    _verified: VerifiedTokenDep,
 ) -> ItemUpsertResponse:
     existing = _ITEMS.get(entity_id)
     if existing is None:
@@ -105,8 +99,6 @@ async def upsert_item(
 @router.delete("/items/{entity_id}", response_model=ItemDeleteResponse)
 async def delete_item(
     entity_id: str,
-    _auth: BearerAuthDep,
-    _verified: VerifiedTokenDep,
 ) -> ItemDeleteResponse:
     rows = 1 if _ITEMS.pop(entity_id, None) is not None else 0
     if rows == 0:

csrd_utils-0.3.68/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/dependencies/__init__.py

@@ -1,3 +0,0 @@
-from .auth_service import BearerAuthDep, VerifiedTokenDep
-
-__all__ = ("BearerAuthDep", "VerifiedTokenDep")