Compare commits

..

77 Commits

Author SHA1 Message Date
Teffen Ellis
c11f407470 web: Demo. 2025-08-25 22:40:00 +02:00
Teffen Ellis
b7c6b961a1 web: Flesh out wave boi. 2025-08-25 18:25:20 +02:00
Teffen Ellis
e6adb72695 web: Flesh out reload behavior. 2025-08-25 18:25:18 +02:00
Teffen Ellis
9cbdcd2cad web: Automatic reload during server start up. 2025-08-25 18:25:12 +02:00
Marc 'risson' Schmitt
197f4c5585 providers/oauth2: avoid deadlock during session migration (#16361) 2025-08-25 17:48:20 +02:00
dependabot[bot]
80e9865c6a lifecycle/aws: bump aws-cdk from 2.1025.0 to 2.1026.0 in /lifecycle/aws (#16352)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-25 12:25:57 +00:00
dependabot[bot]
c08df26c65 core: bump github.com/stretchr/testify from 1.10.0 to 1.11.0 (#16357)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-25 14:07:09 +02:00
dependabot[bot]
332a53ceff core: bump axllent/mailpit from v1.27.5 to v1.27.6 in /tests/e2e (#16358)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-25 14:06:01 +02:00
Mo
4919772d68 website/docs: fix missing trailing slash in vaultwarden documentation (#16348)
Missing trailing slash in documentation

Won't work without the missing forward slash.
Source: https://github.com/dani-garcia/vaultwarden/wiki/Enabling-SSO-support-using-OpenId-Connect#authentik

Signed-off-by: Mo <65728018+Moe1369@users.noreply.github.com>
2025-08-24 22:16:54 +01:00
Dominic R
a978b4b60e root: fix security.md (#16345)
Signed-off-by: Dominic R <dominic@sdko.org>
2025-08-24 22:13:45 +01:00
Dewi Roberts
17bd1f1574 root: update security.md with github reporting link (#16332)
* Adds github reporting link

* Applied suggestions

* Improved wording

* Improved wording
2025-08-22 16:46:16 +01:00
Marc 'risson' Schmitt
0b4be1fdda website/docs: 2025.8.1 release notes (#16343) 2025-08-22 14:51:40 +00:00
Marc 'risson' Schmitt
e305c98eb8 packages/django-dramatiq-postgres: broker: fix various timing issues (#16340) 2025-08-22 14:04:54 +00:00
Dewi Roberts
35bd1d9907 website/docs: adds details to certificates doc (#16335)
* Clarifies certs directory mounting and adds instruction for manually re-triggering discovery.

* Fixed mounting info

* Update website/docs/sys-mgmt/certificates.md

Co-authored-by: Dominic R <dominic@sdko.org>
Signed-off-by: Dewi Roberts <dewi@goauthentik.io>

* Update website/docs/sys-mgmt/certificates.md

Co-authored-by: Dominic R <dominic@sdko.org>
Signed-off-by: Dewi Roberts <dewi@goauthentik.io>

---------

Signed-off-by: Dewi Roberts <dewi@goauthentik.io>
Co-authored-by: Dominic R <dominic@sdko.org>
2025-08-22 14:53:44 +01:00
Marc 'risson' Schmitt
3150885889 outposts: allow ingress path type configuration (#16339) 2025-08-22 15:36:18 +02:00
authentik-automation[bot]
5fd96518d3 core, web: update translations (#16321)
Co-authored-by: authentik-automation[bot] <135050075+authentik-automation[bot]@users.noreply.github.com>
2025-08-22 12:47:49 +00:00
Marc 'risson' Schmitt
287647beea outposts: fix service connection update task arguments (#16312) 2025-08-22 14:31:49 +02:00
Marcelo Elizeche Landó
2c1a0ca0fc core: use email backend for test_email management command (#16311) 2025-08-22 14:17:02 +02:00
dependabot[bot]
da47095ebc core: bump astral-sh/uv from 0.8.12 to 0.8.13 (#16325)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-22 14:15:57 +02:00
Dominic R
2ea95ba189 website: Move docs netlify.toml (#16320)
* website: Move docs netlify.toml

* Update publish path in Netlify configuration

Signed-off-by: Dominic R <dominic@sdko.org>

---------

Signed-off-by: Dominic R <dominic@sdko.org>
2025-08-22 13:36:16 +02:00
Tana M Berry
b277828b21 website/docs: add link in 2025.8 rel notes to back-channel logout docs (#16306)
Co-authored-by: Tana M Berry <tana@goauthentik.io>
2025-08-21 19:12:54 +00:00
Marc 'risson' Schmitt
8765c92fc4 packages/django-dramatiq-postgres: middleware: fix listening on hosts where ipv6 is not supported (#16308) 2025-08-21 19:11:21 +00:00
Teffen Ellis
536688f23b website: Fix version origin detection, build-time URLs (#15774)
* website: Update route base path.

* website: Add copy step for migration.

* website: Use build redirects.

* website: Ensure that netlify config is picked up.

* website: Add shared Netlify plugin cache.

* website: Use relative path.

* website: Fix routing when moving across versioned URLs.

* website: Fix issues surrounding origin detection.

* website: Allow integrations to omit plugin data, fix types.
2025-08-21 18:31:54 +00:00
Teffen Ellis
7861f5a40e web/a11y: Associating labels with inputs (#16119)
web: Flesh out use of label component.

web: Add correct ID to stage inputs.
2025-08-21 18:28:38 +00:00
Teffen Ellis
e7b43b72ab web: Username truncation, field alignment. (#16283) 2025-08-21 18:03:51 +02:00
Dewi Roberts
2bf9a9d4fe website/docs: adds a webhook header mapping example (#16301)
* Adds webhook header example

* Small changes

* Update website/docs/sys-mgmt/events/transports.md

Co-authored-by: Tana M Berry <tanamarieberry@yahoo.com>
Signed-off-by: Dewi Roberts <dewi@goauthentik.io>

---------

Signed-off-by: Dewi Roberts <dewi@goauthentik.io>
Co-authored-by: Tana M Berry <tanamarieberry@yahoo.com>
2025-08-21 16:59:03 +01:00
Teffen Ellis
f6af8f3b9d web: Fix issue where form group uses unknown slot. (#16276) 2025-08-21 17:56:26 +02:00
Marc 'risson' Schmitt
c9a4eff3a8 lifecycle: set PROMETHEUS_MULTIPROC_DIR as early as possible (#16298) 2025-08-21 11:09:36 -03:00
Marc 'risson' Schmitt
b893305e5f providers/oauth2: fix logout token missing sid, fix wrong sub mode used (#16295) 2025-08-21 10:43:10 -03:00
dependabot[bot]
b3a5cc8320 web: bump core-js from 3.45.0 to 3.45.1 in /web (#16290)
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.45.0 to 3.45.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.45.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-version: 3.45.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-21 08:29:05 -04:00
Dominic R
94d7a989a1 root: Remove CODEOWNERS entries from docs/ directory (#16287) 2025-08-21 14:19:09 +02:00
Dominic R
359fa5d5df *: Fix dead doc link (#16288) 2025-08-21 14:09:20 +02:00
Dominic R
11c9015a49 web: saml provider view: fix state refresh issues (#14474)
* web: saml provider view: fix state refresh issues

Fixes the following issues:
1. Fixed incorrect certificate download when changing a signing certificate - previously, clicking "Download Signing Certificate" after updating a certificate would still download the old certificate until the page was refreshed.
2. Fixed missing UI updates when adding a signing certificate - previously, when a signing certificate was added to a provider, the download button wouldn't appear until the page was refreshed.
3. Fixed persistent download button when removing a certificate - previously, when a signing certificate was removed from a provider, the download button would still be visible until the page was refreshed.

* prob has more uses than for certs only

* teffen's suggestions

Signed-off-by: Dominic R <dominic@sdko.org>

* fix

Signed-off-by: Dominic R <dominic@sdko.org>

* this should fix it?

Signed-off-by: Dominic R <dominic@sdko.org>

---------

Signed-off-by: Dominic R <dominic@sdko.org>
2025-08-21 03:39:16 +02:00
Max
f135990c6b web: fix "Explore integrations" link in Quick actions (#16274)
fix "Explore integrations" link in Quick actions
2025-08-20 19:21:46 -04:00
Max
6f63a3eb15 website/integrations: fix dead links to external docs (#16273) 2025-08-20 18:46:27 +00:00
Marc 'risson' Schmitt
2209fcea2a tasks: add rel_obj to system task exception event (#16270) 2025-08-20 17:29:05 +00:00
Marc 'risson' Schmitt
e5efb50a37 website/docs: update 2025.8 release notes (#16269) 2025-08-20 19:15:20 +02:00
dependabot[bot]
bbc02dc065 web: bump @patternfly/elements from 4.1.0 to 4.2.0 in /web (#16265)
Bumps [@patternfly/elements](https://github.com/patternfly/patternfly-elements/tree/HEAD/elements) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/patternfly/patternfly-elements/releases)
- [Changelog](https://github.com/patternfly/patternfly-elements/blob/main/elements/CHANGELOG.md)
- [Commits](https://github.com/patternfly/patternfly-elements/commits/@patternfly/elements@4.2.0/elements)

---
updated-dependencies:
- dependency-name: "@patternfly/elements"
  dependency-version: 4.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-20 13:05:02 +01:00
dependabot[bot]
f3f81951c6 web: bump mermaid from 11.9.0 to 11.10.0 in /web (#16263)
Bumps [mermaid](https://github.com/mermaid-js/mermaid) from 11.9.0 to 11.10.0.
- [Release notes](https://github.com/mermaid-js/mermaid/releases)
- [Commits](https://github.com/mermaid-js/mermaid/compare/mermaid@11.9.0...mermaid@11.10.0)

---
updated-dependencies:
- dependency-name: mermaid
  dependency-version: 11.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-20 13:04:50 +01:00
dependabot[bot]
739eff66e0 web: bump @types/guacamole-common-js from 1.5.3 to 1.5.4 in /web (#16262)
Bumps [@types/guacamole-common-js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/guacamole-common-js) from 1.5.3 to 1.5.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/guacamole-common-js)

---
updated-dependencies:
- dependency-name: "@types/guacamole-common-js"
  dependency-version: 1.5.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-20 13:04:24 +01:00
Dominic R
48de61a926 security: Bump supported versions (#16261)
Signed-off-by: Dominic R <dominic@sdko.org>
2025-08-20 12:41:45 +01:00
Marcelo Elizeche Landó
032031f2cf core: bump channels from 4.3.0 to v4.3.1 (#16260) 2025-08-20 13:25:44 +02:00
transifex-integration[bot]
4e44209af1 translate: Updates for file web/xliff/en.xlf in cs_CZ (#16264)
* Translate web/xliff/en.xlf in cs_CZ

100% translated source file: 'web/xliff/en.xlf'
on 'cs_CZ'.

* Translate web/xliff/en.xlf in cs_CZ

100% translated source file: 'web/xliff/en.xlf'
on 'cs_CZ'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2025-08-20 11:12:41 +00:00
dependabot[bot]
289555abcd website: bump the eslint group in /website with 3 updates (#16248) 2025-08-19 21:38:10 +01:00
Marcelo Elizeche Landó
943c456555 stages/authenticator_duo: Add test to fix codecov error (#16257)
* Add test to fix codecov error

* use self.assertJSONEqual instead of assertEqual
2025-08-19 22:12:39 +02:00
dependabot[bot]
a79b914d39 core: bump selenium/standalone-chrome from 138.0 to 139.0 in /tests/e2e (#16256) 2025-08-19 21:06:20 +01:00
dependabot[bot]
7a8816abd1 web: bump the eslint group across 2 directories with 3 updates (#16255) 2025-08-19 21:06:00 +01:00
Dominic R
93e448c3fd website/docs: sys-mgmt/s3: Clean up and improve (#16242)
* website/docs: sys-mgmt/s3: Clean up and improve

Signed-off-by: Dominic R <dominic@sdko.org>

Co-authored-by: Dewi Roberts <dewi@goauthentik.io>

* Update website/docs/sys-mgmt/ops/storage-s3.md

Signed-off-by: Dewi Roberts <dewi@goauthentik.io>

---------

Signed-off-by: Dewi Roberts <dewi@goauthentik.io>
Co-authored-by: Dewi Roberts <dewi@goauthentik.io>
2025-08-19 15:01:32 -05:00
Tana M Berry
109c869f97 website/docs: Advanced queries, remove reference to QL and add more examples (#16191)
* remove reference to QL

* add Jens' examples

* tweak

* Update website/docs/users-sources/user/user_basic_operations.md

Co-authored-by: Jens L. <jens@goauthentik.io>
Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* Update website/docs/users-sources/user/user_basic_operations.md

Co-authored-by: Jens L. <jens@goauthentik.io>
Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* add note about UX ticks

* tweak

* argh

* clarify there are more values

* add link to Event actions list

* tweaks, typo

* Update website/docs/users-sources/user/user_basic_operations.md

Co-authored-by: Dewi Roberts <dewi@goauthentik.io>
Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* Update website/docs/sys-mgmt/events/logging-events.md

Co-authored-by: Jens L. <jens@goauthentik.io>
Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* jens edits

---------

Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>
Co-authored-by: Tana M Berry <tana@goauthentik.io>
Co-authored-by: Jens L. <jens@goauthentik.io>
Co-authored-by: Dewi Roberts <dewi@goauthentik.io>
2025-08-19 14:27:00 -05:00
Dominic R
8029fdad7b website/integrations: emby (#15921)
Signed-off-by: Dominic R <dominic@sdko.org>
Co-authored-by: Tana Berry <tana@goauthentik.io>
Co-authored-by: Dewi Roberts <dewi@goauthentik.io>
Co-authored-by: Ivan Schaller <ivan@schaller.sh>
2025-08-19 14:12:45 -05:00
Marcelo Elizeche Landó
d2aac457ef stages/authenticator_duo: return generic error message (#16194)
* return generic error message

Signed-off-by: Marcelo Elizeche Landó <marcelo@goauthentik.io>

* fix linting

* Trigger Build

---------

Signed-off-by: Marcelo Elizeche Landó <marcelo@goauthentik.io>
2025-08-19 18:27:48 +02:00
dependabot[bot]
70ce5ccceb core: bump axllent/mailpit from v1.27.4 to v1.27.5 in /tests/e2e (#16252)
Bumps axllent/mailpit from v1.27.4 to v1.27.5.

---
updated-dependencies:
- dependency-name: axllent/mailpit
  dependency-version: v1.27.5
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-19 17:05:56 +01:00
dependabot[bot]
173c334478 core: bump astral-sh/uv from 0.8.11 to 0.8.12 (#16250)
Bumps [astral-sh/uv](https://github.com/astral-sh/uv) from 0.8.11 to 0.8.12.
- [Release notes](https://github.com/astral-sh/uv/releases)
- [Changelog](https://github.com/astral-sh/uv/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/uv/compare/0.8.11...0.8.12)

---
updated-dependencies:
- dependency-name: astral-sh/uv
  dependency-version: 0.8.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-19 17:05:33 +01:00
dependabot[bot]
6e321097a1 web: bump the rollup group across 1 directory with 4 updates (#16251)
Bumps the rollup group with 4 updates in the /web directory: [@rollup/rollup-darwin-arm64](https://github.com/rollup/rollup), [@rollup/rollup-linux-arm64-gnu](https://github.com/rollup/rollup), [@rollup/rollup-linux-x64-gnu](https://github.com/rollup/rollup) and [rollup](https://github.com/rollup/rollup).


Updates `@rollup/rollup-darwin-arm64` from 4.46.2 to 4.46.3
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.46.2...v4.46.3)

Updates `@rollup/rollup-linux-arm64-gnu` from 4.46.2 to 4.46.3
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.46.2...v4.46.3)

Updates `@rollup/rollup-linux-x64-gnu` from 4.46.2 to 4.46.3
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.46.2...v4.46.3)

Updates `rollup` from 4.46.2 to 4.46.3
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.46.2...v4.46.3)

---
updated-dependencies:
- dependency-name: "@rollup/rollup-darwin-arm64"
  dependency-version: 4.46.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rollup
- dependency-name: "@rollup/rollup-linux-arm64-gnu"
  dependency-version: 4.46.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rollup
- dependency-name: "@rollup/rollup-linux-x64-gnu"
  dependency-version: 4.46.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rollup
- dependency-name: rollup
  dependency-version: 4.46.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rollup
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-19 17:05:29 +01:00
dependabot[bot]
f3bf8097b8 core: bump goauthentik/fips-python from 3.13.6-slim-bookworm-fips to 3.13.7-slim-bookworm-fips (#16253)
core: bump goauthentik/fips-python

Bumps goauthentik/fips-python from 3.13.6-slim-bookworm-fips to 3.13.7-slim-bookworm-fips.

---
updated-dependencies:
- dependency-name: goauthentik/fips-python
  dependency-version: 3.13.7-slim-bookworm-fips
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-19 17:05:16 +01:00
authentik-automation[bot]
b869433e4d core, web: update translations (#16244)
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: authentik-automation[bot] <135050075+authentik-automation[bot]@users.noreply.github.com>
2025-08-19 13:51:45 +01:00
Dominic R
5aef86c3d1 core: Block usage of Django's createsuperuser (#16215)
wip
2025-08-19 13:43:06 +01:00
Dominic R
970ac44ff8 web: Do not mark Attributes as a mandatory field (#16004)
* web: Do not mark Attributes as a mandatory field

* fix lint

* Teffen's suggestion
2025-08-19 14:16:49 +02:00
dependabot[bot]
9145d55e6c web: bump @types/react from 19.1.8 to 19.1.10 in /packages/docusaurus-config (#16131)
web: bump @types/react in /packages/docusaurus-config

Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 19.1.8 to 19.1.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-version: 19.1.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-18 20:39:35 +01:00
Dominic R
1c36b361b2 router: fix missing response headers on compressed 404 for static files (#16216)
* router: only serve dist assets if present; fallback to backend 404

* fix

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

---------

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Co-authored-by: Jens Langhammer <jens@goauthentik.io>
2025-08-18 20:18:28 +01:00
Teffen Ellis
d55e23cdb8 web: Fix ak-flow-card footer alignment. (#16236) 2025-08-18 18:10:51 +00:00
Teffen Ellis
52673e4223 web: Fix reported error precedence (#16231)
* web: Fix issue where controlled element is not assigned.

* web: Fix preferred error to display when API response include fields.

* web: Clarify error message alert.

* web: Fix issue where impersonation form can be submitted with empty
fields. Clarify message behavior.
2025-08-18 17:39:44 +00:00
Marc 'risson' Schmitt
5cbcbf8d2c brands: revert sort matched brand by match length (revert #15413) (#16233) 2025-08-18 17:22:00 +00:00
Dominic R
f29a4c1876 website/integrations: vaultwarden (#16057)
Signed-off-by: Dominic R <dominic@sdko.org>
Co-authored-by: Dewi Roberts <dewi@goauthentik.io>
2025-08-18 11:36:41 -05:00
Brian Begun
38fb5cd712 website/integrations: update tautulli (#16059)
* Update index.md

Revised tutorial using new template.  Sorry for the delay on this.  

Signed-off-by: Brian Begun <begunfx@usa.net>

* Update website/integrations/media/tautulli/index.md

Co-authored-by: Dominic R <dominic@sdko.org>
Signed-off-by: Brian Begun <begunfx@usa.net>

* fix linting

* remove placeholder section

* Update website/integrations/media/tautulli/index.md

Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* Update website/integrations/media/tautulli/index.md

Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* Update website/integrations/media/tautulli/index.md

Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* Update website/integrations/media/tautulli/index.md

Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* Update website/integrations/media/tautulli/index.md

Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* Update website/integrations/media/tautulli/index.md

Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* Update website/integrations/media/tautulli/index.md

Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

* Update website/integrations/media/tautulli/index.md

Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>

---------

Signed-off-by: Brian Begun <begunfx@usa.net>
Signed-off-by: Tana M Berry <tanamarieberry@yahoo.com>
Co-authored-by: Dominic R <dominic@sdko.org>
Co-authored-by: Marcelo Elizeche Landó <marcelo@goauthentik.io>
Co-authored-by: Tana M Berry <tanamarieberry@yahoo.com>
2025-08-18 11:30:35 -05:00
authentik-automation[bot]
5b2aad586f core, web: update translations (#16210)
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: authentik-automation[bot] <135050075+authentik-automation[bot]@users.noreply.github.com>
2025-08-18 17:12:15 +01:00
Simonyi Gergő
2dd1c7b1ab rbac: assign InitialPermissions in a middleware (#16138)
assign `InitialPermission`s in a middleware

This will catch more creation events, hopefully fixing things like
https://github.com/goauthentik/authentik/issues/14313
2025-08-18 18:02:48 +02:00
dependabot[bot]
57c24e5c1c website: bump @types/node from 24.2.1 to 24.3.0 in /website (#16218)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.2.1 to 24.3.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-18 16:50:46 +01:00
dependabot[bot]
76d9b3479e web: bump the goauthentik group across 1 directory with 2 updates (#16219)
Bumps the goauthentik group with 2 updates in the /web directory: @goauthentik/prettier-config and [@goauthentik/api](https://github.com/goauthentik/authentik).


Updates `@goauthentik/prettier-config` from 1.0.5 to 3.1.0

Updates `@goauthentik/api` from 2024.6.0-1720200294 to 2025.10.0-rc1-1755254677
- [Release notes](https://github.com/goauthentik/authentik/releases)
- [Commits](https://github.com/goauthentik/authentik/commits)

---
updated-dependencies:
- dependency-name: "@goauthentik/prettier-config"
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: goauthentik
- dependency-name: "@goauthentik/api"
  dependency-version: 2025.10.0-rc1-1755254677
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: goauthentik
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-18 16:50:38 +01:00
dependabot[bot]
e9f946cdf2 web: bump @types/node from 24.2.1 to 24.3.0 in /packages/prettier-config (#16220)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.2.1 to 24.3.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.3.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-18 16:50:22 +01:00
dependabot[bot]
167452f1ed web: bump @types/node from 24.2.1 to 24.3.0 in /packages/esbuild-plugin-live-reload (#16221)
web: bump @types/node in /packages/esbuild-plugin-live-reload

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.2.1 to 24.3.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.3.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-18 16:50:14 +01:00
dependabot[bot]
dbfdb37e83 web: bump @types/node from 22.15.19 to 24.3.0 in /web (#16222)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.15.19 to 24.3.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.3.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-18 16:48:49 +01:00
dependabot[bot]
efdbf7aeed core: bump goauthentik.io/api/v3 from 3.2025100.1 to 3.2025100.2 (#16217)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-18 15:43:36 +02:00
Dominic R
8e9e4de80f website: prettierignore: Add docsmg Rust target (#16067) 2025-08-18 15:31:21 +02:00
Teffen Ellis
a63c5b1846 web: Improvements to ReCaptcha resizing (#16171)
* web: Remove comments from serialized HTML.

* web: Apply color theme to iframe.

* web: Fix issues surrounding reCaptcha resize events not propagating.
2025-08-18 13:24:14 +00:00
Teffen Ellis
80b84fa8a8 web/a11y: QL Search Input (#16198)
web: Fix issues surrounding form submission, keyboard focus, alignment.
2025-08-18 15:01:47 +02:00
Dominic R
4ce9795491 website/integrations: headscale: Remove href in product description (#16214)
Not included in any other integration and frankly unneeded with the link right below

Signed-off-by: Dominic R <dominic@sdko.org>
2025-08-18 01:41:27 -05:00
178 changed files with 6981 additions and 11242 deletions

View File

@@ -33,17 +33,12 @@ packages/prettier-config @goauthentik/frontend
packages/tsconfig @goauthentik/frontend
# Web
web/ @goauthentik/frontend
tests/wdio/ @goauthentik/frontend
# Locale
locale/ @goauthentik/backend @goauthentik/frontend
web/xliff/ @goauthentik/backend @goauthentik/frontend
# Docs & Website
docs/ @goauthentik/docs
# TODO Remove after moving website to docs
# Docs
website/ @goauthentik/docs
CODE_OF_CONDUCT.md @goauthentik/docs
# Security
SECURITY.md @goauthentik/security @goauthentik/docs
# TODO Remove after moving website to docs
website/security/ @goauthentik/security @goauthentik/docs
docs/security/ @goauthentik/security @goauthentik/docs

View File

@@ -76,9 +76,9 @@ RUN --mount=type=secret,id=GEOIPUPDATE_ACCOUNT_ID \
/bin/sh -c "GEOIPUPDATE_LICENSE_KEY_FILE=/run/secrets/GEOIPUPDATE_LICENSE_KEY /usr/bin/entry.sh || echo 'Failed to get GeoIP database, disabling'; exit 0"
# Stage 4: Download uv
FROM ghcr.io/astral-sh/uv:0.8.11 AS uv
FROM ghcr.io/astral-sh/uv:0.8.13 AS uv
# Stage 5: Base python image
FROM ghcr.io/goauthentik/fips-python:3.13.6-slim-bookworm-fips AS python-base
FROM ghcr.io/goauthentik/fips-python:3.13.7-slim-bookworm-fips AS python-base
ENV VENV_PATH="/ak-root/.venv" \
PATH="/lifecycle:/ak-root/.venv/bin:$PATH" \

View File

@@ -20,12 +20,33 @@ Even if the issue is not a CVE, we still greatly appreciate your help in hardeni
| Version | Supported |
| --------- | --------- |
| 2025.4.x | ✅ |
| 2025.6.x | ✅ |
| 2025.8.x | ✅ |
## Reporting a Vulnerability
To report a vulnerability, send an email to [security@goauthentik.io](mailto:security@goauthentik.io). Be sure to include relevant information like which version you've found the issue in, instructions on how to reproduce the issue, and anything else that might make it easier for us to find the issue.
If you discover a potential vulnerability, please report it responsibly through one of the following channels:
- **Email**: [security@goauthentik.io](mailto:security@goauthentik.io)
- **GitHub**: Submit a private security advisory via our [repositorys advisory portal](https://github.com/goauthentik/authentik/security/advisories/new)
When submitting a report, please include as much detail as possible, such as:
- **Affected version(s)**: The version of authentik where the issue was identified.
- **Steps to reproduce**: A clear description or proof of concept to help us verify the issue.
- **Impact assessment**: How the vulnerability could be exploited and its potential effect.
- **Additional information**: Logs, configuration details (if relevant), or any suggested mitigations.
We kindly ask that you do not disclose the vulnerability publicly until we have confirmed and addressed the issue.
Our team will:
- Acknowledge receipt of your report as quickly as possible.
- Keep you updated on the investigation and resolution progress.
## Researcher Recognition
We value contributions from the security community. For each valid report, we will publish a dedicated entry on our Security Advisory page that optionally includes the reporters name (or preferred alias). Please note that while we do not currently offer monetary bounties, we are committed to giving researchers appropriate credit for their efforts in keeping authentik secure.
## Severity levels

View File

@@ -63,28 +63,6 @@ class TestBrands(APITestCase):
},
)
def test_brand_subdomain_same_suffix(self):
"""Test Current brand API"""
Brand.objects.all().delete()
Brand.objects.create(domain="bar.baz", branding_title="custom")
Brand.objects.create(domain="foo.bar.baz", branding_title="custom")
self.assertJSONEqual(
self.client.get(
reverse("authentik_api:brand-current"), HTTP_HOST="foo.bar.baz"
).content.decode(),
{
"branding_logo": "/static/dist/assets/icons/icon_left_brand.svg",
"branding_favicon": "/static/dist/assets/icons/icon.png",
"branding_title": "custom",
"branding_custom_css": "",
"matched_domain": "foo.bar.baz",
"ui_footer_links": [],
"ui_theme": Themes.AUTOMATIC,
"default_locale": "",
"flags": self.default_flags,
},
)
def test_fallback(self):
"""Test fallback brand"""
Brand.objects.all().delete()

View File

@@ -4,7 +4,6 @@ from typing import Any
from django.db.models import F, Q
from django.db.models import Value as V
from django.db.models.functions import Length
from django.http.request import HttpRequest
from django.utils.html import _json_script_escapes
from django.utils.safestring import mark_safe
@@ -21,9 +20,9 @@ DEFAULT_BRAND = Brand(domain="fallback")
def get_brand_for_request(request: HttpRequest) -> Brand:
"""Get brand object for current request"""
db_brands = (
Brand.objects.annotate(host_domain=V(request.get_host()), match_length=Length("domain"))
Brand.objects.annotate(host_domain=V(request.get_host()))
.filter(Q(host_domain__iendswith=F("domain")) | _q_default)
.order_by("-match_length", "default")
.order_by("default")
)
brands = list(db_brands.all())
if len(brands) < 1:

View File

@@ -21,8 +21,6 @@ from rest_framework.serializers import (
raise_errors_on_nested_writes,
)
from authentik.rbac.permissions import assign_initial_permissions
def is_dict(value: Any):
"""Ensure a value is a dictionary, useful for JSONFields"""
@@ -52,15 +50,6 @@ class ModelSerializer(BaseModelSerializer):
serializer_field_mapping = BaseModelSerializer.serializer_field_mapping.copy()
serializer_field_mapping[models.JSONField] = JSONDictField
def create(self, validated_data):
instance = super().create(validated_data)
request = self.context.get("request")
if request and hasattr(request, "user") and not request.user.is_anonymous:
assign_initial_permissions(request.user, instance)
return instance
def update(self, instance: Model, validated_data):
raise_errors_on_nested_writes("update", self, validated_data)
info = model_meta.get_field_info(instance)

View File

@@ -154,6 +154,7 @@ worker:
consumer_listen_timeout: "seconds=30"
task_max_retries: 20
task_default_time_limit: "minutes=10"
lock_purge_interval: "minutes=1"
task_purge_interval: "days=1"
task_expiration: "days=30"
scheduler_interval: "seconds=60"

View File

@@ -76,6 +76,7 @@ class OutpostConfig:
kubernetes_ingress_annotations: dict[str, str] = field(default_factory=dict)
kubernetes_ingress_secret_name: str = field(default="authentik-outpost-tls")
kubernetes_ingress_class_name: str | None = field(default=None)
kubernetes_ingress_path_type: str | None = field(default=None)
kubernetes_httproute_annotations: dict[str, str] = field(default_factory=dict)
kubernetes_httproute_parent_refs: list[dict[str, str]] = field(default_factory=list)
kubernetes_service_type: str = field(default="ClusterIP")
@@ -151,7 +152,7 @@ class OutpostServiceConnection(ScheduledModel, models.Model):
state = cache.get(self.state_key, None)
if not state:
outpost_service_connection_monitor.send_with_options(args=(self.pk), rel_obj=self)
outpost_service_connection_monitor.send_with_options(args=(self.pk,), rel_obj=self)
return OutpostServiceConnectionState("", False)
return state

View File

@@ -11,7 +11,8 @@ def migrate_sessions(apps, schema_editor, model):
AuthenticatedSession = apps.get_model("authentik_core", "AuthenticatedSession")
db_alias = schema_editor.connection.alias
for obj in Model.objects.using(db_alias).all():
objs = list(Model.objects.using(db_alias).select_related("old_session").all())
for obj in objs:
if not obj.old_session:
continue
obj.session = (

View File

@@ -23,7 +23,12 @@ def user_session_deleted_oauth_backchannel_logout_and_tokens_removal(
backchannel_logout_notification_dispatch.send(
revocations=[
(token.provider_id, token.id_token.iss, token.session.user.uid)
(
token.provider_id,
token.id_token.iss,
token.id_token.sub,
instance.session.session_key,
)
for token in access_tokens
],
)

View File

@@ -14,13 +14,19 @@ LOGGER = get_logger()
@actor(description=_("Send a back-channel logout request to the registered client"))
def send_backchannel_logout_request(provider_pk: int, iss: str, sub: str = None) -> bool:
def send_backchannel_logout_request(
provider_pk: int,
iss: str,
sub: str | None = None,
session_key: str | None = None,
) -> bool:
"""Send a back-channel logout request to the registered client
Args:
provider_pk: The OAuth2 provider's primary key
iss: The issuer URL for the logout token
sub: The subject identifier to include in the logout token
session_key: The authentik session key to hash and include in the logout token
Returns:
bool: True if the request was sent successfully, False otherwise
@@ -33,11 +39,10 @@ def send_backchannel_logout_request(provider_pk: int, iss: str, sub: str = None)
return
# Generate the logout token
logout_token = create_logout_token(iss, provider, None, sub)
logout_token = create_logout_token(provider, iss, sub, session_key)
# Get the back-channel logout URI from the provider's dedicated backchannel_logout_uri field
# Back-channel logout requires explicit configuration - no fallback to redirect URIs
backchannel_logout_uri = provider.backchannel_logout_uri
if not backchannel_logout_uri:
self.info("No back-channel logout URI found for provider")
@@ -60,9 +65,9 @@ def send_backchannel_logout_request(provider_pk: int, iss: str, sub: str = None)
def backchannel_logout_notification_dispatch(revocations: list, **kwargs):
"""Handle backchannel logout notifications dispatched via signal"""
for revocation in revocations:
provider_pk, iss, sub = revocation
provider_pk, iss, sub, session_key = revocation
provider = OAuth2Provider.objects.filter(pk=provider_pk).first()
send_backchannel_logout_request.send_with_options(
args=(provider_pk, iss, sub),
args=(provider_pk, iss, sub, session_key),
rel_obj=provider,
)

View File

@@ -217,17 +217,17 @@ class HttpResponseRedirectScheme(HttpResponseRedirect):
def create_logout_token(
iss: str,
provider: OAuth2Provider,
session_key: str | None = None,
iss: str,
sub: str | None = None,
session_key: str | None = None,
) -> str:
"""Create a logout token for Back-Channel Logout
As per https://openid.net/specs/openid-connect-backchannel-1_0.html
"""
LOGGER.debug("Creating logout token", provider=provider, session_key=session_key, sub=sub)
LOGGER.debug("Creating logout token", provider=provider, sub=sub)
# Create the logout token payload
payload = {

View File

@@ -127,6 +127,9 @@ class IngressReconciler(KubernetesObjectReconciler[V1Ingress]):
and self.controller.outpost.config.kubernetes_ingress_secret_name
):
tls_hosts.append(external_host_name.hostname)
path_type = "Prefix"
if self.controller.outpost.config.kubernetes_ingress_path_type:
path_type = self.controller.outpost.config.kubernetes_ingress_path_type
if proxy_provider.mode in [
ProxyMode.FORWARD_SINGLE,
ProxyMode.FORWARD_DOMAIN,
@@ -143,7 +146,7 @@ class IngressReconciler(KubernetesObjectReconciler[V1Ingress]):
),
),
path="/outpost.goauthentik.io",
path_type="Prefix",
path_type=path_type,
)
]
),
@@ -161,7 +164,7 @@ class IngressReconciler(KubernetesObjectReconciler[V1Ingress]):
),
),
path="/",
path_type="Prefix",
path_type=path_type,
)
]
),

View File

@@ -0,0 +1,69 @@
"""InitialPermissions middleware"""
from collections.abc import Callable
from contextvars import ContextVar
from functools import partial
from django.db.models import Model
from django.db.models.signals import post_save
from django.http import HttpRequest, HttpResponse
from authentik.core.models import User
from authentik.rbac.permissions import assign_initial_permissions
_CTX_REQUEST = ContextVar[HttpRequest | None]("authentik_initial_permissions_request", default=None)
class InitialPermissionsMiddleware:
"""Register a handler for duration of request-response that assigns InitialPermissions"""
get_response: Callable[[HttpRequest], HttpResponse]
def __init__(self, get_response: Callable[[HttpRequest], HttpResponse]):
self.get_response = get_response
def get_uid(self, request_id: str) -> str:
return f"InitialPermissionMiddleware-{request_id}"
def connect(self, request: HttpRequest):
if not hasattr(request, "request_id"):
return
post_save.connect(
partial(self.post_save_handler, request=request),
dispatch_uid=self.get_uid(request.request_id),
weak=False,
)
def disconnect(self, request: HttpRequest):
if not hasattr(request, "request_id"):
return
post_save.disconnect(dispatch_uid=self.get_uid(request.request_id))
def __call__(self, request: HttpRequest) -> HttpResponse:
_CTX_REQUEST.set(request)
self.connect(request)
response = self.get_response(request)
self.disconnect(request)
_CTX_REQUEST.set(None)
return response
def process_exception(self, request: HttpRequest, exception: Exception):
self.disconnect(request)
def post_save_handler(
self,
request: HttpRequest,
instance: Model,
created: bool,
**_,
):
if not created:
return
if request.request_id != _CTX_REQUEST.get().request_id:
return
user: User = request.user
if not user or user.is_anonymous:
return
assign_initial_permissions(user, instance)

View File

@@ -5,9 +5,12 @@ from django.db.models import Model
from guardian.shortcuts import assign_perm
from rest_framework.permissions import BasePermission, DjangoObjectPermissions
from rest_framework.request import Request
from structlog.stdlib import get_logger
from authentik.rbac.models import InitialPermissions, InitialPermissionsMode
LOGGER = get_logger()
class ObjectPermissions(DjangoObjectPermissions):
"""RBAC Permissions"""
@@ -71,4 +74,10 @@ def assign_initial_permissions(user, instance: Model):
if initial_permissions.mode == InitialPermissionsMode.USER
else initial_permissions.role.group
)
LOGGER.debug(
"Adding initial permission",
initial_permission=permission,
subject=assign_to,
object=instance,
)
assign_perm(permission, assign_to, instance)

View File

@@ -4,7 +4,6 @@ import importlib
from collections import OrderedDict
from hashlib import sha512
from pathlib import Path
from tempfile import gettempdir
import orjson
from sentry_sdk import set_tag
@@ -266,6 +265,7 @@ MIDDLEWARE = [
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"authentik.core.middleware.ImpersonateMiddleware",
"authentik.rbac.middleware.InitialPermissionsMiddleware",
]
MIDDLEWARE_LAST = [
"django_prometheus.middleware.PrometheusAfterMiddleware",
@@ -368,6 +368,9 @@ DRAMATIQ = {
"broker_class": "authentik.tasks.broker.Broker",
"channel_prefix": "authentik",
"task_model": "authentik.tasks.models.Task",
"lock_purge_interval": timedelta_from_string(
CONFIG.get("worker.lock_purge_interval")
).total_seconds(),
"task_purge_interval": timedelta_from_string(
CONFIG.get("worker.task_purge_interval")
).total_seconds(),
@@ -424,7 +427,6 @@ DRAMATIQ = {
(
"authentik.tasks.middleware.MetricsMiddleware",
{
"multiproc_dir": str(Path(gettempdir()) / "authentik_prometheus_tmp"),
"prefix": "authentik",
},
),

View File

@@ -198,7 +198,10 @@ class AuthenticatorDuoStageViewSet(UsedByMixin, ModelViewSet):
return {"error": "", "count": created}
except RuntimeError as exc:
LOGGER.warning("failed to get users from duo", exc=exc)
return {"error": str(exc), "count": created}
return {
"error": "An internal error occurred while importing devices.",
"count": created,
}
class DuoDeviceSerializer(ModelSerializer):

View File

@@ -168,6 +168,8 @@ class AuthenticatorDuoStageTests(FlowTestCase):
client_secret=generate_id(),
api_hostname=generate_id(),
)
# Test missing admin credentials
response = self.client.post(
reverse(
"authentik_api:authenticatorduostage-import-devices-automatic",
@@ -178,6 +180,31 @@ class AuthenticatorDuoStageTests(FlowTestCase):
)
self.assertEqual(response.status_code, 400)
# Test internal error handling
stage.admin_integration_key = generate_id()
stage.admin_secret_key = generate_id()
stage.save()
with patch(
"duo_client.admin.Admin.get_users_iterator",
MagicMock(side_effect=RuntimeError("Duo API error")),
):
response = self.client.post(
reverse(
"authentik_api:authenticatorduostage-import-devices-automatic",
kwargs={
"pk": str(stage.pk),
},
),
)
self.assertEqual(response.status_code, 400)
self.assertJSONEqual(
response.content,
{
"error": "An internal error occurred while importing devices.",
"count": 0,
},
)
def test_api_import_automatic(self):
"""test `import_devices_automatic`"""
self.client.force_login(self.user)

View File

@@ -35,7 +35,12 @@ class Command(TenantCommand):
template_context={},
)
try:
send_mail(message.__dict__, stage.pk)
if not stage.use_global_settings:
message.from_email = stage.from_address
send_mail.send(message.__dict__, stage.pk).get_result(block=True)
self.stdout.write(self.style.SUCCESS(f"Test email sent to {options['to']}"))
finally:
if delete_stage:
stage.delete()

View File

@@ -0,0 +1,66 @@
"""Test email management commands"""
from unittest.mock import patch
from django.core import mail
from django.core.mail.backends.locmem import EmailBackend
from django.core.management import call_command
from django.test import TestCase
from authentik.core.tests.utils import create_test_admin_user
from authentik.stages.email.models import EmailStage
class TestEmailManagementCommands(TestCase):
"""Test email management commands"""
def setUp(self):
self.user = create_test_admin_user()
def test_test_email_command_with_stage(self):
"""Test test_email command with specified stage"""
EmailStage.objects.create(
name="test-stage",
from_address="test@authentik.local",
host="localhost",
port=25,
)
with patch("authentik.stages.email.models.EmailStage.backend_class", EmailBackend):
call_command("test_email", "test@example.com", stage="test-stage")
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(mail.outbox[0].subject, "authentik Test-Email")
self.assertEqual(mail.outbox[0].to, ["test@example.com"])
def test_test_email_command_with_global_settings(self):
"""Test test_email command with global settings"""
# Mock the backend to use Django's locmem backend
with patch("authentik.stages.email.models.EmailStage.backend_class", EmailBackend):
call_command("test_email", "test@example.com")
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(mail.outbox[0].subject, "authentik Test-Email")
self.assertEqual(mail.outbox[0].to, ["test@example.com"])
def test_test_email_command_invalid_stage(self):
"""Test test_email command with invalid stage"""
call_command("test_email", "test@example.com", stage="nonexistent")
self.assertEqual(len(mail.outbox), 0)
def test_test_email_command_with_custom_from(self):
"""Test test_email command respects custom from address"""
EmailStage.objects.create(
name="test-stage",
from_address="custom@authentik.local",
host="localhost",
port=25,
)
with patch("authentik.stages.email.models.EmailStage.backend_class", EmailBackend):
call_command("test_email", "test@example.com", stage="test-stage")
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(mail.outbox[0].from_email, "custom@authentik.local")
self.assertEqual(mail.outbox[0].to, ["test@example.com"])

View File

@@ -100,10 +100,15 @@ class MessagesMiddleware(Middleware):
TaskStatus.ERROR,
exception,
)
event_kwargs = {
"actor": task.actor_name,
}
if task.rel_obj:
event_kwargs["rel_obj"] = task.rel_obj
Event.new(
EventAction.SYSTEM_TASK_EXCEPTION,
message=f"Task {task.actor_name} encountered an error",
actor=task.actor_name,
**event_kwargs,
).with_exception(exception).save()
def after_skip_message(self, broker: Broker, message: Message):
@@ -151,7 +156,6 @@ class DescriptionMiddleware(Middleware):
class _healthcheck_handler(BaseHTTPRequestHandler):
def log_request(self, code="-", size="-"):
HEALTHCHECK_LOGGER.info(
self.path,

View File

@@ -0,0 +1,10 @@
from django.core.management.base import BaseCommand
class Command(BaseCommand):
help = "ak createsuperuser should not be used. Instead, use ak create_admin_group"
def handle(self, *args, **options): # noqa: ANN001, D401
raise RuntimeError(
"ak createsuperuser should not be used. Instead, use ak create_admin_group"
)

View File

@@ -5,7 +5,7 @@ metadata:
blueprints.goauthentik.io/system-bootstrap: "true"
blueprints.goauthentik.io/system: "true"
blueprints.goauthentik.io/description: |
This blueprint configures the default admin user and group, and configures them for the [Automated install](https://goauthentik.io/docs/installation/automated-install).
This blueprint configures the default admin user and group, and configures them for the [Automated install](https://docs.goauthentik.io/docs/install-config/automated-install?utm_source=bootstrap_blueprint).
context:
username: akadmin
group_name: authentik Admins

4
go.mod
View File

@@ -27,9 +27,9 @@ require (
github.com/sethvargo/go-envconfig v1.3.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.9.1
github.com/stretchr/testify v1.10.0
github.com/stretchr/testify v1.11.0
github.com/wwt/guac v1.3.2
goauthentik.io/api/v3 v3.2025100.1
goauthentik.io/api/v3 v3.2025100.2
golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab
golang.org/x/oauth2 v0.30.0
golang.org/x/sync v0.16.0

8
go.sum
View File

@@ -169,8 +169,8 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=
github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/wwt/guac v1.3.2 h1:sH6OFGa/1tBs7ieWBVlZe7t6F5JAOWBry/tqQL/Vup4=
github.com/wwt/guac v1.3.2/go.mod h1:eKm+NrnK7A88l4UBEcYNpZQGMpZRryYKoz4D/0/n1C0=
go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
@@ -185,8 +185,8 @@ go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
goauthentik.io/api/v3 v3.2025100.1 h1:xOMnQ2j1MtrYJlO+8bHJ8MdFPyymqTZcLQ+5PTspdqA=
goauthentik.io/api/v3 v3.2025100.1/go.mod h1:82lqAz4jxzl6Cg0YDbhNtvvTG2rm6605ZhdJFnbbsl8=
goauthentik.io/api/v3 v3.2025100.2 h1:OF8qEpn6PzZFlB16RzL51RSIyFOY234gAWfd8/kjzhc=
goauthentik.io/api/v3 v3.2025100.2/go.mod h1:82lqAz4jxzl6Cg0YDbhNtvvTG2rm6605ZhdJFnbbsl8=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=

View File

@@ -0,0 +1,91 @@
// https://github.com/gorilla/handlers/issues/259#issuecomment-2671695039
package web
import (
"bufio"
"net"
"net/http"
"github.com/gorilla/handlers"
)
// compressHandler is an HTTP handler that adds the Content-Encoding header
// back to responses when removed by the http.FileServer.
//
// handlers.CompressHandler(newCompressHandler(http.FileServer(...)))
type compressHandler struct {
// handler is an HTTP handler, usually an http.FileServer.
handler http.Handler
}
var _ http.Handler = &compressHandler{}
func NewCompressHandler(handler http.Handler) http.Handler {
h := &compressHandler{
handler: handler,
}
return handlers.CompressHandler(h)
}
func (h *compressHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// The wrapped response writer saves the incoming content encoding so
// it can be restored when writing the response headers.
cw := &compressedResponseWriter{
encoding: w.Header().Get("Content-Encoding"),
fixed: false,
responseWriter: w,
}
h.handler.ServeHTTP(cw, r)
}
// compressedResponseWriter is an http.ResponseWriter that ensures that a
// previously-set Content-Encoding header is in place before writing the
// response.
type compressedResponseWriter struct {
encoding string
fixed bool
responseWriter http.ResponseWriter
}
var _ http.ResponseWriter = &compressedResponseWriter{}
func (w *compressedResponseWriter) Header() http.Header {
return w.responseWriter.Header()
}
func (w *compressedResponseWriter) fixContentEncoding() {
if w.fixed {
return
}
w.fixed = true
// The Go 1.23 http.FileServer() removes headers like Content-Encoding
// from error responses. This breaks gzip and deflate encoding.
// https://github.com/gorilla/handlers/issues/259
// https://github.com/golang/go/issues/66343
if w.encoding == "gzip" || w.encoding == "deflate" {
if w.Header().Get("Content-Encoding") == "" {
w.Header().Set("Content-Encoding", w.encoding)
}
}
}
func (w *compressedResponseWriter) Write(data []byte) (int, error) {
w.fixContentEncoding()
return w.responseWriter.Write(data)
}
func (w *compressedResponseWriter) WriteHeader(statusCode int) {
w.fixContentEncoding()
w.responseWriter.WriteHeader(statusCode)
}
func (w *compressedResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
if hj, ok := w.responseWriter.(http.Hijacker); ok {
return hj.Hijack()
}
return nil, nil, http.ErrNotSupported
}
// Ensure our compressedResponseWriter implements the necessary interfaces.
var _ http.ResponseWriter = &compressedResponseWriter{}
var _ http.Hijacker = &compressedResponseWriter{}

View File

@@ -5,6 +5,7 @@ import (
"encoding/pem"
"errors"
"fmt"
"io"
"net/http"
"net/http/httputil"
"net/url"
@@ -15,6 +16,7 @@ import (
"goauthentik.io/internal/config"
"goauthentik.io/internal/utils/sentry"
"goauthentik.io/internal/utils/web"
staticWeb "goauthentik.io/web"
)
var (
@@ -88,19 +90,81 @@ func (ws *WebServer) configureProxy() {
}
func (ws *WebServer) proxyErrorHandler(rw http.ResponseWriter, req *http.Request, err error) {
if !errors.Is(err, ErrAuthentikStarting) {
ws.log.WithError(err).Warning("failed to proxy to backend")
accept := req.Header.Get("Accept")
header := rw.Header()
if errors.Is(err, ErrAuthentikStarting) {
header.Set("Retry-After", "5")
if strings.Contains(accept, "application/json") {
header.Set("Content-Type", "application/json")
err = json.NewEncoder(rw).Encode(map[string]string{
"error": "authentik starting",
})
if err != nil {
ws.log.WithError(err).Warning("failed to write error message")
return
}
} else if strings.Contains(accept, "text/html") {
header.Set("Content-Type", "text/html")
rw.WriteHeader(http.StatusServiceUnavailable)
loadingSplashFile, err := staticWeb.StaticDir.Open("standalone/loading/startup.html")
if err != nil {
ws.log.WithError(err).Warning("failed to open startup splash screen")
return
}
loadingSplashHTML, err := io.ReadAll(loadingSplashFile)
if err != nil {
ws.log.WithError(err).Warning("failed to read startup splash screen")
return
}
_, err = rw.Write(loadingSplashHTML)
if err != nil {
ws.log.WithError(err).Warning("failed to write startup splash screen")
return
}
} else {
header.Set("Content-Type", "text/plain")
rw.WriteHeader(http.StatusServiceUnavailable)
// Fallback to just a status message
_, err = rw.Write([]byte("authentik starting"))
if err != nil {
ws.log.WithError(err).Warning("failed to write initializing HTML")
}
}
return
}
rw.WriteHeader(http.StatusBadGateway)
ws.log.WithError(err).Warning("failed to proxy to backend")
em := fmt.Sprintf("failed to connect to authentik backend: %v", err)
// return json if the client asks for json
if req.Header.Get("Accept") == "application/json" {
if strings.Contains(accept, "application/json") {
header.Set("Content-Type", "application/json")
rw.WriteHeader(http.StatusBadGateway)
err = json.NewEncoder(rw).Encode(map[string]string{
"error": em,
})
} else {
header.Set("Content-Type", "text/plain")
rw.WriteHeader(http.StatusBadGateway)
_, err = rw.Write([]byte(em))
}
if err != nil {
ws.log.WithError(err).Warning("failed to write error message")
}

View File

@@ -17,9 +17,7 @@ func (ws *WebServer) configureStatic() {
// Setup routers
staticRouter := ws.loggingRouter.NewRoute().Subrouter()
staticRouter.Use(ws.staticHeaderMiddleware)
indexLessRouter := staticRouter.NewRoute().Subrouter()
// Specifically disable index
indexLessRouter.Use(web.DisableIndex)
staticRouter.Use(web.DisableIndex)
distFs := http.FileServer(http.Dir("./web/dist"))
@@ -31,18 +29,18 @@ func (ws *WebServer) configureStatic() {
return h
}
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/static/dist/").Handler(pathStripper(
staticRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/static/dist/").Handler(pathStripper(
distFs,
"static/dist/",
config.Get().Web.Path,
))
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/static/authentik/").Handler(pathStripper(
staticRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/static/authentik/").Handler(pathStripper(
http.FileServer(http.Dir("./web/authentik")),
"static/authentik/",
config.Get().Web.Path,
))
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/flow/{flow_slug}/assets").HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
staticRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/flow/{flow_slug}/assets").HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
pathStripper(
@@ -51,9 +49,9 @@ func (ws *WebServer) configureStatic() {
config.Get().Web.Path,
).ServeHTTP(rw, r)
})
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/admin/assets").Handler(http.StripPrefix(fmt.Sprintf("%sif/admin", config.Get().Web.Path), distFs))
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/user/assets").Handler(http.StripPrefix(fmt.Sprintf("%sif/user", config.Get().Web.Path), distFs))
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/rac/{app_slug}/assets").HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
staticRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/admin/assets").Handler(http.StripPrefix(fmt.Sprintf("%sif/admin", config.Get().Web.Path), distFs))
staticRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/user/assets").Handler(http.StripPrefix(fmt.Sprintf("%sif/user", config.Get().Web.Path), distFs))
staticRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/rac/{app_slug}/assets").HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
pathStripper(
@@ -66,7 +64,7 @@ func (ws *WebServer) configureStatic() {
// Media files, if backend is file
if config.Get().Storage.Media.Backend == "file" {
fsMedia := http.FileServer(http.Dir(config.Get().Storage.Media.File.Path))
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/media/").Handler(pathStripper(
staticRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/media/").Handler(pathStripper(
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'; sandbox")
fsMedia.ServeHTTP(w, r)

View File

@@ -12,7 +12,6 @@ import (
"path"
"time"
"github.com/gorilla/handlers"
"github.com/gorilla/mux"
"github.com/gorilla/securecookie"
"github.com/pires/go-proxyproto"
@@ -60,7 +59,7 @@ func NewWebServer() *WebServer {
l := log.WithField("logger", "authentik.router")
mainHandler := mux.NewRouter()
mainHandler.Use(web.ProxyHeaders())
mainHandler.Use(handlers.CompressHandler)
mainHandler.Use(web.NewCompressHandler)
loggingHandler := mainHandler.NewRoute().Subrouter()
loggingHandler.Use(web.NewLoggingHandler(l, nil))

View File

@@ -68,6 +68,11 @@ function prepare_debug {
chown authentik:authentik /unittest.xml
}
if [[ -z "${PROMETHEUS_MULTIPROC_DIR}" ]]; then
export PROMETHEUS_MULTIPROC_DIR="${TMPDIR:-/tmp}"
fi
mkdir -p "${PROMETHEUS_MULTIPROC_DIR}"
if [[ "$(python -m authentik.lib.config debugger 2>/dev/null)" == "True" ]]; then
prepare_debug
fi

View File

@@ -9,7 +9,7 @@
"version": "0.0.0",
"license": "MIT",
"devDependencies": {
"aws-cdk": "^2.1025.0",
"aws-cdk": "^2.1026.0",
"cross-env": "^10.0.0"
},
"engines": {
@@ -24,9 +24,9 @@
"license": "MIT"
},
"node_modules/aws-cdk": {
"version": "2.1025.0",
"resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.1025.0.tgz",
"integrity": "sha512-qKYM+RG5+U/UbGpjTt8ZaxBEfKJMPdOmtPtFNidsIGlrdIWSIFdNcFYi13zo33FkMk6ZFA6yBnjfDry3fNR+hQ==",
"version": "2.1026.0",
"resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.1026.0.tgz",
"integrity": "sha512-JdXR20s9gMHY3niweK5/D9tILLG8u2FOyJjWgSaNZGJ+pq9u0sBFxufXPO4VxJzDitGFOIW5VvQThXP+Y2VrVA==",
"dev": true,
"license": "Apache-2.0",
"bin": {

View File

@@ -10,7 +10,7 @@
"node": ">=20"
},
"devDependencies": {
"aws-cdk": "^2.1025.0",
"aws-cdk": "^2.1026.0",
"cross-env": "^10.0.0"
}
}

View File

@@ -33,15 +33,12 @@ wait_for_db()
_tmp = Path(gettempdir())
worker_class = "lifecycle.worker.DjangoUvicornWorker"
worker_tmp_dir = str(_tmp.joinpath("authentik_gunicorn_tmp"))
prometheus_tmp_dir = str(_tmp.joinpath("authentik_prometheus_tmp"))
os.makedirs(worker_tmp_dir, exist_ok=True)
os.makedirs(prometheus_tmp_dir, exist_ok=True)
bind = f"unix://{str(_tmp.joinpath('authentik-core.sock'))}"
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "authentik.root.settings")
os.environ.setdefault("PROMETHEUS_MULTIPROC_DIR", prometheus_tmp_dir)
preload_app = True

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-08-11 00:12+0000\n"
"POT-Creation-Date: 2025-08-18 00:11+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -790,6 +790,12 @@ msgstr ""
msgid "Email"
msgstr ""
#: authentik/events/models.py
msgid ""
"Only send notification once, for example when sending a webhook into a chat "
"channel."
msgstr ""
#: authentik/events/models.py
msgid ""
"Customize the body of the request. Mapping should return data that is JSON-"
@@ -802,12 +808,6 @@ msgid ""
"of key-value pairs"
msgstr ""
#: authentik/events/models.py
msgid ""
"Only send notification once, for example when sending a webhook into a chat "
"channel."
msgstr ""
#: authentik/events/models.py
msgid "Severity"
msgstr ""
@@ -2905,10 +2905,6 @@ msgstr ""
msgid "Duo Devices"
msgstr ""
#: authentik/stages/authenticator_email/models.py
msgid "Email OTP"
msgstr ""
#: authentik/stages/authenticator_email/models.py
#: authentik/stages/email/models.py
msgid ""
@@ -3269,6 +3265,14 @@ msgstr ""
msgid "Account Confirmation"
msgstr ""
#: authentik/stages/email/models.py
msgid "Email OTP"
msgstr ""
#: authentik/stages/email/models.py
msgid "Event Notification"
msgstr ""
#: authentik/stages/email/models.py
msgid ""
"The time window used to count recent account recovery attempts. If the "

View File

@@ -237,6 +237,9 @@ class _PostgresConsumer(Consumer):
# Override because dramatiq doesn't allow us setting this manually
self.timeout = Conf().worker["consumer_listen_timeout"]
self.lock_purge_interval = timezone.timedelta(seconds=Conf().lock_purge_interval)
self.lock_purge_last_run = timezone.now()
self.task_purge_interval = timezone.timedelta(seconds=Conf().task_purge_interval)
self.task_purge_last_run = timezone.now() - self.task_purge_interval
@@ -378,6 +381,8 @@ class _PostgresConsumer(Consumer):
# Force creation of listen connection
_ = self.listen_connection
self._purge_locks()
processing = len(self.in_processing)
if processing >= self.prefetch:
# Wait and don't consume the message, other worker will be faster
@@ -415,24 +420,26 @@ class _PostgresConsumer(Consumer):
)
# No message to process
self._purge_locks()
self._auto_purge()
self._scheduler()
return None
def _purge_locks(self):
if timezone.now() - self.lock_purge_last_run < self.lock_purge_interval:
return
while True:
try:
message_id = self.unlock_queue.get(block=False)
except Empty:
return
break
self.logger.debug("Unlocking message", message_id=message_id)
with self.connection.cursor() as cursor:
cursor.execute(
"SELECT pg_advisory_unlock(%s)", (self._get_message_lock_id(message_id),)
)
self.unlock_queue.task_done()
self.lock_purge_last_run = timezone.now()
def _auto_purge(self):
if timezone.now() - self.task_purge_last_run < self.task_purge_interval:
@@ -444,6 +451,7 @@ class _PostgresConsumer(Consumer):
result_expiry__lte=timezone.now(),
).delete()
self.logger.info("Purged messages in all queues", count=count)
self.task_purge_last_run = timezone.now()
def _scheduler(self):
if not self.scheduler:
@@ -451,6 +459,7 @@ class _PostgresConsumer(Consumer):
if timezone.now() - self.scheduler_last_run < self.scheduler_interval:
return
self.scheduler.run()
self.schedule_last_run = timezone.now()
@raise_connection_error
def close(self):
@@ -465,4 +474,7 @@ class _PostgresConsumer(Consumer):
if self._listen_connection is not None:
conn = self._listen_connection
self._listen_connection = None
conn.close()
try:
conn.close()
except DatabaseError:
pass

View File

@@ -56,6 +56,10 @@ class Conf:
def task_model(self) -> str:
return self.conf["task_model"]
@property
def lock_purge_interval(self) -> int:
return self.conf.get("lock_purge_interval", 60)
@property
def task_purge_interval(self) -> int:
# 24 hours

View File

@@ -26,7 +26,7 @@ class HTTPServer(BaseHTTPServer):
self.socket.close()
host, port = self.server_address[:2]
if host == "0.0.0.0": # nosec
if host == "0.0.0.0" and socket.has_dualstack_ipv6(): # nosec
host = "::" # nosec
# Strip IPv6 brackets
@@ -36,7 +36,9 @@ class HTTPServer(BaseHTTPServer):
self.server_address = (host, port)
self.address_family = (
socket.AF_INET6 if isinstance(ip_address(host), IPv6Address) else socket.AF_INET
socket.AF_INET6
if socket.has_dualstack_ipv6() and isinstance(ip_address(host), IPv6Address)
else socket.AF_INET
)
self.socket = socket.create_server(
@@ -141,7 +143,6 @@ class MetricsMiddleware(Middleware):
def __init__(
self,
prefix: str,
multiproc_dir: str,
labels: list[str] | None = None,
):
super().__init__()
@@ -151,9 +152,6 @@ class MetricsMiddleware(Middleware):
self.delayed_messages = set()
self.message_start_times = {}
os.makedirs(multiproc_dir, exist_ok=True)
os.environ.setdefault("PROMETHEUS_MULTIPROC_DIR", multiproc_dir)
@property
def forks(self):
from django_dramatiq_postgres.forks import worker_metrics

View File

@@ -10,8 +10,7 @@
"license": "MIT",
"dependencies": {
"deepmerge-ts": "^7.1.5",
"prism-react-renderer": "^2.4.1",
"react-dom": ">=18"
"prism-react-renderer": "^2.4.1"
},
"devDependencies": {
"@docusaurus/theme-common": "^3.8.1",
@@ -35,7 +34,8 @@
"@docusaurus/theme-common": "^3.8.1",
"@docusaurus/theme-search-algolia": "^3.8.1",
"@docusaurus/types": "^3.8.0",
"react": ">=18"
"react": ">=18",
"react-dom": ">=18"
},
"peerDependenciesMeta": {
"@docusaurus/theme-search-algolia": {
@@ -43,6 +43,9 @@
},
"react": {
"optional": true
},
"react-dom": {
"optional": true
}
}
},
@@ -4643,9 +4646,9 @@
"license": "MIT"
},
"node_modules/@types/react": {
"version": "19.1.8",
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.8.tgz",
"integrity": "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==",
"version": "19.1.10",
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.10.tgz",
"integrity": "sha512-EhBeSYX0Y6ye8pNebpKrwFJq7BoQ8J5SO6NlvNwwHjSj6adXJViPQrKlsyPw7hLBLvckEMO1yxeGdR82YBBlDg==",
"dev": true,
"license": "MIT",
"dependencies": {

View File

@@ -904,9 +904,9 @@
}
},
"node_modules/@types/node": {
"version": "24.2.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz",
"integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==",
"version": "24.3.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz",
"integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==",
"dev": true,
"license": "MIT",
"dependencies": {

View File

@@ -502,17 +502,17 @@
"license": "MIT"
},
"node_modules/@typescript-eslint/eslint-plugin": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.39.1.tgz",
"integrity": "sha512-yYegZ5n3Yr6eOcqgj2nJH8cH/ZZgF+l0YIdKILSDjYFRjgYQMgv/lRjV5Z7Up04b9VYUondt8EPMqg7kTWgJ2g==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.40.0.tgz",
"integrity": "sha512-w/EboPlBwnmOBtRbiOvzjD+wdiZdgFeo17lkltrtn7X37vagKKWJABvyfsJXTlHe6XBzugmYgd4A4nW+k8Mixw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@eslint-community/regexpp": "^4.10.0",
"@typescript-eslint/scope-manager": "8.39.1",
"@typescript-eslint/type-utils": "8.39.1",
"@typescript-eslint/utils": "8.39.1",
"@typescript-eslint/visitor-keys": "8.39.1",
"@typescript-eslint/scope-manager": "8.40.0",
"@typescript-eslint/type-utils": "8.40.0",
"@typescript-eslint/utils": "8.40.0",
"@typescript-eslint/visitor-keys": "8.40.0",
"graphemer": "^1.4.0",
"ignore": "^7.0.0",
"natural-compare": "^1.4.0",
@@ -526,7 +526,7 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"@typescript-eslint/parser": "^8.39.1",
"@typescript-eslint/parser": "^8.40.0",
"eslint": "^8.57.0 || ^9.0.0",
"typescript": ">=4.8.4 <6.0.0"
}
@@ -542,16 +542,16 @@
}
},
"node_modules/@typescript-eslint/parser": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.39.1.tgz",
"integrity": "sha512-pUXGCuHnnKw6PyYq93lLRiZm3vjuslIy7tus1lIQTYVK9bL8XBgJnCWm8a0KcTtHC84Yya1Q6rtll+duSMj0dg==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.40.0.tgz",
"integrity": "sha512-jCNyAuXx8dr5KJMkecGmZ8KI61KBUhkCob+SD+C+I5+Y1FWI2Y3QmY4/cxMCC5WAsZqoEtEETVhUiUMIGCf6Bw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/scope-manager": "8.39.1",
"@typescript-eslint/types": "8.39.1",
"@typescript-eslint/typescript-estree": "8.39.1",
"@typescript-eslint/visitor-keys": "8.39.1",
"@typescript-eslint/scope-manager": "8.40.0",
"@typescript-eslint/types": "8.40.0",
"@typescript-eslint/typescript-estree": "8.40.0",
"@typescript-eslint/visitor-keys": "8.40.0",
"debug": "^4.3.4"
},
"engines": {
@@ -567,14 +567,14 @@
}
},
"node_modules/@typescript-eslint/project-service": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.39.1.tgz",
"integrity": "sha512-8fZxek3ONTwBu9ptw5nCKqZOSkXshZB7uAxuFF0J/wTMkKydjXCzqqga7MlFMpHi9DoG4BadhmTkITBcg8Aybw==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.40.0.tgz",
"integrity": "sha512-/A89vz7Wf5DEXsGVvcGdYKbVM9F7DyFXj52lNYUDS1L9yJfqjW/fIp5PgMuEJL/KeqVTe2QSbXAGUZljDUpArw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/tsconfig-utils": "^8.39.1",
"@typescript-eslint/types": "^8.39.1",
"@typescript-eslint/tsconfig-utils": "^8.40.0",
"@typescript-eslint/types": "^8.40.0",
"debug": "^4.3.4"
},
"engines": {
@@ -589,14 +589,14 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.39.1.tgz",
"integrity": "sha512-RkBKGBrjgskFGWuyUGz/EtD8AF/GW49S21J8dvMzpJitOF1slLEbbHnNEtAHtnDAnx8qDEdRrULRnWVx27wGBw==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.40.0.tgz",
"integrity": "sha512-y9ObStCcdCiZKzwqsE8CcpyuVMwRouJbbSrNuThDpv16dFAj429IkM6LNb1dZ2m7hK5fHyzNcErZf7CEeKXR4w==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/types": "8.39.1",
"@typescript-eslint/visitor-keys": "8.39.1"
"@typescript-eslint/types": "8.40.0",
"@typescript-eslint/visitor-keys": "8.40.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -607,9 +607,9 @@
}
},
"node_modules/@typescript-eslint/tsconfig-utils": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.1.tgz",
"integrity": "sha512-ePUPGVtTMR8XMU2Hee8kD0Pu4NDE1CN9Q1sxGSGd/mbOtGZDM7pnhXNJnzW63zk/q+Z54zVzj44HtwXln5CvHA==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.40.0.tgz",
"integrity": "sha512-jtMytmUaG9d/9kqSl/W3E3xaWESo4hFDxAIHGVW/WKKtQhesnRIJSAJO6XckluuJ6KDB5woD1EiqknriCtAmcw==",
"dev": true,
"license": "MIT",
"engines": {
@@ -624,15 +624,15 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.39.1.tgz",
"integrity": "sha512-gu9/ahyatyAdQbKeHnhT4R+y3YLtqqHyvkfDxaBYk97EcbfChSJXyaJnIL3ygUv7OuZatePHmQvuH5ru0lnVeA==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.40.0.tgz",
"integrity": "sha512-eE60cK4KzAc6ZrzlJnflXdrMqOBaugeukWICO2rB0KNvwdIMaEaYiywwHMzA1qFpTxrLhN9Lp4E/00EgWcD3Ow==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/types": "8.39.1",
"@typescript-eslint/typescript-estree": "8.39.1",
"@typescript-eslint/utils": "8.39.1",
"@typescript-eslint/types": "8.40.0",
"@typescript-eslint/typescript-estree": "8.40.0",
"@typescript-eslint/utils": "8.40.0",
"debug": "^4.3.4",
"ts-api-utils": "^2.1.0"
},
@@ -649,9 +649,9 @@
}
},
"node_modules/@typescript-eslint/types": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.39.1.tgz",
"integrity": "sha512-7sPDKQQp+S11laqTrhHqeAbsCfMkwJMrV7oTDvtDds4mEofJYir414bYKUEb8YPUm9QL3U+8f6L6YExSoAGdQw==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.40.0.tgz",
"integrity": "sha512-ETdbFlgbAmXHyFPwqUIYrfc12ArvpBhEVgGAxVYSwli26dn8Ko+lIo4Su9vI9ykTZdJn+vJprs/0eZU0YMAEQg==",
"dev": true,
"license": "MIT",
"engines": {
@@ -663,16 +663,16 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.1.tgz",
"integrity": "sha512-EKkpcPuIux48dddVDXyQBlKdeTPMmALqBUbEk38McWv0qVEZwOpVJBi7ugK5qVNgeuYjGNQxrrnoM/5+TI/BPw==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.40.0.tgz",
"integrity": "sha512-k1z9+GJReVVOkc1WfVKs1vBrR5MIKKbdAjDTPvIK3L8De6KbFfPFt6BKpdkdk7rZS2GtC/m6yI5MYX+UsuvVYQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/project-service": "8.39.1",
"@typescript-eslint/tsconfig-utils": "8.39.1",
"@typescript-eslint/types": "8.39.1",
"@typescript-eslint/visitor-keys": "8.39.1",
"@typescript-eslint/project-service": "8.40.0",
"@typescript-eslint/tsconfig-utils": "8.40.0",
"@typescript-eslint/types": "8.40.0",
"@typescript-eslint/visitor-keys": "8.40.0",
"debug": "^4.3.4",
"fast-glob": "^3.3.2",
"is-glob": "^4.0.3",
@@ -731,16 +731,16 @@
}
},
"node_modules/@typescript-eslint/utils": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.39.1.tgz",
"integrity": "sha512-VF5tZ2XnUSTuiqZFXCZfZs1cgkdd3O/sSYmdo2EpSyDlC86UM/8YytTmKnehOW3TGAlivqTDT6bS87B/GQ/jyg==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.40.0.tgz",
"integrity": "sha512-Cgzi2MXSZyAUOY+BFwGs17s7ad/7L+gKt6Y8rAVVWS+7o6wrjeFN4nVfTpbE25MNcxyJ+iYUXflbs2xR9h4UBg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@eslint-community/eslint-utils": "^4.7.0",
"@typescript-eslint/scope-manager": "8.39.1",
"@typescript-eslint/types": "8.39.1",
"@typescript-eslint/typescript-estree": "8.39.1"
"@typescript-eslint/scope-manager": "8.40.0",
"@typescript-eslint/types": "8.40.0",
"@typescript-eslint/typescript-estree": "8.40.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -755,13 +755,13 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.1.tgz",
"integrity": "sha512-W8FQi6kEh2e8zVhQ0eeRnxdvIoOkAp/CPAahcNio6nO9dsIwb9b34z90KOlheoyuVf6LSOEdjlkxSkapNEc+4A==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.40.0.tgz",
"integrity": "sha512-8CZ47QwalyRjsypfwnbI3hKy5gJDPmrkLjkgMxhi0+DZZ2QNx2naS6/hWoVYUHU7LU2zleF68V9miaVZvhFfTA==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/types": "8.39.1",
"@typescript-eslint/types": "8.40.0",
"eslint-visitor-keys": "^4.2.1"
},
"engines": {
@@ -4709,16 +4709,16 @@
}
},
"node_modules/typescript-eslint": {
"version": "8.39.1",
"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.39.1.tgz",
"integrity": "sha512-GDUv6/NDYngUlNvwaHM1RamYftxf782IyEDbdj3SeaIHHv8fNQVRC++fITT7kUJV/5rIA/tkoRSSskt6osEfqg==",
"version": "8.40.0",
"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.40.0.tgz",
"integrity": "sha512-Xvd2l+ZmFDPEt4oj1QEXzA4A2uUK6opvKu3eGN9aGjB8au02lIVcLyi375w94hHyejTOmzIU77L8ol2sRg9n7Q==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/eslint-plugin": "8.39.1",
"@typescript-eslint/parser": "8.39.1",
"@typescript-eslint/typescript-estree": "8.39.1",
"@typescript-eslint/utils": "8.39.1"
"@typescript-eslint/eslint-plugin": "8.40.0",
"@typescript-eslint/parser": "8.40.0",
"@typescript-eslint/typescript-estree": "8.40.0",
"@typescript-eslint/utils": "8.40.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"

View File

@@ -1,67 +0,0 @@
import type { LitNode } from "../types/lit-jsx.js";
import { test as base } from "@playwright/experimental-ct-react";
import { Locator, Page } from "playwright/test";
export { expect } from "@playwright/test";
/* eslint-disable react-hooks/rules-of-hooks */
export interface InnerMountOptions {}
async function innerMount(page: Page, componentRef: unknown, options = {}) {
await page.waitForFunction(() => {
// @ts-ignore
return !!window.playwrightMount;
});
const selector = await page.evaluate(
async ({ component: component2 }) => {
let rootElement = document.getElementById("root");
if (!rootElement) {
rootElement = document.createElement("div");
rootElement.id = "root";
document.body.appendChild(rootElement);
}
rootElement.textContent = "Test 123";
return "#root >> internal:control=component";
},
{ component: componentRef },
);
return selector;
}
interface E2EFixturesTestScope {
render: (component: LitNode, options?: any) => Promise<Locator>;
}
interface E2EWorkerScope {
renderWorker: void;
}
export const test = base.extend<E2EFixturesTestScope, E2EWorkerScope>({
// renderWorker: [async ({ browser }, use, workerInfo) => {}, { scope: "worker" }],
render: async ({ page }, use) => {
await use(async (componentRef, options) => {
const selector = await innerMount(page, componentRef, options);
const locator = page.locator(selector);
// Object.assign(locator, {
// unmount: async () => {
// await locator.evaluate(async () => {
// const rootElement = document.getElementById("root");
// await window.playwrightUnmount(rootElement);
// });
// },
// update: async (options2) => {
// if (isJsxComponent(options2)) return await innerUpdate(page, options2);
// await innerUpdate(page, componentRef, options2);
// },
// });
return locator;
});
},
});

View File

@@ -1,39 +0,0 @@
import { isCustomElementConstructor, isElementFactory } from "./predicates.js";
import { ComponentProps, createElement } from "./utils.js";
import type * as Lit from "@goauthentik/lit-jsx/types/lit-jsx.d.ts";
/**
* JSX factory for Lit elements.
*/
export function jsx(
elementLike: Lit.ElementType | Lit.ElementFactoryLike,
props: ComponentProps,
): Lit.LitNode {
console.log({ elementLike, props });
if (isElementFactory(elementLike)) {
if (isCustomElementConstructor(elementLike)) {
const tagName = customElements.getName(elementLike);
if (!tagName) {
throw new Error(`Custom element ${elementLike.name} is not registered`);
}
// Render the custom web component as any other html element.
return createElement(tagName, props);
}
return elementLike(props);
}
return createElement(elementLike, props);
}
export { jsx as jsxAttr, jsx as jsxDEV, jsx as jsxEscape, jsx as jsxs, jsx as jsxTemplate };
/**
* HTML Fragment factory for Lit elements.
*/
export function Fragment(fragment: Lit.Fragment): Lit.ElementType[] {
return Array.isArray(fragment.children) ? fragment.children : [fragment.children];
}

View File

@@ -1,15 +0,0 @@
/**
* Type predicate to check if a given value is a custom element constructor.
*/
export function isElementFactory(elementLike: unknown): elementLike is Lit.ElementFactoryLike {
return typeof elementLike === "function" && elementLike.prototype instanceof HTMLElement;
}
/**
* Type predicate to check if a given value is a custom element constructor.
*/
export function isCustomElementConstructor<P = unknown, T extends HTMLElement = HTMLElement>(
elementLike: Lit.ElementFactoryLike<P>,
): elementLike is Lit.CustomElementConstructor<P, T> {
return elementLike.prototype instanceof HTMLElement;
}

View File

@@ -1,69 +0,0 @@
import { spread } from "@open-wc/lit-helpers";
import { ifDefined } from "lit/directives/if-defined.js";
import { ref, RefOrCallback } from "lit/directives/ref.js";
import { styleMap } from "lit/directives/style-map.js";
import { html, unsafeStatic } from "lit/static-html.js";
export type CSSProperties = Record<string, string | number>;
/**
*
*/
export function parseProps(tagName: string, props: Record<PropertyKey, unknown>) {
const spreadable: Record<PropertyKey, unknown> = {};
const ElementConstructor = customElements.get(tagName);
for (const [propName, value] of Object.entries(props)) {
if (propName === "htmlFor") {
spreadable.for = value;
continue;
}
if (propName.startsWith("on")) {
const eventName = propName.slice(2).toLowerCase();
spreadable[`@${eventName}`] = value;
} else if (typeof value === "boolean") {
spreadable[`?${propName}`] = value;
} else if (ElementConstructor) {
spreadable[`.${propName}`] = value;
} else {
spreadable[`${propName}`] = value;
}
}
console.log(spreadable);
return spreadable;
}
export interface ComponentProps {
className?: string;
children?: unknown;
ref?: RefOrCallback;
style?: CSSProperties;
[key: PropertyKey]: unknown;
}
/**
*
* @returns
*/
export function createElement<P = unknown>(
tagName: string,
{ className, children, ref: refProp, style, ...props }: ComponentProps & P,
) {
const tag = unsafeStatic(tagName);
const result = html`
<${tag} class=${ifDefined(className)}
${ref(refProp)}
${spread(parseProps(tagName, props))}
style=${ifDefined(style ? styleMap(style) : null)}
>
${children}
</${tag}>
`;
return result;
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,83 +0,0 @@
{
"name": "@goauthentik/lit-jsx",
"version": "1.0.0",
"description": "JSX Runtime for Lit",
"license": "MIT",
"scripts": {
"compile": "tsc -b",
"lint": "run-s lint:prettier:check lint:eslint:check",
"lint:eslint:check": "eslint .",
"lint:eslint:fix": "eslint --fix .",
"lint:fix": "run-s lint:prettier:fix lint:eslint:fix",
"lint:prettier": "eslint .",
"lint:prettier:check": "prettier --cache --check -u .",
"lint:prettier:fix": "prettier --cache --write -u .",
"test": "vitest"
},
"main": "tsconfig.json",
"type": "module",
"exports": {
"./package.json": "./package.json",
".": {
"types": "./lib/types/lit-jsx.d.ts"
},
"./jsx-runtime": {
"import": "./out/lib/jsx-runtime.js",
"types": "./types/jsx-runtime.d.ts"
},
"./jsx-dev-runtime": {
"import": "./out/lib/jsx-runtime.js",
"types": "./types/jsx-runtime.d.ts"
},
"./types/*": {
"types": "./types/*"
}
},
"imports": {
"#e2e": "./e2e/index.ts",
"#e2e/*": "./e2e/*.ts"
},
"devDependencies": {
"@eslint/js": "^9.33.0",
"@goauthentik/eslint-config": "^1.0.5",
"@goauthentik/prettier-config": "^3.1.0",
"@goauthentik/tsconfig": "^1.0.4",
"@lit-labs/ssr": "^3.3.1",
"@open-wc/lit-helpers": "^0.7.0",
"@playwright/experimental-ct-react": "^1.54.2",
"@playwright/test": "^1.54.2",
"@types/jsdom": "^21.1.7",
"@types/node": "^24.3.0",
"@typescript-eslint/eslint-plugin": "^8.39.1",
"@typescript-eslint/parser": "^8.39.1",
"dompurify": "^3.2.6",
"eslint": "^9.33.0",
"jsdom": "^26.1.0",
"lit": "^3.3.1",
"lit-html": "^3.3.1",
"npm-run-all": "^4.1.5",
"playwright": "^1.54.2",
"prettier": "^3.6.2",
"prettier-plugin-packagejson": "^2.5.19",
"trusted-types": "^2.0.0",
"typescript": "^5.8.3",
"typescript-eslint": "^8.39.1",
"vite": "^7.1.2",
"vitest": "^3.2.4"
},
"peerDependencies": {
"lit": "^3.3.1"
},
"engines": {
"node": ">=24"
},
"prettier": "@goauthentik/prettier-config",
"overrides": {
"format-imports": {
"eslint": "^9.31.0"
}
},
"publishConfig": {
"access": "public"
}
}

File diff suppressed because one or more lines are too long

View File

@@ -1,43 +0,0 @@
/**
* @file Playwright configuration.
*
* @see https://playwright.dev/docs/test-configuration
*
*/
import { defineConfig, devices } from "@playwright/test";
const CI = !!process.env.CI;
const baseURL = process.env.AK_TEST_RUNNER_PAGE_URL ?? "http://localhost:9000";
export default defineConfig({
testDir: "./test/browser",
fullyParallel: true,
forbidOnly: CI,
retries: CI ? 2 : 0,
workers: CI ? 1 : undefined,
reporter: CI
? "github"
: [
// ---
["list", { printSteps: true }],
["html", { open: "never" }],
],
use: {
testIdAttribute: "data-test-id",
baseURL,
trace: "on-first-retry",
},
/* Configure projects for major browsers */
projects: [
{
name: "chromium",
use: {
...devices["Desktop Chrome"],
},
},
],
});

View File

@@ -1,6 +0,0 @@
<html lang="en">
<body>
<div id="root"></div>
<script type="module" src="./index.ts"></script>
</body>
</html>

View File

@@ -1 +0,0 @@
console.log("Preparing Playwright");

View File

@@ -1,12 +0,0 @@
import { expect, test } from "#e2e";
test.describe("JSX Rendering", () => {
test("Simple static markup can be rendered", async ({ page, render }) => {
await render(
// @ts-ignore - testing
<p style={{ color: "red", fontSize: "12px" }}>Hello World</p>,
);
await expect(page.getByText("Test 123")).toBeVisible();
});
});

View File

@@ -1,48 +0,0 @@
/** @jsxImportSource @goauthentik/lit-jsx */
import { renderVariants } from "../utils.js";
import { test } from "vitest";
import { html } from "@lit-labs/ssr";
import { styleMap } from "lit/directives/style-map.js";
test("Simple static markup can be rendered", async ({ expect }) => {
const [result, comparision] = await renderVariants(
// @ts-ignore - testing
<div>Hello World</div>,
html`<div>Hello World</div>`,
);
expect(result, "JSX element serialized to a matching string").toBe(comparision);
});
test("`className` is rendered to the correct attribute", async ({ expect }) => {
const [result, comparision] = await renderVariants(
// @ts-ignore - testing
<p className="one two">Hello World</p>,
html`<p class="one two">Hello World</p>`,
);
expect(result, "`className` is rendered to the correct attribute").toBe(comparision);
});
test("`style` is rendered to the correct attribute", async ({ expect }) => {
const [result, comparision] = await renderVariants(
// @ts-ignore - testing
<p style={{ color: "red", fontSize: "12px" }}>Hello World</p>,
html`<p style=${styleMap({ color: "red", fontSize: "12px" })}>Hello World</p>`,
);
expect(result, "style is rendered to the correct attribute").toBe(comparision);
});
test("`style` is rendered to the correct attribute", async ({ expect }) => {
const [result, comparision] = await renderVariants(
// @ts-ignore - testing
<p style={{ color: "red", fontSize: "12px" }}>Hello World</p>,
html`<p style=${styleMap({ color: "red", fontSize: "12px" })}>Hello World</p>`,
);
expect(result, "style is rendered to the correct attribute").toBe(comparision);
});

View File

@@ -1,36 +0,0 @@
import type * as Lit from "@goauthentik/lit-jsx/types/lit-jsx.d.ts";
import createDOMPurify, { Config as DOMPurifyConfig, WindowLike } from "dompurify";
import { JSDOM } from "jsdom";
import { format } from "prettier";
import { render, ServerRenderedTemplate } from "@lit-labs/ssr";
import { collectResult } from "@lit-labs/ssr/lib/render-result.js";
export class Purifier {
#window = new JSDOM("").window;
#DOMPurify = createDOMPurify(this.#window as WindowLike);
public sanitize(html: string, config?: DOMPurifyConfig) {
return this.#DOMPurify.sanitize(html, config);
}
}
const purifier = new Purifier();
export async function renderStaticLit(value: unknown) {
const result = await collectResult(render(value));
const sanitized = purifier.sanitize(result);
const formatted = await format(sanitized, {
parser: "html",
});
return formatted.trim();
}
export function renderVariants(
...inputs: Array<ServerRenderedTemplate | Lit.LitNode>
): Promise<string[]> {
return Promise.all(inputs.map((input) => renderStaticLit(input)));
}

View File

@@ -1,15 +0,0 @@
{
"extends": "@goauthentik/tsconfig",
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"baseUrl": ".",
"checkJs": true,
"lib": ["DOM", "DOM.Iterable", "ESNext"]
},
"exclude": [
// ---
"**/out/**/*",
"**/dist/**/*",
"storybook-static"
]
}

View File

@@ -1,75 +0,0 @@
/**
* @file JSX runtime types for Lit.
*/
/* eslint-disable @typescript-eslint/no-explicit-any */
// /* eslint-disable @typescript-eslint/no-empty-object-type */
// /// <reference types="./lit-jsx-runtime.d.ts" />
// /**
// * JSX runtime types for Lit.
// */
// export namespace JSX {
// // type ElementType = Lit.JSX.ElementType;
// // interface Element extends Lit.JSX.Element {}
// // interface ElementClass extends Lit.JSX.ElementClass {}
// // interface ElementAttributesProperty extends Lit.JSX.ElementAttributesProperty {}
// // interface ElementChildrenAttribute extends Lit.JSX.ElementChildrenAttribute {}
// // type LibraryManagedAttributes<C, P> = Lit.JSX.LibraryManagedAttributes<C, P>;
// // interface IntrinsicAttributes extends Lit.JSX.IntrinsicAttributes {}
// // interface IntrinsicClassAttributes<T> extends Lit.JSX.IntrinsicClassAttributes<T> {}
// interface IntrinsicElements extends Lit.JSX.IntrinsicElements {}
// }
import { JSX } from "./lit-jsx.js";
import { Attributes, ComponentChild, ComponentChildren, ComponentType, VNode } from "preact";
export { Fragment } from "preact";
export function jsx(
type: string,
props: JSX.HTMLAttributes &
JSX.SVGAttributes &
Record<string, any> & { children?: ComponentChild },
key?: string,
): VNode<any>;
export function jsx<P>(
type: ComponentType<P>,
props: Attributes & P & { children?: ComponentChild },
key?: string,
): VNode<any>;
export function jsxs(
type: string,
props: JSX.HTMLAttributes &
JSX.SVGAttributes &
Record<string, any> & { children?: ComponentChild[] },
key?: string,
): VNode<any>;
export function jsxs<P>(
type: ComponentType<P>,
props: Attributes & P & { children?: ComponentChild[] },
key?: string,
): VNode<any>;
export function jsxDEV(
type: string,
props: JSX.HTMLAttributes &
JSX.SVGAttributes &
Record<string, any> & { children?: ComponentChildren },
key?: string,
): VNode<any>;
export function jsxDEV<P>(
type: ComponentType<P>,
props: Attributes & P & { children?: ComponentChildren },
key?: string,
): VNode<any>;
// These are not expected to be used manually, but by a JSX transform
export function jsxTemplate(template: string[], ...expressions: any[]): VNode<any>;
export function jsxAttr(name: string, value: any): string | null;
export function jsxEscape<T>(value: T): string | null | VNode<any> | Array<string | null | VNode>;
export { JSX };

View File

@@ -1,318 +0,0 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/**
* @file JSX runtime types for Lit.
*/
import { nothing, TemplateResult } from "lit";
export = Lit;
export as namespace Lit;
declare namespace Lit {
namespace JSX {
interface Element {
type: string;
}
interface IntrinsicElements {
div: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>;
}
}
/**
* A constructable element which returns a valid HTMLElement.
*/
type CustomElementConstructor<P = unknown, T extends HTMLElement = HTMLElement> = new (
...args: unknown[]
) => T;
/**
* A function which given a props object, returns a Lit element.
*/
type ElementFactory<P = unknown> = (props: P) => ElementType;
/**
* Either a constructor, or a function which returns an HTML element.
*/
type ElementFactoryLike<P = unknown> = CustomElementConstructor<P> | ElementFactory<P>;
type ElementType<
P = unknown,
Tag extends keyof JSX.IntrinsicElements = keyof JSX.IntrinsicElements,
> =
| { [K in Tag]: P extends JSX.IntrinsicElements[K] ? K : never }[Tag]
| CustomElementConstructor<P>;
interface Fragment {
children: Lit.ElementType | Lit.ElementType[];
}
type LitNode = JSX.Element | ElementType | string | TemplateResult | typeof nothing;
type FC<P = unknown> = (props: P) => LitNode | LitNode[];
// Keep in sync with JSX namespace in ./jsx-runtime.d.ts and ./jsx-dev-runtime.d.ts
}
// Users who only use Preact for SSR might not specify "dom" in their lib in tsconfig.json
// import * as preact from "preact";
// type Defaultize<Props, Defaults> =
// // Distribute over unions
// Props extends any // Make any properties included in Default optional
// ? Partial<Pick<Props, Extract<keyof Props, keyof Defaults>>> & // Include the remaining properties from Props
// Pick<Props, Exclude<keyof Props, keyof Defaults>>
// : never;
// declare namespace JSX {
// export type LibraryManagedAttributes<Component, Props> = Component extends {
// defaultProps: infer Defaults;
// }
// ? Defaultize<Props, Defaults>
// : Props;
// export interface IntrinsicAttributes {
// key?: any;
// }
// export type ElementType<P = any> =
// | {
// [K in keyof IntrinsicElements]: P extends IntrinsicElements[K] ? K : never;
// }[keyof IntrinsicElements]
// | preact.ComponentType<P>;
// export interface Element extends preact.VNode<any> {}
// export type ElementClass = preact.Component<any, any> | preact.FunctionComponent<any>;
// export interface ElementAttributesProperty {
// props: any;
// }
// export interface ElementChildrenAttribute {
// children: any;
// }
// export interface IntrinsicSVGElements {
// svg: preact.SVGAttributes<SVGSVGElement>;
// animate: preact.SVGAttributes<SVGAnimateElement>;
// circle: preact.SVGAttributes<SVGCircleElement>;
// animateMotion: preact.SVGAttributes<SVGAnimateMotionElement>;
// animateTransform: preact.SVGAttributes<SVGAnimateTransformElement>;
// clipPath: preact.SVGAttributes<SVGClipPathElement>;
// defs: preact.SVGAttributes<SVGDefsElement>;
// desc: preact.SVGAttributes<SVGDescElement>;
// ellipse: preact.SVGAttributes<SVGEllipseElement>;
// feBlend: preact.SVGAttributes<SVGFEBlendElement>;
// feColorMatrix: preact.SVGAttributes<SVGFEColorMatrixElement>;
// feComponentTransfer: preact.SVGAttributes<SVGFEComponentTransferElement>;
// feComposite: preact.SVGAttributes<SVGFECompositeElement>;
// feConvolveMatrix: preact.SVGAttributes<SVGFEConvolveMatrixElement>;
// feDiffuseLighting: preact.SVGAttributes<SVGFEDiffuseLightingElement>;
// feDisplacementMap: preact.SVGAttributes<SVGFEDisplacementMapElement>;
// feDistantLight: preact.SVGAttributes<SVGFEDistantLightElement>;
// feDropShadow: preact.SVGAttributes<SVGFEDropShadowElement>;
// feFlood: preact.SVGAttributes<SVGFEFloodElement>;
// feFuncA: preact.SVGAttributes<SVGFEFuncAElement>;
// feFuncB: preact.SVGAttributes<SVGFEFuncBElement>;
// feFuncG: preact.SVGAttributes<SVGFEFuncGElement>;
// feFuncR: preact.SVGAttributes<SVGFEFuncRElement>;
// feGaussianBlur: preact.SVGAttributes<SVGFEGaussianBlurElement>;
// feImage: preact.SVGAttributes<SVGFEImageElement>;
// feMerge: preact.SVGAttributes<SVGFEMergeElement>;
// feMergeNode: preact.SVGAttributes<SVGFEMergeNodeElement>;
// feMorphology: preact.SVGAttributes<SVGFEMorphologyElement>;
// feOffset: preact.SVGAttributes<SVGFEOffsetElement>;
// fePointLight: preact.SVGAttributes<SVGFEPointLightElement>;
// feSpecularLighting: preact.SVGAttributes<SVGFESpecularLightingElement>;
// feSpotLight: preact.SVGAttributes<SVGFESpotLightElement>;
// feTile: preact.SVGAttributes<SVGFETileElement>;
// feTurbulence: preact.SVGAttributes<SVGFETurbulenceElement>;
// filter: preact.SVGAttributes<SVGFilterElement>;
// foreignObject: preact.SVGAttributes<SVGForeignObjectElement>;
// g: preact.SVGAttributes<SVGGElement>;
// image: preact.SVGAttributes<SVGImageElement>;
// line: preact.SVGAttributes<SVGLineElement>;
// linearGradient: preact.SVGAttributes<SVGLinearGradientElement>;
// marker: preact.SVGAttributes<SVGMarkerElement>;
// mask: preact.SVGAttributes<SVGMaskElement>;
// metadata: preact.SVGAttributes<SVGMetadataElement>;
// mpath: preact.SVGAttributes<SVGMPathElement>;
// path: preact.SVGAttributes<SVGPathElement>;
// pattern: preact.SVGAttributes<SVGPatternElement>;
// polygon: preact.SVGAttributes<SVGPolygonElement>;
// polyline: preact.SVGAttributes<SVGPolylineElement>;
// radialGradient: preact.SVGAttributes<SVGRadialGradientElement>;
// rect: preact.SVGAttributes<SVGRectElement>;
// set: preact.SVGAttributes<SVGSetElement>;
// stop: preact.SVGAttributes<SVGStopElement>;
// switch: preact.SVGAttributes<SVGSwitchElement>;
// symbol: preact.SVGAttributes<SVGSymbolElement>;
// text: preact.SVGAttributes<SVGTextElement>;
// textPath: preact.SVGAttributes<SVGTextPathElement>;
// tspan: preact.SVGAttributes<SVGTSpanElement>;
// use: preact.SVGAttributes<SVGUseElement>;
// view: preact.SVGAttributes<SVGViewElement>;
// }
// export interface IntrinsicMathMLElements {
// "annotation": preact.AnnotationMathMLAttributes<MathMLElement>;
// "annotation-xml": preact.AnnotationXmlMathMLAttributes<MathMLElement>;
// /** @deprecated See https://developer.mozilla.org/en-US/docs/Web/MathML/Element/maction */
// "maction": preact.MActionMathMLAttributes<MathMLElement>;
// "math": preact.MathMathMLAttributes<MathMLElement>;
// /** This feature is non-standard. See https://developer.mozilla.org/en-US/docs/Web/MathML/Element/menclose */
// "menclose": preact.MEncloseMathMLAttributes<MathMLElement>;
// "merror": preact.MErrorMathMLAttributes<MathMLElement>;
// /** @deprecated See https://developer.mozilla.org/en-US/docs/Web/MathML/Element/mfenced */
// "mfenced": preact.MFencedMathMLAttributes<MathMLElement>;
// "mfrac": preact.MFracMathMLAttributes<MathMLElement>;
// "mi": preact.MiMathMLAttributes<MathMLElement>;
// "mmultiscripts": preact.MmultiScriptsMathMLAttributes<MathMLElement>;
// "mn": preact.MNMathMLAttributes<MathMLElement>;
// "mo": preact.MOMathMLAttributes<MathMLElement>;
// "mover": preact.MOverMathMLAttributes<MathMLElement>;
// "mpadded": preact.MPaddedMathMLAttributes<MathMLElement>;
// "mphantom": preact.MPhantomMathMLAttributes<MathMLElement>;
// "mprescripts": preact.MPrescriptsMathMLAttributes<MathMLElement>;
// "mroot": preact.MRootMathMLAttributes<MathMLElement>;
// "mrow": preact.MRowMathMLAttributes<MathMLElement>;
// "ms": preact.MSMathMLAttributes<MathMLElement>;
// "mspace": preact.MSpaceMathMLAttributes<MathMLElement>;
// "msqrt": preact.MSqrtMathMLAttributes<MathMLElement>;
// "mstyle": preact.MStyleMathMLAttributes<MathMLElement>;
// "msub": preact.MSubMathMLAttributes<MathMLElement>;
// "msubsup": preact.MSubsupMathMLAttributes<MathMLElement>;
// "msup": preact.MSupMathMLAttributes<MathMLElement>;
// "mtable": preact.MTableMathMLAttributes<MathMLElement>;
// "mtd": preact.MTdMathMLAttributes<MathMLElement>;
// "mtext": preact.MTextMathMLAttributes<MathMLElement>;
// "mtr": preact.MTrMathMLAttributes<MathMLElement>;
// "munder": preact.MUnderMathMLAttributes<MathMLElement>;
// "munderover": preact.MUnderMathMLAttributes<MathMLElement>;
// "semantics": preact.SemanticsMathMLAttributes<MathMLElement>;
// }
// export interface IntrinsicHTMLElements {
// a: preact.AccessibleAnchorHTMLAttributes<HTMLAnchorElement>;
// abbr: preact.HTMLAttributes<HTMLElement>;
// address: preact.HTMLAttributes<HTMLElement>;
// area: preact.AccessibleAreaHTMLAttributes<HTMLAreaElement>;
// article: preact.ArticleHTMLAttributes<HTMLElement>;
// aside: preact.AsideHTMLAttributes<HTMLElement>;
// audio: preact.AudioHTMLAttributes<HTMLAudioElement>;
// b: preact.HTMLAttributes<HTMLElement>;
// base: preact.BaseHTMLAttributes<HTMLBaseElement>;
// bdi: preact.HTMLAttributes<HTMLElement>;
// bdo: preact.HTMLAttributes<HTMLElement>;
// big: preact.HTMLAttributes<HTMLElement>;
// blockquote: preact.BlockquoteHTMLAttributes<HTMLQuoteElement>;
// body: preact.HTMLAttributes<HTMLBodyElement>;
// br: preact.BrHTMLAttributes<HTMLBRElement>;
// button: preact.ButtonHTMLAttributes<HTMLButtonElement>;
// canvas: preact.CanvasHTMLAttributes<HTMLCanvasElement>;
// caption: preact.CaptionHTMLAttributes<HTMLTableCaptionElement>;
// cite: preact.HTMLAttributes<HTMLElement>;
// code: preact.HTMLAttributes<HTMLElement>;
// col: preact.ColHTMLAttributes<HTMLTableColElement>;
// colgroup: preact.ColgroupHTMLAttributes<HTMLTableColElement>;
// data: preact.DataHTMLAttributes<HTMLDataElement>;
// datalist: preact.DataListHTMLAttributes<HTMLDataListElement>;
// dd: preact.DdHTMLAttributes<HTMLElement>;
// del: preact.DelHTMLAttributes<HTMLModElement>;
// details: preact.DetailsHTMLAttributes<HTMLDetailsElement>;
// dfn: preact.HTMLAttributes<HTMLElement>;
// dialog: preact.DialogHTMLAttributes<HTMLDialogElement>;
// div: preact.HTMLAttributes<HTMLDivElement>;
// dl: preact.DlHTMLAttributes<HTMLDListElement>;
// dt: preact.DtHTMLAttributes<HTMLElement>;
// em: preact.HTMLAttributes<HTMLElement>;
// embed: preact.EmbedHTMLAttributes<HTMLEmbedElement>;
// fieldset: preact.FieldsetHTMLAttributes<HTMLFieldSetElement>;
// figcaption: preact.FigcaptionHTMLAttributes<HTMLElement>;
// figure: preact.HTMLAttributes<HTMLElement>;
// footer: preact.FooterHTMLAttributes<HTMLElement>;
// form: preact.FormHTMLAttributes<HTMLFormElement>;
// h1: preact.HeadingHTMLAttributes<HTMLHeadingElement>;
// h2: preact.HeadingHTMLAttributes<HTMLHeadingElement>;
// h3: preact.HeadingHTMLAttributes<HTMLHeadingElement>;
// h4: preact.HeadingHTMLAttributes<HTMLHeadingElement>;
// h5: preact.HeadingHTMLAttributes<HTMLHeadingElement>;
// h6: preact.HeadingHTMLAttributes<HTMLHeadingElement>;
// head: preact.HeadHTMLAttributes<HTMLHeadElement>;
// header: preact.HeaderHTMLAttributes<HTMLElement>;
// hgroup: preact.HTMLAttributes<HTMLElement>;
// hr: preact.HrHTMLAttributes<HTMLHRElement>;
// html: preact.HtmlHTMLAttributes<HTMLHtmlElement>;
// i: preact.HTMLAttributes<HTMLElement>;
// iframe: preact.IframeHTMLAttributes<HTMLIFrameElement>;
// img: preact.AccessibleImgHTMLAttributes<HTMLImageElement>;
// input: preact.AccessibleInputHTMLAttributes<HTMLInputElement>;
// ins: preact.InsHTMLAttributes<HTMLModElement>;
// kbd: preact.HTMLAttributes<HTMLElement>;
// keygen: preact.KeygenHTMLAttributes<HTMLUnknownElement>;
// label: preact.LabelHTMLAttributes<HTMLLabelElement>;
// legend: preact.LegendHTMLAttributes<HTMLLegendElement>;
// li: preact.LiHTMLAttributes<HTMLLIElement>;
// link: preact.LinkHTMLAttributes<HTMLLinkElement>;
// main: preact.MainHTMLAttributes<HTMLElement>;
// map: preact.MapHTMLAttributes<HTMLMapElement>;
// mark: preact.HTMLAttributes<HTMLElement>;
// marquee: preact.MarqueeHTMLAttributes<HTMLMarqueeElement>;
// menu: preact.MenuHTMLAttributes<HTMLMenuElement>;
// menuitem: preact.HTMLAttributes<HTMLUnknownElement>;
// meta: preact.MetaHTMLAttributes<HTMLMetaElement>;
// meter: preact.MeterHTMLAttributes<HTMLMeterElement>;
// nav: preact.NavHTMLAttributes<HTMLElement>;
// noscript: preact.NoScriptHTMLAttributes<HTMLElement>;
// object: preact.ObjectHTMLAttributes<HTMLObjectElement>;
// ol: preact.OlHTMLAttributes<HTMLOListElement>;
// optgroup: preact.OptgroupHTMLAttributes<HTMLOptGroupElement>;
// option: preact.OptionHTMLAttributes<HTMLOptionElement>;
// output: preact.OutputHTMLAttributes<HTMLOutputElement>;
// p: preact.HTMLAttributes<HTMLParagraphElement>;
// param: preact.ParamHTMLAttributes<HTMLParamElement>;
// picture: preact.PictureHTMLAttributes<HTMLPictureElement>;
// pre: preact.HTMLAttributes<HTMLPreElement>;
// progress: preact.ProgressHTMLAttributes<HTMLProgressElement>;
// q: preact.QuoteHTMLAttributes<HTMLQuoteElement>;
// rp: preact.HTMLAttributes<HTMLElement>;
// rt: preact.HTMLAttributes<HTMLElement>;
// ruby: preact.HTMLAttributes<HTMLElement>;
// s: preact.HTMLAttributes<HTMLElement>;
// samp: preact.HTMLAttributes<HTMLElement>;
// script: preact.ScriptHTMLAttributes<HTMLScriptElement>;
// search: preact.SearchHTMLAttributes<HTMLElement>;
// section: preact.HTMLAttributes<HTMLElement>;
// select: preact.AccessibleSelectHTMLAttributes<HTMLSelectElement>;
// slot: preact.SlotHTMLAttributes<HTMLSlotElement>;
// small: preact.HTMLAttributes<HTMLElement>;
// source: preact.SourceHTMLAttributes<HTMLSourceElement>;
// span: preact.HTMLAttributes<HTMLSpanElement>;
// strong: preact.HTMLAttributes<HTMLElement>;
// style: preact.StyleHTMLAttributes<HTMLStyleElement>;
// sub: preact.HTMLAttributes<HTMLElement>;
// summary: preact.HTMLAttributes<HTMLElement>;
// sup: preact.HTMLAttributes<HTMLElement>;
// table: preact.TableHTMLAttributes<HTMLTableElement>;
// tbody: preact.HTMLAttributes<HTMLTableSectionElement>;
// td: preact.TdHTMLAttributes<HTMLTableCellElement>;
// template: preact.TemplateHTMLAttributes<HTMLTemplateElement>;
// textarea: preact.TextareaHTMLAttributes<HTMLTextAreaElement>;
// tfoot: preact.HTMLAttributes<HTMLTableSectionElement>;
// th: preact.ThHTMLAttributes<HTMLTableCellElement>;
// thead: preact.HTMLAttributes<HTMLTableSectionElement>;
// time: preact.TimeHTMLAttributes<HTMLTimeElement>;
// title: preact.TitleHTMLAttributes<HTMLTitleElement>;
// tr: preact.HTMLAttributes<HTMLTableRowElement>;
// track: preact.TrackHTMLAttributes<HTMLTrackElement>;
// u: preact.UlHTMLAttributes<HTMLElement>;
// ul: preact.HTMLAttributes<HTMLUListElement>;
// var: preact.HTMLAttributes<HTMLElement>;
// video: preact.VideoHTMLAttributes<HTMLVideoElement>;
// wbr: preact.WbrHTMLAttributes<HTMLElement>;
// }
// export interface IntrinsicElements
// extends IntrinsicSVGElements,
// IntrinsicMathMLElements,
// IntrinsicHTMLElements {}
// }

View File

@@ -1,12 +0,0 @@
/// <reference types="vitest/config" />
import { defineConfig } from "vite";
export default defineConfig({
test: {
name: "unit",
environment: "node",
dir: "./test",
include: ["./**/*.test.{ts,tsx}"],
},
});

View File

@@ -385,9 +385,9 @@
"license": "MIT"
},
"node_modules/@types/node": {
"version": "24.2.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz",
"integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==",
"version": "24.3.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz",
"integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==",
"dev": true,
"license": "MIT",
"dependencies": {

View File

@@ -6,7 +6,7 @@ authors = [{ name = "authentik Team", email = "hello@goauthentik.io" }]
requires-python = "==3.13.*"
dependencies = [
"argon2-cffi==25.1.0",
"channels==4.3.0",
"channels==4.3.1",
"channels-redis==4.3.0",
"cryptography==45.0.5",
"dacite==1.9.2",
@@ -79,7 +79,7 @@ dev = [
"aws-cdk-lib==2.188.0",
"bandit==1.8.3",
"black==25.1.0",
"channels[daphne]==4.3.0",
"channels[daphne]==4.3.1",
"codespell==2.4.1",
"colorama==0.4.6",
"constructs==10.4.2",

View File

@@ -1,13 +1,13 @@
services:
chrome:
platform: linux/x86_64
image: docker.io/selenium/standalone-chrome:138.0
image: docker.io/selenium/standalone-chrome:139.0
volumes:
- /dev/shm:/dev/shm
network_mode: host
restart: always
mailpit:
image: docker.io/axllent/mailpit:v1.27.4
image: docker.io/axllent/mailpit:v1.27.6
ports:
- 1025:1025
- 8025:8025

12
uv.lock generated
View File

@@ -1,5 +1,5 @@
version = 1
revision = 3
revision = 2
requires-python = "==3.13.*"
[manifest]
@@ -260,7 +260,7 @@ dev = [
[package.metadata]
requires-dist = [
{ name = "argon2-cffi", specifier = "==25.1.0" },
{ name = "channels", specifier = "==4.3.0" },
{ name = "channels", specifier = "==4.3.1" },
{ name = "channels-redis", specifier = "==4.3.0" },
{ name = "cryptography", specifier = "==45.0.5" },
{ name = "dacite", specifier = "==1.9.2" },
@@ -333,7 +333,7 @@ dev = [
{ name = "aws-cdk-lib", specifier = "==2.188.0" },
{ name = "bandit", specifier = "==1.8.3" },
{ name = "black", specifier = "==25.1.0" },
{ name = "channels", extras = ["daphne"], specifier = "==4.3.0" },
{ name = "channels", extras = ["daphne"], specifier = "==4.3.1" },
{ name = "codespell", specifier = "==2.4.1" },
{ name = "colorama", specifier = "==0.4.6" },
{ name = "constructs", specifier = "==10.4.2" },
@@ -652,15 +652,15 @@ wheels = [
[[package]]
name = "channels"
version = "4.3.0"
version = "4.3.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "asgiref" },
{ name = "django" },
]
sdist = { url = "https://files.pythonhosted.org/packages/72/04/6768c7a887f9c593c4d49f99130c8aec4ea06e750bc17c306b689f6caf3b/channels-4.3.0.tar.gz", hash = "sha256:7db32c61dcd88eada1647e6c6f6ad2eb724b75d4852eeff26ad1c51ccd1a37f7", size = 26816, upload-time = "2025-07-28T13:52:50.334Z" }
sdist = { url = "https://files.pythonhosted.org/packages/12/a0/46450fcf9e56af18a6b0440ba49db6635419bb7bc84142c35f4143b1a66c/channels-4.3.1.tar.gz", hash = "sha256:97413ffd674542db08e16a9ef09cd86ec0113e5f8125fbd33cf0854adcf27cdb", size = 26896, upload-time = "2025-08-01T13:25:19.952Z" }
wheels = [
{ url = "https://files.pythonhosted.org/packages/7c/59/0866202ee593e1b0dab0b472ebb8169e1b2b7886ad3008d193da2bbe10cb/channels-4.3.0-py3-none-any.whl", hash = "sha256:0497f3affb95e621b37d6bae1b6a5d9e8e1e1221007a2566f280091cf30ffcce", size = 31238, upload-time = "2025-07-28T13:52:49.117Z" },
{ url = "https://files.pythonhosted.org/packages/89/1c/eae1c2a8c195760376e7f65d0bdcc3e966695d29cfbe5c54841ce5c71408/channels-4.3.1-py3-none-any.whl", hash = "sha256:b091d4b26f91d807de3e84aead7ba785314f27eaf5bac31dd51b1c956b883859", size = 31286, upload-time = "2025-08-01T13:25:18.845Z" },
]
[package.optional-dependencies]

839
web/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -98,7 +98,6 @@
"@goauthentik/core": "^1.0.0",
"@goauthentik/esbuild-plugin-live-reload": "^1.1.0",
"@goauthentik/eslint-config": "^1.0.5",
"@goauthentik/lit-jsx": "^1.0.0",
"@goauthentik/prettier-config": "^3.1.0",
"@goauthentik/tsconfig": "^1.0.4",
"@hcaptcha/types": "^1.0.4",
@@ -112,7 +111,7 @@
"@open-wc/lit-helpers": "^0.7.0",
"@openlayers-elements/core": "^0.4.0",
"@openlayers-elements/maps": "^0.4.0",
"@patternfly/elements": "^4.1.0",
"@patternfly/elements": "^4.2.0",
"@patternfly/patternfly": "^4.224.2",
"@sentry/browser": "^10.5.0",
"@spotlightjs/spotlight": "^3.0.2",
@@ -122,9 +121,9 @@
"@storybook/web-components-vite": "^9.1.2",
"@types/codemirror": "^5.60.16",
"@types/grecaptcha": "^3.0.9",
"@types/guacamole-common-js": "^1.5.3",
"@types/guacamole-common-js": "^1.5.4",
"@types/mocha": "^10.0.10",
"@types/node": "^24.2.1",
"@types/node": "^24.3.0",
"@types/react": "^19.1.10",
"@types/react-dom": "^19.1.7",
"@typescript-eslint/eslint-plugin": "^8.38.0",
@@ -136,7 +135,7 @@
"chartjs-adapter-date-fns": "^3.0.0",
"codemirror": "^6.0.2",
"construct-style-sheets-polyfill": "^3.1.0",
"core-js": "^3.45.0",
"core-js": "^3.45.1",
"country-flag-icons": "^1.5.19",
"date-fns": "^4.1.0",
"deepmerge-ts": "^7.1.5",
@@ -157,7 +156,7 @@
"lit": "^3.3.1",
"lit-analyzer": "^2.0.3",
"md-front-matter": "^1.0.4",
"mermaid": "^11.9.0",
"mermaid": "^11.10.0",
"npm-run-all": "^4.1.5",
"prettier": "^3.6.2",
"pseudolocale": "^2.1.0",
@@ -178,7 +177,7 @@
"ts-pattern": "^5.8.0",
"turnstile-types": "^1.2.3",
"typescript": "^5.8.3",
"typescript-eslint": "^8.39.1",
"typescript-eslint": "^8.40.0",
"unist-util-visit": "^5.0.0",
"webcomponent-qr-code": "^1.3.0",
"wireit": "^0.14.12",
@@ -188,9 +187,9 @@
"@esbuild/darwin-arm64": "^0.25.4",
"@esbuild/linux-arm64": "^0.25.4",
"@esbuild/linux-x64": "^0.25.4",
"@rollup/rollup-darwin-arm64": "^4.46.2",
"@rollup/rollup-linux-arm64-gnu": "^4.46.2",
"@rollup/rollup-linux-x64-gnu": "^4.46.2",
"@rollup/rollup-darwin-arm64": "^4.46.3",
"@rollup/rollup-linux-arm64-gnu": "^4.46.3",
"@rollup/rollup-linux-x64-gnu": "^4.46.3",
"@wdio/browser-runner": "^9.19.1",
"@wdio/cli": "^9.19.1",
"@wdio/spec-reporter": "^9.19.1",

View File

@@ -47,7 +47,7 @@
"dependencies": {
"@goauthentik/prettier-config": "^3.1.0",
"@goauthentik/tsconfig": "^1.0.4",
"@types/node": "^24.2.1",
"@types/node": "^24.3.0",
"prettier": "^3.6.2",
"typescript": "^5.8.3"
},

View File

@@ -10,7 +10,7 @@
"watch": "rollup -w -c rollup.config.mjs --bundleConfigAsCjs"
},
"dependencies": {
"@goauthentik/api": "^2024.6.0-1719577139",
"@goauthentik/api": "^2025.10.0-rc1-1755254677",
"@goauthentik/core": "^1.0.0",
"@rollup/plugin-commonjs": "^28.0.6",
"@rollup/plugin-node-resolve": "^16.0.1",
@@ -23,7 +23,7 @@
"formdata-polyfill": "^4.0.10",
"jquery": "^3.7.1",
"prettier": "^3.5.3",
"rollup": "^4.46.2",
"rollup": "^4.46.3",
"rollup-plugin-copy": "^3.5.0",
"weakmap-polyfill": "^2.0.4"
},

View File

@@ -48,6 +48,11 @@ const BASE_ESBUILD_OPTIONS = {
plugins: [
copy({
assets: [
{
from: path.join(path.dirname(EntryPoint.StandaloneLoading.in), "startup", "**"),
to: path.dirname(EntryPoint.StandaloneLoading.out),
},
{
from: path.join(patternflyPath, "patternfly.min.css"),
to: ".",

View File

@@ -66,7 +66,7 @@ export class AdminOverviewPage extends AdminOverviewBase {
quickActions: QuickAction[] = [
[msg("Create a new application"), paramURL("/core/applications", { createWizard: true })],
[msg("Check the logs"), paramURL("/events/log")],
[msg("Explore integrations"), "https://goauthentik.io/integrations/", true],
[msg("Explore integrations"), "https://integrations.goauthentik.io/", true],
[msg("Manage users"), paramURL("/identity/users")],
[
msg("Check the release notes"),

View File

@@ -5,6 +5,10 @@ import { groupBy } from "#common/utils";
import { AKElement } from "#elements/Base";
import { AKLabel } from "#components/ak-label";
import { IDGenerator } from "#packages/core/id";
import { Provider, ProvidersAllListRequest, ProvidersApi } from "@goauthentik/api";
import { html, nothing } from "lit";
@@ -38,11 +42,13 @@ export class AkProviderInput extends AKElement {
return this;
}
//#region Properties
@property({ type: String })
name!: string;
@property({ type: String })
label = "";
label?: string;
@property({ type: Number })
value?: number;
@@ -60,14 +66,26 @@ export class AkProviderInput extends AKElement {
super();
this.selected = this.selected.bind(this);
}
/**
* A unique ID to associate with the input and label.
* @property
*/
@property({ type: String, reflect: false })
public fieldID?: string = IDGenerator.elementID().toString();
selected(item: Provider) {
return this.value !== undefined && this.value === item.pk;
}
//#endregion
render() {
return html` <ak-form-element-horizontal label=${this.label} name=${this.name}>
return html` <ak-form-element-horizontal name=${this.name}>
<div slot="label" class="pf-c-form__group-label">
${AKLabel({ htmlFor: this.fieldID, required: this.required }, this.label)}
</div>
<ak-search-select
.fieldID=${this.fieldID}
.selected=${this.selected}
.fetchObjects=${fetch}
.renderElement=${renderElement}

View File

@@ -44,6 +44,7 @@ export class BrandForm extends ModelForm<Brand, string> {
}
async send(data: Brand): Promise<Brand> {
data.attributes ??= {};
if (this.instance?.brandUuid) {
return new CoreApi(DEFAULT_CONFIG).coreBrandsUpdate({
brandUuid: this.instance.brandUuid,

View File

@@ -53,6 +53,7 @@ export class GroupForm extends ModelForm<Group, string> {
}
async send(data: Group): Promise<Group> {
data.attributes ??= {};
if (this.instance?.pk) {
return new CoreApi(DEFAULT_CONFIG).coreGroupsPartialUpdate({
groupUuid: this.instance.pk,
@@ -145,7 +146,7 @@ export class GroupForm extends ModelForm<Group, string> {
)}
</p>
</ak-form-element-horizontal>
<ak-form-element-horizontal label=${msg("Attributes")} required name="attributes">
<ak-form-element-horizontal label=${msg("Attributes")} name="attributes">
<ak-codemirror
mode=${CodeMirrorMode.YAML}
value="${YAML.stringify(this.instance?.attributes ?? {})}"

View File

@@ -1,4 +1,8 @@
import { APIError } from "#common/errors/network";
import { MessageLevel } from "#common/messages";
import { ModelForm } from "#elements/forms/ModelForm";
import { APIMessage } from "#elements/messages/Message";
import { msg } from "@lit/localize";
@@ -8,4 +12,14 @@ export abstract class BaseProviderForm<T> extends ModelForm<T, number> {
? msg("Successfully updated provider.")
: msg("Successfully created provider.");
}
protected override formatAPIErrorMessage(error: APIError): APIMessage {
return {
level: MessageLevel.error,
...super.formatAPIErrorMessage(error),
message: this.instance
? msg("An error occurred while updating the provider.")
: msg("An error occurred while creating the provider."),
};
}
}

View File

@@ -195,7 +195,7 @@ export function renderForm(
.redirectURI=${redirectURI}
name="oauth2-redirect-uri"
style="width: 100%"
inputID="redirect-uri-${idx}"
input-id="redirect-uri-${idx}"
></ak-provider-oauth2-redirect-uri>`;
}}
>

View File

@@ -71,10 +71,10 @@ export class SAMLProviderViewPage extends AKElement {
metadata?: SAMLMetadata;
@state()
signer?: CertificateKeyPair;
signer: CertificateKeyPair | null = null;
@state()
verifier?: CertificateKeyPair;
verifier: CertificateKeyPair | null = null;
@state()
previewUser?: User;
@@ -97,7 +97,7 @@ export class SAMLProviderViewPage extends AKElement {
super();
this.addEventListener(EVENT_REFRESH, () => {
if (!this.provider?.pk) return;
this.providerID = this.provider?.pk;
this.fetchProvider(this.provider.pk);
});
}
@@ -117,20 +117,32 @@ export class SAMLProviderViewPage extends AKElement {
}
fetchSigningCertificate(kpUuid: string) {
this.fetchCertificate(kpUuid).then((kp) => (this.signer = kp));
this.fetchCertificate(kpUuid).then((kp) => {
this.signer = kp;
this.requestUpdate("signer");
});
}
fetchVerificationCertificate(kpUuid: string) {
this.fetchCertificate(kpUuid).then((kp) => (this.verifier = kp));
this.fetchCertificate(kpUuid).then((kp) => {
this.verifier = kp;
this.requestUpdate("verifier");
});
}
fetchProvider(id: number) {
new ProvidersApi(DEFAULT_CONFIG).providersSamlRetrieve({ id }).then((prov) => {
this.provider = prov;
if (this.provider.signingKp) {
// Clear existing signing certificate if the provider has none
if (!this.provider.signingKp) {
this.signer = null;
} else {
this.fetchSigningCertificate(this.provider.signingKp);
}
if (this.provider.verificationKp) {
// Clear existing verification certificate if the provider has none
if (!this.provider.verificationKp) {
this.verifier = null;
} else {
this.fetchVerificationCertificate(this.provider.verificationKp);
}
});

View File

@@ -530,9 +530,8 @@ export class OAuthSourceForm extends WithCapabilitiesConfig(BaseSourceForm<OAuth
</ak-form-element-horizontal>
</div>
</ak-form-group>
<ak-form-group>
<span slot="header"> ${msg("Advanced settings")} </span>
<div slot="body" class="pf-c-form">
<ak-form-group label=${msg("Advanced settings")}>
<div class="pf-c-form">
<ak-form-element-horizontal
label=${msg("Policy engine mode")}
required

View File

@@ -414,9 +414,8 @@ export class PlexSourceForm extends WithCapabilitiesConfig(BaseSourceForm<PlexSo
</ak-form-element-horizontal>
</div>
</ak-form-group>
<ak-form-group>
<span slot="header"> ${msg("Advanced settings")} </span>
<div slot="body" class="pf-c-form">
<ak-form-group label=${msg("Advanced settings")}>
<div class="pf-c-form">
<ak-form-element-horizontal
label=${msg("Policy engine mode")}
required

View File

@@ -574,9 +574,8 @@ export class SAMLSourceForm extends WithCapabilitiesConfig(BaseSourceForm<SAMLSo
</ak-form-element-horizontal>
</div>
</ak-form-group>
<ak-form-group>
<span slot="header"> ${msg("Advanced settings")} </span>
<div slot="body" class="pf-c-form">
<ak-form-group label=${msg("Advanced settings")}>
<div class="pf-c-form">
<ak-form-element-horizontal
label=${msg("Policy engine mode")}
required

View File

@@ -180,11 +180,7 @@ export class UserForm extends ModelForm<User, number> {
required
/>
</ak-form-element-horizontal>
<ak-form-element-horizontal
label=${msg("Attributes")}
?required=${false}
name="attributes"
>
<ak-form-element-horizontal label=${msg("Attributes")} name="attributes">
<ak-codemirror
mode=${CodeMirrorMode.YAML}
value="${YAML.stringify(

View File

@@ -1,20 +1,29 @@
import "#components/ak-text-input";
import { DEFAULT_CONFIG } from "#common/api/config";
import { globalAK } from "#common/global";
import { MessageLevel } from "#common/messages";
import { Form } from "#elements/forms/Form";
import { APIMessage } from "#elements/messages/Message";
import { CoreApi, ImpersonationRequest } from "@goauthentik/api";
import { msg } from "@lit/localize";
import { msg, str } from "@lit/localize";
import { html, TemplateResult } from "lit";
import { customElement, property } from "lit/decorators.js";
@customElement("ak-user-impersonate-form")
export class UserImpersonateForm extends Form<ImpersonationRequest> {
@property({ type: Number })
instancePk?: number;
public instancePk?: number;
protected override formatAPISuccessMessage(): APIMessage | null {
return {
level: MessageLevel.success,
message: msg(str`Impersonating user...`),
description: msg("This may take a few seconds."),
};
}
async send(data: ImpersonationRequest): Promise<void> {
return new CoreApi(DEFAULT_CONFIG)
@@ -23,7 +32,7 @@ export class UserImpersonateForm extends Form<ImpersonationRequest> {
impersonationRequest: data,
})
.then(() => {
window.location.href = globalAK().api.base;
window.location.reload();
});
}
@@ -31,7 +40,12 @@ export class UserImpersonateForm extends Form<ImpersonationRequest> {
return html`<ak-text-input
name="reason"
label=${msg("Reason")}
help=${msg("Reason for impersonating the user")}
autocomplete="off"
placeholder=${msg("Reason for impersonating the user")}
help=${msg(
"A brief explanation of why you are impersonating the user. This will be included in audit logs.",
)}
required
></ak-text-input>`;
}
}

View File

@@ -6,6 +6,8 @@ import {
ValidationErrorFromJSON,
} from "@goauthentik/api";
import { sentenceCase } from "change-case";
//#region HTTP
/**
@@ -233,3 +235,25 @@ export async function parseAPIResponseError<T extends APIError = APIError>(
}
//#endregion
//#region Validation errors
/**
* Pluck a field error from a validation error.
*
* This is used to create a fallback error message when the API returns
* a validation error that isn't associated with field within the form.
*
* We can still show the error message, to at least give the user some feedback.
*/
export function pluckFallbackFieldErrors(parsedError: APIError): string[] {
for (const [fieldName, fieldErrors] of Object.entries(parsedError)) {
if (Array.isArray(fieldErrors)) {
return [`${sentenceCase(fieldName)}: ${fieldErrors.join(", ")}`];
}
}
return [];
}
//#endregion

View File

@@ -20,6 +20,22 @@ export const EscapeTrustPolicy = trustedTypes.createPolicy("authentik-escape", {
},
});
/**
* Trusted types policy that removes all HTML content.
*
*
* @returns {TrustedHTML} All remaining text content.
*/
export const StripHTMLTrustPolicy = trustedTypes.createPolicy("authentik-strip-html", {
createHTML: (untrustedHTML: string) => {
return DOMPurify.sanitize(untrustedHTML, {
RETURN_TRUSTED_TYPE: false,
ALLOWED_TAGS: [],
ALLOWED_ATTR: [],
});
},
});
/**
* Trusted types policy, stripping all HTML content.
*
@@ -105,7 +121,9 @@ export function renderStaticHTMLUnsafe(untrustedHTML: unknown): string {
render(untrustedHTML, container);
const result = container.innerHTML;
const result = container.innerHTML
// Remove all comments as they can interfere with the styles.
.replaceAll("<!---->", "")
.replaceAll(/<!--\?lit\$\d+\$-->/g, "");
return result;
}

View File

@@ -5,12 +5,12 @@ import { SlottedTemplateResult } from "../elements/types";
import { AKElement, type AKElementProps } from "#elements/Base";
import { ErrorProp } from "#components/ak-field-errors";
import { AKLabel } from "#components/ak-label";
import { IDGenerator } from "@goauthentik/core/id";
import { html, nothing, TemplateResult } from "lit";
import { property } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js";
export interface HorizontalLightComponentProps<T> extends AKElementProps {
name: string;
@@ -40,6 +40,8 @@ export abstract class HorizontalLightComponent<T>
return this;
}
//#region Properties
/**
* The name attribute for the form element
* @property
@@ -61,7 +63,7 @@ export abstract class HorizontalLightComponent<T>
* @attribute
*/
@property({ type: Boolean, reflect: true })
required = false;
public required?: boolean;
/**
* Help text to display below the form element. Optional
@@ -96,10 +98,9 @@ export abstract class HorizontalLightComponent<T>
* @property
*/
@property({ attribute: false })
errorMessages: string[] = [];
public errorMessages?: ErrorProp[];
/**
* @attribute
* @property
*/
@property({ attribute: false })
@@ -114,11 +115,21 @@ export abstract class HorizontalLightComponent<T>
@property({ type: String, attribute: "input-hint" })
inputHint?: string;
protected renderControl() {
throw new Error("Must be implemented in a subclass");
}
/**
* A unique ID to associate with the input and label.
* @property
*/
@property({ type: String, reflect: false })
public fieldID?: string = IDGenerator.elementID().toString();
protected fieldID = IDGenerator.elementID().toString();
//#endregion
//#region Rendering
/**
* Render the control element, e.g. an input, textarea, select, etc.
*/
protected abstract renderControl(): SlottedTemplateResult;
protected renderHelp(): SlottedTemplateResult | SlottedTemplateResult[] {
const bigHelp: SlottedTemplateResult[] = Array.isArray(this.bighelp)
@@ -133,14 +144,19 @@ export abstract class HorizontalLightComponent<T>
render() {
return html`<ak-form-element-horizontal
fieldID=${this.fieldID}
label=${ifDefined(this.label)}
.fieldID=${this.fieldID}
?required=${this.required}
?hidden=${this.hidden}
name=${this.name}
.errorMessages=${this.errorMessages}
>
<div slot="label" class="pf-c-form__group-label">
${AKLabel({ htmlFor: this.fieldID, required: this.required }, this.label)}
</div>
${this.renderControl()} ${this.renderHelp()}
</ak-form-element-horizontal> `;
}
//#endregion
}

View File

@@ -1,14 +1,18 @@
import "#elements/buttons/Dropdown";
import { AKElement } from "#elements/Base";
import { StripHTMLTrustPolicy } from "#common/purify";
import { rootInterface } from "#common/theme";
import { FormAssociated, FormAssociatedElement } from "#elements/forms/form-associated-element";
import { PaginatedResponse } from "#elements/table/Table";
import DjangoQL, { Introspections } from "@mrmarble/djangoql-completion";
import { msg } from "@lit/localize";
import { css, CSSResult, html, nothing, TemplateResult } from "lit";
import { customElement, property, query, state } from "lit/decorators.js";
import { css, CSSResult, html, LitElement, nothing, PropertyValues, TemplateResult } from "lit";
import { customElement, property } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js";
import { createRef, ref, Ref } from "lit/directives/ref.js";
import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
import PFSearchInput from "@patternfly/patternfly/components/SearchInput/search-input.css";
@@ -25,40 +29,26 @@ export class QL extends DjangoQL {
textareaResize() {}
}
@customElement("ak-search-ql")
export class QLSearch extends AKElement {
@property()
value?: string;
/**
* Given an array or length, return logical index of the element at the given delta.
* This is effectively a modulo loop, allowing for positive and negative deltas.
*/
function torusIndex(lengthLike: number | ArrayLike<number>, delta: number): number {
const length = typeof lengthLike === "number" ? lengthLike : lengthLike.length;
@query("[name=search]")
searchElement?: HTMLTextAreaElement;
@state()
menuOpen = false;
@property()
onSearch?: (value: string) => void;
@state()
selected?: number;
@state()
cursorX: number = 0;
@state()
cursorY: number = 0;
ql?: QL;
canvas?: CanvasRenderingContext2D;
set apiResponse(value: PaginatedResponse<unknown> | undefined) {
if (!value || !value.autocomplete || !this.ql) {
return;
}
this.ql.loadIntrospections(value.autocomplete as unknown as Introspections);
if (delta < 0) {
return (length + delta) % length;
}
static styles: CSSResult[] = [
return ((delta % length) + length) % length;
}
@customElement("ak-search-ql")
export class QLSearch extends FormAssociatedElement<string> implements FormAssociated {
declare anchorRef: Ref<HTMLTextAreaElement>;
declare anchor: HTMLTextAreaElement | null;
public static styles: CSSResult[] = [
PFBase,
PFFormControl,
PFSearchInput,
@@ -66,207 +56,409 @@ export class QLSearch extends AKElement {
::-webkit-search-cancel-button {
display: none;
}
.ql.pf-c-form-control {
font-family: monospace;
--input-height: 2.25em;
height: var(--input-height);
min-height: var(--input-height);
max-height: calc(var(--input-height) * 6);
resize: vertical;
height: 2.25em;
}
.selected {
background-color: var(--pf-c-search-input__menu-item--hover--BackgroundColor);
}
:host([theme="dark"]) .pf-c-search-input__menu {
--pf-c-search-input__menu--BackgroundColor: var(--ak-dark-background-light-ish);
color: var(--ak-dark-foreground);
}
:host([theme="dark"]) .pf-c-search-input__menu-item {
--pf-c-search-input__menu-item--Color: var(--ak-dark-foreground);
}
:host([theme="dark"]) .pf-c-search-input__menu-item:hover {
--pf-c-search-input__menu-item--BackgroundColor: var(--ak-dark-background-lighter);
}
:host([theme="dark"]) .pf-c-search-input__menu-list-item.selected {
--pf-c-search-input__menu-item--hover--BackgroundColor: var(
--ak-dark-background-light
);
}
:host([theme="dark"]) .pf-c-search-input__text::before {
border: 0;
:host([theme="dark"]) {
.pf-c-search-input__menu {
--pf-c-search-input__menu--BackgroundColor: var(--ak-dark-background-light-ish);
color: var(--ak-dark-foreground);
}
.pf-c-search-input__menu-item {
--pf-c-search-input__menu-item--Color: var(--ak-dark-foreground);
}
.pf-c-search-input__menu-item:hover {
--pf-c-search-input__menu-item--BackgroundColor: var(
--ak-dark-background-lighter
);
}
.pf-c-search-input__menu-list-item.selected {
--pf-c-search-input__menu-item--hover--BackgroundColor: var(
--ak-dark-background-light
);
}
.pf-c-search-input__text::before {
border: 0;
}
}
.pf-c-search-input__menu {
position: fixed;
min-width: 0;
overflow-y: auto;
max-height: 50vh;
}
`,
];
firstUpdated() {
if (!this.searchElement) {
//#region Properties
@property({ type: Boolean })
public open = false;
@property({ type: Number, attribute: false })
public selectionIndex = -1;
#value = "";
@property({ type: String })
public get value(): string {
return this.#value;
}
public set value(value: unknown) {
const parsed = typeof value === "string" ? value : "";
this.setFormValue(parsed.trim(), parsed);
this.#value = parsed;
if (this.anchor) {
this.anchor.value = this.#value;
}
}
//#endregion
//#region State
#menuRef = createRef<HTMLDivElement>();
#ql: QL | null = null;
#ctx: OffscreenCanvasRenderingContext2D | null = null;
#letterWidth = -1;
#scrollContainer: HTMLElement | null = null;
public set apiResponse(value: PaginatedResponse<unknown> | undefined) {
if (!value?.autocomplete || !this.#ql) {
return;
}
this.ql = new QL({
this.#ql.loadIntrospections(value.autocomplete as unknown as Introspections);
}
//#endregion
//#region Lifecycle
public override connectedCallback() {
super.connectedCallback();
this.internals.ariaAutoComplete = "list";
this.internals.role = "combobox";
this.internals.ariaHasPopup = "listbox";
this.#scrollContainer =
rootInterface<LitElement>().renderRoot.querySelector("#main-content");
this.#scrollContainer?.addEventListener("scroll", this.#updateDropdownPosition, {
passive: true,
});
this.tabIndex = 0;
}
public override disconnectedCallback() {
super.disconnectedCallback();
this.#scrollContainer?.removeEventListener("scroll", this.#updateDropdownPosition);
}
public formStateRestoreCallback(state: string) {
this.value = state;
}
public formResetCallback() {
this.value = "";
}
public toJSON() {
return this.value;
}
public override updated(changedProperties: PropertyValues<this>) {
if (changedProperties.has("open")) {
this.internals.ariaExpanded = this.open ? "true" : "false";
}
if (changedProperties.has("selectionIndex")) {
const id = `suggestion-${this.selectionIndex}`;
this.setAttribute("aria-activedescendant", this.selectionIndex === -1 ? "" : id);
this.renderRoot.querySelector(`#${id}`)?.scrollIntoView({
behavior: "auto",
block: "nearest",
});
}
}
public override firstUpdated() {
const textarea = this.anchorRef.value;
if (!textarea) return;
this.#ql = new QL({
completionEnabled: true,
introspections: {
current_model: "",
models: {},
},
selector: this.searchElement,
selector: textarea,
autoResize: false,
});
const canvas = document.createElement("canvas");
const context = canvas.getContext("2d");
if (!context) {
const canvas = new OffscreenCanvas(300, 150);
this.#ctx = canvas.getContext("2d");
if (!this.#ctx) {
console.error("authentik/ql: failed to get canvas context");
return;
}
context.font = window.getComputedStyle(this.searchElement).font;
this.canvas = context;
}
refreshCompletions() {
this.value = this.searchElement?.value;
if (!this.ql) {
return;
}
this.ql.generateSuggestions();
if (this.ql.suggestions.length < 1 || this.ql.loading) {
this.menuOpen = false;
return;
}
this.menuOpen = true;
this.updateDropdownPosition();
this.requestUpdate();
}
this.#ctx.font = window.getComputedStyle(textarea).font;
updateDropdownPosition() {
if (!this.searchElement) {
return;
}
const bcr = this.getBoundingClientRect();
// We need the width of a letter to measure x; we use a monospaced font but still
// check the length for `m` as its the widest ASCII char
const metrics = this.canvas?.measureText("m");
const letterWidth = Math.ceil(metrics?.width || 0) + 1;
const metrics = this.#ctx?.measureText("m");
this.#letterWidth = Math.ceil(metrics?.width || 0) + 1;
}
//#endregion
//#region Completions
#refreshCompletions = () => {
if (this.anchor) {
this.value = this.anchor.value;
}
if (!this.#ql) {
return;
}
this.#ql.generateSuggestions();
if (this.#ql.suggestions.length < 1 || this.#ql.loading) {
this.open = false;
return;
}
this.open = true;
this.requestUpdate();
requestAnimationFrame(this.#updateDropdownPosition);
};
#updateDropdownPosition = () => {
const anchor = this.anchorRef.value;
const menu = this.#menuRef.value;
if (!anchor || !menu) return;
const bcr = this.getBoundingClientRect();
const style = window.getComputedStyle(anchor);
// Mostly static variables for padding, font line-height and how many
const lineHeight = parseInt(window.getComputedStyle(this.searchElement).lineHeight, 10);
const paddingTop = parseInt(window.getComputedStyle(this.searchElement).paddingTop, 10);
const paddingLeft = parseInt(window.getComputedStyle(this.searchElement).paddingLeft, 10);
const paddingRight = parseInt(window.getComputedStyle(this.searchElement).paddingRight, 10);
const lineHeight = parseInt(style.lineHeight, 10);
const paddingTop = parseInt(style.paddingTop, 10);
const paddingLeft = parseInt(style.paddingLeft, 10);
const paddingRight = parseInt(style.paddingRight, 10);
const actualInnerWidth = bcr.width - paddingLeft - paddingRight;
let relX = 0;
let relY = 1;
let letterIndex = 0;
this.searchElement.value.split(" ").some((word, idx) => {
for (const word of anchor.value.split(" ")) {
letterIndex += word.length;
const newRelX = relX + word.length * letterWidth;
const newRelX = relX + word.length * this.#letterWidth;
if (newRelX > actualInnerWidth) {
relY += 1;
if (letterIndex > this.searchElement!.selectionStart) {
if (letterIndex > anchor.selectionStart) {
relX =
letterWidth * word.length -
(letterIndex - this.searchElement!.selectionStart) * letterWidth;
return true;
this.#letterWidth * word.length -
(letterIndex - anchor.selectionStart) * this.#letterWidth;
break;
}
relX = word.length * letterWidth;
relX = word.length * this.#letterWidth;
} else {
relX = newRelX + 1;
}
});
}
this.cursorX = bcr.x + paddingLeft + relX;
this.cursorY = bcr.y + paddingTop + relY * lineHeight;
}
const x = bcr.x + paddingLeft + relX;
const y = bcr.y + paddingTop + relY * lineHeight;
Object.assign(menu.style, {
left: `${x}px`,
top: `${y}px`,
} satisfies Partial<CSSStyleDeclaration>);
};
//#endregion
//#region Event Listeners
#keydownListener = (event: KeyboardEvent) => {
this.#updateDropdownPosition();
const suggestionsLength = this.#ql?.suggestions.length;
if (event.key === "Enter" && !this.open && this.form) {
const submitEvent = new SubmitEvent("submit", {
submitter: this,
bubbles: true,
composed: true,
cancelable: true,
});
this.form.dispatchEvent(submitEvent);
onKeyDown(ev: KeyboardEvent) {
this.updateDropdownPosition();
if (ev.key === "Enter" && ev.metaKey && this.onSearch && this.searchElement) {
this.onSearch(this.searchElement?.value);
return;
}
if (!this.menuOpen) return;
switch (ev.key) {
if (event.key === "ArrowDown") {
event.preventDefault();
if (this.open && suggestionsLength) {
if (this.selectionIndex === -1) {
this.selectionIndex = 0;
} else {
this.selectionIndex = torusIndex(suggestionsLength, this.selectionIndex + 1);
}
this.#refreshCompletions();
return;
}
this.selectionIndex = 0;
this.#refreshCompletions();
return;
}
if (!this.open) return;
switch (event.key) {
case "ArrowUp":
if (this.ql?.suggestions.length) {
if (this.selected === undefined) {
this.selected = this.ql?.suggestions.length - 1;
} else if (this.selected === 0) {
this.selected = undefined;
if (suggestionsLength) {
if (this.selectionIndex === -1) {
this.selectionIndex = suggestionsLength - 1;
} else {
this.selected -= 1;
this.selectionIndex = torusIndex(
suggestionsLength,
this.selectionIndex - 1,
);
}
this.refreshCompletions();
ev.preventDefault();
this.#refreshCompletions();
event.preventDefault();
}
break;
case "ArrowDown":
if (this.ql?.suggestions.length) {
if (this.selected === undefined) {
this.selected = 0;
} else if (this.selected < this.ql?.suggestions.length - 1) {
this.selected += 1;
} else {
this.selected = undefined;
}
this.refreshCompletions();
ev.preventDefault();
}
break;
return;
case "Tab":
if (this.selected) {
this.ql?.selectCompletion(this.selected);
ev.preventDefault();
if (this.selectionIndex) {
this.#ql?.selectCompletion(this.selectionIndex);
event.preventDefault();
}
break;
return;
case "Enter":
// Technically this is a textarea, due to automatic multi-line feature,
// but other than that it should look and behave like a normal input.
// So expected behavior when pressing Enter is to submit the form,
// not to add a new line.
if (this.selected !== undefined) {
this.ql?.selectCompletion(this.selected);
if (this.selectionIndex !== -1) {
this.#ql?.selectCompletion(this.selectionIndex);
this.selectionIndex = 0;
}
ev.preventDefault();
break;
case "Escape":
this.menuOpen = false;
break;
case "Shift": // Shift
case "Control": // Ctrl
case "Alt": // Alt
case "Meta": // Windows Key or Cmd on Mac
// Control keys shouldn't trigger completion popup
break;
}
}
renderMenu() {
if (!this.menuOpen || !this.ql) {
event.preventDefault();
return;
case "Escape":
this.open = false;
return;
}
};
#blurListener = ({ relatedTarget }: FocusEvent) => {
if (relatedTarget instanceof Node && this.renderRoot.contains(relatedTarget)) {
return;
}
this.open = false;
};
#focusListener = () => {
this.selectionIndex = this.selectionIndex === -1 ? 0 : this.selectionIndex;
this.#refreshCompletions();
};
//#endregion
//#region Render
protected renderMenu() {
if (!this.open || !this.#ql) {
return nothing;
}
return html`
<div
class="pf-c-search-input__menu"
style="left: ${this.cursorX}px; top: ${this.cursorY}px;"
>
<ul class="pf-c-search-input__menu-list">
${this.ql.suggestions.map((suggestion, idx) => {
<div ${ref(this.#menuRef)} class="pf-c-search-input__menu">
<ul
class="pf-c-search-input__menu-list"
role="listbox"
id="ql-suggestions"
aria-label=${msg("Query suggestions")}
>
${this.#ql.suggestions.map((suggestion, idx) => {
// Cast to string to sooth Lit Analyzer's primitive type rule.
const label = `${StripHTMLTrustPolicy.createHTML(suggestion.suggestionText)}`;
return html`<li
class="pf-c-search-input__menu-list-item ${this.selected === idx
role="option"
id="suggestion-${idx}"
aria-selected=${this.selectionIndex === idx ? "true" : "false"}
class="pf-c-search-input__menu-list-item ${this.selectionIndex === idx
? "selected"
: ""}"
>
<button
class="pf-c-search-input__menu-item"
type="button"
aria-label=${label}
@click=${() => {
this.ql?.selectCompletion(idx);
this.refreshCompletions();
this.#ql?.selectCompletion(idx);
this.#refreshCompletions();
}}
>
<span class="pf-c-search-input__menu-item-text"
>${suggestion.text}</span
<span class="pf-c-search-input__menu-item-text pf-m-monospace">
${suggestion.text}</span
>
</button>
</li>`;
@@ -276,25 +468,33 @@ export class QLSearch extends AKElement {
`;
}
render(): TemplateResult {
public override render(): TemplateResult {
return html`<div class="pf-c-search-input">
<div class="pf-c-search-input__bar">
<span class="pf-c-search-input__text">
<textarea
class="pf-c-form-control ql"
${ref(this.anchorRef)}
class="pf-c-form-control pf-m-monospace ql"
name="search"
autocomplete="off"
aria-controls="ql-suggestions"
?required=${this.required}
placeholder=${msg("Search...")}
spellcheck="false"
@input=${(ev: InputEvent) => this.refreshCompletions()}
@keydown=${this.onKeyDown}
@input=${this.#refreshCompletions}
@focus=${this.#focusListener}
@blur=${this.#blurListener}
@keydown=${this.#keydownListener}
>
${ifDefined(this.value)}</textarea
${ifDefined(this.#value)}</textarea
>
</span>
</div>
${this.renderMenu()}
</div>`;
}
//#endregion
}
declare global {

View File

@@ -125,6 +125,7 @@ export class AkSlugInput extends HorizontalLightComponent<string> {
public override renderControl() {
return html`<input
id=${ifDefined(this.fieldID)}
@input=${(ev: Event) => this.handleTouch(ev)}
type="text"
value=${ifDefined(this.value)}

View File

@@ -17,6 +17,7 @@ export class AkTextareaInput extends HorizontalLightComponent<string> {
// Prevent the leading spaces added by Prettier's whitespace algo
// prettier-ignore
return html`<textarea
id=${ifDefined(this.fieldID)}
@input=${setValue}
class="pf-c-form-control"
?required=${this.required}

View File

@@ -21,7 +21,6 @@ import diffGrammar from "highlight.js/lib/languages/diff";
import confGrammar from "highlight.js/lib/languages/ini";
import nginxGrammar from "highlight.js/lib/languages/nginx";
import { common } from "lowlight";
import React from "react";
import { createRoot, Root } from "react-dom/client";
import * as runtime from "react/jsx-runtime";
import rehypeHighlight, { Options as HighlightOptions } from "rehype-highlight";
@@ -226,17 +225,15 @@ export class AKMDX extends AKElement {
const { frontmatter = {} } = mdxExports;
this.#reactRoot.render(
React.createElement(
MDXModuleContext.Provider,
{ value: mdxModule },
React.createElement(Content, {
frontmatter,
components: {
<MDXModuleContext.Provider value={mdxModule}>
<Content
frontmatter={frontmatter}
components={{
wrapper: MDXWrapper,
a: MDXAnchor,
},
}),
),
}}
/>
</MDXModuleContext.Provider>,
);
}
}

View File

@@ -49,15 +49,15 @@ export const MDXAnchor = ({
});
};
return React.createElement(
"a",
{
href,
onClick: interceptHeadingLinks,
rel: "noopener noreferrer",
target: "_blank",
...props,
},
children,
return (
<a
href={href}
onClick={interceptHeadingLinks}
rel="noopener noreferrer"
target="_blank"
{...props}
>
{children}
</a>
);
};

View File

@@ -13,8 +13,8 @@ export const MDXWrapper = ({ children, frontmatter }: MDXWrapperProps) => {
const nextChildren = React.Children.toArray(children);
if (title) {
nextChildren.unshift(React.createElement("h1", { key: "header-title" }, title));
nextChildren.unshift(<h1 key="header-title">{title}</h1>);
}
return React.createElement("div", { className: "pf-c-content" }, nextChildren);
return <div className="pf-c-content">{nextChildren}</div>;
};

View File

@@ -9,7 +9,7 @@ import { html } from "lit";
const ACTIONS: QuickAction[] = [
["Create a new application", "/core/applications"],
["Check the logs", "/events/log"],
["Explore integrations", "https://goauthentik.io/integrations/", true],
["Explore integrations", "https://integrations.goauthentik.io/", true],
["Manage users", "/identity/users"],
["Check the release notes", "https://goauthentik.io/docs/releases/", true],
];

View File

@@ -11,7 +11,7 @@ import { html } from "lit";
const ACTIONS: QuickAction[] = [
["Create a new application", "/core/applications"],
["Check the logs", "/events/log"],
["Explore integrations", "https://goauthentik.io/integrations/", true],
["Explore integrations", "https://integrations.goauthentik.io/", true],
["Manage users", "/identity/users"],
["Check the release notes", "https://goauthentik.io/docs/releases/", true],
];

View File

@@ -1,5 +1,10 @@
import { EVENT_REFRESH } from "#common/constants";
import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network";
import {
APIError,
parseAPIResponseError,
pluckErrorDetail,
pluckFallbackFieldErrors,
} from "#common/errors/network";
import { MessageLevel } from "#common/messages";
import { dateToUTC } from "#common/temporal";
@@ -8,17 +13,18 @@ import { AKElement } from "#elements/Base";
import { reportValidityDeep } from "#elements/forms/FormGroup";
import { PreventFormSubmit } from "#elements/forms/helpers";
import { HorizontalFormElement } from "#elements/forms/HorizontalFormElement";
import { APIMessage } from "#elements/messages/Message";
import { showMessage } from "#elements/messages/MessageContainer";
import { SlottedTemplateResult } from "#elements/types";
import { createFileMap, isNamedElement, NamedElement } from "#elements/utils/inputs";
import { ErrorProp } from "#components/ak-field-errors";
import { instanceOfValidationError } from "@goauthentik/api";
import { instanceOfValidationError, ValidationError } from "@goauthentik/api";
import { snakeCase } from "change-case";
import { msg, str } from "@lit/localize";
import { msg } from "@lit/localize";
import { css, CSSResult, html, nothing, TemplateResult } from "lit";
import { property, state } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js";
@@ -143,6 +149,41 @@ export function serializeForm<T = Record<string, unknown>>(elements: Iterable<AK
return json as unknown as T;
}
//#region Validation Reporting
/**
* Assign all input-related errors to their respective elements.
*/
function reportInvalidFields(
parsedError: ValidationError,
elements: Iterable<HorizontalFormElement>,
): HorizontalFormElement[] {
const invalidFields: HorizontalFormElement[] = [];
for (const element of elements) {
element.requestUpdate();
const elementName = element.name;
if (!elementName) continue;
const snakeProperty = snakeCase(elementName);
const errorMessages: ErrorProp[] = parsedError[snakeProperty] ?? [];
element.errorMessages = errorMessages;
if (Array.isArray(errorMessages) && errorMessages.length) {
invalidFields.push(element);
}
}
return invalidFields;
}
//#endregion
//#region Form
/**
* Form
*
@@ -180,8 +221,8 @@ export abstract class Form<T = Record<string, unknown>> extends AKElement {
//#region Properties
@property()
public successMessage = "";
@property({ type: String })
public successMessage?: string;
@property({ type: String })
public autocomplete?: AutoFill;
@@ -226,11 +267,38 @@ export abstract class Form<T = Record<string, unknown>> extends AKElement {
/**
* An overridable method for returning a success message after a successful submission.
*
* @deprecated Use `formatAPISuccessMessage` instead.
*/
protected getSuccessMessage(): string {
protected getSuccessMessage(): string | undefined {
return this.successMessage;
}
/**
* An overridable method for returning a formatted message after a successful submission.
*/
protected formatAPISuccessMessage(response: unknown): APIMessage | null {
const message = this.getSuccessMessage();
if (!message) return null;
return {
level: MessageLevel.success,
message,
};
}
/**
* An overridable method for returning a formatted error message after a failed submission.
*/
protected formatAPIErrorMessage(error: APIError): APIMessage | null {
return {
message: msg("There was an error submitting the form."),
description: pluckErrorDetail(error, pluckFallbackFieldErrors(error)[0]),
level: MessageLevel.error,
};
}
//#region Public methods
public reset(): void {
@@ -294,10 +362,7 @@ export abstract class Form<T = Record<string, unknown>> extends AKElement {
return this.send(data)
.then((response) => {
showMessage({
level: MessageLevel.success,
message: this.getSuccessMessage(),
});
showMessage(this.formatAPISuccessMessage(response));
this.dispatchEvent(
new CustomEvent(EVENT_REFRESH, {
@@ -314,81 +379,32 @@ export abstract class Form<T = Record<string, unknown>> extends AKElement {
}
const parsedError = await parseAPIResponseError(error);
let errorMessage = pluckErrorDetail(error);
let focused = false;
//#region Validation errors
if (instanceOfValidationError(parsedError)) {
// assign all input-related errors to their elements
const elements =
this.shadowRoot?.querySelectorAll<HorizontalFormElement>(
"ak-form-element-horizontal",
) || [];
const invalidFields = reportInvalidFields(
parsedError,
this.renderRoot.querySelectorAll("ak-form-element-horizontal"),
);
for (const element of elements) {
element.requestUpdate();
const focusTarget = Iterator.from(invalidFields)
.map(({ focusTarget }) => focusTarget)
.find(Boolean);
const elementName = element.name;
if (!elementName) continue;
const snakeProperty = snakeCase(elementName);
const errorMessages: ErrorProp[] = parsedError[snakeProperty] ?? [];
element.errorMessages = errorMessages;
const { controlledElement } = element;
if (!focused && Array.isArray(errorMessages) && errorMessages.length) {
if (
controlledElement?.checkVisibility() &&
controlledElement instanceof HTMLElement
) {
focused = true;
requestAnimationFrame(() => {
return controlledElement.focus?.();
});
}
}
}
if (parsedError.nonFieldErrors) {
if (focusTarget) {
requestAnimationFrame(() => focusTarget.focus());
} else if (Array.isArray(parsedError.nonFieldErrors)) {
this.nonFieldErrors = parsedError.nonFieldErrors;
} else if (!focused) {
// It's possible that the API has returned a field error that we're
// not aware of. We can still show the error message, to at least
// give the user some feedback.
for (const [fieldName, fieldErrors] of Object.entries(parsedError)) {
if (Array.isArray(fieldErrors)) {
this.nonFieldErrors = [
msg(str`${fieldName}: ${fieldErrors.join(", ")}`),
];
break;
}
}
} else {
this.nonFieldErrors = pluckFallbackFieldErrors(parsedError);
console.error(
"authentik/forms: API rejected the form submission due to an invalid field that doesn't appear to be in the form. This is likely a bug in authentik.",
parsedError,
);
}
errorMessage = msg("Invalid update request.");
// Only change the message when we have `detail`.
// Everything else is handled in the form.
if ("detail" in parsedError) {
errorMessage = parsedError.detail;
}
}
//#endregion
showMessage({
message: errorMessage,
level: MessageLevel.error,
});
showMessage(this.formatAPIErrorMessage(parsedError), true);
// Rethrow the error so the form doesn't close.
throw error;

View File

@@ -1,70 +0,0 @@
import { AKElement } from "#elements/Base";
import { ErrorDetail } from "@goauthentik/api";
import { CSSResult, html, TemplateResult } from "lit";
import { customElement, property } from "lit/decorators.js";
import PFForm from "@patternfly/patternfly/components/Form/form.css";
import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
import PFBase from "@patternfly/patternfly/patternfly-base.css";
/**
* This is used in two places outside of Flow, and in both cases is used primarily to
* display content, not take input. It displays the TOTP QR code, and the static
* recovery tokens. But it's used a lot in Flow.
*/
@customElement("ak-form-element")
export class FormElement extends AKElement {
static styles: CSSResult[] = [PFBase, PFForm, PFFormControl];
@property()
label?: string;
@property({ type: Boolean })
required = false;
@property({ attribute: false })
set errors(value: ErrorDetail[] | undefined) {
this._errors = value;
const hasError = (value || []).length > 0;
this.querySelectorAll("input").forEach((input) => {
input.setAttribute("aria-invalid", hasError.toString());
});
this.requestUpdate();
}
_errors?: ErrorDetail[];
updated(): void {
this.querySelectorAll<HTMLInputElement>("input[autofocus]").forEach((input) => {
input.focus();
});
}
render(): TemplateResult {
return html`<div class="pf-c-form__group">
<label class="pf-c-form__label">
<span class="pf-c-form__label-text">${this.label}</span>
${this.required
? html`<span class="pf-c-form__label-required" aria-hidden="true">*</span>`
: html``}
</label>
<slot></slot>
${(this._errors || []).map((error) => {
return html`<p class="pf-c-form__helper-text pf-m-error">
<span class="pf-c-form__helper-text-icon">
<i class="fas fa-exclamation-circle" aria-hidden="true"></i> </span
>${error.string}
</p>`;
})}
</div>`;
}
}
declare global {
interface HTMLElementTagNameMap {
"ak-form-element": FormElement;
}
}

View File

@@ -70,7 +70,20 @@ export class HorizontalFormElement extends AKElement {
//#endregion
public controlledElement: NamedElement | AkControlElement | null = null;
#controlledElement: AkControlElement | NamedElement | null = null;
/**
* The element that should be focused when the form is submitted.
*/
public get focusTarget(): AkControlElement | NamedElement<HTMLElement> | null {
if (!(this.#controlledElement instanceof HTMLElement)) {
return null;
}
if (!this.#controlledElement.checkVisibility()) return null;
return this.#controlledElement;
}
//#region Lifecycle
@@ -79,8 +92,8 @@ export class HorizontalFormElement extends AKElement {
}
public override updated(changedProperties: PropertyValues<this>): void {
if (changedProperties.has("errorMessages") && this.controlledElement) {
this.controlledElement.setAttribute(
if (changedProperties.has("errorMessages") && this.#controlledElement) {
this.#controlledElement.setAttribute(
"aria-invalid",
this.errorMessages?.length ? "true" : "false",
);
@@ -99,12 +112,13 @@ export class HorizontalFormElement extends AKElement {
for (const element of this.querySelectorAll("*")) {
// Is this element capable of being named?
if (!isControlElement(element) && !isNameableElement(element)) continue;
// And does the element already match the name?
if (element.getAttribute("name") === this.name) continue;
element.setAttribute("name", this.name);
this.#controlledElement = element;
if (element.getAttribute("name") !== this.name) {
element.setAttribute("name", this.name);
}
this.controlledElement = element;
break;
}
}

View File

@@ -82,7 +82,18 @@ export class SearchSelectBase<T> extends AkControlElement<string> implements ISe
// Used to inform the form of the name of the object
@property()
name?: string;
public name?: string;
/**
* A unique ID to associate with the input and label.
* @property
*/
@property({ type: String, reflect: false })
public fieldID?: string;
// Used to inform the form of the input label.
@property()
public label?: string;
// The textual placeholder for the search's <input> object, if currently empty. Used as the
// native <input> object's `placeholder` field.
@@ -255,6 +266,7 @@ export class SearchSelectBase<T> extends AkControlElement<string> implements ISe
return html`<ak-search-select-view
managed
.fieldID=${this.fieldID}
.options=${options}
value=${ifDefined(value)}
?blankable=${this.blankable}

View File

@@ -0,0 +1,216 @@
import { AKElement } from "#elements/Base";
import { Jsonifiable } from "type-fest";
import { msg } from "@lit/localize";
import { LitElement } from "lit";
import { property } from "lit/decorators.js";
import { createRef, Ref } from "lit/directives/ref.js";
/**
* A subset of form associated {@linkcode ElementInternals} properties.
*
* @see {@linkcode FormAssociatedElement} for usage.
*/
export interface FormAssociated
extends Pick<
ElementInternals,
| "form"
| "validity"
| "validationMessage"
| "willValidate"
| "labels"
| "checkValidity"
| "reportValidity"
> {
/**
* The name of the input, provided to the form.
*/
readonly name: string | null;
/**
* The type of the input, provided to the form.
*/
readonly type: string;
/**
* Whether or not the input is required.
*/
required?: boolean;
/**
* Whether or not the input is read-only.
*/
readonly?: boolean;
/**
* A JSON representation of the value.
*/
toJSON(): Jsonifiable;
}
export type FormValue = File | string | FormData | null;
/**
* A base element which provides reactive properties and methods for interacting with a parent form.
*
* @see {@link https://developer.mozilla.org/en-US/docs/Web/API/ElementInternals | MDN}
*/
export abstract class FormAssociatedElement<
V extends FormValue = string,
T extends Jsonifiable = V extends string ? V : Jsonifiable,
S extends FormValue = V,
>
extends AKElement
implements FormAssociated
{
static shadowRootOptions = { ...LitElement.shadowRootOptions, delegatesFocus: true };
public static readonly formAssociated = true;
/**
* The internals of the element.
*
* @protected
* @see {@linkcode FormAssociated}
*/
protected internals = this.attachInternals();
//#region Reactive Properties
@property({ type: Boolean })
public get required() {
return this.internals.ariaRequired === "true";
}
public set required(value: boolean) {
this.internals.ariaRequired = value ? "true" : "false";
}
@property({ type: Boolean, attribute: "readonly" })
public get readOnly() {
return this.internals.ariaReadOnly === "true";
}
public set readOnly(value: boolean) {
this.internals.ariaReadOnly = value ? "true" : "false";
}
@property({ type: Boolean })
public get disabled() {
return this.internals.ariaDisabled === "true";
}
public set disabled(value: boolean) {
this.internals.ariaDisabled = value ? "true" : "false";
}
//#endregion
//#region Aliased Properties
public get form(): HTMLFormElement | null {
return this.internals.form;
}
public get name() {
return this.getAttribute("name");
}
public get type() {
return this.localName;
}
public get validity() {
return this.internals.validity;
}
public get validationMessage() {
return this.internals.validationMessage;
}
public get willValidate() {
return this.internals.willValidate;
}
public get labels() {
return this.internals.labels;
}
//#endregion
//#region Values
/**
* A reference to an element that is focusable when validation fails.
*/
protected anchorRef: Ref<HTMLElement>;
/**
* The element that is focusable when validation fails.
*/
declare protected anchor: HTMLElement | null;
/**
* Set the value of the form.
*
* @param value The value visible to the form during submission.
* @param state The value as provided by the user.
*/
protected setFormValue(value: V, state?: S) {
this.internals.setFormValue(value, state);
if (this.required) {
if (value) {
this.internals.setValidity({});
} else {
this.internals.setValidity(
{
valueMissing: true,
},
msg("This field is required."),
this.anchorRef.value,
);
}
}
}
public abstract toJSON(): T;
//#endregion
//#region Validation
public checkValidity = this.internals.checkValidity.bind(this.internals);
public reportValidity = this.internals.reportValidity.bind(this.internals);
//#endregion
/**
* Set the validity state of the form.
*
* @param flags The validity state flags.
* @param message The validation message.
* @param element The element to set the validity state on.
*/
protected setValidity(flags: ValidityStateFlags = {}, message?: string, element?: HTMLElement) {
this.internals.setValidity(flags, message, element ?? this.anchorRef.value);
}
//#endregion
public constructor() {
super();
this.anchorRef = createRef<HTMLElement>();
// We define the getter here to allow the base type to be extended,
// letting the subclasses define a more accurate HTMLElement type.
Object.defineProperty(this, "anchor", {
get() {
return this.anchorRef.value || null;
},
enumerable: true,
configurable: true,
});
}
}

41
web/src/elements/forms/types.d.ts vendored Normal file
View File

@@ -0,0 +1,41 @@
/**
* @file Type definitions for form-associated elements.
*
* While these types are part of the HTML standard, they're not yet defined
* in the TypeScript standard library, so we define them here.
*
* @expires 2026-01-01
*/
/**
* Callbacks for form-associated elements.
*/
interface HTMLElement {
/**
* A callback invoked when the browser autofilling sets a value.
*/
formStateRestoreCallback?(state: FormValue, mode: "autocomplete"): void;
/**
* A callback invoked when the browser restores a value from a previous session.
*/
formStateRestoreCallback?(state: FormValue, mode: "restore"): void;
/**
* A callback invoked when the browser restores a value from a previous session.
*/
formStateRestoreCallback?(state: FormValue, mode: "restore" | "autocomplete"): void;
/**
* A callback that is invoked when the form is reset.
*/
formResetCallback?(): void;
/**
* A callback that is invoked when the element's disabled state changes.
*/
formDisabledCallback?(disabled: boolean): void;
/**
* A callback that is invoked when the element is associated with a form.
*/
formAssociatedCallback?(form: HTMLFormElement): void;
}

View File

@@ -27,7 +27,11 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
*
* @todo Consider making this a static method on singleton {@linkcode MessageContainer}
*/
export function showMessage(message: APIMessage, unique = false): void {
export function showMessage(message: APIMessage | null, unique = false): void {
if (!message) {
return;
}
const container = document.querySelector<MessageContainer>("ak-message-container");
if (!container) {
@@ -35,7 +39,10 @@ export function showMessage(message: APIMessage, unique = false): void {
}
if (!message.message.trim()) {
message.message = msg("Error");
console.warn("authentik/messages: `showMessage` received an empty message", message);
message.message = msg("An unknown error occurred");
message.description ??= msg("Please check the browser console for more details.");
}
container.addMessage(message, unique);

View File

@@ -124,8 +124,8 @@ export abstract class Table<T extends object>
@property({ type: String })
public order?: string;
@property({ type: String })
public search: string = "";
@property({ type: String, attribute: false })
public search?: string;
@property({ type: Boolean })
public checkbox = false;
@@ -547,11 +547,11 @@ export abstract class Table<T extends object>
return html`<div class="pf-c-toolbar__group pf-m-search-filter ${isQL ? "ql" : ""}">
<ak-table-search
class="pf-c-toolbar__item pf-m-search-filter ${isQL ? "ql" : ""}"
value=${ifDefined(this.search)}
.defaultValue=${this.search}
label=${ifDefined(this.searchLabel)}
placeholder=${ifDefined(this.searchPlaceholder)}
.onSearch=${this.#searchListener}
?supportsQL=${this.supportsQL}
.supportsQL=${this.supportsQL}
.apiResponse=${this.data}
>
</ak-table-search>

View File

@@ -8,6 +8,7 @@ import { msg } from "@lit/localize";
import { css, CSSResult, html, TemplateResult } from "lit";
import { customElement, property } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js";
import { createRef, ref } from "lit/directives/ref.js";
import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -16,17 +17,23 @@ import PFToolbar from "@patternfly/patternfly/components/Toolbar/toolbar.css";
import PFBase from "@patternfly/patternfly/patternfly-base.css";
@customElement("ak-table-search")
export class TableSearch extends WithLicenseSummary(AKElement) {
@property()
public value?: string;
export class TableSearchForm extends WithLicenseSummary(AKElement) {
@property({ type: String, reflect: false })
public defaultValue?: string;
@property({ type: Boolean })
@property({ type: String })
public label = msg("Table Search");
@property({ type: String })
public placeholder = msg("Search...");
@property({ attribute: false })
public supportsQL: boolean = false;
@property({ attribute: false })
public apiResponse?: PaginatedResponse<unknown>;
@property()
@property({ attribute: false })
public onSearch?: (value: string) => void;
static styles: CSSResult[] = [
@@ -45,25 +52,26 @@ export class TableSearch extends WithLicenseSummary(AKElement) {
`,
];
public reset = () => {
if (!this.onSearch) return;
this.value = "";
this.onSearch("");
#formRef = createRef<HTMLFormElement>();
public reset = (): void => {
this.#formRef.value?.reset();
this.onSearch?.("");
};
#submitListener = (event: SubmitEvent) => {
event.preventDefault();
if (!this.onSearch) return;
const form = this.#formRef.value;
if (!form || !this.onSearch) return;
form.reportValidity();
const form = event.target as HTMLFormElement;
const data = new FormData(form);
const value = data.get("search")?.toString().trim();
if (!value) {
return;
}
const value = data.get("search")?.toString() ?? "";
this.onSearch(value);
};
@@ -71,27 +79,31 @@ export class TableSearch extends WithLicenseSummary(AKElement) {
renderInput(): TemplateResult {
if (this.supportsQL && this.hasEnterpriseLicense) {
return html`<ak-search-ql
.apiResponse=${this.apiResponse}
.value=${this.value}
.onSearch=${(value: string) => {
if (!this.onSearch) return;
this.onSearch(value);
}}
aria-label=${ifDefined(this.label)}
name="search"
required
placeholder=${ifDefined(this.placeholder)}
value=${ifDefined(this.defaultValue)}
.apiResponse=${this.apiResponse}
></ak-search-ql>`;
}
return html`<input
class="pf-c-form-control"
aria-label=${ifDefined(this.label)}
name="search"
type="search"
placeholder=${msg("Search...")}
value="${ifDefined(this.value)}"
required
placeholder=${ifDefined(this.placeholder)}
value=${ifDefined(this.defaultValue)}
class="pf-c-form-control"
/>`;
}
render(): TemplateResult {
return html`<form class="pf-c-input-group" method="get" @submit=${this.#submitListener}>
return html`<form
${ref(this.#formRef)}
class="pf-c-input-group"
@submit=${this.#submitListener}
>
${this.renderInput()}
<button
aria-label=${msg("Clear search")}
@@ -110,6 +122,6 @@ export class TableSearch extends WithLicenseSummary(AKElement) {
declare global {
interface HTMLElementTagNameMap {
"ak-table-search": TableSearch;
"ak-table-search": TableSearchForm;
}
}

View File

@@ -54,6 +54,19 @@ export type LitPropertyRecord<T extends object> = {
*/
export type LitPropertyKey<K> = K extends string ? `.${K}` | `?${K}` | K : K;
/**
* A React-like functional component. Used to render a component in a template.
*
* @template P The type of the props object.
* @param props The props object.
* @param children The children to render.
* @returns The rendered template.
*/
export type LitFC<P> = (
props: P,
children?: SlottedTemplateResult,
) => SlottedTemplateResult | SlottedTemplateResult[];
//#endregion
//#region Host/Controller

Some files were not shown because too many files have changed in this diff Show More