web/flows: update types

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

authentik/stages/prompt/stage.py

@@ -44,7 +44,7 @@ class PromptChallenge(Challenge):
     component = CharField(default="ak-stage-prompt")
 
 
-class PromptResponseChallenge(ChallengeResponse):
+class PromptChallengeResponse(ChallengeResponse):
     """Validate response, fields are dynamically created based
     on the stage"""
 
@@ -159,7 +159,7 @@ class ListPolicyEngine(PolicyEngine):
 class PromptStageView(ChallengeStageView):
     """Prompt Stage, save form data in plan context."""
 
-    response_class = PromptResponseChallenge
+    response_class = PromptChallengeResponse
 
     def get_challenge(self, *args, **kwargs) -> Challenge:
         fields = list(self.executor.current_stage.fields.all().order_by("order"))
@@ -174,7 +174,7 @@ class PromptStageView(ChallengeStageView):
     def get_response_instance(self, data: QueryDict) -> ChallengeResponse:
         if not self.executor.plan:
             raise ValueError
-        return PromptResponseChallenge(
+        return PromptChallengeResponse(
             instance=None,
             data=data,
             stage=self.executor.current_stage,

authentik/stages/prompt/tests.py

@@ -13,7 +13,7 @@ from authentik.flows.planner import FlowPlan
 from authentik.flows.views import SESSION_KEY_PLAN
 from authentik.policies.expression.models import ExpressionPolicy
 from authentik.stages.prompt.models import FieldTypes, Prompt, PromptStage
-from authentik.stages.prompt.stage import PLAN_CONTEXT_PROMPT, PromptResponseChallenge
+from authentik.stages.prompt.stage import PLAN_CONTEXT_PROMPT, PromptChallengeResponse
 
 
 class TestPromptStage(TestCase):
@@ -112,7 +112,7 @@ class TestPromptStage(TestCase):
             self.assertIn(prompt.label, force_str(response.content))
             self.assertIn(prompt.placeholder, force_str(response.content))
 
-    def test_valid_challenge_with_policy(self) -> PromptResponseChallenge:
+    def test_valid_challenge_with_policy(self) -> PromptChallengeResponse:
         """Test challenge_response validation"""
         plan = FlowPlan(
             flow_pk=self.flow.pk.hex, stages=[self.stage], markers=[StageMarker()]
@@ -123,13 +123,13 @@ class TestPromptStage(TestCase):
         )
         self.stage.validation_policies.set([expr_policy])
         self.stage.save()
-        challenge_response = PromptResponseChallenge(
+        challenge_response = PromptChallengeResponse(
             None, stage=self.stage, plan=plan, data=self.prompt_data
         )
         self.assertEqual(challenge_response.is_valid(), True)
         return challenge_response
 
-    def test_invalid_challenge(self) -> PromptResponseChallenge:
+    def test_invalid_challenge(self) -> PromptChallengeResponse:
         """Test challenge_response validation"""
         plan = FlowPlan(
             flow_pk=self.flow.pk.hex, stages=[self.stage], markers=[StageMarker()]
@@ -140,7 +140,7 @@ class TestPromptStage(TestCase):
         )
         self.stage.validation_policies.set([expr_policy])
         self.stage.save()
-        challenge_response = PromptResponseChallenge(
+        challenge_response = PromptChallengeResponse(
             None, stage=self.stage, plan=plan, data=self.prompt_data
         )
         self.assertEqual(challenge_response.is_valid(), False)

schema.yml

@@ -16807,7 +16807,7 @@ components:
       - $ref: '#/components/schemas/IdentificationChallengeResponseRequest'
       - $ref: '#/components/schemas/PasswordChallengeResponseRequest'
       - $ref: '#/components/schemas/PlexAuthenticationChallengeResponseRequest'
-      - $ref: '#/components/schemas/PromptResponseChallengeRequest'
+      - $ref: '#/components/schemas/PromptChallengeResponseRequest'
       discriminator:
         propertyName: component
         mapping:
@@ -16824,7 +16824,7 @@ components:
           ak-stage-identification: '#/components/schemas/IdentificationChallengeResponseRequest'
           ak-stage-password: '#/components/schemas/PasswordChallengeResponseRequest'
           ak-flow-sources-plex: '#/components/schemas/PlexAuthenticationChallengeResponseRequest'
-          ak-stage-prompt: '#/components/schemas/PromptResponseChallengeRequest'
+          ak-stage-prompt: '#/components/schemas/PromptChallengeResponseRequest'
     FlowDesignationEnum:
       enum:
       - authentication
@@ -22995,6 +22995,15 @@ components:
       required:
       - fields
       - type
+    PromptChallengeResponseRequest:
+      type: object
+      description: |-
+        Validate response, fields are dynamically created based
+        on the stage
+      properties:
+        component:
+          type: string
+          default: ak-stage-prompt
     PromptRequest:
       type: object
       description: Prompt Serializer
@@ -23024,15 +23033,6 @@ components:
       - field_key
       - label
       - type
-    PromptResponseChallengeRequest:
-      type: object
-      description: |-
-        Validate response, fields are dynamically created based
-        on the stage
-      properties:
-        component:
-          type: string
-          default: ak-stage-prompt
     PromptStage:
       type: object
       description: PromptStage Serializer

web/src/flows/FlowExecutor.ts

@@ -34,6 +34,7 @@ import { PFSize } from "../elements/Spinner";
 import { TITLE_DEFAULT } from "../constants";
 import { configureSentry } from "../api/Sentry";
 import { ChallengeResponseRequest } from "authentik-api/dist/models/ChallengeResponseRequest";
+import { FlowChallengeResponseRequest } from "authentik-api/src";
 
 
 @customElement("ak-flow-executor")
@@ -77,9 +78,6 @@ export class FlowExecutor extends LitElement implements StageHost {
 
     constructor() {
         super();
-        this.addEventListener("ak-flow-submit", () => {
-            this.submit();
-        });
         this.flowSlug = window.location.pathname.split("/")[3];
     }
 
@@ -100,12 +98,14 @@ export class FlowExecutor extends LitElement implements StageHost {
     }
 
     submit(payload: ChallengeResponseRequest): Promise<void> {
-        payload.component = this.challenge.component;
+        // @ts-ignore
+        payload.component = this.challenge?.component;
+        console.log(payload);
         this.loading = true;
         return new FlowsApi(DEFAULT_CONFIG).flowsExecutorSolve({
             flowSlug: this.flowSlug,
             query: window.location.search.substring(1),
-            challengeResponseRequest: payload,
+            flowChallengeResponseRequest: payload as FlowChallengeResponseRequest,
         }).then((data) => {
             this.challenge = data;
             this.postUpdate();
@@ -142,7 +142,7 @@ export class FlowExecutor extends LitElement implements StageHost {
     }
 
     errorMessage(error: string): void {
-        this.challenge = <ShellChallenge>{
+        this.challenge = {
             type: ChallengeChoices.Shell,
             body: `<header class="pf-c-login__main-header">
                 <h1 class="pf-c-title pf-m-3xl">
@@ -162,7 +162,7 @@ export class FlowExecutor extends LitElement implements StageHost {
                     </li>
                 </ul>
             </footer>`
-        };
+        } as Challenge;
     }
 
     renderLoading(): TemplateResult {

web/src/flows/access_denied/FlowAccessDenied.ts

@@ -1,5 +1,5 @@
 import { AccessDeniedChallenge } from "authentik-api";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
 import { BaseStage } from "../stages/base";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFTitle from "@patternfly/patternfly/components/Title/title.css";
@@ -11,12 +11,10 @@ import AKGlobal from "../../authentik.css";
 import { t } from "@lingui/macro";
 
 import "../../elements/EmptyState";
+import { FlowChallengeResponseRequest } from "authentik-api/src";
 
 @customElement("ak-stage-access-denied")
-export class FlowAccessDenied extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: AccessDeniedChallenge;
+export class FlowAccessDenied extends BaseStage<AccessDeniedChallenge, FlowChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFList, PFFormControl, PFTitle, AKGlobal];

web/src/flows/sources/plex/PlexLoginInit.ts

@@ -7,7 +7,7 @@ import PFTitle from "@patternfly/patternfly/components/Title/title.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import AKGlobal from "../../../authentik.css";
-import { CSSResult, customElement, property } from "lit-element";
+import { CSSResult, customElement } from "lit-element";
 import { html, TemplateResult } from "lit-html";
 import { BaseStage } from "../../stages/base";
 import { PlexAPIClient, popupCenterScreen } from "./API";
@@ -15,13 +15,11 @@ import { DEFAULT_CONFIG } from "../../../api/Config";
 import { SourcesApi } from "authentik-api";
 import { showMessage } from "../../../elements/messages/MessageContainer";
 import { MessageLevel } from "../../../elements/messages/Message";
+import { PlexAuthenticationChallengeResponseRequest } from "authentik-api/dist/models/PlexAuthenticationChallengeResponseRequest";
 
 
 @customElement("ak-flow-sources-plex")
-export class PlexLoginInit extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: PlexAuthenticationChallenge;
+export class PlexLoginInit extends BaseStage<PlexAuthenticationChallenge, PlexAuthenticationChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFButton, PFTitle, AKGlobal];

web/src/flows/stages/authenticator_duo/AuthenticatorDuoStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -14,12 +14,10 @@ import "../../FormStatic";
 import { FlowURLManager } from "../../../api/legacy";
 import { AuthenticatorDuoChallenge, StagesApi } from "authentik-api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
+import { AuthenticatorDuoChallengeResponseRequest } from "authentik-api/dist/models/AuthenticatorDuoChallengeResponseRequest";
 
 @customElement("ak-stage-authenticator-duo")
-export class AuthenticatorDuoStage extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: AuthenticatorDuoChallenge;
+export class AuthenticatorDuoStage extends BaseStage<AuthenticatorDuoChallenge, AuthenticatorDuoChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFTitle, PFButton, AKGlobal];

web/src/flows/stages/authenticator_static/AuthenticatorStaticStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { css, CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { css, CSSResult, customElement, html, TemplateResult } from "lit-element";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -13,6 +13,7 @@ import "../../../elements/EmptyState";
 import "../../FormStatic";
 import { FlowURLManager } from "../../../api/legacy";
 import { AuthenticatorStaticChallenge } from "authentik-api";
+import { AuthenticatorStaticChallengeResponseRequest } from "authentik-api/dist/models/AuthenticatorStaticChallengeResponseRequest";
 
 export const STATIC_TOKEN_STYLE = css`
 /* Static OTP Tokens */
@@ -31,10 +32,7 @@ export const STATIC_TOKEN_STYLE = css`
 
 
 @customElement("ak-stage-authenticator-static")
-export class AuthenticatorStaticStage extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: AuthenticatorStaticChallenge;
+export class AuthenticatorStaticStage extends BaseStage<AuthenticatorStaticChallenge, AuthenticatorStaticChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFTitle, PFButton, AKGlobal, STATIC_TOKEN_STYLE];

web/src/flows/stages/authenticator_totp/AuthenticatorTOTPStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -15,14 +15,11 @@ import "../../../elements/EmptyState";
 import "../../FormStatic";
 import { MessageLevel } from "../../../elements/messages/Message";
 import { FlowURLManager } from "../../../api/legacy";
-import { AuthenticatorTOTPChallenge } from "authentik-api";
+import { AuthenticatorTOTPChallenge, AuthenticatorTOTPChallengeResponseRequest } from "authentik-api";
 
 
 @customElement("ak-stage-authenticator-totp")
-export class AuthenticatorTOTPStage extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: AuthenticatorTOTPChallenge;
+export class AuthenticatorTOTPStage extends BaseStage<AuthenticatorTOTPChallenge, AuthenticatorTOTPChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFTitle, PFButton, AKGlobal];

web/src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts

@@ -12,9 +12,8 @@ import "./AuthenticatorValidateStageWebAuthn";
 import "./AuthenticatorValidateStageCode";
 import "./AuthenticatorValidateStageDuo";
 import { PasswordManagerPrefill } from "../identification/IdentificationStage";
-import { DeviceChallenge } from "authentik-api";
+import { AuthenticatorValidationChallengeResponseRequest, DeviceChallenge } from "authentik-api";
 import { AuthenticatorValidationChallenge } from "authentik-api/dist/models/AuthenticatorValidationChallenge";
-import { ChallengeResponseRequest } from "authentik-api/dist/models/ChallengeResponseRequest";
 
 export enum DeviceClasses {
     STATIC = "static",
@@ -24,15 +23,12 @@ export enum DeviceClasses {
 }
 
 @customElement("ak-stage-authenticator-validate")
-export class AuthenticatorValidateStage extends BaseStage implements StageHost {
-
-    @property({ attribute: false })
-    challenge?: AuthenticatorValidationChallenge;
+export class AuthenticatorValidateStage extends BaseStage<AuthenticatorValidationChallenge, AuthenticatorValidationChallengeResponseRequest> implements StageHost {
 
     @property({attribute: false})
     selectedDeviceChallenge?: DeviceChallenge;
 
-    submit(payload: ChallengeResponseRequest): Promise<void> {
+    submit(payload: AuthenticatorValidationChallengeResponseRequest): Promise<void> {
         return this.host?.submit(payload) || Promise.resolve();
     }
 
@@ -130,21 +126,21 @@ export class AuthenticatorValidateStage extends BaseStage implements StageHost {
         case DeviceClasses.STATIC:
         case DeviceClasses.TOTP:
             return html`<ak-stage-authenticator-validate-code
-                .host=${this as StageHost}
+                .host=${this}
                 .challenge=${this.challenge}
                 .deviceChallenge=${this.selectedDeviceChallenge}
                 .showBackButton=${(this.challenge?.deviceChallenges.length || []) > 1}>
             </ak-stage-authenticator-validate-code>`;
         case DeviceClasses.WEBAUTHN:
             return html`<ak-stage-authenticator-validate-webauthn
-                .host=${this as StageHost}
+                .host=${this}
                 .challenge=${this.challenge}
                 .deviceChallenge=${this.selectedDeviceChallenge}
                 .showBackButton=${(this.challenge?.deviceChallenges.length || []) > 1}>
             </ak-stage-authenticator-validate-webauthn>`;
         case DeviceClasses.DUO:
             return html`<ak-stage-authenticator-validate-duo
-                .host=${this as StageHost}
+                .host=${this}
                 .challenge=${this.challenge}
                 .deviceChallenge=${this.selectedDeviceChallenge}
                 .showBackButton=${(this.challenge?.deviceChallenges.length || []) > 1}>

web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts

@@ -15,13 +15,10 @@ import { PasswordManagerPrefill } from "../identification/IdentificationStage";
 import "../../FormStatic";
 import { FlowURLManager } from "../../../api/legacy";
 import { AuthenticatorValidationChallenge } from "authentik-api/dist/models/AuthenticatorValidationChallenge";
-import { DeviceChallenge } from "authentik-api";
+import { AuthenticatorValidationChallengeResponseRequest, DeviceChallenge } from "authentik-api";
 
 @customElement("ak-stage-authenticator-validate-code")
-export class AuthenticatorValidateStageWebCode extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: AuthenticatorValidationChallenge;
+export class AuthenticatorValidateStageWebCode extends BaseStage<AuthenticatorValidationChallenge, AuthenticatorValidationChallengeResponseRequest> {
 
     @property({ attribute: false })
     deviceChallenge?: DeviceChallenge;

web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts

@@ -14,13 +14,10 @@ import "../../../elements/EmptyState";
 import "../../FormStatic";
 import { FlowURLManager } from "../../../api/legacy";
 import { AuthenticatorValidationChallenge } from "authentik-api/dist/models/AuthenticatorValidationChallenge";
-import { DeviceChallenge } from "authentik-api";
+import { AuthenticatorValidationChallengeResponseRequest, DeviceChallenge } from "authentik-api";
 
 @customElement("ak-stage-authenticator-validate-duo")
-export class AuthenticatorValidateStageWebDuo extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: AuthenticatorValidationChallenge;
+export class AuthenticatorValidateStageWebDuo extends BaseStage<AuthenticatorValidationChallenge, AuthenticatorValidationChallengeResponseRequest> {
 
     @property({ attribute: false })
     deviceChallenge?: DeviceChallenge;

web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts

@@ -12,13 +12,10 @@ import { transformAssertionForServer, transformCredentialRequestOptions } from "
 import { BaseStage } from "../base";
 import { AuthenticatorValidateStage } from "./AuthenticatorValidateStage";
 import { AuthenticatorValidationChallenge } from "authentik-api/dist/models/AuthenticatorValidationChallenge";
-import { DeviceChallenge } from "authentik-api";
+import { AuthenticatorValidationChallengeResponseRequest, DeviceChallenge } from "authentik-api";
 
 @customElement("ak-stage-authenticator-validate-webauthn")
-export class AuthenticatorValidateStageWebAuthn extends BaseStage {
-
-    @property({attribute: false})
-    challenge?: AuthenticatorValidationChallenge;
+export class AuthenticatorValidateStageWebAuthn extends BaseStage<AuthenticatorValidationChallenge, AuthenticatorValidationChallengeResponseRequest> {
 
     @property({attribute: false})
     deviceChallenge?: DeviceChallenge;
@@ -62,9 +59,9 @@ export class AuthenticatorValidateStageWebAuthn extends BaseStage {
 
         // post the assertion to the server for verification.
         try {
-            const formData = new FormData();
-            formData.set("webauthn", JSON.stringify(transformedAssertionForServer));
-            await this.host?.submit(formData);
+            await this.host?.submit({
+                webauthn: transformedAssertionForServer
+            });
         } catch (err) {
             throw new Error(t`Error when validating assertion on server: ${err}`);
         }

web/src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts

@@ -10,17 +10,14 @@ import AKGlobal from "../../../authentik.css";
 import { PFSize } from "../../../elements/Spinner";
 import { BaseStage } from "../base";
 import { Assertion, transformCredentialCreateOptions, transformNewAssertionForServer } from "./utils";
-import { AuthenticatorWebAuthnChallenge } from "authentik-api";
+import { AuthenticatorWebAuthnChallenge, AuthenticatorWebAuthnChallengeResponseRequest } from "authentik-api";
 
 export interface WebAuthnAuthenticatorRegisterChallengeResponse {
     response: Assertion;
 }
 
 @customElement("ak-stage-authenticator-webauthn")
-export class WebAuthnAuthenticatorRegisterStage extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: AuthenticatorWebAuthnChallenge;
+export class WebAuthnAuthenticatorRegisterStage extends BaseStage<AuthenticatorWebAuthnChallenge, AuthenticatorWebAuthnChallengeResponseRequest> {
 
     @property({type: Boolean})
     registerRunning = false;

web/src/flows/stages/autosubmit/AutosubmitStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -10,12 +10,10 @@ import AKGlobal from "../../../authentik.css";
 import { BaseStage } from "../base";
 import "../../../elements/EmptyState";
 import { AutosubmitChallenge } from "authentik-api";
+import { AutoSubmitChallengeResponseRequest } from "authentik-api/dist/models/AutoSubmitChallengeResponseRequest";
 
 @customElement("ak-stage-autosubmit")
-export class AutosubmitStage extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: AutosubmitChallenge;
+export class AutosubmitStage extends BaseStage<AutosubmitChallenge, AutoSubmitChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFButton, PFTitle, AKGlobal];

web/src/flows/stages/base.ts

@@ -1,16 +1,16 @@
-import { Challenge } from "authentik-api";
-import { ChallengeResponseRequest } from "authentik-api/dist/models/ChallengeResponseRequest";
-import { LitElement } from "lit-element";
+import { LitElement, property } from "lit-element";
 
 export interface StageHost {
-    challenge?: Challenge;
-    submit(payload: ChallengeResponseRequest): Promise<void>;
+    challenge?: unknown;
+    submit(payload: unknown): Promise<void>;
 }
 
-export class BaseStage extends LitElement {
+export class BaseStage<Tin, Tout> extends LitElement {
 
-    host?: StageHost;
-    challenge!: Challenge;
+    host!: StageHost;
+
+    @property({ attribute: false })
+    challenge!: Tin;
 
     submitForm(e: Event): void {
         e.preventDefault();
@@ -19,7 +19,7 @@ export class BaseStage extends LitElement {
         } = {};
         const form = new FormData(this.shadowRoot?.querySelector("form") || undefined);
         form.forEach((value, key) => object[key] = value);
-        this.host?.submit(object as unknown as ChallengeResponseRequest);
+        this.host?.submit(object as unknown as Tout);
     }
 
 }

web/src/flows/stages/captcha/CaptchaStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -13,13 +13,10 @@ import "../../../elements/forms/FormElement";
 import "../../../elements/EmptyState";
 import "../../FormStatic";
 import { FlowURLManager } from "../../../api/legacy";
-import { CaptchaChallenge } from "authentik-api";
+import { CaptchaChallenge, CaptchaChallengeResponseRequest } from "authentik-api";
 
 @customElement("ak-stage-captcha")
-export class CaptchaStage extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: CaptchaChallenge;
+export class CaptchaStage extends BaseStage<CaptchaChallenge, CaptchaChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFTitle, PFButton, AKGlobal];

web/src/flows/stages/consent/ConsentStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -11,14 +11,11 @@ import { BaseStage } from "../base";
 import "../../../elements/EmptyState";
 import "../../FormStatic";
 import { FlowURLManager } from "../../../api/legacy";
-import { ConsentChallenge } from "authentik-api";
+import { ConsentChallenge, ConsentChallengeResponseRequest } from "authentik-api";
 
 
 @customElement("ak-stage-consent")
-export class ConsentStage extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: ConsentChallenge;
+export class ConsentStage extends BaseStage<ConsentChallenge, ConsentChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFTitle, PFButton, AKGlobal];

web/src/flows/stages/dummy/DummyStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -10,13 +10,10 @@ import AKGlobal from "../../../authentik.css";
 import { BaseStage } from "../base";
 import "../../../elements/EmptyState";
 import "../../FormStatic";
-import { DummyChallenge } from "authentik-api";
+import { DummyChallenge, DummyChallengeResponseRequest } from "authentik-api";
 
 @customElement("ak-stage-dummy")
-export class DummyStage extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: DummyChallenge;
+export class DummyStage extends BaseStage<DummyChallenge, DummyChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFTitle, PFButton, AKGlobal];

web/src/flows/stages/email/EmailStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -9,13 +9,10 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import AKGlobal from "../../../authentik.css";
 import { BaseStage } from "../base";
 import "../../../elements/EmptyState";
-import { EmailChallenge } from "authentik-api";
+import { EmailChallenge, EmailChallengeResponseRequest } from "authentik-api";
 
 @customElement("ak-stage-email")
-export class EmailStage extends BaseStage {
-
-    @property({ attribute: false })
-    challenge?: EmailChallenge;
+export class EmailStage extends BaseStage<EmailChallenge, EmailChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFButton, PFTitle, AKGlobal];

web/src/flows/stages/identification/IdentificationStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { css, CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { css, CSSResult, customElement, html, TemplateResult } from "lit-element";
 import { BaseStage } from "../base";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
@@ -10,7 +10,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import AKGlobal from "../../../authentik.css";
 import "../../../elements/forms/FormElement";
 import "../../../elements/EmptyState";
-import { IdentificationChallenge, UILoginButton } from "authentik-api";
+import { Challenge, IdentificationChallenge, IdentificationChallengeResponseRequest, UILoginButton } from "authentik-api";
 
 export const PasswordManagerPrefill: {
     password: string | undefined;
@@ -22,10 +22,7 @@ export const PasswordManagerPrefill: {
 
 
 @customElement("ak-stage-identification")
-export class IdentificationStage extends BaseStage {
-
-    @property({attribute: false})
-    challenge?: IdentificationChallenge;
+export class IdentificationStage extends BaseStage<IdentificationChallenge, IdentificationChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFTitle, PFButton, AKGlobal].concat(
@@ -119,7 +116,7 @@ export class IdentificationStage extends BaseStage {
         return html`<li class="pf-c-login__main-footer-links-item">
                 <button type="button" @click=${() => {
                     if (!this.host) return;
-                    this.host.challenge = source.challenge;
+                    this.host.challenge = source.challenge as Challenge;
                 }}>
                     ${icon}
                 </button>

web/src/flows/stages/password/PasswordStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -13,13 +13,10 @@ import "../../../elements/EmptyState";
 import { PasswordManagerPrefill } from "../identification/IdentificationStage";
 import "../../FormStatic";
 import { FlowURLManager } from "../../../api/legacy";
-import { PasswordChallenge } from "authentik-api";
+import { PasswordChallenge, PasswordChallengeResponseRequest } from "authentik-api";
 
 @customElement("ak-stage-password")
-export class PasswordStage extends BaseStage {
-
-    @property({attribute: false})
-    challenge?: PasswordChallenge;
+export class PasswordStage extends BaseStage<PasswordChallenge, PasswordChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFForm, PFFormControl, PFButton, PFTitle, AKGlobal];

web/src/flows/stages/prompt/PromptStage.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, TemplateResult } from "lit-element";
 import { unsafeHTML } from "lit-html/directives/unsafe-html";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
@@ -14,14 +14,12 @@ import "../../../elements/forms/FormElement";
 import "../../../elements/EmptyState";
 import "../../../elements/Divider";
 import { Error } from "../../../api/Flows";
-import { Prompt, PromptChallenge, StagePrompt } from "authentik-api";
+import { PromptChallenge, StagePrompt } from "authentik-api";
+import { PromptChallengeResponseRequest } from "authentik-api/src/models/PromptChallengeResponseRequest";
 
 
 @customElement("ak-stage-prompt")
-export class PromptStage extends BaseStage {
-
-    @property({attribute: false})
-    challenge?: PromptChallenge;
+export class PromptStage extends BaseStage<PromptChallenge, PromptChallengeResponseRequest> {
 
     static get styles(): CSSResult[] {
         return [PFBase, PFLogin, PFAlert, PFForm, PFFormControl, PFTitle, PFButton, AKGlobal];