Merge pull request #926 from lsst-sqre/u/neophile

[neophile] Update dependencies

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.8
+    rev: v0.1.9
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
@@ -28,13 +28,13 @@ repos:
       - id: eslint
         additional_dependencies:
           - '@babel/[email protected]'
-          - '@babel/preset-react@7.22.15'
-          - eslint@8.55.0
+          - '@babel/preset-react@7.23.3'
+          - eslint@8.56.0
           - [email protected]
           - [email protected]
           - [email protected]
           - [email protected]
-          - eslint-plugin-import@2.28.1
+          - eslint-plugin-import@2.29.1
           - [email protected]
           - [email protected]
           - [email protected]

src/gafaelfawr/handlers/login.py

@@ -325,9 +325,9 @@ async def _error_system(
     if slack_client:
         await slack_client.post_exception(exc)
     return templates.TemplateResponse(
+        context.request,
         "login-error.html",
         context={
-            "request": context.request,
             "error": error,
             "message": error.value,
             "details": str(exc),
@@ -366,9 +366,9 @@ def _error_user(
     else:
         context.logger.warning("Authentication failed", error=error.value)
     return templates.TemplateResponse(
+        context.request,
         "login-error.html",
         context={
-            "request": context.request,
             "error": error,
             "message": error.value,
             "details": details,

src/gafaelfawr/templates.py

@@ -7,14 +7,14 @@
 from __future__ import annotations
 
 from fastapi.templating import Jinja2Templates
-from jinja2 import PackageLoader
+from jinja2 import Environment, PackageLoader
 
 __all__ = ["templates"]
 
-# Starlette requires a directory argument, but since we override the loader so
-# that the templates are retrieved from the Python package, it's unused.
 templates = Jinja2Templates(
-    loader=PackageLoader("gafaelfawr", package_path="templates"),
-    directory="templates",
+    env=Environment(
+        loader=PackageLoader("gafaelfawr", package_path="templates"),
+        autoescape=True,
+    ),
 )
 """The template manager."""

tests/models/oidc_test.py

@@ -18,7 +18,7 @@ def test_authorization_lifetime() -> None:
         token=Token(),
     )
     assert authorization.lifetime <= OIDC_AUTHORIZATION_LIFETIME
-    assert OIDC_AUTHORIZATION_LIFETIME - 2 <= authorization.lifetime
+    assert authorization.lifetime >= OIDC_AUTHORIZATION_LIFETIME - 2
 
     lifetime = timedelta(seconds=OIDC_AUTHORIZATION_LIFETIME)
     authorization.created_at = current_datetime() - lifetime