From c4caef4c38d4845897bdd9d7e0192689b4a22a8a Mon Sep 17 00:00:00 2001
From: "Jens L." <jens@goauthentik.io>
Date: Wed, 16 Oct 2024 17:19:06 +0200
Subject: [PATCH] web/admin: fix duplicate flow labels (#11689)

* web/admin: fix duplicate flow labels

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

* format

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

---------

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
---
 ...lication-wizard-authentication-by-oauth.ts | 18 +-----------------
 .../proxy/AuthenticationByProxyPage.ts        | 19 +------------------
 ...rd-authentication-by-saml-configuration.ts | 18 +-----------------
 .../admin/providers/ldap/LDAPProviderForm.ts  |  9 +++++++--
 web/src/elements/AppIcon.ts                   |  2 +-
 5 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/web/src/admin/applications/wizard/methods/oauth/ak-application-wizard-authentication-by-oauth.ts b/web/src/admin/applications/wizard/methods/oauth/ak-application-wizard-authentication-by-oauth.ts
index d57cbd5908..14700b1506 100644
--- a/web/src/admin/applications/wizard/methods/oauth/ak-application-wizard-authentication-by-oauth.ts
+++ b/web/src/admin/applications/wizard/methods/oauth/ak-application-wizard-authentication-by-oauth.ts
@@ -70,22 +70,6 @@ export class ApplicationWizardAuthenticationByOauth extends BaseProviderPanel {
                     required
                 ></ak-text-input>
 
-                <ak-form-element-horizontal
-                    name="authenticationFlow"
-                    label=${msg("Authentication flow")}
-                    .errorMessages=${errors?.authenticationFlow ?? []}
-                >
-                    <ak-flow-search
-                        flowType=${FlowsInstancesListDesignationEnum.Authentication}
-                        .currentFlow=${provider?.authenticationFlow}
-                        required
-                    ></ak-flow-search>
-                    <p class="pf-c-form__helper-text">
-                        ${msg(
-                            "Flow used when a user access this provider and is not authenticated.",
-                        )}
-                    </p>
-                </ak-form-element-horizontal>
                 <ak-form-element-horizontal
                     name="authorizationFlow"
                     label=${msg("Authorization flow")}
@@ -103,7 +87,7 @@ export class ApplicationWizardAuthenticationByOauth extends BaseProviderPanel {
                 </ak-form-element-horizontal>
                 <ak-form-element-horizontal
                     name="invalidationFlow"
-                    label=${msg("Authorization flow")}
+                    label=${msg("Invalidation flow")}
                     .errorMessages=${errors?.invalidationFlow ?? []}
                     ?required=${true}
                 >
diff --git a/web/src/admin/applications/wizard/methods/proxy/AuthenticationByProxyPage.ts b/web/src/admin/applications/wizard/methods/proxy/AuthenticationByProxyPage.ts
index 725fe1e5a4..4ac7d01cb5 100644
--- a/web/src/admin/applications/wizard/methods/proxy/AuthenticationByProxyPage.ts
+++ b/web/src/admin/applications/wizard/methods/proxy/AuthenticationByProxyPage.ts
@@ -104,23 +104,6 @@ export class AkTypeProxyApplicationWizardPage extends BaseProviderPanel {
                     label=${msg("Name")}
                 ></ak-text-input>
 
-                <ak-form-element-horizontal
-                    label=${msg("Authentication flow")}
-                    ?required=${false}
-                    .errorMessages=${errors?.authenticationFlow ?? []}
-                    name="authenticationFlow"
-                >
-                    <ak-flow-search
-                        flowType=${FlowsInstancesListDesignationEnum.Authentication}
-                        .currentFlow=${this.instance?.authenticationFlow}
-                        required
-                    ></ak-flow-search>
-                    <p class="pf-c-form__helper-text">
-                        ${msg(
-                            "Flow used when a user access this provider and is not authenticated.",
-                        )}
-                    </p>
-                </ak-form-element-horizontal>
                 <ak-form-element-horizontal
                     label=${msg("Authorization flow")}
                     required
@@ -138,7 +121,7 @@ export class AkTypeProxyApplicationWizardPage extends BaseProviderPanel {
                 </ak-form-element-horizontal>
                 <ak-form-element-horizontal
                     name="invalidationFlow"
-                    label=${msg("Authorization flow")}
+                    label=${msg("Invalidation flow")}
                     .errorMessages=${errors?.invalidationFlow ?? []}
                     ?required=${true}
                 >
diff --git a/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-configuration.ts b/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-configuration.ts
index a2ca32cecf..844024f20f 100644
--- a/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-configuration.ts
+++ b/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-configuration.ts
@@ -88,22 +88,6 @@ export class ApplicationWizardProviderSamlConfiguration extends BaseProviderPane
                     .errorMessages=${errors?.name ?? []}
                 ></ak-text-input>
 
-                <ak-form-element-horizontal
-                    label=${msg("Authentication flow")}
-                    ?required=${false}
-                    name="authenticationFlow"
-                    .errorMessages=${errors?.authenticationFlow ?? []}
-                >
-                    <ak-flow-search
-                        flowType=${FlowsInstancesListDesignationEnum.Authentication}
-                        .currentFlow=${provider?.authenticationFlow}
-                    ></ak-flow-search>
-                    <p class="pf-c-form__helper-text">
-                        ${msg(
-                            "Flow used when a user access this provider and is not authenticated.",
-                        )}
-                    </p>
-                </ak-form-element-horizontal>
                 <ak-form-element-horizontal
                     label=${msg("Authorization flow")}
                     ?required=${true}
@@ -121,7 +105,7 @@ export class ApplicationWizardProviderSamlConfiguration extends BaseProviderPane
                 </ak-form-element-horizontal>
                 <ak-form-element-horizontal
                     name="invalidationFlow"
-                    label=${msg("Authorization flow")}
+                    label=${msg("Invalidation flow")}
                     .errorMessages=${errors?.invalidationFlow ?? []}
                     ?required=${true}
                 >
diff --git a/web/src/admin/providers/ldap/LDAPProviderForm.ts b/web/src/admin/providers/ldap/LDAPProviderForm.ts
index 69828add78..3d81f23076 100644
--- a/web/src/admin/providers/ldap/LDAPProviderForm.ts
+++ b/web/src/admin/providers/ldap/LDAPProviderForm.ts
@@ -135,8 +135,8 @@ export class LDAPProviderFormPage extends WithBrandConfig(BaseProviderForm<LDAPP
                 <div slot="body" class="pf-c-form">
                     <ak-form-element-horizontal
                         label=${msg("Bind flow")}
-                        ?required=${true}
                         name="authorizationFlow"
+                        required
                     >
                         <ak-branded-flow-search
                             flowType=${FlowsInstancesListDesignationEnum.Authentication}
@@ -148,10 +148,15 @@ export class LDAPProviderFormPage extends WithBrandConfig(BaseProviderForm<LDAPP
                             ${msg("Flow used for users to authenticate.")}
                         </p>
                     </ak-form-element-horizontal>
-                    <ak-form-element-horizontal label=${msg("Unbind flow")} name="invalidationFlow">
+                    <ak-form-element-horizontal
+                        label=${msg("Unbind flow")}
+                        name="invalidationFlow"
+                        required
+                    >
                         <ak-flow-search
                             flowType=${FlowsInstancesListDesignationEnum.Invalidation}
                             .currentFlow=${this.instance?.invalidationFlow}
+                            required
                         ></ak-flow-search>
                         <p class="pf-c-form__helper-text">
                             ${msg("Flow used for unbinding users.")}
diff --git a/web/src/elements/AppIcon.ts b/web/src/elements/AppIcon.ts
index 31118a1518..e9cfbb36ee 100644
--- a/web/src/elements/AppIcon.ts
+++ b/web/src/elements/AppIcon.ts
@@ -23,7 +23,7 @@ export class AppIcon extends AKElement implements IAppIcon {
     @property({ type: String })
     icon?: string;
 
-    @property()
+    @property({ reflect: true })
     size: PFSize = PFSize.Medium;
 
     static get styles(): CSSResult[] {