habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source 
* main:
  web: bump chromedriver from 122.0.5 to 122.0.6 in /tests/wdio (#8902)
  web: bump vite-tsconfig-paths from 4.3.1 to 4.3.2 in /web (#8903)
  core: bump google.golang.org/protobuf from 1.32.0 to 1.33.0 (#8901)
  web: provide InstallID on EnterpriseListPage (#8898)
This commit is contained in:
Ken Sternberg
2024-03-14 08:14:43 -07:00
parent 2d0117d096 be1219a73f
commit 22cb5b7379
7 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -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
)

4
go.sum
View File

@ -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=

8
tests/wdio/package-lock.json generated
View File

@ -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",

2
tests/wdio/package.json
View File

@ -32,6 +32,6 @@
"node": ">=20"
},
"dependencies": {
"chromedriver": "^122.0.5"
"chromedriver": "^122.0.6"
}
}

15
web/package-lock.json generated
View File

@ -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": "*"

2
web/package.json
View File

@ -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",

50
web/src/admin/enterprise/EnterpriseLicenseListPage.ts
View File

@ -158,22 +158,7 @@ export class EnterpriseLicenseListPage extends TablePage<License> {
<div
class="pf-l-grid pf-m-gutter pf-m-all-6-col-on-sm pf-m-all-4-col-on-md pf-m-all-3-col-on-lg pf-m-all-3-col-on-xl"
>
<div class="pf-l-grid__item pf-c-card">
<div class="pf-c-card__title">${msg("Get a license")}</div>
<div class="pf-c-card__body">
${this.installID
? html` <a
target="_blank"
href=${`https://customers.goauthentik.io/from_authentik/purchase/?install_id=${encodeURIComponent(
this.installID,
)}&authentik_url=${encodeURI(window.location.origin)}`}
class="pf-c-button pf-m-primary pf-m-block"
>${msg("Go to Customer Portal")}</a
>`
: html`<ak-spinner></ak-spinner>`}
</div>
</div>
${this.renderGetLicenseCard()}
<ak-aggregate-card
class="pf-l-grid__item"
icon="pf-icon pf-icon-user"
@ -249,6 +234,39 @@ export class EnterpriseLicenseListPage extends TablePage<License> {
];
}
renderGetLicenseCard() {
const renderSpinner = () =>
html` <div class="pf-c-card__body">
<ak-spinner></ak-spinner>
</div>`;
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`
<div class="pf-c-card__title">${msg("Get a license")}</div>
<div class="pf-c-card__body">
<a
target="_blank"
href="${installURL(installID)}"
class="pf-c-button pf-m-primary pf-m-block"
>${msg("Go to Customer Portal")}</a
>
</div>
<div class="pf-c-card__title">${msg("Your Install ID")}</div>
<div class="pf-c-card__body">${installID}</div>
`;
return html`<div class="pf-l-grid__item pf-c-card">
${this.installID ? renderCard(this.installID) : renderSpinner()}
</div> `;
}
renderObjectCreate(): TemplateResult {
return html`
<ak-forms-modal>