From 4bc6fd28d4c107ad7593df38f1878b62e670a8ca Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sat, 24 Apr 2021 23:32:46 +0200 Subject: [PATCH 01/12] web/flows: include ShadyDOM, always enable ShadyDOM for flow interface improve compatibility with password managers and iOS Signed-off-by: Jens Langhammer --- authentik/core/templates/base/skeleton.html | 2 ++ authentik/core/templates/if/flow.html | 4 ++++ web/package-lock.json | 5 +++++ web/package.json | 1 + web/poly.ts | 2 ++ web/rollup.config.js | 4 +--- web/src/interfaces/flow/index.html | 1 + 7 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 web/poly.ts diff --git a/authentik/core/templates/base/skeleton.html b/authentik/core/templates/base/skeleton.html index 8e4e20ce5..125b531a3 100644 --- a/authentik/core/templates/base/skeleton.html +++ b/authentik/core/templates/base/skeleton.html @@ -15,6 +15,8 @@ + {% block head_before %} + {% endblock %} {% block head %} diff --git a/authentik/core/templates/if/flow.html b/authentik/core/templates/if/flow.html index 2156e8e9f..191be97ad 100644 --- a/authentik/core/templates/if/flow.html +++ b/authentik/core/templates/if/flow.html @@ -3,6 +3,10 @@ {% load static %} {% load i18n %} +{% block head_before %} + +{% endblock %} + {% block head %} {% endblock %} diff --git a/web/package-lock.json b/web/package-lock.json index 54017ddd0..410cbb9cc 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -2303,6 +2303,11 @@ "resolved": "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.10.2.tgz", "integrity": "sha512-9Iseu8bRtecb0klvv+WXZOVZatsRkbaH7M97Z+f+Pt909R4lDfgUODAnra23DOZTpeMTAkVpf4m/FZztN7Ox1A==" }, + "@webcomponents/webcomponentsjs": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.5.0.tgz", + "integrity": "sha512-C0l51MWQZ9kLzcxOZtniOMohpIFdCLZum7/TEHv3XWFc1Fvt5HCpbSX84x8ltka/JuNKcuiDnxXFkiB2gaePcg==" + }, "acorn": { "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", diff --git a/web/package.json b/web/package.json index f75c35cd8..79b59054c 100644 --- a/web/package.json +++ b/web/package.json @@ -57,6 +57,7 @@ "@types/grecaptcha": "^3.0.1", "@typescript-eslint/eslint-plugin": "^4.22.0", "@typescript-eslint/parser": "^4.22.0", + "@webcomponents/webcomponentsjs": "^2.5.0", "authentik-api": "file:api", "babel-plugin-macros": "^3.0.1", "base64-js": "^1.5.1", diff --git a/web/poly.ts b/web/poly.ts new file mode 100644 index 000000000..510032fcc --- /dev/null +++ b/web/poly.ts @@ -0,0 +1,2 @@ +import "construct-style-sheets-polyfill"; +import "@webcomponents/webcomponentsjs"; diff --git a/web/rollup.config.js b/web/rollup.config.js index c761f2bc9..001108d40 100644 --- a/web/rollup.config.js +++ b/web/rollup.config.js @@ -76,9 +76,7 @@ export default [ }, // Polyfills (imported first) { - input: [ - "construct-style-sheets-polyfill" - ], + input: "./poly.ts", output: [ { format: "iife", diff --git a/web/src/interfaces/flow/index.html b/web/src/interfaces/flow/index.html index 92121cbec..c990acb83 100644 --- a/web/src/interfaces/flow/index.html +++ b/web/src/interfaces/flow/index.html @@ -10,6 +10,7 @@ + From 502ac51fa77cba67fdd59a4551bbffd469cf0b19 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 25 Apr 2021 01:29:01 +0200 Subject: [PATCH 02/12] web: don't enable ShadyDOM on selenium Signed-off-by: Jens Langhammer --- authentik/core/templates/if/flow.html | 2 +- web/src/interfaces/flow/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/authentik/core/templates/if/flow.html b/authentik/core/templates/if/flow.html index 191be97ad..e8fc13e1a 100644 --- a/authentik/core/templates/if/flow.html +++ b/authentik/core/templates/if/flow.html @@ -4,7 +4,7 @@ {% load i18n %} {% block head_before %} - + {% endblock %} {% block head %} diff --git a/web/src/interfaces/flow/index.html b/web/src/interfaces/flow/index.html index c990acb83..b03ab73b4 100644 --- a/web/src/interfaces/flow/index.html +++ b/web/src/interfaces/flow/index.html @@ -10,7 +10,7 @@ - + From ea187d4e814f6c9748513ec78c71e14b08cceb06 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 25 Apr 2021 17:12:28 +0200 Subject: [PATCH 03/12] root: remove dependabot Signed-off-by: Jens Langhammer --- .github/dependabot.yml | 50 ------------------------------------------ 1 file changed, 50 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index e6cffffd1..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,50 +0,0 @@ -version: 2 -updates: -- package-ecosystem: gomod - directory: "/outpost" - schedule: - interval: daily - time: "04:00" - open-pull-requests-limit: 10 - assignees: - - BeryJu -- package-ecosystem: npm - directory: "/web" - schedule: - interval: daily - time: "04:00" - open-pull-requests-limit: 10 - assignees: - - BeryJu -- package-ecosystem: npm - directory: "/website" - schedule: - interval: daily - time: "04:00" - open-pull-requests-limit: 10 - assignees: - - BeryJu -- package-ecosystem: pip - directory: "/" - schedule: - interval: daily - time: "04:00" - open-pull-requests-limit: 10 - assignees: - - BeryJu -- package-ecosystem: docker - directory: "/" - schedule: - interval: daily - time: "04:00" - open-pull-requests-limit: 10 - assignees: - - BeryJu -- package-ecosystem: docker - directory: "/outpost" - schedule: - interval: daily - time: "04:00" - open-pull-requests-limit: 10 - assignees: - - BeryJu From d03b43605ef3c2b24ef8c7087a5225206b5ae124 Mon Sep 17 00:00:00 2001 From: Jens L Date: Sun, 25 Apr 2021 17:12:48 +0200 Subject: [PATCH 04/12] root: fix dependabot --- .github/dependabot.yml | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..e6cffffd1 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,50 @@ +version: 2 +updates: +- package-ecosystem: gomod + directory: "/outpost" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + assignees: + - BeryJu +- package-ecosystem: npm + directory: "/web" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + assignees: + - BeryJu +- package-ecosystem: npm + directory: "/website" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + assignees: + - BeryJu +- package-ecosystem: pip + directory: "/" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + assignees: + - BeryJu +- package-ecosystem: docker + directory: "/" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + assignees: + - BeryJu +- package-ecosystem: docker + directory: "/outpost" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + assignees: + - BeryJu From 5f81909bab80640bcb9a840181ddca5a951774f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Apr 2021 18:11:21 +0200 Subject: [PATCH 05/12] build(deps): bump eslint from 7.24.0 to 7.25.0 in /web (#775) Bumps [eslint](https://github.com/eslint/eslint) from 7.24.0 to 7.25.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.24.0...v7.25.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package-lock.json | 42 +++++++++++------------------------------- web/package.json | 2 +- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index 410cbb9cc..d29e9565a 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -3162,9 +3162,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz", - "integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz", + "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==", "requires": { "@babel/code-frame": "7.12.11", "@eslint/eslintrc": "^0.4.0", @@ -3222,9 +3222,9 @@ } }, "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -4015,14 +4015,6 @@ "binary-extensions": "^2.0.0" } }, - "is-boolean-object": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz", - "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==", - "requires": { - "call-bind": "^1.0.0" - } - }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", @@ -4114,11 +4106,6 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" }, - "is-number-object": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz", - "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==" - }, "is-plain-object": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz", @@ -4132,11 +4119,6 @@ "@types/estree": "*" } }, - "is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==" - }, "is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", @@ -5964,19 +5946,17 @@ } }, "table": { - "version": "6.0.9", - "resolved": "https://registry.npmjs.org/table/-/table-6.0.9.tgz", - "integrity": "sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/table/-/table-6.5.1.tgz", + "integrity": "sha512-xGDXWTBJxahkzPQCsn1S9ESHEenU7TbMD5Iv4FeopXv/XwJyWatFjfbor+6ipI10/MNPXBYUamYukOrbPZ9L/w==", "requires": { "ajv": "^8.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", "lodash.clonedeep": "^4.5.0", "lodash.flatten": "^4.4.0", "lodash.truncate": "^4.4.2", "slice-ansi": "^4.0.0", - "string-width": "^4.2.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0" }, "dependencies": { "ajv": { diff --git a/web/package.json b/web/package.json index 79b59054c..1df1f7535 100644 --- a/web/package.json +++ b/web/package.json @@ -65,7 +65,7 @@ "chartjs-adapter-moment": "^1.0.0", "codemirror": "^5.61.0", "construct-style-sheets-polyfill": "^2.4.16", - "eslint": "^7.24.0", + "eslint": "^7.25.0", "eslint-config-google": "^0.14.0", "eslint-plugin-lit": "^1.3.0", "flowchart.js": "^1.15.0", From e567cd5580d7582b87ff861838c0388939d9a3a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Apr 2021 18:11:30 +0200 Subject: [PATCH 06/12] build(deps): bump chart.js from 3.1.1 to 3.2.0 in /web (#776) Bumps [chart.js](https://github.com/chartjs/Chart.js) from 3.1.1 to 3.2.0. - [Release notes](https://github.com/chartjs/Chart.js/releases) - [Commits](https://github.com/chartjs/Chart.js/compare/v3.1.1...v3.2.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package-lock.json | 6 +++--- web/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index d29e9565a..a79171b56 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -2724,9 +2724,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "chart.js": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.1.1.tgz", - "integrity": "sha512-ghNJersc9VD9MECwa5bL8gqvCkndW6RSCicdEHL9lIriNtXwKawlSmwo+u6KNXLYT2+f24GdFPBoynKW3ke4MQ==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.2.0.tgz", + "integrity": "sha512-Ml3R47TvOPW6gQ6T8mg/uPvyOASPpPVVF6xb7ZyHkek1c6kJIT5ScT559afXoDf6uwtpDR2BpCommkA5KT8ODg==" }, "chartjs-adapter-moment": { "version": "1.0.0", diff --git a/web/package.json b/web/package.json index 1df1f7535..9f7400bb4 100644 --- a/web/package.json +++ b/web/package.json @@ -61,7 +61,7 @@ "authentik-api": "file:api", "babel-plugin-macros": "^3.0.1", "base64-js": "^1.5.1", - "chart.js": "^3.1.1", + "chart.js": "^3.2.0", "chartjs-adapter-moment": "^1.0.0", "codemirror": "^5.61.0", "construct-style-sheets-polyfill": "^2.4.16", From 41c5f0142210fad20aa5ebdcec3178114158b3cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Apr 2021 18:11:43 +0200 Subject: [PATCH 07/12] build(deps): bump postcss from 8.2.10 to 8.2.12 in /website (#777) Bumps [postcss](https://github.com/postcss/postcss) from 8.2.10 to 8.2.12. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.2.10...8.2.12) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- website/package-lock.json | 11 +++-------- website/package.json | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/website/package-lock.json b/website/package-lock.json index b00671863..704dda322 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -11756,20 +11756,15 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "8.2.10", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.10.tgz", - "integrity": "sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==", + "version": "8.2.12", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.12.tgz", + "integrity": "sha512-BJnGT5+0q2tzvs6oQfnY2NpEJ7rIXNfBnZtQOKCIsweeWXBXeDd5k31UgTdS3d/c02ouspufn37mTaHWkJyzMQ==", "requires": { "colorette": "^1.2.2", "nanoid": "^3.1.22", "source-map": "^0.6.1" }, "dependencies": { - "colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", diff --git a/website/package.json b/website/package.json index 7cbe286c7..d744ac2b8 100644 --- a/website/package.json +++ b/website/package.json @@ -14,7 +14,7 @@ "@docusaurus/preset-classic": "2.0.0-alpha.73", "@mdx-js/react": "^1.6.22", "clsx": "^1.1.1", - "postcss": "^8.2.10", + "postcss": "^8.2.12", "rapidoc": "^9.0.0", "react": "^17.0.2", "react-before-after-slider": "^1.0.4", From 4d6cd4c57d18860822fd8895546e8ed99fd4a043 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Apr 2021 18:11:59 +0200 Subject: [PATCH 08/12] build(deps): bump @patternfly/patternfly from 4.96.2 to 4.102.2 in /web (#778) Bumps [@patternfly/patternfly](https://github.com/patternfly/patternfly) from 4.96.2 to 4.102.2. - [Release notes](https://github.com/patternfly/patternfly/releases) - [Changelog](https://github.com/patternfly/patternfly/blob/master/RELEASE-NOTES.md) - [Commits](https://github.com/patternfly/patternfly/compare/prerelease-v4.96.2...prerelease-v4.102.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package-lock.json | 6 +++--- web/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index a79171b56..2a21776ab 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1679,9 +1679,9 @@ } }, "@patternfly/patternfly": { - "version": "4.96.2", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.96.2.tgz", - "integrity": "sha512-nxXLyAGVYubXdJ8XuSPDuPBuUbuY1XPyYYzkIg6AmWp/bLA5Fs1kqX32F4djjGgR1eOteqRz478W/CE7Xi5E4A==" + "version": "4.102.2", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.102.2.tgz", + "integrity": "sha512-n51n3iW/lRHCvModGYDCEzeLJO+x4Z9ZRkdz6HtUqrStfjIRFHCKbKlpyPvpWacdQEC5Mx1oNIrHmNASmm/Zgw==" }, "@polymer/font-roboto": { "version": "3.0.2", diff --git a/web/package.json b/web/package.json index 9f7400bb4..173726734 100644 --- a/web/package.json +++ b/web/package.json @@ -44,7 +44,7 @@ "@lingui/cli": "^3.8.10", "@lingui/core": "^3.8.10", "@lingui/macro": "^3.8.10", - "@patternfly/patternfly": "^4.96.2", + "@patternfly/patternfly": "^4.102.2", "@polymer/iron-form": "^3.0.1", "@polymer/paper-input": "^3.2.1", "@rollup/plugin-babel": "^5.3.0", From 51ffdcb5cb4cc46f05d3398cc63f540606c44469 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Apr 2021 18:12:12 +0200 Subject: [PATCH 09/12] build(deps): bump @sentry/tracing from 6.3.0 to 6.3.1 in /web (#779) Bumps [@sentry/tracing](https://github.com/getsentry/sentry-javascript) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/6.3.0...6.3.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package-lock.json | 48 +++++++++++++++++++++---------------------- web/package.json | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index 2a21776ab..53e057b2d 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1937,48 +1937,48 @@ } }, "@sentry/tracing": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.3.0.tgz", - "integrity": "sha512-3UNGgQOrDKBoDqLc4vt+0n27Zv3lbNEoCbBydq4IvGfuYq7ozWMsaTcelsotMsd4ckDuOEh8V/nJTqrDjvL76g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.3.1.tgz", + "integrity": "sha512-qveDmoWsXy9qLEblZJwJ1OU/zZRlEd/q7Jhd0Hnwlob8Ci96huABEbYyGdJs18BKVHEFU3gSdVfvrikUE/W17g==", "requires": { - "@sentry/hub": "6.3.0", - "@sentry/minimal": "6.3.0", - "@sentry/types": "6.3.0", - "@sentry/utils": "6.3.0", + "@sentry/hub": "6.3.1", + "@sentry/minimal": "6.3.1", + "@sentry/types": "6.3.1", + "@sentry/utils": "6.3.1", "tslib": "^1.9.3" }, "dependencies": { "@sentry/hub": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.3.0.tgz", - "integrity": "sha512-lAnW3Om66t9IR+t1wya1NpOF9lGbvYG6Ca8wxJJGJ1t2PxKwyxpZKzRx0q8M1QFhlZ5cETCzxmM7lBEZ4QVCBg==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.3.1.tgz", + "integrity": "sha512-2er+OeVlsdVZkhl9kXQAANwgjwoCdM1etK2iFuhzX8xkMaJlAuZLyQInv2U1BbXBlIfWjvzRM8B95hCWvVrR3Q==", "requires": { - "@sentry/types": "6.3.0", - "@sentry/utils": "6.3.0", + "@sentry/types": "6.3.1", + "@sentry/utils": "6.3.1", "tslib": "^1.9.3" } }, "@sentry/minimal": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.3.0.tgz", - "integrity": "sha512-ZdPUwdPQkaKroy67NkwQRqmnfKyd/C1OyouM9IqYKyBjAInjOijwwc/Rd91PMHalvCOGfp1scNZYbZ+YFs/qQQ==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.3.1.tgz", + "integrity": "sha512-0eN9S7HvXsCQEjX/qXHTMgvSb3mwrnZEWS9Qz/Bz5ig9pEGXKgJ1om5NTTHVHhXqd3wFCjdvIo6slufLHoCtSw==", "requires": { - "@sentry/hub": "6.3.0", - "@sentry/types": "6.3.0", + "@sentry/hub": "6.3.1", + "@sentry/types": "6.3.1", "tslib": "^1.9.3" } }, "@sentry/types": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.3.0.tgz", - "integrity": "sha512-xWyCYDmFPjS5ex60kxOOHbHEs4vs00qHbm0iShQfjl4OSg9S2azkcWofDmX8Xbn0FSOUXgdPCjNJW1B0bPVhCA==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.3.1.tgz", + "integrity": "sha512-BEBn8JX1yaooCAuonbaMci9z0RjwwMbQ3Eny/eyDdd+rjXprZCZaStZnCvSThbNBqAJ8YaUqY2YBMnEwJxarAw==" }, "@sentry/utils": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.3.0.tgz", - "integrity": "sha512-NZzw4oLelgvCsVBG2e+ZtFtaBvgA7rZYtcGFbZTphhAlYoJ6JMCQUzYk0iwJK79yR1quh510x4UE0jynvvToWg==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.3.1.tgz", + "integrity": "sha512-cdtl/QWC9FtinAuW3w8QfvSfh/Q9ui5vwvjzVHiS1ga/U38edi2XX+cttY39ZYwz0SQG99cE10GOIhd1p7/mAA==", "requires": { - "@sentry/types": "6.3.0", + "@sentry/types": "6.3.1", "tslib": "^1.9.3" } }, diff --git a/web/package.json b/web/package.json index 173726734..e5037a1dc 100644 --- a/web/package.json +++ b/web/package.json @@ -51,7 +51,7 @@ "@rollup/plugin-replace": "^2.4.2", "@rollup/plugin-typescript": "^8.2.1", "@sentry/browser": "^6.3.0", - "@sentry/tracing": "^6.3.0", + "@sentry/tracing": "^6.3.1", "@types/chart.js": "^2.9.32", "@types/codemirror": "0.0.109", "@types/grecaptcha": "^3.0.1", From 9fb41b8d10f14c7415278dc1664e6e864ad50fe0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Apr 2021 18:12:34 +0200 Subject: [PATCH 10/12] build(deps): bump boto3 from 1.17.54 to 1.17.57 (#783) Bumps [boto3](https://github.com/boto/boto3) from 1.17.54 to 1.17.57. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.17.54...1.17.57) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Pipfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 5710a5415..8ffa08893 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -116,18 +116,18 @@ }, "boto3": { "hashes": [ - "sha256:1e55df93aa47a84e2a12a639c7f145e16e6e9ef959542d69d5526d50d2e92692", - "sha256:eab42daaaf68cdad5b112d31dcb0684162098f6558ba7b64156be44f993525fa" + "sha256:2783947ec34dd84fc36093e8fc8a9a24679cf912a97bc9a0c47f4966ed059a29", + "sha256:6b4a79691a48740816f03c4cb1e8ef46f8335ad2019d9c4a95da73eb5cb98f05" ], "index": "pypi", - "version": "==1.17.54" + "version": "==1.17.57" }, "botocore": { "hashes": [ - "sha256:20a864fc6570ba11d52532c72c3ccabab5c71a9b4a9418601a313d56f1d2ce5b", - "sha256:37ec76ea2df8609540ba6cb0fe360ae1c589d2e1ee91eb642fd767823f3fcedd" + "sha256:ae4ac72921f23d35ad54a5fb0989fc00c6fff8a39e24f26128b9315cc6209fec", + "sha256:fa430bc773363a3d332c11c55bd8c0c0a5819d576121eb6990528a1bdaa89bcd" ], - "version": "==1.20.54" + "version": "==1.20.57" }, "cachetools": { "hashes": [ @@ -1106,10 +1106,10 @@ }, "s3transfer": { "hashes": [ - "sha256:af1af6384bd7fb8208b06480f9be73d0295d965c4c073a5c95ea5b6661dccc18", - "sha256:f3dfd791cad2799403e3c8051810a7ca6ee1d2e630e5d2a8f9649d892bdb3db6" + "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc", + "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2" ], - "version": "==0.4.0" + "version": "==0.4.2" }, "sentry-sdk": { "hashes": [ @@ -1439,10 +1439,10 @@ }, "astroid": { "hashes": [ - "sha256:ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91", - "sha256:bea3f32799fbb8581f58431c12591bc20ce11cbc90ad82e2ea5717d94f2080d5" + "sha256:4db03ab5fc3340cf619dbc25e42c2cc3755154ce6009469766d7143d1fc2ee4e", + "sha256:8a398dfce302c13f14bab13e2b14fe385d32b73f4e4853b9bdfb64598baa1975" ], - "version": "==2.5.3" + "version": "==2.5.6" }, "attrs": { "hashes": [ @@ -1556,10 +1556,10 @@ }, "gitpython": { "hashes": [ - "sha256:3283ae2fba31c913d857e12e5ba5f9a7772bbc064ae2bb09efafa71b0dd4939b", - "sha256:be27633e7509e58391f10207cd32b2a6cf5b908f92d9cd30da2e514e1137af61" + "sha256:05af150f47a5cca3f4b0af289b73aef8cf3c4fe2385015b06220cbcdee48bb6e", + "sha256:a77824e516d3298b04fb36ec7845e92747df8fcfee9cacc32dd6239f9652f867" ], - "version": "==3.1.14" + "version": "==3.1.15" }, "iniconfig": { "hashes": [ From 7687b744ccb60d9a876769860c4909b09e7c843c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Apr 2021 18:14:42 +0200 Subject: [PATCH 11/12] build(deps): bump @sentry/browser from 6.3.0 to 6.3.1 in /web (#780) Bumps [@sentry/browser](https://github.com/getsentry/sentry-javascript) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/6.3.0...6.3.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package-lock.json | 60 +++++++++++++++++++++---------------------- web/package.json | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index 53e057b2d..7d292694f 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1866,13 +1866,13 @@ } }, "@sentry/browser": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.3.0.tgz", - "integrity": "sha512-Rse9j5XwN9n7GnfW1mNscTS4YQ0oiBNJcaSk3Mw/vQT872Wh60yKyx5wxAw5GujFZI0NgdyPlZwZ/tGQwirRxA==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.3.1.tgz", + "integrity": "sha512-Ri4tYsyuJIeLQnvQUqbpGzailUYpbjFSYM0+yEM63gPsjiXdg+W8yKHluA6cs6FLWVN3oWfwHW7Kd61echlGuw==", "requires": { - "@sentry/core": "6.3.0", - "@sentry/types": "6.3.0", - "@sentry/utils": "6.3.0", + "@sentry/core": "6.3.1", + "@sentry/types": "6.3.1", + "@sentry/utils": "6.3.1", "tslib": "^1.9.3" }, "dependencies": { @@ -1884,14 +1884,14 @@ } }, "@sentry/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.3.0.tgz", - "integrity": "sha512-voot/lJ9gRXB6bx6tVqbEbD6jOd4Sx6Rfmm6pzfpom9C0q+fjIZTatTLq8GdXj8DzxaH1MBDSwtaq/eC3NqYpA==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.3.1.tgz", + "integrity": "sha512-aVuvVbaehGeN86jZlLDGGkhEtprdOtB6lvYLfGy40Dj1Tkh2mGWE550QsRXAXAqYvQzIYwQR23r6m3o8FujgVg==", "requires": { - "@sentry/hub": "6.3.0", - "@sentry/minimal": "6.3.0", - "@sentry/types": "6.3.0", - "@sentry/utils": "6.3.0", + "@sentry/hub": "6.3.1", + "@sentry/minimal": "6.3.1", + "@sentry/types": "6.3.1", + "@sentry/utils": "6.3.1", "tslib": "^1.9.3" }, "dependencies": { @@ -1903,12 +1903,12 @@ } }, "@sentry/hub": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.3.0.tgz", - "integrity": "sha512-lAnW3Om66t9IR+t1wya1NpOF9lGbvYG6Ca8wxJJGJ1t2PxKwyxpZKzRx0q8M1QFhlZ5cETCzxmM7lBEZ4QVCBg==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.3.1.tgz", + "integrity": "sha512-2er+OeVlsdVZkhl9kXQAANwgjwoCdM1etK2iFuhzX8xkMaJlAuZLyQInv2U1BbXBlIfWjvzRM8B95hCWvVrR3Q==", "requires": { - "@sentry/types": "6.3.0", - "@sentry/utils": "6.3.0", + "@sentry/types": "6.3.1", + "@sentry/utils": "6.3.1", "tslib": "^1.9.3" }, "dependencies": { @@ -1920,12 +1920,12 @@ } }, "@sentry/minimal": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.3.0.tgz", - "integrity": "sha512-ZdPUwdPQkaKroy67NkwQRqmnfKyd/C1OyouM9IqYKyBjAInjOijwwc/Rd91PMHalvCOGfp1scNZYbZ+YFs/qQQ==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.3.1.tgz", + "integrity": "sha512-0eN9S7HvXsCQEjX/qXHTMgvSb3mwrnZEWS9Qz/Bz5ig9pEGXKgJ1om5NTTHVHhXqd3wFCjdvIo6slufLHoCtSw==", "requires": { - "@sentry/hub": "6.3.0", - "@sentry/types": "6.3.0", + "@sentry/hub": "6.3.1", + "@sentry/types": "6.3.1", "tslib": "^1.9.3" }, "dependencies": { @@ -1990,16 +1990,16 @@ } }, "@sentry/types": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.3.0.tgz", - "integrity": "sha512-xWyCYDmFPjS5ex60kxOOHbHEs4vs00qHbm0iShQfjl4OSg9S2azkcWofDmX8Xbn0FSOUXgdPCjNJW1B0bPVhCA==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.3.1.tgz", + "integrity": "sha512-BEBn8JX1yaooCAuonbaMci9z0RjwwMbQ3Eny/eyDdd+rjXprZCZaStZnCvSThbNBqAJ8YaUqY2YBMnEwJxarAw==" }, "@sentry/utils": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.3.0.tgz", - "integrity": "sha512-NZzw4oLelgvCsVBG2e+ZtFtaBvgA7rZYtcGFbZTphhAlYoJ6JMCQUzYk0iwJK79yR1quh510x4UE0jynvvToWg==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.3.1.tgz", + "integrity": "sha512-cdtl/QWC9FtinAuW3w8QfvSfh/Q9ui5vwvjzVHiS1ga/U38edi2XX+cttY39ZYwz0SQG99cE10GOIhd1p7/mAA==", "requires": { - "@sentry/types": "6.3.0", + "@sentry/types": "6.3.1", "tslib": "^1.9.3" }, "dependencies": { diff --git a/web/package.json b/web/package.json index e5037a1dc..35fc47d62 100644 --- a/web/package.json +++ b/web/package.json @@ -50,7 +50,7 @@ "@rollup/plugin-babel": "^5.3.0", "@rollup/plugin-replace": "^2.4.2", "@rollup/plugin-typescript": "^8.2.1", - "@sentry/browser": "^6.3.0", + "@sentry/browser": "^6.3.1", "@sentry/tracing": "^6.3.1", "@types/chart.js": "^2.9.32", "@types/codemirror": "0.0.109", From b59b9314e4a7a56ff56222f636a4e4a9e46b7cbc Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 25 Apr 2021 18:50:19 +0200 Subject: [PATCH 12/12] web/flows/identification: fix phrasing account recovery Signed-off-by: Jens Langhammer --- web/src/elements/PageHeader.ts | 2 +- .../flows/stages/identification/IdentificationStage.ts | 1 - web/src/locales/en.po | 9 ++++----- web/src/locales/pseudo-LOCALE.po | 9 ++++----- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/web/src/elements/PageHeader.ts b/web/src/elements/PageHeader.ts index 7be03f728..e0aff235a 100644 --- a/web/src/elements/PageHeader.ts +++ b/web/src/elements/PageHeader.ts @@ -44,7 +44,7 @@ export class PageHeader extends LitElement { flex-direction: row; min-height: 114px; } - button.sidebar-trigger { + button.pf-c-button.pf-m-plain.sidebar-trigger { background-color: var(--pf-c-page__main-section--m-light--BackgroundColor); border-radius: 0px; } diff --git a/web/src/flows/stages/identification/IdentificationStage.ts b/web/src/flows/stages/identification/IdentificationStage.ts index c6fa5490c..c44511052 100644 --- a/web/src/flows/stages/identification/IdentificationStage.ts +++ b/web/src/flows/stages/identification/IdentificationStage.ts @@ -149,7 +149,6 @@ export class IdentificationStage extends BaseStage {

` : html``} ${this.challenge.recovery_url ? html` ` : html``} `; diff --git a/web/src/locales/en.po b/web/src/locales/en.po index aaa1f86a9..9825f5408 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -1079,7 +1079,7 @@ msgstr "Email" msgid "Email address" msgstr "Email address" -#: src/flows/stages/identification/IdentificationStage.ts:151 +#: src/flows/stages/identification/IdentificationStage.ts:150 msgid "Email or Username" msgstr "Email or Username" @@ -1382,7 +1382,7 @@ msgstr "Force the user to configure an authenticator" msgid "Forgot password?" msgstr "Forgot password?" -#: src/flows/stages/identification/IdentificationStage.ts:125 +#: src/flows/stages/identification/IdentificationStage.ts:124 msgid "Forgot username or password?" msgstr "Forgot username or password?" @@ -1677,7 +1677,7 @@ msgstr "Library" #: src/flows/stages/consent/ConsentStage.ts:28 #: src/flows/stages/dummy/DummyStage.ts:27 #: src/flows/stages/email/EmailStage.ts:26 -#: src/flows/stages/identification/IdentificationStage.ts:134 +#: src/flows/stages/identification/IdentificationStage.ts:133 #: src/flows/stages/password/PasswordStage.ts:31 #: src/flows/stages/prompt/PromptStage.ts:126 #: src/pages/applications/ApplicationViewPage.ts:43 @@ -1752,7 +1752,7 @@ msgstr "Log the currently pending user in." msgid "Login password is synced from LDAP into authentik automatically. Enable this option only to write password changes in authentik back to LDAP." msgstr "Login password is synced from LDAP into authentik automatically. Enable this option only to write password changes in authentik back to LDAP." -#: src/flows/stages/identification/IdentificationStage.ts:146 +#: src/flows/stages/identification/IdentificationStage.ts:145 msgid "Login to continue to {0}." msgstr "Login to continue to {0}." @@ -1930,7 +1930,6 @@ msgid "NameID Property Mapping" msgstr "NameID Property Mapping" #: src/flows/stages/identification/IdentificationStage.ts:119 -#: src/flows/stages/identification/IdentificationStage.ts:124 msgid "Need an account?" msgstr "Need an account?" diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index a346554c3..5ed3a220d 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -1071,7 +1071,7 @@ msgstr "" msgid "Email address" msgstr "" -#: src/flows/stages/identification/IdentificationStage.ts:151 +#: src/flows/stages/identification/IdentificationStage.ts:150 msgid "Email or Username" msgstr "" @@ -1374,7 +1374,7 @@ msgstr "" msgid "Forgot password?" msgstr "" -#: src/flows/stages/identification/IdentificationStage.ts:125 +#: src/flows/stages/identification/IdentificationStage.ts:124 msgid "Forgot username or password?" msgstr "" @@ -1669,7 +1669,7 @@ msgstr "" #: src/flows/stages/consent/ConsentStage.ts:28 #: src/flows/stages/dummy/DummyStage.ts:27 #: src/flows/stages/email/EmailStage.ts:26 -#: src/flows/stages/identification/IdentificationStage.ts:134 +#: src/flows/stages/identification/IdentificationStage.ts:133 #: src/flows/stages/password/PasswordStage.ts:31 #: src/flows/stages/prompt/PromptStage.ts:126 #: src/pages/applications/ApplicationViewPage.ts:43 @@ -1744,7 +1744,7 @@ msgstr "" msgid "Login password is synced from LDAP into authentik automatically. Enable this option only to write password changes in authentik back to LDAP." msgstr "" -#: src/flows/stages/identification/IdentificationStage.ts:146 +#: src/flows/stages/identification/IdentificationStage.ts:145 msgid "Login to continue to {0}." msgstr "" @@ -1922,7 +1922,6 @@ msgid "NameID Property Mapping" msgstr "" #: src/flows/stages/identification/IdentificationStage.ts:119 -#: src/flows/stages/identification/IdentificationStage.ts:124 msgid "Need an account?" msgstr ""