mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-12-10 00:07:21 -06:00
refactor to use react-hook-form and zod (#21195)
This commit is contained in:
Josh Hawkins
GitHub
parent
152e585206
commit
dfd837cfb0
@ -1,6 +1,6 @@
|
||||
import { Button } from "../ui/button";
|
||||
import { Input } from "../ui/input";
|
||||
import { useState, useEffect } from "react";
|
||||
import { useState, useEffect, useMemo } from "react";
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
@ -9,14 +9,23 @@ import {
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from "../ui/dialog";
|
||||
|
||||
import { Label } from "../ui/label";
|
||||
import {
|
||||
Form,
|
||||
FormControl,
|
||||
FormField,
|
||||
FormItem,
|
||||
FormLabel,
|
||||
FormMessage,
|
||||
} from "../ui/form";
|
||||
import { LuCheck, LuX, LuEye, LuEyeOff, LuExternalLink } from "react-icons/lu";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useDocDomain } from "@/hooks/use-doc-domain";
|
||||
import useSWR from "swr";
|
||||
import { formatSecondsToDuration } from "@/utils/dateUtil";
|
||||
import ActivityIndicator from "../indicators/activity-indicator";
|
||||
import { zodResolver } from "@hookform/resolvers/zod";
|
||||
import { useForm } from "react-hook-form";
|
||||
import { z } from "zod";
|
||||
|
||||
type SetPasswordProps = {
|
||||
show: boolean;
|
||||
@ -44,11 +53,6 @@ export default function SetPasswordDialog({
|
||||
const refreshTimeLabel = refreshSeconds
|
||||
? formatSecondsToDuration(refreshSeconds)
|
||||
: "30 minutes";
|
||||
const [oldPassword, setOldPassword] = useState<string>("");
|
||||
const [password, setPassword] = useState<string>("");
|
||||
const [confirmPassword, setConfirmPassword] = useState<string>("");
|
||||
const [passwordStrength, setPasswordStrength] = useState<number>(0);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
// visibility toggles for password fields
|
||||
const [showOldPassword, setShowOldPassword] = useState<boolean>(false);
|
||||
@ -56,92 +60,136 @@ export default function SetPasswordDialog({
|
||||
useState<boolean>(false);
|
||||
const [showConfirmPassword, setShowConfirmPassword] =
|
||||
useState<boolean>(false);
|
||||
const [hasInitialized, setHasInitialized] = useState<boolean>(false);
|
||||
|
||||
// Password strength requirements
|
||||
|
||||
const requirements = {
|
||||
length: password.length >= 8,
|
||||
uppercase: /[A-Z]/.test(password),
|
||||
digit: /\d/.test(password),
|
||||
special: /[!@#$%^&*(),.?":{}|<>]/.test(password),
|
||||
// Create form schema with conditional old password requirement
|
||||
const formSchema = useMemo(() => {
|
||||
const baseSchema = {
|
||||
password: z
|
||||
.string()
|
||||
.min(8, t("users.dialog.form.password.requirements.length"))
|
||||
.regex(/[A-Z]/, t("users.dialog.form.password.requirements.uppercase"))
|
||||
.regex(/\d/, t("users.dialog.form.password.requirements.digit"))
|
||||
.regex(
|
||||
/[!@#$%^&*(),.?":{}|<>]/,
|
||||
t("users.dialog.form.password.requirements.special"),
|
||||
),
|
||||
confirmPassword: z.string(),
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (show) {
|
||||
if (!hasInitialized) {
|
||||
setOldPassword("");
|
||||
setPassword("");
|
||||
setConfirmPassword("");
|
||||
setError(null);
|
||||
setHasInitialized(true);
|
||||
}
|
||||
if (username) {
|
||||
return z
|
||||
.object({
|
||||
oldPassword: z
|
||||
.string()
|
||||
.min(1, t("users.dialog.passwordSetting.currentPasswordRequired")),
|
||||
...baseSchema,
|
||||
})
|
||||
.refine((data) => data.password === data.confirmPassword, {
|
||||
message: t("users.dialog.passwordSetting.doNotMatch"),
|
||||
path: ["confirmPassword"],
|
||||
});
|
||||
} else {
|
||||
setHasInitialized(false);
|
||||
return z
|
||||
.object(baseSchema)
|
||||
.refine((data) => data.password === data.confirmPassword, {
|
||||
message: t("users.dialog.passwordSetting.doNotMatch"),
|
||||
path: ["confirmPassword"],
|
||||
});
|
||||
}
|
||||
}, [show, hasInitialized]);
|
||||
}, [username, t]);
|
||||
|
||||
useEffect(() => {
|
||||
if (show && initialError) {
|
||||
setError(initialError);
|
||||
type FormValues = z.infer<typeof formSchema>;
|
||||
|
||||
const defaultValues = username
|
||||
? {
|
||||
oldPassword: "",
|
||||
password: "",
|
||||
confirmPassword: "",
|
||||
}
|
||||
}, [show, initialError]);
|
||||
: {
|
||||
password: "",
|
||||
confirmPassword: "",
|
||||
};
|
||||
|
||||
const form = useForm<FormValues>({
|
||||
resolver: zodResolver(formSchema),
|
||||
mode: "onChange",
|
||||
defaultValues: defaultValues as FormValues,
|
||||
});
|
||||
|
||||
const password = form.watch("password");
|
||||
const confirmPassword = form.watch("confirmPassword");
|
||||
|
||||
// Password strength calculation
|
||||
|
||||
useEffect(() => {
|
||||
if (!password) {
|
||||
setPasswordStrength(0);
|
||||
return;
|
||||
}
|
||||
const passwordStrength = useMemo(() => {
|
||||
if (!password) return 0;
|
||||
|
||||
let strength = 0;
|
||||
if (requirements.length) strength += 1;
|
||||
if (requirements.digit) strength += 1;
|
||||
if (requirements.special) strength += 1;
|
||||
if (requirements.uppercase) strength += 1;
|
||||
if (password.length >= 8) strength += 1;
|
||||
if (/\d/.test(password)) strength += 1;
|
||||
if (/[!@#$%^&*(),.?":{}|<>]/.test(password)) strength += 1;
|
||||
if (/[A-Z]/.test(password)) strength += 1;
|
||||
|
||||
setPasswordStrength(strength);
|
||||
// we know that these deps are correct
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
return strength;
|
||||
}, [password]);
|
||||
|
||||
const handleSave = async () => {
|
||||
if (!password) {
|
||||
setError(t("users.dialog.passwordSetting.cannotBeEmpty"));
|
||||
return;
|
||||
}
|
||||
const requirements = useMemo(
|
||||
() => ({
|
||||
length: password?.length >= 8,
|
||||
uppercase: /[A-Z]/.test(password || ""),
|
||||
digit: /\d/.test(password || ""),
|
||||
special: /[!@#$%^&*(),.?":{}|<>]/.test(password || ""),
|
||||
}),
|
||||
[password],
|
||||
);
|
||||
|
||||
// Validate all requirements
|
||||
if (!requirements.length) {
|
||||
setError(t("users.dialog.form.password.requirements.length"));
|
||||
return;
|
||||
}
|
||||
if (!requirements.uppercase) {
|
||||
setError(t("users.dialog.form.password.requirements.uppercase"));
|
||||
return;
|
||||
}
|
||||
if (!requirements.digit) {
|
||||
setError(t("users.dialog.form.password.requirements.digit"));
|
||||
return;
|
||||
}
|
||||
if (!requirements.special) {
|
||||
setError(t("users.dialog.form.password.requirements.special"));
|
||||
return;
|
||||
// Reset form and visibility toggles when dialog opens/closes
|
||||
useEffect(() => {
|
||||
if (show) {
|
||||
form.reset();
|
||||
setShowOldPassword(false);
|
||||
setShowPasswordVisible(false);
|
||||
setShowConfirmPassword(false);
|
||||
}
|
||||
}, [show, form]);
|
||||
|
||||
if (password !== confirmPassword) {
|
||||
setError(t("users.dialog.passwordSetting.doNotMatch"));
|
||||
return;
|
||||
// Handle backend errors
|
||||
useEffect(() => {
|
||||
if (show && initialError) {
|
||||
const errorMsg = String(initialError);
|
||||
// Check if the error is about incorrect current password
|
||||
if (
|
||||
errorMsg.toLowerCase().includes("current password is incorrect") ||
|
||||
errorMsg.toLowerCase().includes("current password incorrect")
|
||||
) {
|
||||
if (username) {
|
||||
form.setError("oldPassword" as keyof FormValues, {
|
||||
type: "manual",
|
||||
message: t("users.dialog.passwordSetting.incorrectCurrentPassword"),
|
||||
});
|
||||
}
|
||||
|
||||
// Require old password when changing own password (username is provided)
|
||||
if (username && !oldPassword) {
|
||||
setError(t("users.dialog.passwordSetting.currentPasswordRequired"));
|
||||
return;
|
||||
} else {
|
||||
// For other errors, show as form-level error
|
||||
form.setError("root", {
|
||||
type: "manual",
|
||||
message: errorMsg,
|
||||
});
|
||||
}
|
||||
}
|
||||
}, [show, initialError, form, t, username]);
|
||||
|
||||
onSave(password, oldPassword || undefined);
|
||||
const onSubmit = async (values: FormValues) => {
|
||||
const oldPassword =
|
||||
"oldPassword" in values
|
||||
? (
|
||||
values as {
|
||||
oldPassword: string;
|
||||
password: string;
|
||||
confirmPassword: string;
|
||||
}
|
||||
).oldPassword
|
||||
: undefined;
|
||||
onSave(values.password, oldPassword);
|
||||
};
|
||||
|
||||
const getStrengthLabel = () => {
|
||||
@ -200,25 +248,29 @@ export default function SetPasswordDialog({
|
||||
</p>
|
||||
</DialogHeader>
|
||||
|
||||
<div className="space-y-4 pt-4">
|
||||
<Form {...form}>
|
||||
<form
|
||||
onSubmit={form.handleSubmit(onSubmit)}
|
||||
className="space-y-4 pt-4"
|
||||
>
|
||||
{username && (
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="old-password">
|
||||
<FormField
|
||||
control={form.control}
|
||||
name={"oldPassword" as keyof FormValues}
|
||||
render={({ field }) => (
|
||||
<FormItem>
|
||||
<FormLabel>
|
||||
{t("users.dialog.form.currentPassword.title")}
|
||||
</Label>
|
||||
</FormLabel>
|
||||
<FormControl>
|
||||
<div className="relative">
|
||||
<Input
|
||||
id="old-password"
|
||||
className="h-10 pr-10"
|
||||
{...field}
|
||||
type={showOldPassword ? "text" : "password"}
|
||||
value={oldPassword}
|
||||
onChange={(event) => {
|
||||
setOldPassword(event.target.value);
|
||||
setError(null);
|
||||
}}
|
||||
placeholder={t(
|
||||
"users.dialog.form.currentPassword.placeholder",
|
||||
)}
|
||||
className="h-10 pr-10"
|
||||
/>
|
||||
<Button
|
||||
type="button"
|
||||
@ -244,24 +296,30 @@ export default function SetPasswordDialog({
|
||||
)}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</FormControl>
|
||||
<FormMessage />
|
||||
</FormItem>
|
||||
)}
|
||||
/>
|
||||
)}
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="password">
|
||||
<FormField
|
||||
control={form.control}
|
||||
name="password"
|
||||
render={({ field }) => (
|
||||
<FormItem>
|
||||
<FormLabel>
|
||||
{t("users.dialog.form.newPassword.title")}
|
||||
</Label>
|
||||
</FormLabel>
|
||||
<FormControl>
|
||||
<div className="relative">
|
||||
<Input
|
||||
id="password"
|
||||
className="h-10 pr-10"
|
||||
{...field}
|
||||
type={showPasswordVisible ? "text" : "password"}
|
||||
value={password}
|
||||
onChange={(event) => {
|
||||
setPassword(event.target.value);
|
||||
setError(null);
|
||||
}}
|
||||
placeholder={t("users.dialog.form.newPassword.placeholder")}
|
||||
placeholder={t(
|
||||
"users.dialog.form.newPassword.placeholder",
|
||||
)}
|
||||
className="h-10 pr-10"
|
||||
autoFocus
|
||||
/>
|
||||
<Button
|
||||
@ -279,7 +337,9 @@ export default function SetPasswordDialog({
|
||||
})
|
||||
}
|
||||
className="absolute right-0 top-0 h-full px-3 py-2 hover:bg-transparent"
|
||||
onClick={() => setShowPasswordVisible(!showPasswordVisible)}
|
||||
onClick={() =>
|
||||
setShowPasswordVisible(!showPasswordVisible)
|
||||
}
|
||||
>
|
||||
{showPasswordVisible ? (
|
||||
<LuEyeOff className="size-4" />
|
||||
@ -288,6 +348,7 @@ export default function SetPasswordDialog({
|
||||
)}
|
||||
</Button>
|
||||
</div>
|
||||
</FormControl>
|
||||
|
||||
{password && (
|
||||
<div className="mt-2 space-y-2">
|
||||
@ -299,7 +360,9 @@ export default function SetPasswordDialog({
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{t("users.dialog.form.password.strength.title")}
|
||||
<span className="font-medium">{getStrengthLabel()}</span>
|
||||
<span className="font-medium">
|
||||
{getStrengthLabel()}
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<div className="space-y-1 rounded-md bg-muted/50 p-2">
|
||||
@ -320,7 +383,9 @@ export default function SetPasswordDialog({
|
||||
: "text-red-600"
|
||||
}
|
||||
>
|
||||
{t("users.dialog.form.password.requirements.length")}
|
||||
{t(
|
||||
"users.dialog.form.password.requirements.length",
|
||||
)}
|
||||
</span>
|
||||
</li>
|
||||
<li className="flex items-center gap-2 text-xs">
|
||||
@ -336,7 +401,9 @@ export default function SetPasswordDialog({
|
||||
: "text-red-600"
|
||||
}
|
||||
>
|
||||
{t("users.dialog.form.password.requirements.uppercase")}
|
||||
{t(
|
||||
"users.dialog.form.password.requirements.uppercase",
|
||||
)}
|
||||
</span>
|
||||
</li>
|
||||
<li className="flex items-center gap-2 text-xs">
|
||||
@ -347,10 +414,14 @@ export default function SetPasswordDialog({
|
||||
)}
|
||||
<span
|
||||
className={
|
||||
requirements.digit ? "text-green-600" : "text-red-600"
|
||||
requirements.digit
|
||||
? "text-green-600"
|
||||
: "text-red-600"
|
||||
}
|
||||
>
|
||||
{t("users.dialog.form.password.requirements.digit")}
|
||||
{t(
|
||||
"users.dialog.form.password.requirements.digit",
|
||||
)}
|
||||
</span>
|
||||
</li>
|
||||
<li className="flex items-center gap-2 text-xs">
|
||||
@ -366,32 +437,38 @@ export default function SetPasswordDialog({
|
||||
: "text-red-600"
|
||||
}
|
||||
>
|
||||
{t("users.dialog.form.password.requirements.special")}
|
||||
{t(
|
||||
"users.dialog.form.password.requirements.special",
|
||||
)}
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="confirm-password">
|
||||
<FormMessage />
|
||||
</FormItem>
|
||||
)}
|
||||
/>
|
||||
|
||||
<FormField
|
||||
control={form.control}
|
||||
name="confirmPassword"
|
||||
render={({ field }) => (
|
||||
<FormItem>
|
||||
<FormLabel>
|
||||
{t("users.dialog.form.password.confirm.title")}
|
||||
</Label>
|
||||
</FormLabel>
|
||||
<FormControl>
|
||||
<div className="relative">
|
||||
<Input
|
||||
id="confirm-password"
|
||||
className="h-10 pr-10"
|
||||
{...field}
|
||||
type={showConfirmPassword ? "text" : "password"}
|
||||
value={confirmPassword}
|
||||
onChange={(event) => {
|
||||
setConfirmPassword(event.target.value);
|
||||
setError(null);
|
||||
}}
|
||||
placeholder={t(
|
||||
"users.dialog.form.newPassword.confirm.placeholder",
|
||||
)}
|
||||
className="h-10 pr-10"
|
||||
/>
|
||||
<Button
|
||||
type="button"
|
||||
@ -408,7 +485,9 @@ export default function SetPasswordDialog({
|
||||
})
|
||||
}
|
||||
className="absolute right-0 top-0 h-full px-3 py-2 hover:bg-transparent"
|
||||
onClick={() => setShowConfirmPassword(!showConfirmPassword)}
|
||||
onClick={() =>
|
||||
setShowConfirmPassword(!showConfirmPassword)
|
||||
}
|
||||
>
|
||||
{showConfirmPassword ? (
|
||||
<LuEyeOff className="size-4" />
|
||||
@ -417,35 +496,29 @@ export default function SetPasswordDialog({
|
||||
)}
|
||||
</Button>
|
||||
</div>
|
||||
</FormControl>
|
||||
|
||||
{/* Password match indicator */}
|
||||
{password && confirmPassword && (
|
||||
{password &&
|
||||
confirmPassword &&
|
||||
password === confirmPassword && (
|
||||
<div className="mt-1 flex items-center gap-1.5 text-xs">
|
||||
{password === confirmPassword ? (
|
||||
<>
|
||||
<LuCheck className="size-3.5 text-green-500" />
|
||||
<span className="text-green-600">
|
||||
{t("users.dialog.form.password.match")}
|
||||
</span>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<LuX className="size-3.5 text-red-500" />
|
||||
<span className="text-red-600">
|
||||
{t("users.dialog.form.password.notMatch")}
|
||||
</span>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<FormMessage />
|
||||
</FormItem>
|
||||
)}
|
||||
/>
|
||||
|
||||
{form.formState.errors.root && (
|
||||
<div className="rounded-md bg-destructive/10 p-3 text-sm text-destructive">
|
||||
{error}
|
||||
{form.formState.errors.root.message}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<DialogFooter className="flex flex-col-reverse gap-2 sm:flex-row sm:justify-end">
|
||||
<div className="flex flex-1 flex-col justify-end">
|
||||
@ -463,17 +536,8 @@ export default function SetPasswordDialog({
|
||||
variant="select"
|
||||
aria-label={t("button.save", { ns: "common" })}
|
||||
className="flex flex-1"
|
||||
onClick={handleSave}
|
||||
disabled={
|
||||
isLoading ||
|
||||
!password ||
|
||||
password !== confirmPassword ||
|
||||
(username && !oldPassword) ||
|
||||
!requirements.length ||
|
||||
!requirements.uppercase ||
|
||||
!requirements.digit ||
|
||||
!requirements.special
|
||||
}
|
||||
type="submit"
|
||||
disabled={isLoading || !form.formState.isValid}
|
||||
>
|
||||
{isLoading ? (
|
||||
<div className="flex flex-row items-center gap-2">
|
||||
@ -487,6 +551,8 @@ export default function SetPasswordDialog({
|
||||
</div>
|
||||
</div>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
</Form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user