diff --git a/pyproject.toml b/pyproject.toml index b1f08a0..49f3dab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "gds-idea-app-kit" -version = "0.2.1" +version = "0.2.2" description = "CLI tool for scaffolding and maintaining GDS IDEA web apps on AWS" readme = "README.md" requires-python = ">=3.11" @@ -27,8 +27,8 @@ include = [ "src/gds_idea_app_kit/templates/**", ] -[tool.uv] -dev-dependencies = [ +[dependency-groups] +dev = [ "pytest>=8.0", "ruff>=0.8.0", ] diff --git a/src/gds_idea_app_kit/templates/dev_mocks/dev_mock_user.json b/src/gds_idea_app_kit/templates/dev_mocks/dev_mock_user.json index 8ee8429..785e4fc 100644 --- a/src/gds_idea_app_kit/templates/dev_mocks/dev_mock_user.json +++ b/src/gds_idea_app_kit/templates/dev_mocks/dev_mock_user.json @@ -2,5 +2,8 @@ "email": "developer@example.com", "sub": "12345678-1234-1234-1234-123456789abc", "username": "12345678-1234-1234-1234-123456789abc", + "name": "Dev User", + "given_name": "Dev", + "family_name": "User", "groups": ["gds-idea"] } diff --git a/src/gds_idea_app_kit/templates/fastapi/fastapi_app.py b/src/gds_idea_app_kit/templates/fastapi/fastapi_app.py index 7583e60..df0d859 100644 --- a/src/gds_idea_app_kit/templates/fastapi/fastapi_app.py +++ b/src/gds_idea_app_kit/templates/fastapi/fastapi_app.py @@ -19,7 +19,8 @@ logger = logging.getLogger(__name__) app = FastAPI() -auth = FastAPIAuth(app) +auth = FastAPIAuth() +auth.protect_app(app) # Health check endpoint for ECS/ALB (unprotected) @@ -31,7 +32,7 @@ def health_check(): # Main route - protected by app-wide auth middleware @app.get("/") def index(request: Request): - user = auth.get_current_user(request) + user = auth.get_auth_user(request) return { "message": "You are Authorised!", @@ -44,6 +45,6 @@ def index(request: Request): # Additional example route - also automatically protected @app.get("/api/user") def get_user(request: Request): - user = auth.get_current_user(request) + user = auth.get_auth_user(request) return {"email": user.email, "groups": user.groups if hasattr(user, "groups") else []} diff --git a/uv.lock b/uv.lock index 23dc41f..d533ea5 100644 --- a/uv.lock +++ b/uv.lock @@ -52,7 +52,7 @@ wheels = [ [[package]] name = "gds-idea-app-kit" -version = "0.1.0" +version = "0.2.2" source = { editable = "." } dependencies = [ { name = "boto3" },