@oussemasahbeni/keycloakify-login-shadcn 250004.0.2 → 250004.0.7

package/keycloak-theme/login/pages/login-username/Page.tsx

@@ -1,246 +1,246 @@
-import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { clsx } from "keycloakify/tools/clsx";
-import { useState } from "react";
-
-import { Field, FieldError, FieldLabel } from "@/components/ui/field";
-import { useI18n } from '@/login/i18n';
-import { useKcContext } from '@/login/KcContext';
-import { useKcClsx } from '@keycloakify/login-ui/useKcClsx';
-import { kcSanitize } from "keycloakify/lib/kcSanitize";
-import { Fingerprint } from "lucide-react";
-import { assert } from "tsafe/assert";
-import { Template } from "../../components/Template";
-import { useScript } from './useScript';
-
-export function Page() {
-    const { kcContext } = useKcContext();
-    assert(kcContext.pageId === "login-username.ftl");
-
-    const { kcClsx } = useKcClsx();
-
-    const {
-        social,
-        realm,
-        url,
-        usernameHidden,
-        login,
-        registrationDisabled,
-        messagesPerField,
-        enableWebAuthnConditionalUI,
-        authenticators
-    } = kcContext;
-
-    const { msg, msgStr } = useI18n();
-
-    const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
-
-    const webAuthnButtonId = "authenticateWebAuthnButton";
-
-    useScript({ webAuthnButtonId });
-
-    return (
-        <Template
-            displayMessage={!messagesPerField.existsError("username")}
-            displayInfo={
-                realm.password && realm.registrationAllowed && !registrationDisabled
-            }
-            infoNode={
-                <div id="kc-registration" className="text-center text-sm">
-                    <span>
-                        {msg("noAccount")}{" "}
-                        <a
-                            className="text-primary dark:text-primary-foreground underline underline-offset-4 "
-                            tabIndex={8}
-                            href={url.registrationUrl}
-                        >
-                            {msg("doRegister")}
-                        </a>
-                    </span>
-                </div>
-            }
-            headerNode={msg("doLogIn")}
-            socialProvidersNode={
-                <>
-                    {realm.password &&
-                        social?.providers !== undefined &&
-                        social.providers.length !== 0 && (
-                            <div id="kc-social-providers" className="space-y-4">
-                                <div className="text-center">
-                                    <h2 className="text-sm font-medium text-muted-foreground">
-                                        {msg("identity-provider-login-label")}
-                                    </h2>
-                                </div>
-                                <div
-                                    className={clsx(
-                                        "grid gap-2",
-                                        social.providers.length > 3
-                                            ? "grid-cols-2"
-                                            : "grid-cols-1"
-                                    )}
-                                >
-                                    {social.providers.map(p => (
-                                        <a
-                                            key={p.alias}
-                                            id={`social-${p.alias}`}
-                                            className="flex items-center justify-center gap-2 px-4 py-2 border rounded-md hover:bg-accent transition-colors"
-                                            href={p.loginUrl}
-                                        >
-                                            {p.iconClasses && (
-                                                <i
-                                                    className={clsx(p.iconClasses)}
-                                                    aria-hidden="true"
-                                                ></i>
-                                            )}
-                                            <span className="text-sm font-medium">
-                                                {p.displayName}
-                                            </span>
-                                        </a>
-                                    ))}
-                                </div>
-                            </div>
-                        )}
-                </>
-            }
-        >
-            <div>
-                {realm.password && (
-                    <form
-                        id="kc-form-login"
-                        className="space-y-4"
-                        onSubmit={() => {
-                            setIsLoginButtonDisabled(true);
-                            return true;
-                        }}
-                        action={url.loginAction}
-                        method="post"
-                    >
-                        {!usernameHidden && (
-                            <Field>
-                                <FieldLabel htmlFor="username">
-                                    {!realm.loginWithEmailAllowed
-                                        ? msg("email")
-                                        : !realm.registrationEmailAsUsername
-                                            ? msg("usernameOrEmail")
-                                            : msg("username")}
-                                </FieldLabel>
-                                <Input
-                                    tabIndex={2}
-                                    type="text"
-                                    id="username"
-                                    defaultValue={login.username ?? ""}
-                                    name="username"
-                                    autoFocus
-                                    className="autofill:bg-background"
-                                    autoComplete="username"
-                                    aria-invalid={messagesPerField.existsError(
-                                        "username"
-                                    )}
-                                />
-                                {messagesPerField.existsError("username") && (
-                                    <FieldError>
-                                        <span
-                                            id="input-error"
-                                            aria-live="polite"
-                                            dangerouslySetInnerHTML={{
-                                                __html: kcSanitize(
-                                                    messagesPerField.getFirstError(
-                                                        "username"
-                                                    )
-                                                )
-                                            }}
-                                        />
-                                    </FieldError>
-                                )}
-                            </Field>
-                        )}
-
-                        {realm.rememberMe && !usernameHidden && (
-                            <div className="flex items-center space-x-2">
-                                <Checkbox
-                                    tabIndex={3}
-                                    id="rememberMe"
-                                    name="rememberMe"
-                                    value="on"
-                                    defaultChecked={!!login.rememberMe}
-                                />
-                                <Label
-                                    htmlFor="rememberMe"
-                                    className="text-sm font-medium cursor-pointer"
-                                >
-                                    {msg("rememberMe")}
-                                </Label>
-                            </div>
-                        )}
-
-                        <Button
-                            disabled={isLoginButtonDisabled}
-                            className="w-full"
-                            name="login"
-                            type="submit"
-                            tabIndex={4}
-                        >
-                            {msgStr("doLogIn")}
-                        </Button>
-                    </form>
-                )}
-
-                {enableWebAuthnConditionalUI && (
-                    <>
-                        <form id="webauth" action={url.loginAction} method="post">
-                            <input
-                                type="hidden"
-                                id="clientDataJSON"
-                                name="clientDataJSON"
-                            />
-                            <input
-                                type="hidden"
-                                id="authenticatorData"
-                                name="authenticatorData"
-                            />
-                            <input type="hidden" id="signature" name="signature" />
-                            <input type="hidden" id="credentialId" name="credentialId" />
-                            <input type="hidden" id="userHandle" name="userHandle" />
-                            <input type="hidden" id="error" name="error" />
-                        </form>
-
-                        {authenticators !== undefined &&
-                            authenticators.authenticators.length !== 0 && (
-                                <>
-                                    <form
-                                        id="authn_select"
-                                        className={kcClsx("kcFormClass")}
-                                    >
-                                        {authenticators.authenticators.map(
-                                            (authenticator, i) => (
-                                                <input
-                                                    key={i}
-                                                    type="hidden"
-                                                    name="authn_use_chk"
-                                                    readOnly
-                                                    value={authenticator.credentialId}
-                                                />
-                                            )
-                                        )}
-                                    </form>
-                                </>
-                            )}
-                        <br />
-
-                        <Button
-                            id={webAuthnButtonId}
-                            type="button"
-                            className="w-full"
-                            variant="outline"
-                        >
-                            <Fingerprint className="w-4 h-4" />
-                            {msgStr("passkey-doAuthenticate")}
-                        </Button>
-                    </>
-                )}
-            </div>
-        </Template>
-    );
-}
+import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { clsx } from "keycloakify/tools/clsx";
+import { useState } from "react";
+
+import { Field, FieldError, FieldLabel } from "@/components/ui/field";
+import { useI18n } from '@/login/i18n';
+import { useKcContext } from '@/login/KcContext';
+import { useKcClsx } from '@keycloakify/login-ui/useKcClsx';
+import { kcSanitize } from "keycloakify/lib/kcSanitize";
+import { Fingerprint } from "lucide-react";
+import { assert } from "tsafe/assert";
+import { Template } from "../../components/Template";
+import { useScript } from './useScript';
+
+export function Page() {
+    const { kcContext } = useKcContext();
+    assert(kcContext.pageId === "login-username.ftl");
+
+    const { kcClsx } = useKcClsx();
+
+    const {
+        social,
+        realm,
+        url,
+        usernameHidden,
+        login,
+        registrationDisabled,
+        messagesPerField,
+        enableWebAuthnConditionalUI,
+        authenticators
+    } = kcContext;
+
+    const { msg, msgStr } = useI18n();
+
+    const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
+
+    const webAuthnButtonId = "authenticateWebAuthnButton";
+
+    useScript({ webAuthnButtonId });
+
+    return (
+        <Template
+            displayMessage={!messagesPerField.existsError("username")}
+            displayInfo={
+                realm.password && realm.registrationAllowed && !registrationDisabled
+            }
+            infoNode={
+                <div id="kc-registration" className="text-center text-sm">
+                    <span>
+                        {msg("noAccount")}{" "}
+                        <a
+                            className="text-primary dark:text-primary-foreground underline underline-offset-4 "
+                            tabIndex={8}
+                            href={url.registrationUrl}
+                        >
+                            {msg("doRegister")}
+                        </a>
+                    </span>
+                </div>
+            }
+            headerNode={msg("doLogIn")}
+            socialProvidersNode={
+                <>
+                    {realm.password &&
+                        social?.providers !== undefined &&
+                        social.providers.length !== 0 && (
+                            <div id="kc-social-providers" className="space-y-4">
+                                <div className="text-center">
+                                    <h2 className="text-sm font-medium text-muted-foreground">
+                                        {msg("identity-provider-login-label")}
+                                    </h2>
+                                </div>
+                                <div
+                                    className={clsx(
+                                        "grid gap-2",
+                                        social.providers.length > 3
+                                            ? "grid-cols-2"
+                                            : "grid-cols-1"
+                                    )}
+                                >
+                                    {social.providers.map(p => (
+                                        <a
+                                            key={p.alias}
+                                            id={`social-${p.alias}`}
+                                            className="flex items-center justify-center gap-2 px-4 py-2 border rounded-md hover:bg-accent transition-colors"
+                                            href={p.loginUrl}
+                                        >
+                                            {p.iconClasses && (
+                                                <i
+                                                    className={clsx(p.iconClasses)}
+                                                    aria-hidden="true"
+                                                ></i>
+                                            )}
+                                            <span className="text-sm font-medium">
+                                                {p.displayName}
+                                            </span>
+                                        </a>
+                                    ))}
+                                </div>
+                            </div>
+                        )}
+                </>
+            }
+        >
+            <div>
+                {realm.password && (
+                    <form
+                        id="kc-form-login"
+                        className="space-y-4"
+                        onSubmit={() => {
+                            setIsLoginButtonDisabled(true);
+                            return true;
+                        }}
+                        action={url.loginAction}
+                        method="post"
+                    >
+                        {!usernameHidden && (
+                            <Field>
+                                <FieldLabel htmlFor="username">
+                                    {!realm.loginWithEmailAllowed
+                                        ? msg("email")
+                                        : !realm.registrationEmailAsUsername
+                                            ? msg("usernameOrEmail")
+                                            : msg("username")}
+                                </FieldLabel>
+                                <Input
+                                    tabIndex={2}
+                                    type="text"
+                                    id="username"
+                                    defaultValue={login.username ?? ""}
+                                    name="username"
+                                    autoFocus
+                                    className="autofill:bg-background"
+                                    autoComplete="username"
+                                    aria-invalid={messagesPerField.existsError(
+                                        "username"
+                                    )}
+                                />
+                                {messagesPerField.existsError("username") && (
+                                    <FieldError>
+                                        <span
+                                            id="input-error"
+                                            aria-live="polite"
+                                            dangerouslySetInnerHTML={{
+                                                __html: kcSanitize(
+                                                    messagesPerField.getFirstError(
+                                                        "username"
+                                                    )
+                                                )
+                                            }}
+                                        />
+                                    </FieldError>
+                                )}
+                            </Field>
+                        )}
+
+                        {realm.rememberMe && !usernameHidden && (
+                            <div className="flex items-center space-x-2">
+                                <Checkbox
+                                    tabIndex={3}
+                                    id="rememberMe"
+                                    name="rememberMe"
+                                    value="on"
+                                    defaultChecked={!!login.rememberMe}
+                                />
+                                <Label
+                                    htmlFor="rememberMe"
+                                    className="text-sm font-medium cursor-pointer"
+                                >
+                                    {msg("rememberMe")}
+                                </Label>
+                            </div>
+                        )}
+
+                        <Button
+                            disabled={isLoginButtonDisabled}
+                            className="w-full"
+                            name="login"
+                            type="submit"
+                            tabIndex={4}
+                        >
+                            {msgStr("doLogIn")}
+                        </Button>
+                    </form>
+                )}
+
+                {enableWebAuthnConditionalUI && (
+                    <>
+                        <form id="webauth" action={url.loginAction} method="post">
+                            <input
+                                type="hidden"
+                                id="clientDataJSON"
+                                name="clientDataJSON"
+                            />
+                            <input
+                                type="hidden"
+                                id="authenticatorData"
+                                name="authenticatorData"
+                            />
+                            <input type="hidden" id="signature" name="signature" />
+                            <input type="hidden" id="credentialId" name="credentialId" />
+                            <input type="hidden" id="userHandle" name="userHandle" />
+                            <input type="hidden" id="error" name="error" />
+                        </form>
+
+                        {authenticators !== undefined &&
+                            authenticators.authenticators.length !== 0 && (
+                                <>
+                                    <form
+                                        id="authn_select"
+                                        className={kcClsx("kcFormClass")}
+                                    >
+                                        {authenticators.authenticators.map(
+                                            (authenticator, i) => (
+                                                <input
+                                                    key={i}
+                                                    type="hidden"
+                                                    name="authn_use_chk"
+                                                    readOnly
+                                                    value={authenticator.credentialId}
+                                                />
+                                            )
+                                        )}
+                                    </form>
+                                </>
+                            )}
+                        <br />
+
+                        <Button
+                            id={webAuthnButtonId}
+                            type="button"
+                            className="w-full"
+                            variant="outline"
+                        >
+                            <Fingerprint className="w-4 h-4" />
+                            {msgStr("passkey-doAuthenticate")}
+                        </Button>
+                    </>
+                )}
+            </div>
+        </Template>
+    );
+}

