From ac8145c24962cb0986e077f4d1ae20ba48a6ad92 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens@goauthentik.io>
Date: Wed, 3 Jan 2024 19:05:00 +0100
Subject: [PATCH] fix order for validation stage

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
---
 .../AuthenticatorValidateStageForm.ts         | 57 ++++++++++---------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
index 8fc2816e6..1100c31f8 100644
--- a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
+++ b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
@@ -189,33 +189,6 @@ export class AuthenticatorValidateStageForm extends BaseStageForm<AuthenticatorV
                             </option>
                         </select>
                     </ak-form-element-horizontal>
-                    <ak-form-element-horizontal
-                        label=${msg("WebAuthn User verification")}
-                        ?required=${true}
-                        name="webauthnUserVerification"
-                    >
-                        <ak-radio
-                            .options=${[
-                                {
-                                    label: msg("User verification must occur."),
-                                    value: UserVerificationEnum.Required,
-                                    default: true,
-                                },
-                                {
-                                    label: msg(
-                                        "User verification is preferred if available, but not required.",
-                                    ),
-                                    value: UserVerificationEnum.Preferred,
-                                },
-                                {
-                                    label: msg("User verification should not occur."),
-                                    value: UserVerificationEnum.Discouraged,
-                                },
-                            ]}
-                            .value=${this.instance?.webauthnUserVerification}
-                        >
-                        </ak-radio>
-                    </ak-form-element-horizontal>
                     ${this.showConfigurationStages
                         ? html`
                               <ak-form-element-horizontal
@@ -247,9 +220,39 @@ export class AuthenticatorValidateStageForm extends BaseStageForm<AuthenticatorV
                                           "When multiple stages are selected, the user can choose which one they want to enroll.",
                                       )}
                                   </p>
+                                  <p class="pf-c-form__helper-text">
+                                      ${msg("Hold control/command to select multiple items.")}
+                                  </p>
                               </ak-form-element-horizontal>
                           `
                         : html``}
+                    <ak-form-element-horizontal
+                        label=${msg("WebAuthn User verification")}
+                        ?required=${true}
+                        name="webauthnUserVerification"
+                    >
+                        <ak-radio
+                            .options=${[
+                                {
+                                    label: msg("User verification must occur."),
+                                    value: UserVerificationEnum.Required,
+                                    default: true,
+                                },
+                                {
+                                    label: msg(
+                                        "User verification is preferred if available, but not required.",
+                                    ),
+                                    value: UserVerificationEnum.Preferred,
+                                },
+                                {
+                                    label: msg("User verification should not occur."),
+                                    value: UserVerificationEnum.Discouraged,
+                                },
+                            ]}
+                            .value=${this.instance?.webauthnUserVerification}
+                        >
+                        </ak-radio>
+                    </ak-form-element-horizontal>
                 </div>
             </ak-form-group>`;
     }