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

*: add clear param to file upload API to delete stored file and reset field

Browse Source 
closes #949

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer
2021-06-05 21:33:03 +02:00
parent 277c2f4aad
commit f5dbdbd48b
7 changed files with 121 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/src/locales/en.po
View File

@ -593,6 +593,10 @@ msgstr "Clear Flow cache"
msgid "Clear Policy cache"
msgstr "Clear Policy cache"
#: src/pages/flows/FlowForm.ts
msgid "Clear background image"
msgstr "Clear background image"
#: src/pages/flows/FlowListPage.ts
#: src/pages/flows/FlowListPage.ts
#: src/pages/policies/PolicyListPage.ts
@ -600,6 +604,10 @@ msgstr "Clear Policy cache"
msgid "Clear cache"
msgstr "Clear cache"
#: src/pages/applications/ApplicationForm.ts
msgid "Clear icon"
msgstr "Clear icon"
#: src/elements/forms/HorizontalFormElement.ts
msgid "Click to change value"
msgstr "Click to change value"
@ -948,6 +956,7 @@ msgstr "Created {0}"
msgid "Creation Date"
msgstr "Creation Date"
#: src/pages/applications/ApplicationForm.ts
#: src/pages/flows/FlowForm.ts
msgid "Currently set to:"
msgstr "Currently set to:"
@ -1040,6 +1049,14 @@ msgstr "Delete Session"
msgid "Delete account"
msgstr "Delete account"
#: src/pages/flows/FlowForm.ts
msgid "Delete currently set background image."
msgstr "Delete currently set background image."
#: src/pages/applications/ApplicationForm.ts
msgid "Delete currently set icon."
msgstr "Delete currently set icon."
#: src/pages/sources/saml/SAMLSourceForm.ts
msgid "Delete temporary users after"
msgstr "Delete temporary users after"
@ -1744,6 +1761,7 @@ msgstr "IP"
msgid "IP Reputation"
msgstr "IP Reputation"
#: src/pages/applications/ApplicationForm.ts
#: src/pages/applications/ApplicationForm.ts
msgid "Icon"
msgstr "Icon"

18
web/src/locales/pseudo-LOCALE.po
View File

@ -587,6 +587,10 @@ msgstr ""
msgid "Clear Policy cache"
msgstr ""
#:
msgid "Clear background image"
msgstr ""
#:
#:
#:
@ -594,6 +598,10 @@ msgstr ""
msgid "Clear cache"
msgstr ""
#:
msgid "Clear icon"
msgstr ""
#:
msgid "Click to change value"
msgstr ""
@ -942,6 +950,7 @@ msgstr ""
msgid "Creation Date"
msgstr ""
#:
#:
msgid "Currently set to:"
msgstr ""
@ -1034,6 +1043,14 @@ msgstr ""
msgid "Delete account"
msgstr ""
#:
msgid "Delete currently set background image."
msgstr ""
#:
msgid "Delete currently set icon."
msgstr ""
#:
msgid "Delete temporary users after"
msgstr ""
@ -1736,6 +1753,7 @@ msgstr ""
msgid "IP Reputation"
msgstr ""
#:
#:
msgid "Icon"
msgstr ""

24
web/src/pages/applications/ApplicationForm.ts
View File

@ -27,6 +27,9 @@ export class ApplicationForm extends ModelForm<Application, string> {
@property({ attribute: false })
provider?: number;
@property({ type: Boolean })
clearIcon = false;
getSuccessMessage(): string {
if (this.instance) {
return t`Successfully updated application.`;
@ -54,11 +57,12 @@ export class ApplicationForm extends ModelForm<Application, string> {
return config().then((c) => {
if (c.capabilities.includes(CapabilitiesEnum.SaveMedia)) {
const icon = this.getFormFile();
if (icon) {
if (icon || this.clearIcon) {
return writeOp.then(app => {
return new CoreApi(DEFAULT_CONFIG).coreApplicationsSetIconCreate({
slug: app.slug,
file: icon
file: icon,
clear: this.clearIcon,
});
});
}
@ -186,7 +190,21 @@ export class ApplicationForm extends ModelForm<Application, string> {
${this.instance?.metaIcon ? html`
<p class="pf-c-form__helper-text">${t`Currently set to:`} ${this.instance?.metaIcon}</p>
`: html``}
</ak-form-element-horizontal>`;
</ak-form-element-horizontal>
${this.instance?.metaIcon ? html`
<ak-form-element-horizontal>
<div class="pf-c-check">
<input type="checkbox" class="pf-c-check__input" @change=${(ev: Event) => {
const target = ev.target as HTMLInputElement;
this.clearIcon = target.checked;
}}>
<label class="pf-c-check__label">
${t`Clear icon`}
</label>
</div>
<p class="pf-c-form__helper-text">${t`Delete currently set icon.`}</p>
</ak-form-element-horizontal>
`: html``}`;
}
return html`<ak-form-element-horizontal
label=${t`Icon`}

26
web/src/pages/flows/FlowForm.ts
View File

@ -1,6 +1,6 @@
import { Flow, FlowDesignationEnum, PolicyEngineMode, FlowsApi, CapabilitiesEnum } from "authentik-api";
import { t } from "@lingui/macro";
import { customElement } from "lit-element";
import { customElement, property } from "lit-element";
import { html, TemplateResult } from "lit-html";
import { config, DEFAULT_CONFIG } from "../../api/Config";
import { ifDefined } from "lit-html/directives/if-defined";
@ -26,6 +26,9 @@ export class FlowForm extends ModelForm<Flow, string> {
}
}
@property({ type: Boolean })
clearBackground = false;
send = (data: Flow): Promise<void | Flow> => {
let writeOp: Promise<Flow>;
if (this.instance) {
@ -41,11 +44,12 @@ export class FlowForm extends ModelForm<Flow, string> {
return config().then((c) => {
if (c.capabilities.includes(CapabilitiesEnum.SaveMedia)) {
const icon = this.getFormFile();
if (icon) {
if (icon || this.clearBackground) {
return writeOp.then(app => {
return new FlowsApi(DEFAULT_CONFIG).flowsInstancesSetBackgroundCreate({
slug: app.slug,
file: icon
file: icon,
clear: this.clearBackground,
});
});
}
@ -143,7 +147,21 @@ export class FlowForm extends ModelForm<Flow, string> {
<p class="pf-c-form__helper-text">${t`Currently set to:`} ${this.instance?.background}</p>
`: html``}
<p class="pf-c-form__helper-text">${t`Background shown during execution.`}</p>
</ak-form-element-horizontal>`;
</ak-form-element-horizontal>
${this.instance?.background ? html`
<ak-form-element-horizontal>
<div class="pf-c-check">
<input type="checkbox" class="pf-c-check__input" @change=${(ev: Event) => {
const target = ev.target as HTMLInputElement;
this.clearBackground = target.checked;
}}>
<label class="pf-c-check__label">
${t`Clear background image`}
</label>
</div>
<p class="pf-c-form__helper-text">${t`Delete currently set background image.`}</p>
</ak-form-element-horizontal>
`: html``}`;
}
return html`<ak-form-element-horizontal
label=${t`Background`}