Upgrade dependencies

fief-dev · Dec 29, 2023 · 6a5929c · 6a5929c
1 parent dab7f3e
commit 6a5929c
Show file tree

Hide file tree

Showing 24 changed files with 114 additions and 82 deletions.
diff --git a/fief/apps/auth/exception_handlers.py b/fief/apps/auth/exception_handlers.py
@@ -21,9 +21,9 @@
 
 async def authorize_exception_handler(request: Request, exc: AuthorizeException):
     return templates.TemplateResponse(
+        request,
         "auth/authorize.html",
         {
-            "request": request,
             "error": exc.error.error_description,
             "tenant": exc.tenant,
             "fatal_error": True,
@@ -64,10 +64,10 @@ async def login_exception_handler(
     form = await form_helper.get_form()
 
     return templates.TemplateResponse(
+        request,
         "auth/login.html",
         {
             "form": form,
-            "request": request,
             "error": exc.error.error_description,
             "oauth_providers": exc.oauth_providers,
             "tenant": exc.tenant,
@@ -94,9 +94,9 @@ async def token_request_exception_handler(request: Request, exc: TokenRequestExc
 
 async def logout_exception_handler(request: Request, exc: LogoutException):
     return templates.TemplateResponse(
+        request,
         "auth/logout.html",
         {
-            "request": request,
             "error": exc.error.error_description,
             "tenant": exc.tenant,
             "fatal_error": True,

diff --git a/fief/apps/dashboard/app.py b/fief/apps/dashboard/app.py
@@ -1,4 +1,4 @@
-from fastapi import Depends, FastAPI
+from fastapi import Depends, FastAPI, Request
 from fastapi.middleware.gzip import GZipMiddleware
 from fastapi.staticfiles import StaticFiles
 from starlette.middleware.sessions import SessionMiddleware
@@ -60,8 +60,8 @@
 @app.get(
     "/", name="dashboard:index", dependencies=[Depends(is_authenticated_admin_session)]
 )
-async def index(context: BaseContext = Depends(get_base_context)):
-    return templates.TemplateResponse("admin/index.html", {**context})
+async def index(request: Request, context: BaseContext = Depends(get_base_context)):
+    return templates.TemplateResponse(request, "admin/index.html", {**context})
 
 
 __all__ = ["app"]
diff --git a/fief/apps/dashboard/dependencies.py b/fief/apps/dashboard/dependencies.py
@@ -23,7 +23,6 @@ async def get_layout(hx_request: bool = Header(False)) -> str:
 
 
 class BaseContext(TypedDict):
-    request: Request
     layout: str
     hx_target: str | None
     user: FiefUserInfo
@@ -32,15 +31,13 @@ class BaseContext(TypedDict):
 
 
 async def get_base_context(
-    request: Request,
     hx_target: str | None = Header(None),
     layout: str = Depends(get_layout),
     userinfo: FiefUserInfo = Depends(get_userinfo),
     current_workspace: Workspace = Depends(get_current_workspace),
     workspaces: list[Workspace] = Depends(get_admin_user_workspaces),
 ) -> BaseContext:
     return {
-        "request": request,
         "layout": layout,
         "hx_target": hx_target,
         "user": userinfo,

diff --git a/fief/apps/dashboard/exception_handlers.py b/fief/apps/dashboard/exception_handlers.py
@@ -11,9 +11,9 @@
 async def http_exception_handler(request: Request, exc: StarletteHTTPException):
     headers = getattr(exc, "headers", None)
     return templates.TemplateResponse(
+        request,
         "admin/error.html",
         {
-            "request": request,
             "status_code": exc.status_code,
             "detail": exc.detail,
         },

diff --git a/fief/apps/dashboard/routers/api_keys.py b/fief/apps/dashboard/routers/api_keys.py
@@ -56,11 +56,12 @@ async def get_list_context(
 
 @router.get("/", name="dashboard.api_keys:list")
 async def list_api_keys(
+    request: Request,
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
     return templates.TemplateResponse(
-        "admin/api_keys/list.html", {**context, **list_context}
+        request, "admin/api_keys/list.html", {**context, **list_context}
     )
 
 
@@ -93,6 +94,7 @@ async def create_api_key(
         audit_logger.log_object_write(AuditLogMessage.OBJECT_CREATED, api_key)
 
         return templates.TemplateResponse(
+            request,
             "admin/api_keys/token.html",
             {**context, **list_context, "api_key": api_key, "token": token},
             status_code=status.HTTP_201_CREATED,
@@ -125,6 +127,7 @@ async def delete_api_key(
         )
     else:
         return templates.TemplateResponse(
+            request,
             "admin/api_keys/delete.html",
             {**context, **list_context, "api_key": api_key},
         )
diff --git a/fief/apps/dashboard/routers/auth.py b/fief/apps/dashboard/routers/auth.py
@@ -2,11 +2,12 @@
 
 from fastapi import APIRouter, Depends, Query, Request, status
 from fastapi.responses import RedirectResponse
+from fief_client import FiefAsync
 
 from fief.crypto.token import generate_token
 from fief.dependencies.admin_authentication import is_authenticated_admin_session
 from fief.dependencies.admin_session import get_admin_session_token
-from fief.dependencies.fief import FiefAsyncRelativeEndpoints, get_fief
+from fief.dependencies.fief import get_fief
 from fief.dependencies.main_repositories import get_main_repository
 from fief.models import AdminSessionToken
 from fief.repositories import AdminSessionTokenRepository
@@ -19,7 +20,7 @@
 async def login(
     request: Request,
     screen: str = Query("login"),
-    fief: FiefAsyncRelativeEndpoints = Depends(get_fief),
+    fief: FiefAsync = Depends(get_fief),
 ):
     url = await fief.auth_url(
         redirect_uri=str(request.url_for("dashboard.auth:callback")),
@@ -33,7 +34,7 @@ async def login(
 async def callback(
     request: Request,
     code: str = Query(...),
-    fief: FiefAsyncRelativeEndpoints = Depends(get_fief),
+    fief: FiefAsync = Depends(get_fief),
     repository: AdminSessionTokenRepository = Depends(
         get_main_repository(AdminSessionTokenRepository)
     ),

diff --git a/fief/apps/dashboard/routers/clients.py b/fief/apps/dashboard/routers/clients.py
@@ -68,20 +68,23 @@ async def get_list_template(hx_combobox: bool = Header(False)) -> str:
 
 @router.get("/", name="dashboard.clients:list")
 async def list_clients(
+    request: Request,
     template: str = Depends(get_list_template),
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
-    return templates.TemplateResponse(template, {**context, **list_context})
+    return templates.TemplateResponse(request, template, {**context, **list_context})
 
 
 @router.get("/{id:uuid}", name="dashboard.clients:get")
 async def get_client(
+    request: Request,
     client: Client = Depends(get_client_by_id_or_404),
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
     return templates.TemplateResponse(
+        request,
         "admin/clients/get/general.html",
         {**context, **list_context, "client": client, "tab": "general"},
     )
@@ -209,6 +212,7 @@ async def update_client(
     name="dashboard.clients:encryption_key",
 )
 async def create_encryption_key(
+    request: Request,
     client: Client = Depends(get_client_by_id_or_404),
     repository: ClientRepository = Depends(get_workspace_repository(ClientRepository)),
     context: BaseContext = Depends(get_base_context),
@@ -222,6 +226,7 @@ async def create_encryption_key(
     trigger_webhooks(ClientUpdated, client, schemas.client.Client)
 
     return templates.TemplateResponse(
+        request,
         "admin/clients/encryption_key.html",
         {**context, "client": client, "key": key.export(as_dict=True)},
     )
@@ -252,6 +257,7 @@ async def delete_client(
         )
     else:
         return templates.TemplateResponse(
+            request,
             "admin/clients/delete.html",
             {**context, **list_context, "client": client},
         )
diff --git a/fief/apps/dashboard/routers/email_templates.py b/fief/apps/dashboard/routers/email_templates.py
@@ -66,11 +66,12 @@ async def get_list_context(
 
 @router.get("/", name="dashboard.email_templates:list")
 async def list_email_templates(
+    request: Request,
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
     return templates.TemplateResponse(
-        "admin/email_templates/list.html", {**context, **list_context}
+        request, "admin/email_templates/list.html", {**context, **list_context}
     )
 
 
@@ -120,10 +121,12 @@ async def update_email_template(
         )
         try:
             subject = await email_subject_renderer.render(
-                EmailTemplateType[email_template_preview.type], sample_context
+                EmailTemplateType[email_template_preview.type],
+                sample_context,
             )  # type: ignore
             content = await email_template_renderer.render(
-                EmailTemplateType[email_template_preview.type], sample_context
+                EmailTemplateType[email_template_preview.type],
+                sample_context,
             )  # type: ignore
         except jinja2.exceptions.TemplateError as e:
             return await form_helper.get_error_response(

diff --git a/fief/apps/dashboard/routers/oauth_providers.py b/fief/apps/dashboard/routers/oauth_providers.py
@@ -69,20 +69,23 @@ async def get_list_template(hx_combobox: bool = Header(False)) -> str:
 
 @router.get("/", name="dashboard.oauth_providers:list")
 async def list_oauth_providers(
+    request: Request,
     template: str = Depends(get_list_template),
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
-    return templates.TemplateResponse(template, {**context, **list_context})
+    return templates.TemplateResponse(request, template, {**context, **list_context})
 
 
 @router.get("/{id:uuid}", name="dashboard.oauth_providers:get")
 async def get_oauth_provider(
+    request: Request,
     oauth_provider: OAuthProvider = Depends(get_oauth_provider_by_id_or_404),
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
     return templates.TemplateResponse(
+        request,
         "admin/oauth_providers/get.html",
         {**context, **list_context, "oauth_provider": oauth_provider},
     )
@@ -205,6 +208,7 @@ async def delete_oauth_provider(
         )
     else:
         return templates.TemplateResponse(
+            request,
             "admin/oauth_providers/delete.html",
             {**context, **list_context, "oauth_provider": oauth_provider},
         )
diff --git a/fief/apps/dashboard/routers/permissions.py b/fief/apps/dashboard/routers/permissions.py
@@ -142,6 +142,7 @@ async def delete_permission(
         )
     else:
         return templates.TemplateResponse(
+            request,
             "admin/permissions/delete.html",
             {**form_helper.context, "permission": permission},
         )
diff --git a/fief/apps/dashboard/routers/roles.py b/fief/apps/dashboard/routers/roles.py
@@ -65,20 +65,23 @@ async def get_list_template(hx_combobox: bool = Header(False)) -> str:
 
 @router.get("/", name="dashboard.roles:list")
 async def list_roles(
+    request: Request,
     template: str = Depends(get_list_template),
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
-    return templates.TemplateResponse(template, {**context, **list_context})
+    return templates.TemplateResponse(request, template, {**context, **list_context})
 
 
 @router.get("/{id:uuid}", name="dashboard.roles:get")
 async def get_role(
+    request: Request,
     role: Role = Depends(get_role_by_id_or_404),
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
     return templates.TemplateResponse(
+        request,
         "admin/roles/get.html",
         {**context, **list_context, "role": role},
     )
@@ -223,6 +226,7 @@ async def delete_role(
         )
     else:
         return templates.TemplateResponse(
+            request,
             "admin/roles/delete.html",
             {**context, **list_context, "role": role},
         )
diff --git a/fief/apps/dashboard/routers/tenants.py b/fief/apps/dashboard/routers/tenants.py
@@ -88,20 +88,23 @@ async def get_list_template(hx_combobox: bool = Header(False)) -> str:
 
 @router.get("/", name="dashboard.tenants:list")
 async def list_tenants(
+    request: Request,
     template: str = Depends(get_list_template),
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
-    return templates.TemplateResponse(template, {**context, **list_context})
+    return templates.TemplateResponse(request, template, {**context, **list_context})
 
 
 @router.get("/{id:uuid}", name="dashboard.tenants:get")
 async def get_tenant(
+    request: Request,
     tenant: Tenant = Depends(get_tenant_by_id_or_404),
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
     return templates.TemplateResponse(
+        request,
         "admin/tenants/get/general.html",
         {**context, **list_context, "tenant": tenant, "tab": "general"},
     )
@@ -399,6 +402,7 @@ async def delete_tenant(
     users_count = await user_repository.count_by_tenant(tenant.id)
     clients_count = await client_repository.count_by_tenant(tenant.id)
     return templates.TemplateResponse(
+        request,
         "admin/tenants/delete.html",
         {
             **context,

diff --git a/fief/apps/dashboard/routers/themes.py b/fief/apps/dashboard/routers/themes.py
@@ -64,11 +64,12 @@ async def get_list_template(hx_combobox: bool = Header(False)) -> str:
 
 @router.get("/", name="dashboard.themes:list")
 async def list_themes(
+    request: Request,
     template: str = Depends(get_list_template),
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
-    return templates.TemplateResponse(template, {**context, **list_context})
+    return templates.TemplateResponse(request, template, {**context, **list_context})
 
 
 @router.api_route("/create", methods=["GET", "POST"], name="dashboard.themes:create")

diff --git a/fief/apps/dashboard/routers/user_fields.py b/fief/apps/dashboard/routers/user_fields.py
@@ -72,21 +72,24 @@ async def get_list_context(
 
 @router.get("/", name="dashboard.user_fields:list")
 async def list_user_fields(
+    request: Request,
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
     return templates.TemplateResponse(
-        "admin/user_fields/list.html", {**context, **list_context}
+        request, "admin/user_fields/list.html", {**context, **list_context}
     )
 
 
 @router.get("/{id:uuid}", name="dashboard.user_fields:get")
 async def get_user_field(
+    request: Request,
     user_field: UserField = Depends(get_user_field_by_id_or_404),
     list_context=Depends(get_list_context),
     context: BaseContext = Depends(get_base_context),
 ):
     return templates.TemplateResponse(
+        request,
         "admin/user_fields/get.html",
         {**context, **list_context, "user_field": user_field},
     )
@@ -236,6 +239,7 @@ async def delete_user_field(
         )
     else:
         return templates.TemplateResponse(
+            request,
             "admin/user_fields/delete.html",
             {**context, **list_context, "user_field": user_field},
         )