keycloakify 6.4.3 → 6.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "6.4.3",
+    "version": "6.6.1",
     "description": "Keycloak theme generator for Reacts app",
     "repository": {
         "type": "git",
@@ -70,9 +70,11 @@
         "src/lib/components/LoginIdpLinkEmail.tsx",
         "src/lib/components/LoginOtp.tsx",
         "src/lib/components/LoginPageExpired.tsx",
+        "src/lib/components/LoginPassword.tsx",
         "src/lib/components/LoginResetPassword.tsx",
         "src/lib/components/LoginUpdatePassword.tsx",
         "src/lib/components/LoginUpdateProfile.tsx",
+        "src/lib/components/LoginUsername.tsx",
         "src/lib/components/LoginVerifyEmail.tsx",
         "src/lib/components/LogoutConfirm.tsx",
         "src/lib/components/Register.tsx",
@@ -467,6 +469,9 @@
         "lib/components/LoginPageExpired.d.ts",
         "lib/components/LoginPageExpired.js",
         "lib/components/LoginPageExpired.js.map",
+        "lib/components/LoginPassword.d.ts",
+        "lib/components/LoginPassword.js",
+        "lib/components/LoginPassword.js.map",
         "lib/components/LoginResetPassword.d.ts",
         "lib/components/LoginResetPassword.js",
         "lib/components/LoginResetPassword.js.map",
@@ -476,6 +481,9 @@
         "lib/components/LoginUpdateProfile.d.ts",
         "lib/components/LoginUpdateProfile.js",
         "lib/components/LoginUpdateProfile.js.map",
+        "lib/components/LoginUsername.d.ts",
+        "lib/components/LoginUsername.js",
+        "lib/components/LoginUsername.js.map",
         "lib/components/LoginVerifyEmail.d.ts",
         "lib/components/LoginVerifyEmail.js",
         "lib/components/LoginVerifyEmail.js.map",
@@ -1259,6 +1267,7 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
     },
     "devDependencies": {
+        "@babel/core": "^7.0.0",
         "@emotion/react": "^11.4.1",
         "@types/memoizee": "^0.4.7",
         "@types/minimist": "^1.2.2",
@@ -1286,7 +1295,7 @@
         "react-markdown": "^5.0.3",
         "scripting-tools": "^0.19.13",
         "tsafe": "^1.1.1",
-        "tss-react": "^4.3.3",
+        "tss-react": "^4.3.4",
         "zod": "^3.17.10"
     }
 }

package/src/bin/keycloakify/generateFtl/generateFtl.ts

@@ -13,6 +13,8 @@ import { Reflect } from "tsafe/Reflect";
 // https://github.com/keycloak/keycloak/blob/main/services/src/main/java/org/keycloak/forms/login/freemarker/Templates.java
 export const pageIds = [
     "login.ftl",
+    "login-username.ftl",
+    "login-password.ftl",
     "register.ftl",
     "register-user-profile.ftl",
     "info.ftl",

package/src/lib/components/KcApp.tsx

@@ -13,6 +13,8 @@ const LoginResetPassword = lazy(() => import("./LoginResetPassword"));
 const LoginVerifyEmail = lazy(() => import("./LoginVerifyEmail"));
 const Terms = lazy(() => import("./Terms"));
 const LoginOtp = lazy(() => import("./LoginOtp"));
+const LoginPassword = lazy(() => import("./LoginPassword"));
+const LoginUsername = lazy(() => import("./LoginUsername"));
 const LoginUpdatePassword = lazy(() => import("./LoginUpdatePassword"));
 const LoginUpdateProfile = lazy(() => import("./LoginUpdateProfile"));
 const LoginIdpLinkConfirm = lazy(() => import("./LoginIdpLinkConfirm"));
@@ -67,6 +69,10 @@ const KcApp = memo(
                             return <Terms {...{ kcContext, ...props }} />;
                         case "login-otp.ftl":
                             return <LoginOtp {...{ kcContext, ...props }} />;
+                        case "login-username.ftl":
+                            return <LoginUsername {...{ kcContext, ...props }} />;
+                        case "login-password.ftl":
+                            return <LoginPassword {...{ kcContext, ...props }} />;
                         case "login-update-password.ftl":
                             return <LoginUpdatePassword {...{ kcContext, ...props }} />;
                         case "login-update-profile.ftl":

package/src/lib/components/LoginPassword.tsx

@@ -0,0 +1,96 @@
+import React, { useState, memo } from "react";
+import Template from "./Template";
+import type { KcProps } from "./KcProps";
+import type { KcContextBase } from "../getKcContext/KcContextBase";
+import { useCssAndCx } from "../tools/useCssAndCx";
+import { useConstCallback } from "powerhooks/useConstCallback";
+import type { FormEventHandler } from "react";
+import type { I18n } from "../i18n";
+
+const LoginPassword = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginPassword; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { realm, url, login } = kcContext;
+
+        const { msg, msgStr } = i18n;
+
+        const { cx } = useCssAndCx();
+
+        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, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("doLogIn")}
+                formNode={
+                    <div id="kc-form">
+                        <div id="kc-form-wrapper">
+                            <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
+                                <div className={cx(props.kcFormGroupClass)}>
+                                    <hr />
+                                    <label htmlFor="password" className={cx(props.kcLabelClass)}>
+                                        {msg("password")}
+                                    </label>
+                                    <input
+                                        tabIndex={2}
+                                        id="password"
+                                        className={cx(props.kcInputClass)}
+                                        name="password"
+                                        type="password"
+                                        autoFocus={true}
+                                        autoComplete="on"
+                                        defaultValue={login.password ?? ""}
+                                    />
+                                </div>
+                                <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
+                                    <div id="kc-form-options" />
+                                    <div className={cx(props.kcFormOptionsWrapperClass)}>
+                                        {realm.resetPasswordAllowed && (
+                                            <span>
+                                                <a tabIndex={5} href={url.loginResetCredentialsUrl}>
+                                                    {msg("doForgotPassword")}
+                                                </a>
+                                            </span>
+                                        )}
+                                    </div>
+                                </div>
+                                <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
+                                    <input
+                                        tabIndex={4}
+                                        className={cx(
+                                            props.kcButtonClass,
+                                            props.kcButtonPrimaryClass,
+                                            props.kcButtonBlockClass,
+                                            props.kcButtonLargeClass
+                                        )}
+                                        name="login"
+                                        id="kc-login"
+                                        type="submit"
+                                        value={msgStr("doLogIn")}
+                                        disabled={isLoginButtonDisabled}
+                                    />
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                }
+            />
+        );
+    }
+);
+
+export default LoginPassword;

