Update auth-gateway TemplateResponse calls for Starlette 1.x

This commit is contained in:
Eduardo Silva
2026-11-16 17:51:37 -03:00
parent 9de7851f06
commit 065f278c06
3 changed files with 16 additions and 12 deletions
@@ -1,13 +1,14 @@
from urllib.parse import urlsplit
from fastapi import APIRouter, Form, Request
from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
from auth_gateway.services.challenge_service import (
CHALLENGE_COOKIE_NAME,
generate_altcha_challenge,
generate_challenge_cookie,
verify_altcha_solution,
)
from fastapi import APIRouter, Form, Request
from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
router = APIRouter()
@@ -28,8 +29,9 @@ def _safe_next(url: str | None, external_path: str) -> str:
async def challenge_page(request: Request, next: str = "/"):
external_path = request.app.state.settings.external_path
return request.app.state.templates.TemplateResponse(
request,
"challenge.html",
{"request": request, "external_path": external_path, "next": next},
{"external_path": external_path, "next": next},
)
@@ -47,8 +49,9 @@ async def challenge_verify(request: Request, next: str = Form("/"), altcha: str
if not verify_altcha_solution(altcha, hmac_key):
return request.app.state.templates.TemplateResponse(
request,
"challenge.html",
{"request": request, "external_path": external_path, "next": next, "error": True},
{"external_path": external_path, "next": next, "error": True},
status_code=400,
)
@@ -34,11 +34,10 @@ router = APIRouter()
def _render(request: Request, template_name: str, status_code: int = 200, **context):
templates = request.app.state.templates
base_context = {
"request": request,
"external_path": request.app.state.settings.external_path,
}
base_context.update(context)
response = templates.TemplateResponse(template_name, base_context, status_code=status_code)
response = templates.TemplateResponse(request, template_name, base_context, status_code=status_code)
csrf_token = context.get("csrf_token")
if csrf_token:
set_csrf_cookie(request, response, csrf_token)