Skip to content

Commit

Permalink
Merge branch 'main' into web/replace-rollup-with-esbuild
Browse files Browse the repository at this point in the history
* main:
  website/docs: installation: kubernetes: fix values (#8783)
  web: bump the wdio group in /tests/wdio with 4 updates (#8789)
  core: bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (#8790)
  core: bump twisted from 23.10.0 to 24.3.0 (#8788)
  translate: Updates for file locale/en/LC_MESSAGES/django.po in zh_CN (#8778)
  translate: Updates for file locale/en/LC_MESSAGES/django.po in zh-Hans (#8779)
  root: ensure consistent install_id (#8775)
  web: bump the sentry group in /web with 1 update (#8762)
  web: bump style-mod from 4.1.1 to 4.1.2 in /web (#8763)
  website: bump @types/react from 18.2.60 to 18.2.61 in /website (#8764)
  core: bump goauthentik.io/api/v3 from 3.2024021.2 to 3.2024021.3 (#8765)
  core: bump ruff from 0.2.2 to 0.3.0 (#8766)
  core: bump twilio from 8.13.0 to 9.0.0 (#8767)
  translate: Updates for file locale/en/LC_MESSAGES/django.po in fr (#8774)
  core, web: update translations (#8759)
  web/admin: don't mark LDAP group property mappings as required (#8772)
  website/docs: move Applications docs up a level, other edits (#8712)
  web/admin: don't mark property mappings as required anywhere (#8752)
  website: redirect root to /docs (#8754)
  • Loading branch information
kensternberg-authentik committed Mar 4, 2024
2 parents 8cf594b + cd4d648 commit 250f9b5
Show file tree
Hide file tree
Showing 31 changed files with 385 additions and 321 deletions.
6 changes: 4 additions & 2 deletions authentik/root/install_id.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

from authentik.lib.config import CONFIG

QUERY = """SELECT id FROM public.authentik_install_id ORDER BY id LIMIT 1;"""


@lru_cache
def get_install_id() -> str:
Expand All @@ -18,7 +20,7 @@ def get_install_id() -> str:
if settings.TEST:
return str(uuid4())
with connection.cursor() as cursor:
cursor.execute("SELECT id FROM public.authentik_install_id LIMIT 1;")
cursor.execute(QUERY)
return cursor.fetchone()[0]


Expand All @@ -38,5 +40,5 @@ def get_install_id_raw():
sslkey=CONFIG.get("postgresql.sslkey"),
)
cursor = conn.cursor()
cursor.execute("SELECT id FROM public.authentik_install_id LIMIT 1;")
cursor.execute(QUERY)
return cursor.fetchone()[0]
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ require (
github.com/sethvargo/go-envconfig v1.0.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
github.com/wwt/guac v1.3.2
goauthentik.io/api/v3 v3.2024021.2
goauthentik.io/api/v3 v3.2024021.3
golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab
golang.org/x/oauth2 v0.17.0
golang.org/x/sync v0.6.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
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=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
Expand All @@ -280,8 +280,8 @@ go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYO
go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY=
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
goauthentik.io/api/v3 v3.2024021.2 h1:yky58o0BDSg5ko/CbYww4EtdHDzwygOxHwl+shtE9dw=
goauthentik.io/api/v3 v3.2024021.2/go.mod h1:zz+mEZg8rY/7eEjkMGWJ2DnGqk+zqxuybGCGrR2O4Kw=
goauthentik.io/api/v3 v3.2024021.3 h1:8RU7GYVSfWmrbJYLKC9fycgVbOLsu4kA2ei5cBI804U=
goauthentik.io/api/v3 v3.2024021.3/go.mod h1:zz+mEZg8rY/7eEjkMGWJ2DnGqk+zqxuybGCGrR2O4Kw=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand Down
10 changes: 9 additions & 1 deletion locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-19 23:33+0000\n"
"POT-Creation-Date: 2024-03-01 00:07+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"
Expand Down Expand Up @@ -1820,6 +1820,14 @@ msgstr ""
msgid "GitHub OAuth Sources"
msgstr ""

#: authentik/sources/oauth/models.py
msgid "GitLab OAuth Source"
msgstr ""

#: authentik/sources/oauth/models.py
msgid "GitLab OAuth Sources"
msgstr ""

#: authentik/sources/oauth/models.py
msgid "Twitch OAuth Source"
msgstr ""
Expand Down
10 changes: 9 additions & 1 deletion locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-19 23:33+0000\n"
"POT-Creation-Date: 2024-03-01 00:07+0000\n"
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
"Last-Translator: Marc Schmitt, 2024\n"
"Language-Team: French (https://app.transifex.com/authentik/teams/119923/fr/)\n"
Expand Down Expand Up @@ -2029,6 +2029,14 @@ msgstr "Source d'OAuth GitHub"
msgid "GitHub OAuth Sources"
msgstr "Sources d'OAuth GitHub"

#: authentik/sources/oauth/models.py
msgid "GitLab OAuth Source"
msgstr "Source d'OAuth GitLab"

#: authentik/sources/oauth/models.py
msgid "GitLab OAuth Sources"
msgstr "Sources d'OAuth GitLab"

#: authentik/sources/oauth/models.py
msgid "Twitch OAuth Source"
msgstr "Source d'OAuth Twitch"
Expand Down
10 changes: 9 additions & 1 deletion locale/zh-Hans/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-19 23:33+0000\n"
"POT-Creation-Date: 2024-03-01 00:07+0000\n"
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
"Last-Translator: deluxghost, 2024\n"
"Language-Team: Chinese Simplified (https://app.transifex.com/authentik/teams/119923/zh-Hans/)\n"
Expand Down Expand Up @@ -1852,6 +1852,14 @@ msgstr "GitHub OAuth 源"
msgid "GitHub OAuth Sources"
msgstr "GitHub OAuth 源"

#: authentik/sources/oauth/models.py
msgid "GitLab OAuth Source"
msgstr "GitLab OAuth 源"

#: authentik/sources/oauth/models.py
msgid "GitLab OAuth Sources"
msgstr "GitLab OAuth 源"

#: authentik/sources/oauth/models.py
msgid "Twitch OAuth Source"
msgstr "Twitch OAuth 源"
Expand Down
10 changes: 9 additions & 1 deletion locale/zh_CN/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-19 23:33+0000\n"
"POT-Creation-Date: 2024-03-01 00:07+0000\n"
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
"Last-Translator: deluxghost, 2024\n"
"Language-Team: Chinese (China) (https://app.transifex.com/authentik/teams/119923/zh_CN/)\n"
Expand Down Expand Up @@ -1852,6 +1852,14 @@ msgstr "GitHub OAuth 源"
msgid "GitHub OAuth Sources"
msgstr "GitHub OAuth 源"

#: authentik/sources/oauth/models.py
msgid "GitLab OAuth Source"
msgstr "GitLab OAuth 源"

#: authentik/sources/oauth/models.py
msgid "GitLab OAuth Sources"
msgstr "GitLab OAuth 源"

#: authentik/sources/oauth/models.py
msgid "Twitch OAuth Source"
msgstr "Twitch OAuth 源"
Expand Down
50 changes: 25 additions & 25 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 250f9b5

Please sign in to comment.