package/src/lib/components/LoginUsername.tsx

@@ -0,0 +1,168 @@
+import React, { useState, memo } from "react";
+import Template from "./Template";
+import type { KcProps } from "./KcProps";
+import type { KcContextBase } from "../getKcContext/KcContextBase";
+import { useCssAndCx } from "../tools/useCssAndCx";
+import { useConstCallback } from "powerhooks/useConstCallback";
+import type { FormEventHandler } from "react";
+import type { I18n } from "../i18n";
+
+const LoginUsername = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginUsername; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { social, realm, url, usernameHidden, login, registrationDisabled } = kcContext;
+
+        const { msg, msgStr } = i18n;
+
+        const { cx } = useCssAndCx();
+
+        const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
+
+        const onSubmit = useConstCallback<FormEventHandler<HTMLFormElement>>(e => {
+            e.preventDefault();
+
+            setIsLoginButtonDisabled(true);
+
+            const formElement = e.target as HTMLFormElement;
+
+            //NOTE: Even if we login with email Keycloak expect username and password in
+            //the POST request.
+            formElement.querySelector("input[name='email']")?.setAttribute("name", "username");
+
+            formElement.submit();
+        });
+
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayInfo={social.displayInfo}
+                displayWide={realm.password && social.providers !== undefined}
+                headerNode={msg("doLogIn")}
+                formNode={
+                    <div id="kc-form" className={cx(realm.password && social.providers !== undefined && props.kcContentWrapperClass)}>
+                        <div
+                            id="kc-form-wrapper"
+                            className={cx(
+                                realm.password && social.providers && [props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass]
+                            )}
+                        >
+                            {realm.password && (
+                                <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
+                                    <div className={cx(props.kcFormGroupClass)}>
+                                        {!usernameHidden &&
+                                            (() => {
+                                                const label = !realm.loginWithEmailAllowed
+                                                    ? "username"
+                                                    : realm.registrationEmailAsUsername
+                                                    ? "email"
+                                                    : "usernameOrEmail";
+
+                                                const autoCompleteHelper: typeof label = label === "usernameOrEmail" ? "username" : label;
+
+                                                return (
+                                                    <>
+                                                        <label htmlFor={autoCompleteHelper} className={cx(props.kcLabelClass)}>
+                                                            {msg(label)}
+                                                        </label>
+                                                        <input
+                                                            tabIndex={1}
+                                                            id={autoCompleteHelper}
+                                                            className={cx(props.kcInputClass)}
+                                                            //NOTE: This is used by Google Chrome auto fill so we use it to tell
+                                                            //the browser how to pre fill the form but before submit we put it back
+                                                            //to username because it is what keycloak expects.
+                                                            name={autoCompleteHelper}
+                                                            defaultValue={login.username ?? ""}
+                                                            type="text"
+                                                            autoFocus={true}
+                                                            autoComplete="off"
+                                                        />
+                                                    </>
+                                                );
+                                            })()}
+                                    </div>
+                                    <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
+                                        <div id="kc-form-options">
+                                            {realm.rememberMe && !usernameHidden && (
+                                                <div className="checkbox">
+                                                    <label>
+                                                        <input
+                                                            tabIndex={3}
+                                                            id="rememberMe"
+                                                            name="rememberMe"
+                                                            type="checkbox"
+                                                            {...(login.rememberMe
+                                                                ? {
+                                                                      "checked": true
+                                                                  }
+                                                                : {})}
+                                                        />
+                                                        {msg("rememberMe")}
+                                                    </label>
+                                                </div>
+                                            )}
+                                        </div>
+                                    </div>
+                                    <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
+                                        <input
+                                            tabIndex={4}
+                                            className={cx(
+                                                props.kcButtonClass,
+                                                props.kcButtonPrimaryClass,
+                                                props.kcButtonBlockClass,
+                                                props.kcButtonLargeClass
+                                            )}
+                                            name="login"
+                                            id="kc-login"
+                                            type="submit"
+                                            value={msgStr("doLogIn")}
+                                            disabled={isLoginButtonDisabled}
+                                        />
+                                    </div>
+                                </form>
+                            )}
+                        </div>
+                        {realm.password && social.providers !== undefined && (
+                            <div id="kc-social-providers" className={cx(props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass)}>
+                                <ul
+                                    className={cx(
+                                        props.kcFormSocialAccountListClass,
+                                        social.providers.length > 4 && props.kcFormSocialAccountDoubleListClass
+                                    )}
+                                >
+                                    {social.providers.map(p => (
+                                        <li key={p.providerId} className={cx(props.kcFormSocialAccountListLinkClass)}>
+                                            <a href={p.loginUrl} id={`zocial-${p.alias}`} className={cx("zocial", p.providerId)}>
+                                                <span>{p.displayName}</span>
+                                            </a>
+                                        </li>
+                                    ))}
+                                </ul>
+                            </div>
+                        )}
+                    </div>
+                }
+                infoNode={
+                    realm.password &&
+                    realm.registrationAllowed &&
+                    !registrationDisabled && (
+                        <div id="kc-registration">
+                            <span>
+                                {msg("noAccount")}
+                                <a tabIndex={6} href={url.registrationUrl}>
+                                    {msg("doRegister")}
+                                </a>
+                            </span>
+                        </div>
+                    )
+                }
+            />
+        );
+    }
+);
+
+export default LoginUsername;

