From 259dbbae36a9b4ea5f5becdda4bd98af6704ee98 Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Sat, 11 May 2024 01:13:09 +0200
Subject: [PATCH] Update the login-otp.ftl page

---
 src/login/Fallback.tsx           |   4 +-
 src/login/kcContext/KcContext.ts |   6 +-
 src/login/pages/LoginOtp.tsx     | 140 ++++++++++++++++---------------
 3 files changed, 81 insertions(+), 69 deletions(-)

diff --git a/src/login/Fallback.tsx b/src/login/Fallback.tsx
index 07c59e47..94b24dc7 100644
--- a/src/login/Fallback.tsx
+++ b/src/login/Fallback.tsx
@@ -13,7 +13,7 @@ const Error = lazy(() => import("keycloakify/login/pages/Error"));
 const LoginResetPassword = lazy(() => import("keycloakify/login/pages/LoginResetPassword"));
 const LoginVerifyEmail = lazy(() => import("keycloakify/login/pages/LoginVerifyEmail"));
 const Terms = lazy(() => import("keycloakify/login/pages/Terms"));
-const LoginDeviceVerifyUserCode = lazy(() => import("keycloakify/login/pages/LoginOauth2DeviceVerifyUserCode"));
+const LoginOauth2DeviceVerifyUserCode = lazy(() => import("keycloakify/login/pages/LoginOauth2DeviceVerifyUserCode"));
 const LoginOauthGrant = lazy(() => import("keycloakify/login/pages/LoginOauthGrant"));
 const LoginOtp = lazy(() => import("keycloakify/login/pages/LoginOtp"));
 const LoginPassword = lazy(() => import("keycloakify/login/pages/LoginPassword"));
