From 1ac4dacc3b85289198fd4129e9fb84512e16e9e0 Mon Sep 17 00:00:00 2001
From: Jens Langhammer
Date: Tue, 5 Oct 2021 10:44:07 +0200
Subject: [PATCH 01/25] outposts: fix error when comparing ports in docker
controller when port mapping is disabled
Signed-off-by: Jens Langhammer
---
authentik/outposts/controllers/docker.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/authentik/outposts/controllers/docker.py b/authentik/outposts/controllers/docker.py
index 4714750c3..fbf4bea98 100644
--- a/authentik/outposts/controllers/docker.py
+++ b/authentik/outposts/controllers/docker.py
@@ -76,6 +76,9 @@ class DockerController(BaseController):
# {'HostIp': '0.0.0.0', 'HostPort': '389'},
# {'HostIp': '::', 'HostPort': '389'}
# ]}
+ # If no ports are mapped (either mapping disabled, or host network)
+ if not container.ports:
+ return False
for port in self.deployment_ports:
key = f"{port.inner_port or port.port}/{port.protocol.lower()}"
if key not in container.ports:
From a69fcbca9aca9ab046e1e33e6980c0010bd978f8 Mon Sep 17 00:00:00 2001
From: Jens Langhammer
Date: Tue, 5 Oct 2021 11:08:14 +0200
Subject: [PATCH 02/25] web: fix rendering of token copy button in dark mode
closes #1528
Signed-off-by: Jens Langhammer
# Conflicts:
# web/src/locales/fr_FR.po
---
web/src/locales/en.po | 10 +++++++---
web/src/locales/pseudo-LOCALE.po | 10 +++++++---
web/src/pages/tokens/TokenListPage.ts | 10 ++++++++--
web/src/user/user-settings/tokens/UserTokenList.ts | 7 +++++--
4 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/web/src/locales/en.po b/web/src/locales/en.po
index 483387081..d5eebc79d 100644
--- a/web/src/locales/en.po
+++ b/web/src/locales/en.po
@@ -978,9 +978,9 @@ msgstr "Cookie domain"
msgid "Copy"
msgstr "Copy"
-#: src/user/user-settings/tokens/UserTokenList.ts
-msgid "Copy Key"
-msgstr "Copy Key"
+#:
+#~ msgid "Copy Key"
+#~ msgstr "Copy Key"
#: src/pages/providers/saml/SAMLProviderViewPage.ts
msgid "Copy download URL"
@@ -4630,6 +4630,10 @@ msgstr "Token count"
msgid "Token expiry"
msgstr "Token expiry"
+#: src/pages/tokens/TokenListPage.ts
+msgid "Token is managed by authentik."
+msgstr "Token is managed by authentik."
+
#: src/pages/providers/oauth2/OAuth2ProviderForm.ts
#: src/pages/providers/proxy/ProxyProviderForm.ts
msgid "Token validity"
diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po
index de14a6654..6abcd2de5 100644
--- a/web/src/locales/pseudo-LOCALE.po
+++ b/web/src/locales/pseudo-LOCALE.po
@@ -972,9 +972,9 @@ msgstr ""
msgid "Copy"
msgstr ""
-#: src/user/user-settings/tokens/UserTokenList.ts
-msgid "Copy Key"
-msgstr ""
+#:
+#~ msgid "Copy Key"
+#~ msgstr ""
#: src/pages/providers/saml/SAMLProviderViewPage.ts
msgid "Copy download URL"
@@ -4615,6 +4615,10 @@ msgstr ""
msgid "Token expiry"
msgstr ""
+#: src/pages/tokens/TokenListPage.ts
+msgid "Token is managed by authentik."
+msgstr ""
+
#: src/pages/providers/oauth2/OAuth2ProviderForm.ts
#: src/pages/providers/proxy/ProxyProviderForm.ts
msgid "Token validity"
diff --git a/web/src/pages/tokens/TokenListPage.ts b/web/src/pages/tokens/TokenListPage.ts
index c585b27a7..8a658f93d 100644
--- a/web/src/pages/tokens/TokenListPage.ts
+++ b/web/src/pages/tokens/TokenListPage.ts
@@ -105,7 +105,10 @@ export class TokenListPage extends TablePage {
row(item: Token): TemplateResult[] {
return [
- html`${item.identifier}`,
+ html`
+
${item.identifier}
+ ${item.managed ? html`
${t`Token is managed by authentik.`}` : html``}
+
`,
html`${item.userObj?.username}`,
html`${item.expiring ? t`Yes` : t`No`}`,
html`${item.expiring ? item.expires?.toLocaleString() : t`-`}`,
@@ -123,7 +126,10 @@ export class TokenListPage extends TablePage {
-
+
`,
diff --git a/web/src/user/user-settings/tokens/UserTokenList.ts b/web/src/user/user-settings/tokens/UserTokenList.ts
index 6571ed7ed..69274be45 100644
--- a/web/src/user/user-settings/tokens/UserTokenList.ts
+++ b/web/src/user/user-settings/tokens/UserTokenList.ts
@@ -151,8 +151,11 @@ export class UserTokenList extends Table {
-
- ${t`Copy Key`}
+
+
`,
];
From d1a1bfbbc5bc634b589f38116b3d62d47be8ab07 Mon Sep 17 00:00:00 2001
From: Jens Langhammer
Date: Tue, 5 Oct 2021 11:11:34 +0200
Subject: [PATCH 03/25] web/user: don't show managed tokens in user interface
Signed-off-by: Jens Langhammer
---
authentik/core/api/tokens.py | 1 +
schema.yml | 4 ++++
web/src/user/user-settings/tokens/UserTokenList.ts | 1 +
3 files changed, 6 insertions(+)
diff --git a/authentik/core/api/tokens.py b/authentik/core/api/tokens.py
index 24c5b76e7..d246629e6 100644
--- a/authentik/core/api/tokens.py
+++ b/authentik/core/api/tokens.py
@@ -82,6 +82,7 @@ class TokenViewSet(UsedByMixin, ModelViewSet):
"description",
"expires",
"expiring",
+ "managed",
]
ordering = ["identifier", "expires"]
permission_classes = [OwnerSuperuserPermissions]
diff --git a/schema.yml b/schema.yml
index 9aba2a107..371eae18e 100644
--- a/schema.yml
+++ b/schema.yml
@@ -2318,6 +2318,10 @@ paths:
- app_password
- recovery
- verification
+ - in: query
+ name: managed
+ schema:
+ type: string
- name: ordering
required: false
in: query
diff --git a/web/src/user/user-settings/tokens/UserTokenList.ts b/web/src/user/user-settings/tokens/UserTokenList.ts
index 69274be45..99b699910 100644
--- a/web/src/user/user-settings/tokens/UserTokenList.ts
+++ b/web/src/user/user-settings/tokens/UserTokenList.ts
@@ -37,6 +37,7 @@ export class UserTokenList extends Table {
page: page,
pageSize: PAGE_SIZE,
search: this.search || "",
+ managed: "",
});
}
From 0452537e8bfaabb73389ddb219851ba38a1bfa61 Mon Sep 17 00:00:00 2001
From: Jens Langhammer
Date: Tue, 5 Oct 2021 11:11:44 +0200
Subject: [PATCH 04/25] web/admin: only show outpost deployment info when not
embedded
Signed-off-by: Jens Langhammer
---
web/src/pages/outposts/OutpostListPage.ts | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/web/src/pages/outposts/OutpostListPage.ts b/web/src/pages/outposts/OutpostListPage.ts
index 6914b3617..2b32f43e2 100644
--- a/web/src/pages/outposts/OutpostListPage.ts
+++ b/web/src/pages/outposts/OutpostListPage.ts
@@ -103,11 +103,13 @@ export class OutpostListPage extends TablePage {
-
-
- `,
+ ${item.managed !== "goauthentik.io/outposts/embedded"
+ ? html`
+
+ `
+ : html``}`,
];
}
From 2716a268874bec1f13c20f9447821b073883a02e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 11:14:04 +0200
Subject: [PATCH 05/25] web: Update Web API Client version (#1539)
Signed-off-by: GitHub
Co-authored-by: BeryJu
Signed-off-by: Jens Langhammer
# Conflicts:
# web/package-lock.json
# web/package.json
---
web/package-lock.json | 324 +++++++++++++++++++++++-------------------
web/package.json | 24 ++--
2 files changed, 191 insertions(+), 157 deletions(-)
diff --git a/web/package-lock.json b/web/package-lock.json
index d6f10c87f..e05c93cca 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -15,10 +15,11 @@
"@babel/preset-env": "^7.15.6",
"@babel/preset-typescript": "^7.15.0",
"@fortawesome/fontawesome-free": "^5.15.4",
- "@goauthentik/api": "^2021.9.4-1633366097",
- "@lingui/cli": "^3.11.1",
- "@lingui/core": "^3.11.1",
- "@lingui/macro": "^3.11.1",
+ "@goauthentik/api": "^2021.9.5-1633425132",
+ "@lingui/cli": "^3.12.1",
+ "@lingui/core": "^3.12.1",
+ "@lingui/detect-locale": "^3.12.1",
+ "@lingui/macro": "^3.12.1",
"@patternfly/patternfly": "^4.135.2",
"@polymer/iron-form": "^3.0.1",
"@polymer/paper-input": "^3.2.1",
@@ -30,17 +31,17 @@
"@squoosh/cli": "^0.7.2",
"@trivago/prettier-plugin-sort-imports": "^2.0.4",
"@types/chart.js": "^2.9.34",
- "@types/codemirror": "5.60.3",
+ "@types/codemirror": "5.60.4",
"@types/grecaptcha": "^3.0.3",
- "@typescript-eslint/eslint-plugin": "^4.31.2",
- "@typescript-eslint/parser": "^4.31.2",
+ "@typescript-eslint/eslint-plugin": "^4.33.0",
+ "@typescript-eslint/parser": "^4.33.0",
"@webcomponents/webcomponentsjs": "^2.6.0",
"babel-plugin-macros": "^3.1.0",
"base64-js": "^1.5.1",
"chart.js": "^3.5.1",
"chartjs-adapter-moment": "^1.0.0",
- "codemirror": "^5.63.0",
- "construct-style-sheets-polyfill": "^2.4.16",
+ "codemirror": "^5.63.1",
+ "construct-style-sheets-polyfill": "^3.0.3",
"eslint": "^7.32.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-custom-elements": "0.0.2",
@@ -51,7 +52,7 @@
"moment": "^2.29.1",
"prettier": "^2.4.1",
"rapidoc": "^9.1.3",
- "rollup": "^2.57.0",
+ "rollup": "^2.58.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-cssimport": "^1.0.2",
@@ -1691,9 +1692,9 @@
}
},
"node_modules/@goauthentik/api": {
- "version": "2021.9.4-1633366097",
- "resolved": "https://registry.npmjs.org/@goauthentik/api/-/api-2021.9.4-1633366097.tgz",
- "integrity": "sha512-k0RX5kHNfkgmciwPD6a7o8Movj9nfYt/uqvuJ0+5ptttJTDkB177c+okS0hqBtZF8n1u662w85gMvffAYrvU/Q=="
+ "version": "2021.9.5-1633425132",
+ "resolved": "https://registry.npmjs.org/@goauthentik/api/-/api-2021.9.5-1633425132.tgz",
+ "integrity": "sha512-glq1nfnpXidVw6ThQpEsePkUeOLWchOeQ/5lrioDnD1XTTmx6JpESgHBMRUehBWvV43lwgR+98R3GVA8Q10JEw=="
},
"node_modules/@humanwhocodes/config-array": {
"version": "0.5.0",
@@ -1793,13 +1794,13 @@
}
},
"node_modules/@lingui/babel-plugin-extract-messages": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-3.11.1.tgz",
- "integrity": "sha512-MAsZ0BYIsHh08dptT7bA6Jsh1ixO1sBU8eNDtobkZaZ78SXIUMUYCy9e3T9D/RYpecgDGaFUf2djctTqguMgmQ==",
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-3.12.1.tgz",
+ "integrity": "sha512-5x119XBpWe3gYUDTgwkoTFqeI60beFRdEL1HnArFkrWfhaGqUK8SjzpqO7NtN335IIBU3SPtGXKsI4NPkJQ8TA==",
"dependencies": {
"@babel/generator": "^7.11.6",
"@babel/runtime": "^7.11.2",
- "@lingui/conf": "^3.11.1",
+ "@lingui/conf": "^3.12.1",
"mkdirp": "^1.0.4"
},
"engines": {
@@ -1807,17 +1808,17 @@
}
},
"node_modules/@lingui/cli": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/@lingui/cli/-/cli-3.11.1.tgz",
- "integrity": "sha512-piKjrGjiornzX18Lt6EhyICAHEGH9wio0KaOXKyCjHqPw8sQnC4AZv0iyZqTACVYL+0ROsrtNd/xgDMYNSQgeA==",
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/cli/-/cli-3.12.1.tgz",
+ "integrity": "sha512-Z3klth+zD3+oqkDEhm1cTuI1Z9K/lyZD615cUQXPxLZRn9dokZ+9enoJNiese412VMNvcp/dtYC+wfyMpYX2PQ==",
"dependencies": {
"@babel/generator": "^7.11.6",
"@babel/parser": "^7.11.5",
"@babel/plugin-syntax-jsx": "^7.10.4",
"@babel/runtime": "^7.11.2",
"@babel/types": "^7.11.5",
- "@lingui/babel-plugin-extract-messages": "^3.11.1",
- "@lingui/conf": "^3.11.1",
+ "@lingui/babel-plugin-extract-messages": "^3.12.1",
+ "@lingui/conf": "^3.12.1",
"babel-plugin-macros": "^3.0.1",
"bcp-47": "^1.0.7",
"chalk": "^4.1.0",
@@ -1920,9 +1921,9 @@
}
},
"node_modules/@lingui/conf": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-3.11.1.tgz",
- "integrity": "sha512-WoEdtDAiI+TR7Gz2F7VMZQyIGZFP2b4qT3JO3gLuGzHY6a6DCqOMojqUuo6KHFQrUoUtebI/1Yn7gAxVH1xcWQ==",
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-3.12.1.tgz",
+ "integrity": "sha512-asTFAUTf8zxYU+fI1MxggJD/o4BenT/rE4IJ/+ngaf1cbzBo71lXmhSYkIa8/vTZrdHDSuXGzIL43f1D9BF6YA==",
"dependencies": {
"@babel/runtime": "^7.11.2",
"@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2",
@@ -2000,9 +2001,9 @@
}
},
"node_modules/@lingui/core": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/@lingui/core/-/core-3.11.1.tgz",
- "integrity": "sha512-qHMo47SbwFFx3IwXbMRafIMZH2tTYebrQhvAu5wH9OabI+bqbVWbTOLSAXzX/gDZqxMQWIrr2ndrah0aPZk6EQ==",
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/core/-/core-3.12.1.tgz",
+ "integrity": "sha512-MkZgkaaBcFtmUXdck9YNMTMTwCRogUif8Ll4Wyqz0re2Ydo7fdwGFBkacYjOc787R5/UmZr2F21OtPqSbaoaJg==",
"dependencies": {
"@babel/runtime": "^7.11.2",
"make-plural": "^6.2.2",
@@ -2012,13 +2013,21 @@
"node": ">=10.0.0"
}
},
+ "node_modules/@lingui/detect-locale": {
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/detect-locale/-/detect-locale-3.12.1.tgz",
+ "integrity": "sha512-/apP+LscyRuh+CIf42+LNuYmEsceNA/rh6N3iqebNcEsOcIzLA8v6dq1llzDOlfd3SxEj7xP9Kfhn6Vnp+78+Q==",
+ "engines": {
+ "node": ">=10.0.0"
+ }
+ },
"node_modules/@lingui/macro": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-3.11.1.tgz",
- "integrity": "sha512-rSzvBs4Gasn6VO8msYA0/Bw285jUOBoLAVxURt6XaH45NXnJiWnDtEOD/DhQcuggDKbaWwz13lXOiRfUP0zG6g==",
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-3.12.1.tgz",
+ "integrity": "sha512-CszdqDnaCo5cnbg6RROYnYtYGOADPhJuRf9U9t2aL9IsN+N7pSQAMdMLbjYkEMT/V8Cjon33ZjLgeGihe0FhSA==",
"dependencies": {
"@babel/runtime": "^7.11.2",
- "@lingui/conf": "^3.11.1",
+ "@lingui/conf": "^3.12.1",
"ramda": "^0.27.1"
},
"engines": {
@@ -2562,9 +2571,9 @@
}
},
"node_modules/@types/codemirror": {
- "version": "5.60.3",
- "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.3.tgz",
- "integrity": "sha512-dVX8Vsio70u4la9LGi1jjmaqtcdMMZUYalO5QY5EWy4XKrNjewNm9cy2K5XvP+puzLzum417gmJ9w7F6bVR1XA==",
+ "version": "5.60.4",
+ "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.4.tgz",
+ "integrity": "sha512-SUQgBj9jZ+xj75zgwfgQZt0CManWBISN/YsE0xRmPwO6uDyLNpXO8bn2m59tpevsFw+eQdmx+qY1WjOrUgMDgw==",
"dependencies": {
"@types/tern": "*"
}
@@ -2708,14 +2717,15 @@
"integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.2.tgz",
- "integrity": "sha512-w63SCQ4bIwWN/+3FxzpnWrDjQRXVEGiTt9tJTRptRXeFvdZc/wLiz3FQUwNQ2CVoRGI6KUWMNUj/pk63noUfcA==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
+ "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
"dependencies": {
- "@typescript-eslint/experimental-utils": "4.31.2",
- "@typescript-eslint/scope-manager": "4.31.2",
+ "@typescript-eslint/experimental-utils": "4.33.0",
+ "@typescript-eslint/scope-manager": "4.33.0",
"debug": "^4.3.1",
"functional-red-black-tree": "^1.0.1",
+ "ignore": "^5.1.8",
"regexpp": "^3.1.0",
"semver": "^7.3.5",
"tsutils": "^3.21.0"
@@ -2737,6 +2747,14 @@
}
}
},
+ "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+ "version": "5.1.8",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+ "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+ "engines": {
+ "node": ">= 4"
+ }
+ },
"node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
"version": "7.3.5",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -2752,14 +2770,14 @@
}
},
"node_modules/@typescript-eslint/experimental-utils": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.2.tgz",
- "integrity": "sha512-3tm2T4nyA970yQ6R3JZV9l0yilE2FedYg8dcXrTar34zC9r6JB7WyBQbpIVongKPlhEMjhQ01qkwrzWy38Bk1Q==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz",
+ "integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==",
"dependencies": {
"@types/json-schema": "^7.0.7",
- "@typescript-eslint/scope-manager": "4.31.2",
- "@typescript-eslint/types": "4.31.2",
- "@typescript-eslint/typescript-estree": "4.31.2",
+ "@typescript-eslint/scope-manager": "4.33.0",
+ "@typescript-eslint/types": "4.33.0",
+ "@typescript-eslint/typescript-estree": "4.33.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -2775,13 +2793,13 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.2.tgz",
- "integrity": "sha512-EcdO0E7M/sv23S/rLvenHkb58l3XhuSZzKf6DBvLgHqOYdL6YFMYVtreGFWirxaU2mS1GYDby3Lyxco7X5+Vjw==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
+ "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
"dependencies": {
- "@typescript-eslint/scope-manager": "4.31.2",
- "@typescript-eslint/types": "4.31.2",
- "@typescript-eslint/typescript-estree": "4.31.2",
+ "@typescript-eslint/scope-manager": "4.33.0",
+ "@typescript-eslint/types": "4.33.0",
+ "@typescript-eslint/typescript-estree": "4.33.0",
"debug": "^4.3.1"
},
"engines": {
@@ -2801,12 +2819,12 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.2.tgz",
- "integrity": "sha512-2JGwudpFoR/3Czq6mPpE8zBPYdHWFGL6lUNIGolbKQeSNv4EAiHaR5GVDQaLA0FwgcdcMtRk+SBJbFGL7+La5w==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz",
+ "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
"dependencies": {
- "@typescript-eslint/types": "4.31.2",
- "@typescript-eslint/visitor-keys": "4.31.2"
+ "@typescript-eslint/types": "4.33.0",
+ "@typescript-eslint/visitor-keys": "4.33.0"
},
"engines": {
"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -2817,9 +2835,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.2.tgz",
- "integrity": "sha512-kWiTTBCTKEdBGrZKwFvOlGNcAsKGJSBc8xLvSjSppFO88AqGxGNYtF36EuEYG6XZ9vT0xX8RNiHbQUKglbSi1w==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz",
+ "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
"engines": {
"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
},
@@ -2829,12 +2847,12 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.2.tgz",
- "integrity": "sha512-ieBq8U9at6PvaC7/Z6oe8D3czeW5d//Fo1xkF/s9394VR0bg/UaMYPdARiWyKX+lLEjY3w/FNZJxitMsiWv+wA==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz",
+ "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
"dependencies": {
- "@typescript-eslint/types": "4.31.2",
- "@typescript-eslint/visitor-keys": "4.31.2",
+ "@typescript-eslint/types": "4.33.0",
+ "@typescript-eslint/visitor-keys": "4.33.0",
"debug": "^4.3.1",
"globby": "^11.0.3",
"is-glob": "^4.0.1",
@@ -2869,11 +2887,11 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.2.tgz",
- "integrity": "sha512-PrBId7EQq2Nibns7dd/ch6S6/M4/iwLM9McbgeEbCXfxdwRUNxJ4UNreJ6Gh3fI2GNKNrWnQxKL7oCPmngKBug==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz",
+ "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
"dependencies": {
- "@typescript-eslint/types": "4.31.2",
+ "@typescript-eslint/types": "4.33.0",
"eslint-visitor-keys": "^2.0.0"
},
"engines": {
@@ -3605,9 +3623,9 @@
}
},
"node_modules/codemirror": {
- "version": "5.63.0",
- "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.0.tgz",
- "integrity": "sha512-KlLWRPggDg2rBD1Mx7/EqEhaBdy+ybBCVh/efgjBDsPpMeEu6MbTAJzIT4TuCzvmbTEgvKOGzVT6wdBTNusqrg=="
+ "version": "5.63.1",
+ "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.1.tgz",
+ "integrity": "sha512-baivaNZreZOGh1/tYyTvCupC9NeWk7qlZeGUDi4nFKj/J0JU8FYKZND4QqLw70P7HOttlCt4JJAOj9GoIhHEkA=="
},
"node_modules/collection-visit": {
"version": "1.0.0",
@@ -3666,9 +3684,12 @@
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"node_modules/construct-style-sheets-polyfill": {
- "version": "2.4.17",
- "resolved": "https://registry.npmjs.org/construct-style-sheets-polyfill/-/construct-style-sheets-polyfill-2.4.17.tgz",
- "integrity": "sha512-rKtZGWWAVFE6HgdBuuui1emic/t8aAKQbePQ7Je6ird8nZYSd3mqqBX9IvFn2CMtnbh7mQTk/vxc9mfaLl7cGQ=="
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/construct-style-sheets-polyfill/-/construct-style-sheets-polyfill-3.0.3.tgz",
+ "integrity": "sha512-z5sn55s4Avgpfj5uEKXP50DIawJoQ9iYtojSXrbxYL8W1njzZqW3/Yzsgmqgb2sV0NVvhn1cH5wk313DeQLzbA==",
+ "engines": {
+ "npm": ">=7"
+ }
},
"node_modules/convert-source-map": {
"version": "1.8.0",
@@ -7080,9 +7101,9 @@
}
},
"node_modules/rollup": {
- "version": "2.57.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.57.0.tgz",
- "integrity": "sha512-bKQIh1rWKofRee6mv8SrF2HdP6pea5QkwBZSMImJysFj39gQuiV8MEPBjXOCpzk3wSYp63M2v2wkWBmFC8O/rg==",
+ "version": "2.58.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.58.0.tgz",
+ "integrity": "sha512-NOXpusKnaRpbS7ZVSzcEXqxcLDOagN6iFS8p45RkoiMqPHDLwJm758UF05KlMoCRbLBTZsPOIa887gZJ1AiXvw==",
"bin": {
"rollup": "dist/bin/rollup"
},
@@ -9760,9 +9781,9 @@
"integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg=="
},
"@goauthentik/api": {
- "version": "2021.9.4-1633366097",
- "resolved": "https://registry.npmjs.org/@goauthentik/api/-/api-2021.9.4-1633366097.tgz",
- "integrity": "sha512-k0RX5kHNfkgmciwPD6a7o8Movj9nfYt/uqvuJ0+5ptttJTDkB177c+okS0hqBtZF8n1u662w85gMvffAYrvU/Q=="
+ "version": "2021.9.5-1633425132",
+ "resolved": "https://registry.npmjs.org/@goauthentik/api/-/api-2021.9.5-1633425132.tgz",
+ "integrity": "sha512-glq1nfnpXidVw6ThQpEsePkUeOLWchOeQ/5lrioDnD1XTTmx6JpESgHBMRUehBWvV43lwgR+98R3GVA8Q10JEw=="
},
"@humanwhocodes/config-array": {
"version": "0.5.0",
@@ -9837,28 +9858,28 @@
}
},
"@lingui/babel-plugin-extract-messages": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-3.11.1.tgz",
- "integrity": "sha512-MAsZ0BYIsHh08dptT7bA6Jsh1ixO1sBU8eNDtobkZaZ78SXIUMUYCy9e3T9D/RYpecgDGaFUf2djctTqguMgmQ==",
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-3.12.1.tgz",
+ "integrity": "sha512-5x119XBpWe3gYUDTgwkoTFqeI60beFRdEL1HnArFkrWfhaGqUK8SjzpqO7NtN335IIBU3SPtGXKsI4NPkJQ8TA==",
"requires": {
"@babel/generator": "^7.11.6",
"@babel/runtime": "^7.11.2",
- "@lingui/conf": "^3.11.1",
+ "@lingui/conf": "^3.12.1",
"mkdirp": "^1.0.4"
}
},
"@lingui/cli": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/@lingui/cli/-/cli-3.11.1.tgz",
- "integrity": "sha512-piKjrGjiornzX18Lt6EhyICAHEGH9wio0KaOXKyCjHqPw8sQnC4AZv0iyZqTACVYL+0ROsrtNd/xgDMYNSQgeA==",
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/cli/-/cli-3.12.1.tgz",
+ "integrity": "sha512-Z3klth+zD3+oqkDEhm1cTuI1Z9K/lyZD615cUQXPxLZRn9dokZ+9enoJNiese412VMNvcp/dtYC+wfyMpYX2PQ==",
"requires": {
"@babel/generator": "^7.11.6",
"@babel/parser": "^7.11.5",
"@babel/plugin-syntax-jsx": "^7.10.4",
"@babel/runtime": "^7.11.2",
"@babel/types": "^7.11.5",
- "@lingui/babel-plugin-extract-messages": "^3.11.1",
- "@lingui/conf": "^3.11.1",
+ "@lingui/babel-plugin-extract-messages": "^3.12.1",
+ "@lingui/conf": "^3.12.1",
"babel-plugin-macros": "^3.0.1",
"bcp-47": "^1.0.7",
"chalk": "^4.1.0",
@@ -9931,9 +9952,9 @@
}
},
"@lingui/conf": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-3.11.1.tgz",
- "integrity": "sha512-WoEdtDAiI+TR7Gz2F7VMZQyIGZFP2b4qT3JO3gLuGzHY6a6DCqOMojqUuo6KHFQrUoUtebI/1Yn7gAxVH1xcWQ==",
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-3.12.1.tgz",
+ "integrity": "sha512-asTFAUTf8zxYU+fI1MxggJD/o4BenT/rE4IJ/+ngaf1cbzBo71lXmhSYkIa8/vTZrdHDSuXGzIL43f1D9BF6YA==",
"requires": {
"@babel/runtime": "^7.11.2",
"@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2",
@@ -9989,22 +10010,27 @@
}
},
"@lingui/core": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/@lingui/core/-/core-3.11.1.tgz",
- "integrity": "sha512-qHMo47SbwFFx3IwXbMRafIMZH2tTYebrQhvAu5wH9OabI+bqbVWbTOLSAXzX/gDZqxMQWIrr2ndrah0aPZk6EQ==",
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/core/-/core-3.12.1.tgz",
+ "integrity": "sha512-MkZgkaaBcFtmUXdck9YNMTMTwCRogUif8Ll4Wyqz0re2Ydo7fdwGFBkacYjOc787R5/UmZr2F21OtPqSbaoaJg==",
"requires": {
"@babel/runtime": "^7.11.2",
"make-plural": "^6.2.2",
"messageformat-parser": "^4.1.3"
}
},
+ "@lingui/detect-locale": {
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/detect-locale/-/detect-locale-3.12.1.tgz",
+ "integrity": "sha512-/apP+LscyRuh+CIf42+LNuYmEsceNA/rh6N3iqebNcEsOcIzLA8v6dq1llzDOlfd3SxEj7xP9Kfhn6Vnp+78+Q=="
+ },
"@lingui/macro": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-3.11.1.tgz",
- "integrity": "sha512-rSzvBs4Gasn6VO8msYA0/Bw285jUOBoLAVxURt6XaH45NXnJiWnDtEOD/DhQcuggDKbaWwz13lXOiRfUP0zG6g==",
+ "version": "3.12.1",
+ "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-3.12.1.tgz",
+ "integrity": "sha512-CszdqDnaCo5cnbg6RROYnYtYGOADPhJuRf9U9t2aL9IsN+N7pSQAMdMLbjYkEMT/V8Cjon33ZjLgeGihe0FhSA==",
"requires": {
"@babel/runtime": "^7.11.2",
- "@lingui/conf": "^3.11.1",
+ "@lingui/conf": "^3.12.1",
"ramda": "^0.27.1"
}
},
@@ -10465,9 +10491,9 @@
}
},
"@types/codemirror": {
- "version": "5.60.3",
- "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.3.tgz",
- "integrity": "sha512-dVX8Vsio70u4la9LGi1jjmaqtcdMMZUYalO5QY5EWy4XKrNjewNm9cy2K5XvP+puzLzum417gmJ9w7F6bVR1XA==",
+ "version": "5.60.4",
+ "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.4.tgz",
+ "integrity": "sha512-SUQgBj9jZ+xj75zgwfgQZt0CManWBISN/YsE0xRmPwO6uDyLNpXO8bn2m59tpevsFw+eQdmx+qY1WjOrUgMDgw==",
"requires": {
"@types/tern": "*"
}
@@ -10610,19 +10636,25 @@
"integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="
},
"@typescript-eslint/eslint-plugin": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.2.tgz",
- "integrity": "sha512-w63SCQ4bIwWN/+3FxzpnWrDjQRXVEGiTt9tJTRptRXeFvdZc/wLiz3FQUwNQ2CVoRGI6KUWMNUj/pk63noUfcA==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
+ "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
"requires": {
- "@typescript-eslint/experimental-utils": "4.31.2",
- "@typescript-eslint/scope-manager": "4.31.2",
+ "@typescript-eslint/experimental-utils": "4.33.0",
+ "@typescript-eslint/scope-manager": "4.33.0",
"debug": "^4.3.1",
"functional-red-black-tree": "^1.0.1",
+ "ignore": "^5.1.8",
"regexpp": "^3.1.0",
"semver": "^7.3.5",
"tsutils": "^3.21.0"
},
"dependencies": {
+ "ignore": {
+ "version": "5.1.8",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+ "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
+ },
"semver": {
"version": "7.3.5",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -10634,50 +10666,50 @@
}
},
"@typescript-eslint/experimental-utils": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.2.tgz",
- "integrity": "sha512-3tm2T4nyA970yQ6R3JZV9l0yilE2FedYg8dcXrTar34zC9r6JB7WyBQbpIVongKPlhEMjhQ01qkwrzWy38Bk1Q==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz",
+ "integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==",
"requires": {
"@types/json-schema": "^7.0.7",
- "@typescript-eslint/scope-manager": "4.31.2",
- "@typescript-eslint/types": "4.31.2",
- "@typescript-eslint/typescript-estree": "4.31.2",
+ "@typescript-eslint/scope-manager": "4.33.0",
+ "@typescript-eslint/types": "4.33.0",
+ "@typescript-eslint/typescript-estree": "4.33.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
}
},
"@typescript-eslint/parser": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.2.tgz",
- "integrity": "sha512-EcdO0E7M/sv23S/rLvenHkb58l3XhuSZzKf6DBvLgHqOYdL6YFMYVtreGFWirxaU2mS1GYDby3Lyxco7X5+Vjw==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
+ "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
"requires": {
- "@typescript-eslint/scope-manager": "4.31.2",
- "@typescript-eslint/types": "4.31.2",
- "@typescript-eslint/typescript-estree": "4.31.2",
+ "@typescript-eslint/scope-manager": "4.33.0",
+ "@typescript-eslint/types": "4.33.0",
+ "@typescript-eslint/typescript-estree": "4.33.0",
"debug": "^4.3.1"
}
},
"@typescript-eslint/scope-manager": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.2.tgz",
- "integrity": "sha512-2JGwudpFoR/3Czq6mPpE8zBPYdHWFGL6lUNIGolbKQeSNv4EAiHaR5GVDQaLA0FwgcdcMtRk+SBJbFGL7+La5w==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz",
+ "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
"requires": {
- "@typescript-eslint/types": "4.31.2",
- "@typescript-eslint/visitor-keys": "4.31.2"
+ "@typescript-eslint/types": "4.33.0",
+ "@typescript-eslint/visitor-keys": "4.33.0"
}
},
"@typescript-eslint/types": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.2.tgz",
- "integrity": "sha512-kWiTTBCTKEdBGrZKwFvOlGNcAsKGJSBc8xLvSjSppFO88AqGxGNYtF36EuEYG6XZ9vT0xX8RNiHbQUKglbSi1w=="
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz",
+ "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="
},
"@typescript-eslint/typescript-estree": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.2.tgz",
- "integrity": "sha512-ieBq8U9at6PvaC7/Z6oe8D3czeW5d//Fo1xkF/s9394VR0bg/UaMYPdARiWyKX+lLEjY3w/FNZJxitMsiWv+wA==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz",
+ "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
"requires": {
- "@typescript-eslint/types": "4.31.2",
- "@typescript-eslint/visitor-keys": "4.31.2",
+ "@typescript-eslint/types": "4.33.0",
+ "@typescript-eslint/visitor-keys": "4.33.0",
"debug": "^4.3.1",
"globby": "^11.0.3",
"is-glob": "^4.0.1",
@@ -10696,11 +10728,11 @@
}
},
"@typescript-eslint/visitor-keys": {
- "version": "4.31.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.2.tgz",
- "integrity": "sha512-PrBId7EQq2Nibns7dd/ch6S6/M4/iwLM9McbgeEbCXfxdwRUNxJ4UNreJ6Gh3fI2GNKNrWnQxKL7oCPmngKBug==",
+ "version": "4.33.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz",
+ "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
"requires": {
- "@typescript-eslint/types": "4.31.2",
+ "@typescript-eslint/types": "4.33.0",
"eslint-visitor-keys": "^2.0.0"
}
},
@@ -11215,9 +11247,9 @@
"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
},
"codemirror": {
- "version": "5.63.0",
- "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.0.tgz",
- "integrity": "sha512-KlLWRPggDg2rBD1Mx7/EqEhaBdy+ybBCVh/efgjBDsPpMeEu6MbTAJzIT4TuCzvmbTEgvKOGzVT6wdBTNusqrg=="
+ "version": "5.63.1",
+ "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.1.tgz",
+ "integrity": "sha512-baivaNZreZOGh1/tYyTvCupC9NeWk7qlZeGUDi4nFKj/J0JU8FYKZND4QqLw70P7HOttlCt4JJAOj9GoIhHEkA=="
},
"collection-visit": {
"version": "1.0.0",
@@ -11267,9 +11299,9 @@
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"construct-style-sheets-polyfill": {
- "version": "2.4.17",
- "resolved": "https://registry.npmjs.org/construct-style-sheets-polyfill/-/construct-style-sheets-polyfill-2.4.17.tgz",
- "integrity": "sha512-rKtZGWWAVFE6HgdBuuui1emic/t8aAKQbePQ7Je6ird8nZYSd3mqqBX9IvFn2CMtnbh7mQTk/vxc9mfaLl7cGQ=="
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/construct-style-sheets-polyfill/-/construct-style-sheets-polyfill-3.0.3.tgz",
+ "integrity": "sha512-z5sn55s4Avgpfj5uEKXP50DIawJoQ9iYtojSXrbxYL8W1njzZqW3/Yzsgmqgb2sV0NVvhn1cH5wk313DeQLzbA=="
},
"convert-source-map": {
"version": "1.8.0",
@@ -13816,9 +13848,9 @@
}
},
"rollup": {
- "version": "2.57.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.57.0.tgz",
- "integrity": "sha512-bKQIh1rWKofRee6mv8SrF2HdP6pea5QkwBZSMImJysFj39gQuiV8MEPBjXOCpzk3wSYp63M2v2wkWBmFC8O/rg==",
+ "version": "2.58.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.58.0.tgz",
+ "integrity": "sha512-NOXpusKnaRpbS7ZVSzcEXqxcLDOagN6iFS8p45RkoiMqPHDLwJm758UF05KlMoCRbLBTZsPOIa887gZJ1AiXvw==",
"requires": {
"fsevents": "~2.3.2"
}
diff --git a/web/package.json b/web/package.json
index 1e91440b9..83a83cd14 100644
--- a/web/package.json
+++ b/web/package.json
@@ -17,7 +17,8 @@
"sourceLocale": "en",
"locales": [
"en",
- "pseudo-LOCALE"
+ "pseudo-LOCALE",
+ "fr_FR"
],
"formatOptions": {
"lineNumbers": false
@@ -47,10 +48,11 @@
"@babel/preset-env": "^7.15.6",
"@babel/preset-typescript": "^7.15.0",
"@fortawesome/fontawesome-free": "^5.15.4",
- "@goauthentik/api": "^2021.9.4-1633366097",
- "@lingui/cli": "^3.11.1",
- "@lingui/core": "^3.11.1",
- "@lingui/macro": "^3.11.1",
+ "@goauthentik/api": "^2021.9.5-1633425132",
+ "@lingui/cli": "^3.12.1",
+ "@lingui/core": "^3.12.1",
+ "@lingui/detect-locale": "^3.12.1",
+ "@lingui/macro": "^3.12.1",
"@patternfly/patternfly": "^4.135.2",
"@polymer/iron-form": "^3.0.1",
"@polymer/paper-input": "^3.2.1",
@@ -62,17 +64,17 @@
"@squoosh/cli": "^0.7.2",
"@trivago/prettier-plugin-sort-imports": "^2.0.4",
"@types/chart.js": "^2.9.34",
- "@types/codemirror": "5.60.3",
+ "@types/codemirror": "5.60.4",
"@types/grecaptcha": "^3.0.3",
- "@typescript-eslint/eslint-plugin": "^4.31.2",
- "@typescript-eslint/parser": "^4.31.2",
+ "@typescript-eslint/eslint-plugin": "^4.33.0",
+ "@typescript-eslint/parser": "^4.33.0",
"@webcomponents/webcomponentsjs": "^2.6.0",
"babel-plugin-macros": "^3.1.0",
"base64-js": "^1.5.1",
"chart.js": "^3.5.1",
"chartjs-adapter-moment": "^1.0.0",
- "codemirror": "^5.63.0",
- "construct-style-sheets-polyfill": "^2.4.16",
+ "codemirror": "^5.63.1",
+ "construct-style-sheets-polyfill": "^3.0.3",
"eslint": "^7.32.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-custom-elements": "0.0.2",
@@ -83,7 +85,7 @@
"moment": "^2.29.1",
"prettier": "^2.4.1",
"rapidoc": "^9.1.3",
- "rollup": "^2.57.0",
+ "rollup": "^2.58.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-cssimport": "^1.0.2",
From 73d57d6f8272b2077d212f06a528b44bcb4183b4 Mon Sep 17 00:00:00 2001
From: Jens Langhammer
Date: Tue, 5 Oct 2021 11:23:27 +0200
Subject: [PATCH 06/25] core: make user's name field fully options
closes #1537
Signed-off-by: Jens Langhammer
---
authentik/core/api/users.py | 4 ++++
web/src/pages/users/UserForm.ts | 3 +--
web/src/user/user-settings/UserSelfForm.ts | 3 +--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/authentik/core/api/users.py b/authentik/core/api/users.py
index 90b3bf7ce..623e919dd 100644
--- a/authentik/core/api/users.py
+++ b/authentik/core/api/users.py
@@ -90,6 +90,9 @@ class UserSerializer(ModelSerializer):
"attributes",
"uid",
]
+ extra_kwargs = {
+ "name": {"allow_blank": True},
+ }
class UserSelfSerializer(ModelSerializer):
@@ -117,6 +120,7 @@ class UserSelfSerializer(ModelSerializer):
]
extra_kwargs = {
"is_active": {"read_only": True},
+ "name": {"allow_blank": True},
}
diff --git a/web/src/pages/users/UserForm.ts b/web/src/pages/users/UserForm.ts
index 5e2f98688..349c0656a 100644
--- a/web/src/pages/users/UserForm.ts
+++ b/web/src/pages/users/UserForm.ts
@@ -58,12 +58,11 @@ export class UserForm extends ModelForm {
${t`Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.`}
-
+
${t`User's display name.`}
diff --git a/web/src/user/user-settings/UserSelfForm.ts b/web/src/user/user-settings/UserSelfForm.ts
index 7660b4ecf..33fa9d97a 100644
--- a/web/src/user/user-settings/UserSelfForm.ts
+++ b/web/src/user/user-settings/UserSelfForm.ts
@@ -55,12 +55,11 @@ export class UserSelfForm extends ModelForm {
${t`Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.`}
-
+
${t`User's display name.`}
From d0c56325efcddecfee85f1e8bbc88c11938756a6 Mon Sep 17 00:00:00 2001
From: Jens Langhammer
Date: Tue, 5 Oct 2021 11:23:45 +0200
Subject: [PATCH 07/25] web/elements: fix model form always loading when
viewport check is disabled
Signed-off-by: Jens Langhammer
---
web/src/elements/forms/ModelForm.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/src/elements/forms/ModelForm.ts b/web/src/elements/forms/ModelForm.ts
index 8afa0063b..23f513384 100644
--- a/web/src/elements/forms/ModelForm.ts
+++ b/web/src/elements/forms/ModelForm.ts
@@ -48,10 +48,10 @@ export abstract class ModelForm extends Form
}
render(): TemplateResult {
- if (this._instancePk) {
+ if (this._instancePk && !this._initialLoad) {
if (
// if we're in viewport now and haven't loaded AND have a PK set, load now
- (this.isInViewport && !this._initialLoad) ||
+ this.isInViewport ||
// Or if we don't check for viewport in some cases
!this.viewportCheck
) {
From 782764ac73dd856da146b3b5f99ce659712ca6fa Mon Sep 17 00:00:00 2001
From: Jens Langhammer
Date: Tue, 5 Oct 2021 11:26:41 +0200
Subject: [PATCH 08/25] api: ensure viewsets have default ordering
Signed-off-by: Jens Langhammer
---
authentik/core/api/users.py | 1 +
authentik/flows/api/flows.py | 1 +
authentik/policies/api/policies.py | 1 +
3 files changed, 3 insertions(+)
diff --git a/authentik/core/api/users.py b/authentik/core/api/users.py
index 623e919dd..013d82685 100644
--- a/authentik/core/api/users.py
+++ b/authentik/core/api/users.py
@@ -212,6 +212,7 @@ class UserViewSet(UsedByMixin, ModelViewSet):
"""User Viewset"""
queryset = User.objects.none()
+ ordering = ["username"]
serializer_class = UserSerializer
search_fields = ["username", "name", "is_active", "email"]
filterset_class = UsersFilter
diff --git a/authentik/flows/api/flows.py b/authentik/flows/api/flows.py
index 602cc4654..332e525d6 100644
--- a/authentik/flows/api/flows.py
+++ b/authentik/flows/api/flows.py
@@ -108,6 +108,7 @@ class FlowViewSet(UsedByMixin, ModelViewSet):
queryset = Flow.objects.all()
serializer_class = FlowSerializer
lookup_field = "slug"
+ ordering = ["slug", "name"]
search_fields = ["name", "slug", "designation", "title"]
filterset_fields = ["flow_uuid", "name", "slug", "designation"]
diff --git a/authentik/policies/api/policies.py b/authentik/policies/api/policies.py
index 3d3753802..094f894b6 100644
--- a/authentik/policies/api/policies.py
+++ b/authentik/policies/api/policies.py
@@ -87,6 +87,7 @@ class PolicyViewSet(
"promptstage": ["isnull"],
}
search_fields = ["name"]
+ ordering = ["name"]
def get_queryset(self): # pragma: no cover
return Policy.objects.select_subclasses().prefetch_related("bindings", "promptstage_set")
From cb31e52d0e3b73cc9a604e36aa668e20b63d3b9f Mon Sep 17 00:00:00 2001
From: Jens Langhammer
Date: Tue, 5 Oct 2021 11:28:11 +0200
Subject: [PATCH 09/25] web/flows: adjust message for email stage
closes #1538
Signed-off-by: Jens Langhammer
# Conflicts:
# web/src/locales/fr_FR.po
---
web/src/flows/stages/email/EmailStage.ts | 2 +-
web/src/locales/en.po | 8 ++++++--
web/src/locales/pseudo-LOCALE.po | 6 +++++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/web/src/flows/stages/email/EmailStage.ts b/web/src/flows/stages/email/EmailStage.ts
index d4bc22029..1137b4beb 100644
--- a/web/src/flows/stages/email/EmailStage.ts
+++ b/web/src/flows/stages/email/EmailStage.ts
@@ -37,7 +37,7 @@ export class EmailStage extends BaseStage