package/src/lib/getKcContext/KcContextBase.ts

@@ -19,6 +19,8 @@ export type KcContextBase =
     | KcContextBase.LoginVerifyEmail
     | KcContextBase.Terms
     | KcContextBase.LoginOtp
+    | KcContextBase.LoginUsername
+    | KcContextBase.LoginPassword
     | KcContextBase.LoginUpdatePassword
     | KcContextBase.LoginUpdateProfile
     | KcContextBase.LoginIdpLinkConfirm
@@ -198,6 +200,59 @@ export declare namespace KcContextBase {
         };
     };
 
+    export type LoginUsername = Common & {
+        pageId: "login-username.ftl";
+        url: {
+            loginResetCredentialsUrl: string;
+            registrationUrl: string;
+        };
+        realm: {
+            loginWithEmailAllowed: boolean;
+            rememberMe: boolean;
+            password: boolean;
+            resetPasswordAllowed: boolean;
+            registrationAllowed: boolean;
+        };
+        registrationDisabled: boolean;
+        login: {
+            username?: string;
+            rememberMe?: boolean;
+        };
+        usernameHidden?: boolean;
+        social: {
+            displayInfo: boolean;
+            providers?: {
+                loginUrl: string;
+                alias: string;
+                providerId: string;
+                displayName: string;
+            }[];
+        };
+    };
+
+    export type LoginPassword = Common & {
+        pageId: "login-password.ftl";
+        url: {
+            loginResetCredentialsUrl: string;
+            registrationUrl: string;
+        };
+        realm: {
+            resetPasswordAllowed: boolean;
+        };
+        auth?: {
+            showUsername?: boolean;
+            showResetCredentials?: boolean;
+            showTryAnotherWayLink?: boolean;
+            attemptedUsername?: string;
+        };
+        social: {
+            displayInfo: boolean;
+        };
+        login: {
+            password?: string;
+        };
+    };
+
     export type LoginUpdatePassword = Common & {
         pageId: "login-update-password.ftl";
         username: string;

package/src/lib/getKcContext/kcContextMocks/kcContextMocks.ts

@@ -359,6 +359,40 @@ export const kcContextMocks: KcContextBase[] = [
             ]
         }
     }),
+    id<KcContextBase.LoginUsername>({
+        ...kcContextCommonMock,
+        "pageId": "login-username.ftl",
+        "url": loginUrl,
+        "realm": {
+            ...kcContextCommonMock.realm,
+            "loginWithEmailAllowed": true,
+            "rememberMe": true,
+            "password": true,
+            "resetPasswordAllowed": true,
+            "registrationAllowed": true
+        },
+        "social": {
+            "displayInfo": true
+        },
+        "usernameHidden": false,
+        "login": {
+            "rememberMe": false
+        },
+        "registrationDisabled": false
+    }),
+    id<KcContextBase.LoginPassword>({
+        ...kcContextCommonMock,
+        "pageId": "login-password.ftl",
+        "url": loginUrl,
+        "realm": {
+            ...kcContextCommonMock.realm,
+            "resetPasswordAllowed": true
+        },
+        "social": {
+            "displayInfo": false
+        },
+        "login": {}
+    }),
     id<KcContextBase.LoginUpdatePassword>({
         ...kcContextCommonMock,
         "pageId": "login-update-password.ftl",