diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index a52a79bf7..6e5bd99e6 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -2,7 +2,7 @@ name: "Setup authentik testing environment"
description: "Setup authentik testing environment"
inputs:
- postgresql_tag:
+ postgresql_version:
description: "Optional postgresql image tag"
default: "12"
@@ -33,9 +33,8 @@ runs:
- name: Setup dependencies
shell: bash
run: |
- export PSQL_TAG=${{ inputs.postgresql_tag }}
+ export PSQL_TAG=${{ inputs.postgresql_version }}
docker-compose -f .github/actions/setup/docker-compose.yml up -d
- poetry env use python3.11
poetry install
cd web && npm ci
- name: Generate config
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 4f7cf5256..26baa3556 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -91,14 +91,13 @@ jobs:
git checkout $GITHUB_SHA
# Delete previous poetry env
rm -rf $(poetry env info --path)
+ poetry install
- name: Setup authentik env (ensure latest deps are installed)
uses: ./.github/actions/setup
with:
postgresql_version: ${{ matrix.psql }}
- name: migrate to latest
- run: |
- poetry install
- poetry run python -m lifecycle.migrate
+ run: poetry run python -m lifecycle.migrate
test-unittest:
name: test-unittest - PostgreSQL ${{ matrix.psql }}
runs-on: ubuntu-latest
diff --git a/authentik/events/utils.py b/authentik/events/utils.py
index 2bc3587d6..a7c3bdf3e 100644
--- a/authentik/events/utils.py
+++ b/authentik/events/utils.py
@@ -164,9 +164,10 @@ def sanitize_item(value: Any) -> Any:
if isinstance(value, (bool, int, float, NoneType, list, tuple, dict)):
return value
try:
- return DjangoJSONEncoder.default(value)
- finally:
+ return DjangoJSONEncoder().default(value)
+ except TypeError:
return str(value)
+ return str(value)
def sanitize_dict(source: dict[Any, Any]) -> dict[Any, Any]:
diff --git a/web/xliff/de.xlf b/web/xliff/de.xlf
index fb09939a9..9370ec145 100644
--- a/web/xliff/de.xlf
+++ b/web/xliff/de.xlf
@@ -6038,32 +6038,11 @@ Bindings to groups/users are checked against the user of the event.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-