@@ -63,7 +63,7 @@ export default function Fallback(props: FallbackProps) {
                     case "terms.ftl":
                         return <Terms kcContext={kcContext} {...rest} />;
                     case "login-oauth2-device-verify-user-code.ftl":
-                        return <LoginDeviceVerifyUserCode kcContext={kcContext} {...rest} />;
+                        return <LoginOauth2DeviceVerifyUserCode kcContext={kcContext} {...rest} />;
                     case "login-oauth-grant.ftl":
                         return <LoginOauthGrant kcContext={kcContext} {...rest} />;
                     case "login-otp.ftl":
diff --git a/src/login/kcContext/KcContext.ts b/src/login/kcContext/KcContext.ts
index e8b68b54..15146652 100644
--- a/src/login/kcContext/KcContext.ts
+++ b/src/login/kcContext/KcContext.ts
@@ -273,7 +273,11 @@ export declare namespace KcContext {
     export type LoginOtp = Common & {
         pageId: "login-otp.ftl";
         otpLogin: {
-            userOtpCredentials: { id: string; userLabel: string }[];
+            userOtpCredentials: {
+                id: string;
+                userLabel: string;
+            }[];
+            selectedCredentialId?: string;
         };
     };
 
diff --git a/src/login/pages/LoginOtp.tsx b/src/login/pages/LoginOtp.tsx
index 3dc8419b..8dbe637f 100644
--- a/src/login/pages/LoginOtp.tsx
+++ b/src/login/pages/LoginOtp.tsx
@@ -1,3 +1,4 @@
+import { Fragment } from "react";
 import { clsx } from "keycloakify/tools/clsx";
 import type { PageProps } from "keycloakify/login/pages/PageProps";
 import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
@@ -12,81 +13,88 @@ export default function LoginOtp(props: PageProps<Extract<KcContext, { pageId: "
         classes
     });
 
-    const { otpLogin, url } = kcContext;
+    const { otpLogin, url, messagesPerField } = kcContext;
 
     const { msg, msgStr } = i18n;
 
     return (
-        <>
-            <style>
-                {`
-                input[type="radio"]:checked~label.kcSelectOTPListClass{
-                    border: 2px solid #39a5dc;
-                }`}
-            </style>
-            <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} headerNode={msg("doLogIn")}>
-                <form id="kc-otp-login-form" className={getClassName("kcFormClass")} action={url.loginAction} method="post">
-                    {otpLogin.userOtpCredentials.length > 1 && (
-                        <div className={getClassName("kcFormGroupClass")}>
-                            <div className={getClassName("kcInputWrapperClass")}>
-                                {otpLogin.userOtpCredentials.map((otpCredential, index) => (
-                                    <div key={otpCredential.id}>
-                                        <input
-                                            id={`kc-otp-credential-${index}`}
-                                            name="selectedCredentialId"
-                                            type="radio"
-                                            value={otpCredential.id}
-                                            style={{ display: "none" }}
-                                        />
-                                        <label
-                                            htmlFor={`kc-otp-credential-${index}`}
-                                            key={otpCredential.id}
-                                            className={getClassName("kcSelectOTPListClass")}
-                                        >
-                                            <div className={getClassName("kcSelectOTPListItemClass")}>
-                                                <span className={getClassName("kcAuthenticatorOtpCircleClass")} />
-                                                <h2 className={getClassName("kcSelectOTPItemHeadingClass")}>{otpCredential.userLabel}</h2>
-                                            </div>
-                                        </label>
-                                    </div>
-                                ))}
-                            </div>
-                        </div>
-                    )}
+        <Template
+            {...{ kcContext, i18n, doUseDefaultCss, classes }}
+            displayMessage={!messagesPerField.existsError("totp")}
+            headerNode={msg("doLogIn")}
+        >
+            <form id="kc-otp-login-form" className={clsx(getClassName("kcFormClass"))} action={url.loginAction} method="post">
+                {otpLogin.userOtpCredentials.length > 1 && (
                     <div className={getClassName("kcFormGroupClass")}>
-                        <div className={getClassName("kcLabelWrapperClass")}>
-                            <label htmlFor="otp" className={getClassName("kcLabelClass")}>
-                                {msg("loginOtpOneTime")}
-                            </label>
-                        </div>
-
                         <div className={getClassName("kcInputWrapperClass")}>
-                            <input id="otp" name="otp" autoComplete="off" type="text" className={getClassName("kcInputClass")} autoFocus />
+                            {otpLogin.userOtpCredentials.map((otpCredential, index) => (
+                                <Fragment key={index}>
+                                    <input
+                                        id={`kc-otp-credential-${index}`}
+                                        className={getClassName("kcLoginOTPListInputClass")}
+                                        type="radio"
+                                        name="selectedCredentialId"
+                                        value={otpCredential.id}
+                                        defaultChecked={otpCredential.id === otpLogin.selectedCredentialId}
+                                    />
+                                    <label htmlFor={`kc-otp-credential-${index}`} className={getClassName("kcLoginOTPListClass")} tabIndex={index}>
+                                        <span className={getClassName("kcLoginOTPListItemHeaderClass")}>
+                                            <span className={getClassName("kcLoginOTPListItemIconBodyClass")}>
+                                                <i className={getClassName("kcLoginOTPListItemIconClass")} aria-hidden="true"></i>
+                                            </span>
+                                            <span className={getClassName("kcLoginOTPListItemTitleClass")}>{otpCredential.userLabel}</span>
+                                        </span>
+                                    </label>
+                                </Fragment>
+                            ))}
                         </div>
                     </div>
+                )}
 
-                    <div className={getClassName("kcFormGroupClass")}>
-                        <div id="kc-form-options" className={getClassName("kcFormOptionsClass")}>
-                            <div className={getClassName("kcFormOptionsWrapperClass")} />
-                        </div>
-
-                        <div id="kc-form-buttons" className={getClassName("kcFormButtonsClass")}>
-                            <input
-                                className={clsx(
-                                    getClassName("kcButtonClass"),
-                                    getClassName("kcButtonPrimaryClass"),
-                                    getClassName("kcButtonBlockClass"),
-                                    getClassName("kcButtonLargeClass")
-                                )}
-                                name="login"
-                                id="kc-login"
-                                type="submit"
-                                value={msgStr("doLogIn")}
-                            />
-                        </div>
+                <div className={getClassName("kcFormGroupClass")}>
+                    <div className={getClassName("kcLabelWrapperClass")}>
+                        <label htmlFor="otp" className={getClassName("kcLabelClass")}>
+                            {msg("loginOtpOneTime")}
+                        </label>
                     </div>
-                </form>
-            </Template>
-        </>
+                    <div className={getClassName("kcInputWrapperClass")}>
+                        <input
+                            id="otp"
+                            name="otp"
+                            autoComplete="off"
+                            type="text"
+                            className={getClassName("kcInputClass")}
+                            autoFocus
+                            aria-invalid={messagesPerField.existsError("totp")}
+                        />
+                        {messagesPerField.existsError("totp") && (
+                            <span id="input-error-otp-code" className={getClassName("kcInputErrorMessageClass")} aria-live="polite">
+                                {messagesPerField.get("totp")}
+                            </span>
+                        )}
+                    </div>
+                </div>
+
+                <div className={getClassName("kcFormGroupClass")}>
+                    <div id="kc-form-options" className={getClassName("kcFormOptionsClass")}>
+                        <div className={getClassName("kcFormOptionsWrapperClass")}></div>
+                    </div>
+                    <div id="kc-form-buttons" className={getClassName("kcFormButtonsClass")}>
+                        <input
+                            className={clsx(
+                                getClassName("kcButtonClass"),
+                                getClassName("kcButtonPrimaryClass"),
+                                getClassName("kcButtonBlockClass"),
+                                getClassName("kcButtonLargeClass")
+                            )}
+                            name="login"
+                            id="kc-login"
+                            type="submit"
+                            value={msgStr("doLogIn")}
+                        />
+                    </div>
+                </div>
+            </form>
+        </Template>
     );
 }