keycloakify 9.6.7 → 10.0.0-rc.1

package/src/login/pages/LoginConfigTotp.tsx

@@ -17,6 +17,8 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
 
     const { msg, msgStr } = i18n;
 
+    // NOTE: We should edit the ftl_object_to_js_code_declaring_an_object.ftl
+    // so that we have access to getAlgorithmKey()
     const algToKeyUriAlg: Record<(typeof kcContext)["totp"]["policy"]["algorithm"], string> = {
         "HmacSHA1": "SHA1",
         "HmacSHA256": "SHA256",
@@ -37,7 +39,7 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
                         </ul>
                     </li>
 
-                    {mode && mode == "manual" ? (
+                    {mode == "manual" ? (
                         <>
                             <li>
                                 <p>{msg("loginTotpManualStep2")}</p>
@@ -146,6 +148,10 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
                         </div>
                     </div>
 
+                    <div className={getClassName("kcFormGroupClass")}>
+                        <LogoutOtherSessions {...{ getClassName, i18n }} />
+                    </div>
+
                     {isAppInitiatedAction ? (
                         <>
                             <input
@@ -186,3 +192,22 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
         </Template>
     );
 }
+
+function LogoutOtherSessions(props: { getClassName: ReturnType<typeof useGetClassName>["getClassName"]; i18n: I18n }) {
+    const { getClassName, i18n } = props;
+
+    const { msg } = i18n;
+
+    return (
+        <div id="kc-form-options" className={getClassName("kcFormOptionsClass")}>
+            <div className={getClassName("kcFormOptionsWrapperClass")}>
+                <div className="checkbox">
+                    <label>
+                        <input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" defaultChecked={true} />
+                        {msg("logoutOtherSessions")}
+                    </label>
+                </div>
+            </div>
+        </div>
+    );
+}

package/src/login/pages/{LoginDeviceVerifyUserCode.tsx → LoginOauth2DeviceVerifyUserCode.tsx}

@@ -4,7 +4,9 @@ import { KcContext } from "../kcContext";
 import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import { PageProps } from "./PageProps";
 
-export default function LoginOauthGrant(props: PageProps<Extract<KcContext, { pageId: "login-oauth2-device-verify-user-code.ftl" }>, I18n>) {
+export default function LoginOauth2DeviceVerifyUserCode(
+    props: PageProps<Extract<KcContext, { pageId: "login-oauth2-device-verify-user-code.ftl" }>, I18n>
+) {
     const { kcContext, i18n, doUseDefaultCss, classes, Template } = props;
     const { url } = kcContext;
 

package/src/login/pages/LoginOauthGrant.tsx

@@ -18,18 +18,54 @@ export default function LoginOauthGrant(props: PageProps<Extract<KcContext, { pa
     return (
         <Template
             {...{ kcContext, i18n, doUseDefaultCss, classes }}
-            headerNode={msg("oauthGrantTitle", client.name ? advancedMsgStr(client.name) : client.clientId)}
+            bodyClassName="oauth"
+            headerNode={
+                <>
+                    {client.attributes.logoUri && <img src={client.attributes.logoUri} />}
+                    <p>{client.name ? msg("oauthGrantTitle", advancedMsgStr(client.name)) : msg("oauthGrantTitle", client.clientId)}</p>
+                </>
+            }
         >
             <div id="kc-oauth" className="content-area">
                 <h3>{msg("oauthGrantRequest")}</h3>
                 <ul>
                     {oauth.clientScopesRequested.map(clientScope => (
                         <li key={clientScope.consentScreenText}>
-                            <span>{advancedMsg(clientScope.consentScreenText)}</span>
+                            <span>
+                                {advancedMsg(clientScope.consentScreenText)}
+                                {clientScope.dynamicScopeParameter && (
+                                    <>
+                                        : <b>{clientScope.dynamicScopeParameter}</b>
+                                    </>
+                                )}
+                            </span>
                         </li>
                     ))}
                 </ul>
 
+                {client.attributes.policyUri ||
+                    (client.attributes.tosUri && (
+                        <h3>
+                            {client.name ? msg("oauthGrantInformation", advancedMsgStr(client.name)) : msg("oauthGrantInformation", client.clientId)}
+                            {client.attributes.tosUri && (
+                                <>
+                                    {msg("oauthGrantReview")}
+                                    <a href={client.attributes.tosUri} target="_blank">
+                                        {msg("oauthGrantTos")}
+                                    </a>
+                                </>
+                            )}
+                            {client.attributes.policyUri && (
+                                <>
+                                    {msg("oauthGrantReview")}
+                                    <a href={client.attributes.policyUri} target="_blank">
+                                        {msg("oauthGrantPolicy")}
+                                    </a>
+                                </>
+                            )}
+                        </h3>
+                    ))}
+
                 <form className="form-actions" action={url.oauthAction} method="POST">
                     <input type="hidden" name="code" value={oauth.code} />
                     <div className={getClassName("kcFormGroupClass")}>

package/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 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
+                            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 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 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>
-                </form>
-            </Template>
-        </>
+                </div>
+            </form>
+        </Template>
     );
 }

package/src/login/pages/LoginPageExpired.tsx

@@ -10,7 +10,7 @@ export default function LoginPageExpired(props: PageProps<Extract<KcContext, { p
     const { msg } = i18n;
 
     return (
-        <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} displayMessage={false} headerNode={msg("pageExpiredTitle")}>
+        <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} headerNode={msg("pageExpiredTitle")}>
             <p id="instruction1" className="instruction">
                 {msg("pageExpiredMsg1")}
                 <a id="loginRestartLink" href={url.loginRestartFlowUrl}>

package/src/login/pages/LoginPassword.tsx

@@ -1,13 +1,12 @@
-import { useState } from "react";
+import { useState, useEffect, useReducer } from "react";
 import { clsx } from "keycloakify/tools/clsx";
-import { useConstCallback } from "keycloakify/tools/useConstCallback";
-import type { FormEventHandler } from "react";
+import { assert } from "tsafe/assert";
 import type { PageProps } from "keycloakify/login/pages/PageProps";
 import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
-export default function LoginPassword(props: PageProps<Extract<KcContext, { "pageId": "login-password.ftl" }>, I18n>) {
+export default function LoginPassword(props: PageProps<Extract<KcContext, { pageId: "login-password.ftl" }>, I18n>) {
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
@@ -15,42 +14,53 @@ export default function LoginPassword(props: PageProps<Extract<KcContext, { "pag
         classes
     });
 
-    const { realm, url, login } = kcContext;
+    const { realm, url, messagesPerField } = kcContext;
 
     const { msg, msgStr } = i18n;
 
     const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
 
-    const onSubmit = useConstCallback<FormEventHandler<HTMLFormElement>>(e => {
-        e.preventDefault();
-
-        setIsLoginButtonDisabled(true);
-
-        const formElement = e.target as HTMLFormElement;
-
-        formElement.submit();
-    });
-
     return (
-        <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} headerNode={msg("doLogIn")}>
+        <Template
+            {...{ kcContext, i18n, doUseDefaultCss, classes }}
+            headerNode={msg("doLogIn")}
+            displayMessage={!messagesPerField.existsError("password")}
+        >
             <div id="kc-form">
                 <div id="kc-form-wrapper">
-                    <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
-                        <div className={getClassName("kcFormGroupClass")}>
+                    <form
+                        id="kc-form-login"
+                        onSubmit={() => {
+                            setIsLoginButtonDisabled(true);
+                            return true;
+                        }}
+                        action={url.loginAction}
+                        method="post"
+                    >
+                        <div className={clsx(getClassName("kcFormGroupClass"), "no-bottom-margin")}>
                             <hr />
                             <label htmlFor="password" className={getClassName("kcLabelClass")}>
                                 {msg("password")}
                             </label>
-                            <input
-                                tabIndex={2}
-                                id="password"
-                                className={getClassName("kcInputClass")}
-                                name="password"
-                                type="password"
-                                autoFocus={true}
-                                autoComplete="on"
-                                defaultValue={login.password ?? ""}
-                            />
+
+                            <PasswordWrapper getClassName={getClassName} i18n={i18n} passwordInputId="password">
+                                <input
+                                    tabIndex={2}
+                                    id="password"
+                                    className={getClassName("kcInputClass")}
+                                    name="password"
+                                    type="password"
+                                    autoFocus
+                                    autoComplete="on"
+                                    aria-invalid={messagesPerField.existsError("username", "password")}
+                                />
+                            </PasswordWrapper>
+
+                            {messagesPerField.existsError("password") && (
+                                <span id="input-error-password" className={getClassName("kcInputErrorMessageClass")} aria-live="polite">
+                                    {messagesPerField.get("password")}
+                                </span>
+                            )}
                         </div>
                         <div className={clsx(getClassName("kcFormGroupClass"), getClassName("kcFormSettingClass"))}>
                             <div id="kc-form-options" />
@@ -86,3 +96,42 @@ export default function LoginPassword(props: PageProps<Extract<KcContext, { "pag
         </Template>
     );
 }
+
+function PasswordWrapper(props: {
+    getClassName: ReturnType<typeof useGetClassName>["getClassName"];
+    i18n: I18n;
+    passwordInputId: string;
+    children: JSX.Element;
+}) {
+    const { getClassName, i18n, passwordInputId, children } = props;
+
+    const { msgStr } = i18n;
+
+    const [isPasswordRevealed, toggleIsPasswordRevealed] = useReducer((isPasswordRevealed: boolean) => !isPasswordRevealed, false);
+
+    useEffect(() => {
+        const passwordInputElement = document.getElementById(passwordInputId);
+
+        assert(passwordInputElement instanceof HTMLInputElement);
+
+        passwordInputElement.type = isPasswordRevealed ? "text" : "password";
+    }, [isPasswordRevealed]);
+
+    return (
+        <div className={getClassName("kcInputGroup")}>
+            {children}
+            <button
+                type="button"
+                className={getClassName("kcFormPasswordVisibilityButtonClass")}
+                aria-label={msgStr(isPasswordRevealed ? "hidePassword" : "showPassword")}
+                aria-controls={passwordInputId}
+                onClick={toggleIsPasswordRevealed}
+            >
+                <i
+                    className={getClassName(isPasswordRevealed ? "kcFormPasswordVisibilityIconHide" : "kcFormPasswordVisibilityIconShow")}
+                    aria-hidden
+                />
+            </button>
+        </div>
+    );
+}