From 959dee013e576d9311c1c62e40873fcbbba9330a Mon Sep 17 00:00:00 2001 From: dswbx Date: Wed, 3 Dec 2025 17:41:25 +0100 Subject: [PATCH] fix admin local auth --- app/src/ui/components/form/native-form/NativeForm.tsx | 11 +++++++---- app/src/ui/elements/auth/AuthForm.tsx | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/src/ui/components/form/native-form/NativeForm.tsx b/app/src/ui/components/form/native-form/NativeForm.tsx index bc67dc9..9618160 100644 --- a/app/src/ui/components/form/native-form/NativeForm.tsx +++ b/app/src/ui/components/form/native-form/NativeForm.tsx @@ -21,10 +21,13 @@ export type NativeFormProps = Omit, "onChange" validateOn?: "change" | "submit"; errorFieldSelector?: (selector: string) => any | null; reportValidity?: boolean; - onSubmit?: (data: any, ctx: { event: FormEvent }) => Promise | void; + onSubmit?: ( + data: any, + ctx: { event: FormEvent; form: HTMLFormElement }, + ) => Promise | void; onSubmitInvalid?: ( errors: InputError[], - ctx: { event: FormEvent }, + ctx: { event: FormEvent; form: HTMLFormElement }, ) => Promise | void; onError?: (errors: InputError[]) => void; disableSubmitOnError?: boolean; @@ -188,12 +191,12 @@ export function NativeForm({ const errors = validate({ report: true }); if (errors.length > 0) { - onSubmitInvalid?.(errors, { event: e }); + onSubmitInvalid?.(errors, { event: e, form }); return; } if (onSubmit) { - await onSubmit(getFormValues(), { event: e }); + await onSubmit(getFormValues(), { event: e, form }); } else { form.submit(); } diff --git a/app/src/ui/elements/auth/AuthForm.tsx b/app/src/ui/elements/auth/AuthForm.tsx index 119b8f6..d412b8e 100644 --- a/app/src/ui/elements/auth/AuthForm.tsx +++ b/app/src/ui/elements/auth/AuthForm.tsx @@ -43,7 +43,10 @@ export function AuthForm({ }) as Record; const has_oauth = Object.keys(oauth).length > 0; - async function onSubmit(data: any, ctx: { event: FormEvent }) { + async function onSubmit( + data: any, + ctx: { event: FormEvent; form: HTMLFormElement }, + ) { if ($auth?.local) { ctx.event.preventDefault(); @@ -58,7 +61,7 @@ export function AuthForm({ await _onSubmit?.(ctx.event); // submit form - ctx.event.currentTarget.submit(); + ctx.form.submit(); } useEffect(() => {