package/keycloak-theme/login/pages/login-username/index.ts

@@ -1,3 +1,3 @@
-import { Page } from "./Page";
-
-export default Page;
+import { Page } from "./Page";
+
+export default Page;

package/keycloak-theme/login/pages/login-username/useScript.tsx

@@ -1,62 +1,62 @@
-import { useInsertScriptTags } from "@keycloakify/login-ui/tools/useInsertScriptTags";
-import { waitForElementMountedOnDom } from "@keycloakify/login-ui/tools/waitForElementMountedOnDom";
-import { useEffect } from "react";
-import { assert } from "tsafe/assert";
-import { useI18n } from "../../i18n";
-import { useKcContext } from "../../KcContext";
-
-export function useScript(params: { webAuthnButtonId: string }) {
-    const { webAuthnButtonId } = params;
-
-    const { kcContext } = useKcContext();
-    assert(kcContext.pageId === "login-username.ftl");
-
-    const { msgStr, isFetchingTranslations } = useI18n();
-
-    const { insertScriptTags } = useInsertScriptTags({
-        effectId: "LoginRecoveryAuthnCodeConfigLoginUsername",
-        scriptTags: [
-            {
-                type: "module",
-                textContent: () => `
-                    import { authenticateByWebAuthn } from "${import.meta.env.BASE_URL}keycloak-theme/login/js/webauthnAuthenticate.js";
-                    import { initAuthenticate } from "${import.meta.env.BASE_URL}keycloak-theme/login/js/passkeysConditionalAuth.js";
-
-                    const authButton = document.getElementById("${webAuthnButtonId}");
-                    const input = {
-                        isUserIdentified : ${kcContext.isUserIdentified},
-                        challenge : ${JSON.stringify(kcContext.challenge)},
-                        userVerification : ${JSON.stringify(kcContext.userVerification)},
-                        rpId : ${JSON.stringify(kcContext.rpId)},
-                        createTimeout : ${kcContext.createTimeout}
-                    };
-                    authButton.addEventListener("click", () => {
-                        authenticateByWebAuthn({
-                            ...input,
-                            errmsg : ${JSON.stringify(msgStr("webauthn-unsupported-browser-text"))}
-                        });
-                    });
-
-                    initAuthenticate({
-                        ...input,
-                        errmsg : ${JSON.stringify(msgStr("passkey-unsupported-browser-text"))}
-                    });
-                `
-            }
-        ]
-    });
-
-    useEffect(() => {
-        if (isFetchingTranslations) {
-            return;
-        }
-
-        (async () => {
-            await waitForElementMountedOnDom({
-                elementId: webAuthnButtonId
-            });
-
-            insertScriptTags();
-        })();
-    }, [isFetchingTranslations]);
-}
+import { useInsertScriptTags } from "@keycloakify/login-ui/tools/useInsertScriptTags";
+import { waitForElementMountedOnDom } from "@keycloakify/login-ui/tools/waitForElementMountedOnDom";
+import { useEffect } from "react";
+import { assert } from "tsafe/assert";
+import { useI18n } from "../../i18n";
+import { useKcContext } from "../../KcContext";
+
+export function useScript(params: { webAuthnButtonId: string }) {
+    const { webAuthnButtonId } = params;
+
+    const { kcContext } = useKcContext();
+    assert(kcContext.pageId === "login-username.ftl");
+
+    const { msgStr, isFetchingTranslations } = useI18n();
+
+    const { insertScriptTags } = useInsertScriptTags({
+        effectId: "LoginRecoveryAuthnCodeConfigLoginUsername",
+        scriptTags: [
+            {
+                type: "module",
+                textContent: () => `
+                    import { authenticateByWebAuthn } from "${import.meta.env.BASE_URL}keycloak-theme/login/js/webauthnAuthenticate.js";
+                    import { initAuthenticate } from "${import.meta.env.BASE_URL}keycloak-theme/login/js/passkeysConditionalAuth.js";
+
+                    const authButton = document.getElementById("${webAuthnButtonId}");
+                    const input = {
+                        isUserIdentified : ${kcContext.isUserIdentified},
+                        challenge : ${JSON.stringify(kcContext.challenge)},
+                        userVerification : ${JSON.stringify(kcContext.userVerification)},
+                        rpId : ${JSON.stringify(kcContext.rpId)},
+                        createTimeout : ${kcContext.createTimeout}
+                    };
+                    authButton.addEventListener("click", () => {
+                        authenticateByWebAuthn({
+                            ...input,
+                            errmsg : ${JSON.stringify(msgStr("webauthn-unsupported-browser-text"))}
+                        });
+                    });
+
+                    initAuthenticate({
+                        ...input,
+                        errmsg : ${JSON.stringify(msgStr("passkey-unsupported-browser-text"))}
+                    });
+                `
+            }
+        ]
+    });
+
+    useEffect(() => {
+        if (isFetchingTranslations) {
+            return;
+        }
+
+        (async () => {
+            await waitForElementMountedOnDom({
+                elementId: webAuthnButtonId
+            });
+
+            insertScriptTags();
+        })();
+    }, [isFetchingTranslations]);
+}