From 16cfa8cae2a7f629a4737245af10747bfdc2f53f Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 24 Aug 2021 20:13:05 +0200 Subject: [PATCH] web/admin: add ServiceAccount creation form Signed-off-by: Jens Langhammer --- web/src/elements/forms/ModalForm.ts | 30 +++++--- web/src/locales/en.po | 24 +++++++ web/src/locales/pseudo-LOCALE.po | 24 +++++++ web/src/pages/users/ServiceAccountForm.ts | 87 +++++++++++++++++++++++ web/src/pages/users/UserListPage.ts | 9 +++ 5 files changed, 163 insertions(+), 11 deletions(-) create mode 100644 web/src/pages/users/ServiceAccountForm.ts diff --git a/web/src/elements/forms/ModalForm.ts b/web/src/elements/forms/ModalForm.ts index 9809287e4..80d58a790 100644 --- a/web/src/elements/forms/ModalForm.ts +++ b/web/src/elements/forms/ModalForm.ts @@ -11,9 +11,15 @@ export class ModalForm extends ModalButton { @property({ type: Boolean }) closeAfterSuccessfulSubmit = true; + @property({ type: Boolean }) + showSubmitButton = true; + @property({ type: Boolean }) loading = false; + @property({ type: String }) + cancelText = t`Cancel`; + confirm(): Promise { const form = this.querySelector>("[slot=form]"); if (!form) { @@ -60,16 +66,18 @@ export class ModalForm extends ModalButton {
- { - this.loading = true; - this.locked = true; - return this.confirm(); - }} - class="pf-m-primary" - > -   + ${this.showSubmitButton + ? html` { + this.loading = true; + this.locked = true; + return this.confirm(); + }} + class="pf-m-primary" + > +  ` + : html``} { this.resetForms(); @@ -77,7 +85,7 @@ export class ModalForm extends ModalButton { }} class="pf-m-secondary" > - ${t`Cancel`} + ${this.cancelText}
`; } diff --git a/web/src/locales/en.po b/web/src/locales/en.po index 95ab42d42..9f63b92c1 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -723,6 +723,7 @@ msgid "Client type" msgstr "Client type" #: src/pages/outposts/OutpostDeploymentModal.ts +#: src/pages/users/UserListPage.ts msgid "Close" msgstr "Close" @@ -957,6 +958,7 @@ msgstr "Copy recovery link" #: src/pages/user-settings/tokens/UserTokenList.ts #: src/pages/users/UserListPage.ts #: src/pages/users/UserListPage.ts +#: src/pages/users/UserListPage.ts msgid "Create" msgstr "Create" @@ -1018,6 +1020,11 @@ msgstr "Create Policy" msgid "Create Prompt" msgstr "Create Prompt" +#: src/pages/users/UserListPage.ts +#: src/pages/users/UserListPage.ts +msgid "Create Service account" +msgstr "Create Service account" + #: src/pages/flows/BoundStagesList.ts msgid "Create Stage" msgstr "Create Stage" @@ -1040,6 +1047,10 @@ msgstr "Create Token" msgid "Create User" msgstr "Create User" +#: src/pages/users/ServiceAccountForm.ts +msgid "Create group" +msgstr "Create group" + #: src/pages/applications/ApplicationForm.ts msgid "Create provider" msgstr "Create provider" @@ -1455,6 +1466,10 @@ msgstr "Enable compatibility mode, increases compatibility with password manager msgid "Enabled" msgstr "Enabled" +#: src/pages/users/ServiceAccountForm.ts +msgid "Enabling this toggle will create a group named after the user, with the user as member." +msgstr "Enabling this toggle will create a group named after the user, with the user as member." + #: src/pages/flows/FlowForm.ts msgid "Enrollment" msgstr "Enrollment" @@ -2915,6 +2930,7 @@ msgstr "Passing" #: src/flows/stages/identification/IdentificationStage.ts #: src/flows/stages/identification/IdentificationStage.ts #: src/flows/stages/password/PasswordStage.ts +#: src/pages/users/ServiceAccountForm.ts msgid "Password" msgstr "Password" @@ -3329,6 +3345,7 @@ msgid "Required" msgstr "Required" #: src/pages/user-settings/UserSelfForm.ts +#: src/pages/users/ServiceAccountForm.ts #: src/pages/users/UserForm.ts msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." @@ -3973,6 +3990,7 @@ msgstr "Successfully created token." msgid "Successfully created transport." msgstr "Successfully created transport." +#: src/pages/users/ServiceAccountForm.ts #: src/pages/users/UserForm.ts msgid "Successfully created user." msgstr "Successfully created user." @@ -4726,6 +4744,10 @@ msgstr "Use the user's email address, but deny enrollment when the email address msgid "Use the user's username, but deny enrollment when the username already exists." msgstr "Use the user's username, but deny enrollment when the username already exists." +#: src/pages/users/ServiceAccountForm.ts +msgid "Use the username and password below to authenticate. The password can be retrieved later on the Tokens page." +msgstr "Use the username and password below to authenticate. The password can be retrieved later on the Tokens page." + #: src/pages/providers/proxy/ProxyProviderForm.ts msgid "Use this provider with nginx's auth_request or traefik's forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /akprox must be routed to the outpost (when using a manged outpost, this is done for you)." msgstr "Use this provider with nginx's auth_request or traefik's forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /akprox must be routed to the outpost (when using a manged outpost, this is done for you)." @@ -4849,6 +4871,8 @@ msgstr "Userinfo URL" #: src/pages/policies/reputation/UserReputationListPage.ts #: src/pages/stages/identification/IdentificationStageForm.ts #: src/pages/user-settings/UserSelfForm.ts +#: src/pages/users/ServiceAccountForm.ts +#: src/pages/users/ServiceAccountForm.ts #: src/pages/users/UserForm.ts #: src/pages/users/UserListPage.ts #: src/pages/users/UserViewPage.ts diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 21142156d..03c24fbee 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -717,6 +717,7 @@ msgid "Client type" msgstr "" #: src/pages/outposts/OutpostDeploymentModal.ts +#: src/pages/users/UserListPage.ts msgid "Close" msgstr "" @@ -951,6 +952,7 @@ msgstr "" #: src/pages/user-settings/tokens/UserTokenList.ts #: src/pages/users/UserListPage.ts #: src/pages/users/UserListPage.ts +#: src/pages/users/UserListPage.ts msgid "Create" msgstr "" @@ -1012,6 +1014,11 @@ msgstr "" msgid "Create Prompt" msgstr "" +#: src/pages/users/UserListPage.ts +#: src/pages/users/UserListPage.ts +msgid "Create Service account" +msgstr "" + #: src/pages/flows/BoundStagesList.ts msgid "Create Stage" msgstr "" @@ -1034,6 +1041,10 @@ msgstr "" msgid "Create User" msgstr "" +#: src/pages/users/ServiceAccountForm.ts +msgid "Create group" +msgstr "" + #: src/pages/applications/ApplicationForm.ts msgid "Create provider" msgstr "" @@ -1447,6 +1458,10 @@ msgstr "" msgid "Enabled" msgstr "" +#: src/pages/users/ServiceAccountForm.ts +msgid "Enabling this toggle will create a group named after the user, with the user as member." +msgstr "" + #: src/pages/flows/FlowForm.ts msgid "Enrollment" msgstr "" @@ -2907,6 +2922,7 @@ msgstr "" #: src/flows/stages/identification/IdentificationStage.ts #: src/flows/stages/identification/IdentificationStage.ts #: src/flows/stages/password/PasswordStage.ts +#: src/pages/users/ServiceAccountForm.ts msgid "Password" msgstr "" @@ -3321,6 +3337,7 @@ msgid "Required" msgstr "" #: src/pages/user-settings/UserSelfForm.ts +#: src/pages/users/ServiceAccountForm.ts #: src/pages/users/UserForm.ts msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" @@ -3965,6 +3982,7 @@ msgstr "" msgid "Successfully created transport." msgstr "" +#: src/pages/users/ServiceAccountForm.ts #: src/pages/users/UserForm.ts msgid "Successfully created user." msgstr "" @@ -4711,6 +4729,10 @@ msgstr "" msgid "Use the user's username, but deny enrollment when the username already exists." msgstr "" +#: src/pages/users/ServiceAccountForm.ts +msgid "Use the username and password below to authenticate. The password can be retrieved later on the Tokens page." +msgstr "" + #: src/pages/providers/proxy/ProxyProviderForm.ts msgid "Use this provider with nginx's auth_request or traefik's forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /akprox must be routed to the outpost (when using a manged outpost, this is done for you)." msgstr "" @@ -4834,6 +4856,8 @@ msgstr "" #: src/pages/policies/reputation/UserReputationListPage.ts #: src/pages/stages/identification/IdentificationStageForm.ts #: src/pages/user-settings/UserSelfForm.ts +#: src/pages/users/ServiceAccountForm.ts +#: src/pages/users/ServiceAccountForm.ts #: src/pages/users/UserForm.ts #: src/pages/users/UserListPage.ts #: src/pages/users/UserViewPage.ts diff --git a/web/src/pages/users/ServiceAccountForm.ts b/web/src/pages/users/ServiceAccountForm.ts new file mode 100644 index 000000000..fc533d259 --- /dev/null +++ b/web/src/pages/users/ServiceAccountForm.ts @@ -0,0 +1,87 @@ +import { CoreApi, UserServiceAccountRequest, UserServiceAccountResponse } from "@goauthentik/api"; +import { t } from "@lingui/macro"; +import { customElement, property } from "lit-element"; +import { html, TemplateResult } from "lit-html"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import "../../elements/forms/HorizontalFormElement"; +import { Form } from "../../elements/forms/Form"; +import { ModalForm } from "../../elements/forms/ModalForm"; +import { ifDefined } from "lit-html/directives/if-defined"; + +@customElement("ak-user-service-account") +export class ServiceAccountForm extends Form { + @property({ attribute: false }) + result?: UserServiceAccountResponse; + + getSuccessMessage(): string { + return t`Successfully created user.`; + } + + send = (data: UserServiceAccountRequest): Promise => { + return new CoreApi(DEFAULT_CONFIG) + .coreUsersServiceAccountCreate({ + userServiceAccountRequest: data, + }) + .then((result) => { + this.result = result; + (this.parentElement as ModalForm).showSubmitButton = false; + return result; + }); + }; + + resetForm(): void { + super.resetForm(); + this.result = undefined; + } + + renderRequestForm(): TemplateResult { + return html`
+ + +

+ ${t`Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.`} +

+ + +
+ + +
+

+ ${t`Enabling this toggle will create a group named after the user, with the user as member.`} +

+ +
`; + } + + renderResponseForm(): TemplateResult { + return html`

+ ${t`Use the username and password below to authenticate. The password can be retrieved later on the Tokens page.`} +

+
+ + + + + + +
`; + } + + renderForm(): TemplateResult { + if (this.result) { + return this.renderResponseForm(); + } + return this.renderRequestForm(); + } +} diff --git a/web/src/pages/users/UserListPage.ts b/web/src/pages/users/UserListPage.ts index de1a1041d..d5e62277a 100644 --- a/web/src/pages/users/UserListPage.ts +++ b/web/src/pages/users/UserListPage.ts @@ -14,6 +14,7 @@ import "../../elements/forms/DeleteBulkForm"; import "./UserActiveForm"; import "./UserForm"; import "./UserResetEmailForm"; +import "./ServiceAccountForm"; import { showMessage } from "../../elements/messages/MessageContainer"; import { MessageLevel } from "../../elements/messages/Message"; import { first } from "../../utils"; @@ -247,6 +248,14 @@ export class UserListPage extends TablePage { + + ${t`Create`} + ${t`Create Service account`} + + + ${super.renderToolbar()} `; }