From f228e5044316c12042eeca3ff70053c8b9834725 Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Sat, 11 May 2024 17:17:35 +0200
Subject: [PATCH] Update login-reset-password.ftl page

---
 src/login/kcContext/KcContext.ts       |  4 ++++
 src/login/pages/LoginResetPassword.tsx | 15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/login/kcContext/KcContext.ts b/src/login/kcContext/KcContext.ts
index 7b6fde05..cbe77c3b 100644
--- a/src/login/kcContext/KcContext.ts
+++ b/src/login/kcContext/KcContext.ts
@@ -222,10 +222,14 @@ export declare namespace KcContext {
         pageId: "login-reset-password.ftl";
         realm: {
             loginWithEmailAllowed: boolean;
+            duplicateEmailsAllowed: boolean;
         };
         url: {
             loginResetCredentialsUrl: string;
         };
+        auth: {
+            attemptedUsername?: string;
+        };
     };
 
     export type LoginVerifyEmail = Common & {
diff --git a/src/login/pages/LoginResetPassword.tsx b/src/login/pages/LoginResetPassword.tsx
index 3fcc1de5..b07f27fc 100644
--- a/src/login/pages/LoginResetPassword.tsx
+++ b/src/login/pages/LoginResetPassword.tsx
@@ -12,16 +12,17 @@ export default function LoginResetPassword(props: PageProps<Extract<KcContext, {
         classes
     });
 
-    const { url, realm, auth } = kcContext;
+    const { url, realm, auth, messagesPerField } = kcContext;
 
     const { msg, msgStr } = i18n;
 
     return (
         <Template
             {...{ kcContext, i18n, doUseDefaultCss, classes }}
-            displayMessage={false}
+            displayInfo
+            displayMessage={!messagesPerField.existsError("username")}
+            infoNode={realm.duplicateEmailsAllowed ? msg("emailInstructionUsername") : msg("emailInstruction")}
             headerNode={msg("emailForgotTitle")}
-            infoNode={msg("emailInstruction")}
         >
             <form id="kc-reset-password-form" className={getClassName("kcFormClass")} action={url.loginAction} method="post">
                 <div className={getClassName("kcFormGroupClass")}>
@@ -41,8 +42,14 @@ export default function LoginResetPassword(props: PageProps<Extract<KcContext, {
                             name="username"
                             className={getClassName("kcInputClass")}
                             autoFocus
-                            defaultValue={auth !== undefined && auth.showUsername ? auth.attemptedUsername : undefined}
+                            defaultValue={auth.attemptedUsername ?? ""}
+                            aria-invalid={messagesPerField.existsError("username")}
                         />
+                        {messagesPerField.existsError("username") && (
+                            <span id="input-error-username" className={getClassName("kcInputErrorMessageClass")} aria-live="polite">
+                                {messagesPerField.get("username")}
+                            </span>
+                        )}
                     </div>
                 </div>
                 <div className={clsx(getClassName("kcFormGroupClass"), getClassName("kcFormSettingClass"))}>