csrd-utils 0.3.64__tar.gz → 0.3.66__tar.gz

{csrd_utils-0.3.64 → csrd_utils-0.3.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.3.64
+Version: 0.3.66
 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.64 → csrd_utils-0.3.66}/pyproject.toml

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

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

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

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

@@ -3,6 +3,7 @@ from typing import Annotated
 import httpx
 from fastapi import 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
@@ -46,10 +47,14 @@ async def _remote_verify(_: Request, token: str) -> UserClaims:
 
 
 _authenticator = CallbackAuthenticator(callback=_remote_verify)
+_http_bearer_scheme = HTTPBearer()
 
 VerifiedTokenDep = Annotated[
     UserClaims,
     Security(create_bearer_dependency(_authenticator, token_finder=find_token)),
 ]
 
-__all__ = ("VerifiedTokenDep",)
+# OpenAPI docs dependency to surface the Swagger "Authorize" button.
+BearerAuthDep = Annotated[HTTPAuthorizationCredentials, Security(_http_bearer_scheme)]
+
+__all__ = ("BearerAuthDep", "VerifiedTokenDep")

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

@@ -4,7 +4,7 @@ from datetime import UTC, datetime
 from fastapi import APIRouter, HTTPException
 from pydantic import BaseModel
 
-from ...dependencies import VerifiedTokenDep
+from ...dependencies import BearerAuthDep, VerifiedTokenDep
 
 router = APIRouter(prefix="/api", tags=["Items Endpoints"])
 
@@ -47,7 +47,11 @@ class ItemDeleteResponse(BaseModel):
 
 
 @router.post("/items", response_model=ItemResponse)
-async def create_item(payload: CreateItemRequest, _verified: VerifiedTokenDep) -> ItemResponse:
+async def create_item(
+    payload: CreateItemRequest,
+    _auth: BearerAuthDep,
+    _verified: VerifiedTokenDep,
+) -> ItemResponse:
     item_id = str(uuid.uuid4())
     created_at = datetime.now(UTC).isoformat()
     item = {"id": item_id, "name": payload.name, "created_at": created_at}
@@ -56,12 +60,12 @@ async def create_item(payload: CreateItemRequest, _verified: VerifiedTokenDep) -
 
 
 @router.get("/items", response_model=ItemListResponse)
-async def list_items(_verified: VerifiedTokenDep) -> ItemListResponse:
+async def list_items(_auth: BearerAuthDep, _verified: VerifiedTokenDep) -> ItemListResponse:
     return {"items": list(_ITEMS.values())}
 
 
 @router.get("/items/{entity_id}", response_model=ItemResponse)
-async def get_item(entity_id: str, _verified: VerifiedTokenDep) -> ItemResponse:
+async def get_item(entity_id: str, _auth: BearerAuthDep, _verified: VerifiedTokenDep) -> ItemResponse:
     item = _ITEMS.get(entity_id)
     if item is None:
         raise HTTPException(status_code=404, detail="item not found")
@@ -70,7 +74,10 @@ async def get_item(entity_id: str, _verified: VerifiedTokenDep) -> ItemResponse:
 
 @router.put("/items/{entity_id}", response_model=ItemUpdateResponse)
 async def update_item(
-    entity_id: str, payload: UpdateItemRequest, _verified: VerifiedTokenDep
+    entity_id: str,
+    payload: UpdateItemRequest,
+    _auth: BearerAuthDep,
+    _verified: VerifiedTokenDep,
 ) -> ItemUpdateResponse:
     item = _ITEMS.get(entity_id)
     if item is None:
@@ -81,7 +88,10 @@ async def update_item(
 
 @router.put("/items/{entity_id}/upsert", response_model=ItemUpsertResponse)
 async def upsert_item(
-    entity_id: str, payload: UpdateItemRequest, _verified: VerifiedTokenDep
+    entity_id: str,
+    payload: UpdateItemRequest,
+    _auth: BearerAuthDep,
+    _verified: VerifiedTokenDep,
 ) -> ItemUpsertResponse:
     existing = _ITEMS.get(entity_id)
     if existing is None:
@@ -93,7 +103,11 @@ async def upsert_item(
 
 
 @router.delete("/items/{entity_id}", response_model=ItemDeleteResponse)
-async def delete_item(entity_id: str, _verified: VerifiedTokenDep) -> 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:
         raise HTTPException(status_code=404, detail="item not found")

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

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