From f159973d8b0278d08ae11fffaf5c7f65dce1fd80 Mon Sep 17 00:00:00 2001 From: Ken Sternberg <133134217+kensternberg-authentik@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:36:41 -0700 Subject: [PATCH 1/4] web: provide InstallID on EnterpriseListPage (#8898) * web: fix esbuild issue with style sheets Getting ESBuild, Lit, and Storybook to all agree on how to read and parse stylesheets is a serious pain. This fix better identifies the value types (instances) being passed from various sources in the repo to the three *different* kinds of style processors we're using (the native one, the polyfill one, and whatever the heck Storybook does internally). Falling back to using older CSS instantiating techniques one era at a time seems to do the trick. It's ugly, but in the face of the aggressive styling we use to avoid Flashes of Unstyled Content (FLoUC), it's the logic with which we're left. In standard mode, the following warning appears on the console when running a Flow: ``` Autofocus processing was blocked because a document already has a focused element. ``` In compatibility mode, the following **error** appears on the console when running a Flow: ``` crawler-inject.js:1106 Uncaught TypeError: Failed to execute 'observe' on 'MutationObserver': parameter 1 is not of type 'Node'. at initDomMutationObservers (crawler-inject.js:1106:18) at crawler-inject.js:1114:24 at Array.forEach () at initDomMutationObservers (crawler-inject.js:1114:10) at crawler-inject.js:1549:1 initDomMutationObservers @ crawler-inject.js:1106 (anonymous) @ crawler-inject.js:1114 initDomMutationObservers @ crawler-inject.js:1114 (anonymous) @ crawler-inject.js:1549 ``` Despite this error, nothing seems to be broken and flows work as anticipated. * web: provide InstallID on EnterpriseListPage Changes the appearance of the "Get a License" card on the EnterpriseLicenseListPage to include a view of the InstallID. * web: restore line accidentally deleted by fatfinger error --- .../enterprise/EnterpriseLicenseListPage.ts | 50 +++++++++++++------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/web/src/admin/enterprise/EnterpriseLicenseListPage.ts b/web/src/admin/enterprise/EnterpriseLicenseListPage.ts index b8df8ca70f..4949e193bc 100644 --- a/web/src/admin/enterprise/EnterpriseLicenseListPage.ts +++ b/web/src/admin/enterprise/EnterpriseLicenseListPage.ts @@ -158,22 +158,7 @@ export class EnterpriseLicenseListPage extends TablePage {
-
-
${msg("Get a license")}
-
- ${this.installID - ? html` ${msg("Go to Customer Portal")}` - : html``} -
-
- + ${this.renderGetLicenseCard()} { ]; } + renderGetLicenseCard() { + const renderSpinner = () => + html`
+ +
`; + + const installURL = (installID: string) => + [ + "https://customers.goauthentik.io/from_authentik/purchase/?install_id=", + encodeURIComponent(installID), + "&authentik_url=", + encodeURI(window.location.origin), + ].join(""); + + const renderCard = (installID: string) => html` +
${msg("Get a license")}
+
+ ${msg("Go to Customer Portal")} +
+
${msg("Your Install ID")}
+
${installID}
+ `; + + return html`
+ ${this.installID ? renderCard(this.installID) : renderSpinner()} +
`; + } + renderObjectCreate(): TemplateResult { return html` From f9b6c8cef94a61aed89553d0c9a103acab2f1c2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 01:37:03 +0100 Subject: [PATCH 2/4] core: bump google.golang.org/protobuf from 1.32.0 to 1.33.0 (#8901) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 81f1c060c2..d2e883f8c3 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 7b69290051..c112628a5f 100644 --- a/go.sum +++ b/go.sum @@ -556,8 +556,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= From 9ab057fafc2517162bb6b2dc0047a72e1471a1b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 11:24:58 +0100 Subject: [PATCH 3/4] web: bump vite-tsconfig-paths from 4.3.1 to 4.3.2 in /web (#8903) Bumps [vite-tsconfig-paths](https://github.com/aleclarson/vite-tsconfig-paths) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/aleclarson/vite-tsconfig-paths/releases) - [Commits](https://github.com/aleclarson/vite-tsconfig-paths/compare/v4.3.1...v4.3.2) --- updated-dependencies: - dependency-name: vite-tsconfig-paths dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package-lock.json | 15 ++++++++------- web/package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index c0d82cfd1a..124f325095 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -25,7 +25,6 @@ "@open-wc/lit-helpers": "^0.7.0", "@patternfly/elements": "^2.4.0", "@patternfly/patternfly": "^4.224.2", - "@rollup/rollup-linux-x64-gnu": "4.13.0", "@sentry/browser": "^7.106.1", "@webcomponents/webcomponentsjs": "^2.8.0", "base64-js": "^1.5.1", @@ -103,7 +102,7 @@ "tslib": "^2.6.2", "turnstile-types": "^1.2.0", "typescript": "^5.4.2", - "vite-tsconfig-paths": "^4.3.1" + "vite-tsconfig-paths": "^4.3.2" }, "engines": { "node": ">=20" @@ -16830,9 +16829,10 @@ "license": "Apache-2.0" }, "node_modules/tsconfck": { - "version": "3.0.2", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.0.3.tgz", + "integrity": "sha512-4t0noZX9t6GcPTfBAbIbbIU4pfpCwh0ueq3S4O/5qXI1VwK1outmxhe9dOiEWqMz3MW2LKgDTpqWV+37IWuVbA==", "dev": true, - "license": "MIT", "bin": { "tsconfck": "bin/tsconfck.js" }, @@ -17406,13 +17406,14 @@ } }, "node_modules/vite-tsconfig-paths": { - "version": "4.3.1", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz", + "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^4.1.1", "globrex": "^0.1.2", - "tsconfck": "^3.0.1" + "tsconfck": "^3.0.3" }, "peerDependencies": { "vite": "*" diff --git a/web/package.json b/web/package.json index 1f20d25239..ed109e88d0 100644 --- a/web/package.json +++ b/web/package.json @@ -123,7 +123,7 @@ "tslib": "^2.6.2", "turnstile-types": "^1.2.0", "typescript": "^5.4.2", - "vite-tsconfig-paths": "^4.3.1" + "vite-tsconfig-paths": "^4.3.2" }, "optionalDependencies": { "@esbuild/darwin-arm64": "^0.20.1", From be1219a73f08d90495ea7b1902aabe65ba27ccd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 11:25:05 +0100 Subject: [PATCH 4/4] web: bump chromedriver from 122.0.5 to 122.0.6 in /tests/wdio (#8902) Bumps [chromedriver](https://github.com/giggio/node-chromedriver) from 122.0.5 to 122.0.6. - [Commits](https://github.com/giggio/node-chromedriver/compare/122.0.5...122.0.6) --- updated-dependencies: - dependency-name: chromedriver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tests/wdio/package-lock.json | 8 ++++---- tests/wdio/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/wdio/package-lock.json b/tests/wdio/package-lock.json index d56e019427..3c67d9df4d 100644 --- a/tests/wdio/package-lock.json +++ b/tests/wdio/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "@goauthentik/web-tests", "dependencies": { - "chromedriver": "^122.0.5" + "chromedriver": "^122.0.6" }, "devDependencies": { "@trivago/prettier-plugin-sort-imports": "^4.3.0", @@ -2081,9 +2081,9 @@ } }, "node_modules/chromedriver": { - "version": "122.0.5", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-122.0.5.tgz", - "integrity": "sha512-5WkCY4ioJZ1Qna6KWqPSrIz1MwGh6tHW7F67XTSbZn/GaMJrpiuy6b5c1BetrddSax+NX8u4tg4l3Wy1THecLQ==", + "version": "122.0.6", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-122.0.6.tgz", + "integrity": "sha512-Q0r+QlUtiJWMQ5HdYaFa0CtBmLFq3n5JWfmq9mOC00UMBvWxku09gUkvBt457QnYfTM/XHqY/HTFOxHvATnTmA==", "hasInstallScript": true, "dependencies": { "@testim/chrome-version": "^1.1.4", diff --git a/tests/wdio/package.json b/tests/wdio/package.json index 873ab81c22..0df50f6c1b 100644 --- a/tests/wdio/package.json +++ b/tests/wdio/package.json @@ -32,6 +32,6 @@ "node": ">=20" }, "dependencies": { - "chromedriver": "^122.0.5" + "chromedriver": "^122.0.6" } }