Skip to content

Commit 1587224

Browse files
authored
Merge pull request #7 from co-cddo/fix/template-corrections
Fix FastAPI template API, add mock user name fields, and use dependency-groups
2 parents a08496f + 4957ecc commit 1587224

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
44

55
[project]
66
name = "gds-idea-app-kit"
7-
version = "0.2.1"
7+
version = "0.2.2"
88
description = "CLI tool for scaffolding and maintaining GDS IDEA web apps on AWS"
99
readme = "README.md"
1010
requires-python = ">=3.11"
@@ -27,8 +27,8 @@ include = [
2727
"src/gds_idea_app_kit/templates/**",
2828
]
2929

30-
[tool.uv]
31-
dev-dependencies = [
30+
[dependency-groups]
31+
dev = [
3232
"pytest>=8.0",
3333
"ruff>=0.8.0",
3434
]

src/gds_idea_app_kit/templates/dev_mocks/dev_mock_user.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@
22
"email": "developer@example.com",
33
"sub": "12345678-1234-1234-1234-123456789abc",
44
"username": "12345678-1234-1234-1234-123456789abc",
5+
"name": "Dev User",
6+
"given_name": "Dev",
7+
"family_name": "User",
58
"groups": ["gds-idea"]
69
}

src/gds_idea_app_kit/templates/fastapi/fastapi_app.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
logger = logging.getLogger(__name__)
2020

2121
app = FastAPI()
22-
auth = FastAPIAuth(app)
22+
auth = FastAPIAuth()
23+
auth.protect_app(app)
2324

2425

2526
# Health check endpoint for ECS/ALB (unprotected)
@@ -31,7 +32,7 @@ def health_check():
3132
# Main route - protected by app-wide auth middleware
3233
@app.get("/")
3334
def index(request: Request):
34-
user = auth.get_current_user(request)
35+
user = auth.get_auth_user(request)
3536

3637
return {
3738
"message": "You are Authorised!",
@@ -44,6 +45,6 @@ def index(request: Request):
4445
# Additional example route - also automatically protected
4546
@app.get("/api/user")
4647
def get_user(request: Request):
47-
user = auth.get_current_user(request)
48+
user = auth.get_auth_user(request)
4849

4950
return {"email": user.email, "groups": user.groups if hasattr(user, "groups") else []}

uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)