mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-16 10:45:12 +00:00
<!-- Please inform yourself about the contribution guidelines on submitting a PR here: https://github.com/zitadel/zitadel/blob/main/CONTRIBUTING.md#submit-a-pull-request-pr. Take note of how PR/commit titles should be written and replace the template texts in the sections below. Don't remove any of the sections. It is important that the commit history clearly shows what is changed and why. Important: By submitting a contribution you agree to the terms from our Licensing Policy as described here: https://github.com/zitadel/zitadel/blob/main/LICENSING.md#community-contributions. --> # Which Problems Are Solved The first input field on login screens is not automatically focused, requiring users to manually click before typing. This creates unnecessary friction during the login flow, particularly for keyboard-oriented users and accessibility scenarios. # How the Problems Are Solved - Added the `autoFocus` prop to the first `TextInput` in all 12 login form components. - For forms with conditionally rendered first inputs (`set-password-form` and `register-form-idp-incomplete`), `autoFocus` is set dynamically so the correct field receives focus depending on which input is visible. # Additional Changes None # Additional Context - Closes #11565 Co-authored-by: Max Peintner <[email protected]>
152 lines
4.9 KiB
TypeScript
152 lines
4.9 KiB
TypeScript
"use client";
|
|
|
|
import { completeFlowOrGetUrl, handleServerActionResponse } from "@/lib/client";
|
|
import { verifyTOTP } from "@/lib/server/verify";
|
|
import { LoginSettings } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
|
|
import Link from "next/link";
|
|
import { useRouter } from "next/navigation";
|
|
import { QRCodeSVG } from "qrcode.react";
|
|
import { useState } from "react";
|
|
import { useTranslations } from "next-intl";
|
|
import { useForm } from "react-hook-form";
|
|
import { Alert } from "./alert";
|
|
import { Button, ButtonVariants } from "./button";
|
|
import { CopyToClipboard } from "./copy-to-clipboard";
|
|
import { TextInput } from "./input";
|
|
import { Spinner } from "./spinner";
|
|
import { Translated } from "./translated";
|
|
import { AutoSubmitForm } from "./auto-submit-form";
|
|
|
|
type Inputs = {
|
|
code: string;
|
|
};
|
|
|
|
type Props = {
|
|
uri: string;
|
|
secret: string;
|
|
loginName?: string;
|
|
sessionId?: string;
|
|
requestId?: string;
|
|
organization?: string;
|
|
checkAfter?: boolean;
|
|
loginSettings?: LoginSettings;
|
|
};
|
|
export function TotpRegister({ uri, loginName, sessionId, requestId, organization, checkAfter, loginSettings }: Props) {
|
|
const [error, setError] = useState<string>("");
|
|
const [loading, setLoading] = useState<boolean>(false);
|
|
const [samlData, setSamlData] = useState<{ url: string; fields: Record<string, string> } | null>(null);
|
|
const router = useRouter();
|
|
|
|
const { register, handleSubmit, formState } = useForm<Inputs>({
|
|
mode: "onChange",
|
|
defaultValues: {
|
|
code: "",
|
|
},
|
|
});
|
|
|
|
const t = useTranslations("otp");
|
|
|
|
async function continueWithCode(values: Inputs) {
|
|
setLoading(true);
|
|
return verifyTOTP(values.code, loginName, organization)
|
|
.then(async () => {
|
|
// if attribute is set, validate MFA after it is setup, otherwise proceed as usual (when mfa is enforced to login)
|
|
if (checkAfter) {
|
|
const params = new URLSearchParams({});
|
|
|
|
if (loginName) {
|
|
params.append("loginName", loginName);
|
|
}
|
|
if (requestId) {
|
|
params.append("requestId", requestId);
|
|
}
|
|
if (organization) {
|
|
params.append("organization", organization);
|
|
}
|
|
|
|
return router.push(`/otp/time-based?` + params);
|
|
} else {
|
|
if (requestId && sessionId) {
|
|
const callbackResponse = await completeFlowOrGetUrl(
|
|
{
|
|
sessionId: sessionId,
|
|
requestId: requestId,
|
|
organization: organization,
|
|
},
|
|
loginSettings?.defaultRedirectUri,
|
|
);
|
|
|
|
handleServerActionResponse(callbackResponse, router, setSamlData, setError);
|
|
} else if (loginName) {
|
|
const callbackResponse = await completeFlowOrGetUrl(
|
|
{
|
|
loginName: loginName,
|
|
organization: organization,
|
|
},
|
|
loginSettings?.defaultRedirectUri,
|
|
);
|
|
|
|
handleServerActionResponse(callbackResponse, router, setSamlData, setError);
|
|
}
|
|
}
|
|
})
|
|
.catch((e) => {
|
|
setError(e.message);
|
|
return;
|
|
})
|
|
.finally(() => {
|
|
setLoading(false);
|
|
});
|
|
}
|
|
|
|
return (
|
|
<div className="flex flex-col items-center">
|
|
{samlData && <AutoSubmitForm url={samlData.url} fields={samlData.fields} />}
|
|
{uri && (
|
|
<>
|
|
<QRCodeSVG className="my-4 h-40 w-40 rounded-md bg-white p-2" value={uri} />
|
|
<div className="my-2 mb-4 flex w-96 rounded-lg border border-divider-light px-4 py-2 pr-2 text-sm dark:border-divider-dark">
|
|
<Link href={uri} target="_blank" className="flex-1 overflow-x-auto">
|
|
{uri}
|
|
</Link>
|
|
|
|
<CopyToClipboard value={uri}></CopyToClipboard>
|
|
</div>
|
|
<form className="w-full">
|
|
<div className="">
|
|
<TextInput
|
|
type="text"
|
|
autoFocus
|
|
{...register("code", { required: t("set.required.code") })}
|
|
label={t("set.labels.code")}
|
|
data-testid="code-text-input"
|
|
/>
|
|
</div>
|
|
|
|
{error && (
|
|
<div className="py-4">
|
|
<Alert>{error}</Alert>
|
|
</div>
|
|
)}
|
|
|
|
<div className="mt-8 flex w-full flex-row items-center">
|
|
<span className="flex-grow"></span>
|
|
<Button
|
|
type="submit"
|
|
className="self-end"
|
|
variant={ButtonVariants.Primary}
|
|
disabled={loading || !formState.isValid}
|
|
onClick={handleSubmit(continueWithCode)}
|
|
data-testid="submit-button"
|
|
>
|
|
{loading && <Spinner className="mr-2 h-5 w-5" />}
|
|
<Translated i18nKey="set.submit" namespace="otp" />
|
|
</Button>
|
|
</div>
|
|
</form>
|
|
</>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|