trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web/flows: improve handling of flow info 

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
Jens Langhammer 2023-01-25 15:01:08 +01:00
parent 3bf8c915d5
commit 1b6f920265
No known key found for this signature in database
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
web/src/flow/FlowExecutor.ts
View File

@ -27,7 +27,7 @@ import "@goauthentik/flow/stages/password/PasswordStage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, TemplateResult, css, html, render } from "lit"; import { CSSResult, TemplateResult, css, html, render } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property, state } from "lit/decorators.js";
import { unsafeHTML } from "lit/directives/unsafe-html.js"; import { unsafeHTML } from "lit/directives/unsafe-html.js";
import { until } from "lit/directives/until.js"; import { until } from "lit/directives/until.js";
@ -44,6 +44,7 @@ import {
CapabilitiesEnum, CapabilitiesEnum,
ChallengeChoices, ChallengeChoices,
ChallengeTypes, ChallengeTypes,
ContextualFlowInfo,
CurrentTenant, CurrentTenant,
FlowChallengeResponseRequest, FlowChallengeResponseRequest,
FlowErrorChallenge, FlowErrorChallenge,
@ -95,9 +96,28 @@ export class FlowExecutor extends AKElement implements StageHost {
@property({ attribute: false }) @property({ attribute: false })
tenant!: CurrentTenant; tenant!: CurrentTenant;
@property({ attribute: false }) @state()
inspectorOpen: boolean; inspectorOpen: boolean;
_flowInfo?: ContextualFlowInfo;
@state()
set flowInfo(value: ContextualFlowInfo | undefined) {
this._flowInfo = value;
if (!value) {
return;
}
this.shadowRoot
?.querySelectorAll<HTMLDivElement>(".pf-c-background-image")
.forEach((bg) => {
bg.style.setProperty("--ak-flow-background", `url('${value?.background}')`);
});
}
get flowInfo(): ContextualFlowInfo | undefined {
return this._flowInfo;
}
ws: WebsocketClient; ws: WebsocketClient;
static get styles(): CSSResult[] { static get styles(): CSSResult[] {
@ -168,14 +188,6 @@ export class FlowExecutor extends AKElement implements StageHost {
tenant().then((tenant) => (this.tenant = tenant)); tenant().then((tenant) => (this.tenant = tenant));
} }
setBackground(url: string): void {
this.shadowRoot
?.querySelectorAll<HTMLDivElement>(".pf-c-background-image")
.forEach((bg) => {
bg.style.setProperty("--ak-flow-background", `url('${url}')`);
});
}
submit(payload?: FlowChallengeResponseRequest): Promise<boolean> { submit(payload?: FlowChallengeResponseRequest): Promise<boolean> {
if (!payload) return Promise.reject(); if (!payload) return Promise.reject();
if (!this.challenge) return Promise.reject(); if (!this.challenge) return Promise.reject();
@ -198,6 +210,9 @@ export class FlowExecutor extends AKElement implements StageHost {
); );
} }
this.challenge = data; this.challenge = data;
if (this.challenge.flowInfo) {
this.flowInfo = this.challenge.flowInfo;
}
if (this.challenge.responseErrors) { if (this.challenge.responseErrors) {
return false; return false;
} }
@ -231,9 +246,8 @@ export class FlowExecutor extends AKElement implements StageHost {
); );
} }
this.challenge = challenge; this.challenge = challenge;
// Only set background on first update, flow won't change throughout execution if (this.challenge.flowInfo) {
if (this.challenge?.flowInfo?.background) { this.flowInfo = this.challenge.flowInfo;
this.setBackground(this.challenge.flowInfo.background);
} }
}) })
.catch((e: Error | ResponseError) => { .catch((e: Error | ResponseError) => {
@ -531,9 +545,7 @@ export class FlowExecutor extends AKElement implements StageHost {
>${t`Powered by authentik`}</a >${t`Powered by authentik`}</a
> >
</li> </li>
${this.challenge?.flowInfo?.background?.startsWith( ${this.flowInfo?.background?.startsWith("/static")
"/static",
)
? html` ? html`
<li> <li>
<a <a