Merge branch 'dev'

Fix upgrade @hookform/resolvers from 4.1.3 to 5.2.2

package-lock.json

@@ -10,7 +10,7 @@
             "license": "SEE LICENSE IN LICENSE AND README.md",
             "dependencies": {
                 "@asteasolutions/zod-to-openapi": "^7.3.4",
-                "@hookform/resolvers": "4.1.3",
+                "@hookform/resolvers": "5.2.2",
                 "@node-rs/argon2": "^2.0.2",
                 "@oslojs/crypto": "1.0.1",
                 "@oslojs/encoding": "1.1.0",
@@ -2233,15 +2233,14 @@
             "license": "MIT"
         },
         "node_modules/@hookform/resolvers": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-4.1.3.tgz",
-            "integrity": "sha512-Jsv6UOWYTrEFJ/01ZrnwVXs7KDvP8XIo115i++5PWvNkNvkrsTfGiLS6w+eJ57CYtUtDQalUWovCZDHFJ8u1VQ==",
-            "license": "MIT",
+            "version": "5.2.2",
+            "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.2.2.tgz",
+            "integrity": "sha512-A/IxlMLShx3KjV/HeTcTfaMxdwy690+L/ZADoeaTltLx+CVuzkeVIPuybK3jrRfw7YZnmdKsVVHAlEPIAEUNlA==",
             "dependencies": {
                 "@standard-schema/utils": "^0.3.0"
             },
             "peerDependencies": {
-                "react-hook-form": "^7.0.0"
+                "react-hook-form": "^7.55.0"
             }
         },
         "node_modules/@humanfs/core": {

package.json

@@ -27,7 +27,7 @@
     },
     "dependencies": {
         "@asteasolutions/zod-to-openapi": "^7.3.4",
-        "@hookform/resolvers": "4.1.3",
+        "@hookform/resolvers": "5.2.2",
         "@node-rs/argon2": "^2.0.2",
         "@oslojs/crypto": "1.0.1",
         "@oslojs/encoding": "1.1.0",

server/routers/resource/updateResource.ts

@@ -47,7 +47,7 @@ const updateHttpResourceBodySchema = z
         tlsServerName: z.string().nullable().optional(),
         setHostHeader: z.string().nullable().optional(),
         skipToIdpId: z.number().int().positive().nullable().optional(),
-        headers: z.array(z.object({ name: z.string(), value: z.string() })).optional(),
+        headers: z.array(z.object({ name: z.string(), value: z.string() })).nullable().optional(),
     })
     .strict()
     .refine((data) => Object.keys(data).length > 0, {

src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx

@@ -63,7 +63,7 @@ export default function AccessControlsPage() {
         autoProvisioned: z.boolean()
     });
 
-    const form = useForm<z.infer<typeof formSchema>>({
+    const form = useForm({
         resolver: zodResolver(formSchema),
         defaultValues: {
             username: user.username!,

src/app/[orgId]/settings/access/users/create/page.tsx

@@ -161,7 +161,7 @@ export default function Page() {
         { hours: 168, name: t("day", { count: 7 }) }
     ];
 
-    const internalForm = useForm<z.infer<typeof internalFormSchema>>({
+    const internalForm = useForm({
         resolver: zodResolver(internalFormSchema),
         defaultValues: {
             email: "",
@@ -170,7 +170,7 @@ export default function Page() {
         }
     });
 
-    const googleAzureForm = useForm<z.infer<typeof googleAzureFormSchema>>({
+    const googleAzureForm = useForm({
         resolver: zodResolver(googleAzureFormSchema),
         defaultValues: {
             email: "",
@@ -179,7 +179,7 @@ export default function Page() {
         }
     });
 
-    const genericOidcForm = useForm<z.infer<typeof genericOidcFormSchema>>({
+    const genericOidcForm = useForm({
         resolver: zodResolver(genericOidcFormSchema),
         defaultValues: {
             username: "",

src/app/[orgId]/settings/api-keys/create/page.tsx

@@ -91,14 +91,14 @@ export default function Page() {
 
     type CopiedFormValues = z.infer<typeof copiedFormSchema>;
 
-    const form = useForm<CreateFormValues>({
+    const form = useForm({
         resolver: zodResolver(createFormSchema),
         defaultValues: {
             name: ""
         }
     });
 
-    const copiedForm = useForm<CopiedFormValues>({
+    const copiedForm = useForm({
         resolver: zodResolver(copiedFormSchema),
         defaultValues: {
             copied: true

src/app/[orgId]/settings/clients/[clientId]/general/page.tsx

@@ -58,7 +58,7 @@ export default function GeneralPage() {
     const [clientSites, setClientSites] = useState<Tag[]>([]);
     const [activeSitesTagIndex, setActiveSitesTagIndex] = useState<number | null>(null);
 
-    const form = useForm<GeneralFormValues>({
+    const form = useForm({
         resolver: zodResolver(GeneralFormSchema),
         defaultValues: {
             name: client?.name,

src/app/[orgId]/settings/clients/create/page.tsx

@@ -265,7 +265,7 @@ export default function Page() {
         }
     };
 
-    const form = useForm<CreateClientFormValues>({
+    const form = useForm({
         resolver: zodResolver(createClientFormSchema),
         defaultValues: {
             name: "",

src/app/[orgId]/settings/general/page.tsx

@@ -59,7 +59,7 @@ export default function GeneralPage() {
     const [loadingDelete, setLoadingDelete] = useState(false);
     const [loadingSave, setLoadingSave] = useState(false);
 
-    const form = useForm<GeneralFormValues>({
+    const form = useForm({
         resolver: zodResolver(GeneralFormSchema),
         defaultValues: {
             name: org?.org.name,

src/app/[orgId]/settings/resources/[niceId]/authentication/page.tsx

@@ -138,12 +138,12 @@ export default function ResourceAuthenticationPage() {
     const [isSetPasswordOpen, setIsSetPasswordOpen] = useState(false);
     const [isSetPincodeOpen, setIsSetPincodeOpen] = useState(false);
 
-    const usersRolesForm = useForm<z.infer<typeof UsersRolesFormSchema>>({
+    const usersRolesForm = useForm({
         resolver: zodResolver(UsersRolesFormSchema),
         defaultValues: { roles: [], users: [] }
     });
 
-    const whitelistForm = useForm<z.infer<typeof whitelistSchema>>({
+    const whitelistForm = useForm({
         resolver: zodResolver(whitelistSchema),
         defaultValues: { emails: [] }
     });

src/app/[orgId]/settings/resources/[niceId]/general/page.tsx

@@ -119,7 +119,7 @@ export default function GeneralForm() {
 
     type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
 
-    const form = useForm<GeneralFormValues>({
+    const form = useForm({
         resolver: zodResolver(GeneralFormSchema),
         defaultValues: {
             enabled: resource.enabled,

src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx

@@ -260,7 +260,7 @@ export default function ReverseProxyTargets(props: {
             port: "" as any as number,
             path: null,
             pathMatchType: null
-        } as z.infer<typeof addTargetSchema>
+        }
     });
 
     const watchedIp = addTargetForm.watch("ip");
@@ -274,7 +274,7 @@ export default function ReverseProxyTargets(props: {
         }
     };
 
-    const tlsSettingsForm = useForm<TlsSettingsValues>({
+    const tlsSettingsForm = useForm({
         resolver: zodResolver(tlsSettingsSchema),
         defaultValues: {
             ssl: resource.ssl,
@@ -282,7 +282,7 @@ export default function ReverseProxyTargets(props: {
         }
     });
 
-    const proxySettingsForm = useForm<ProxySettingsValues>({
+    const proxySettingsForm = useForm({
         resolver: zodResolver(proxySettingsSchema),
         defaultValues: {
             setHostHeader: resource.setHostHeader || "",
@@ -290,7 +290,7 @@ export default function ReverseProxyTargets(props: {
         }
     });
 
-    const targetsSettingsForm = useForm<TargetsSettingsValues>({
+    const targetsSettingsForm = useForm({
         resolver: zodResolver(targetsSettingsSchema),
         defaultValues: {
             stickySession: resource.stickySession

src/app/[orgId]/settings/resources/[niceId]/rules/page.tsx

@@ -114,7 +114,7 @@ export default function ResourceRules(props: {
         CIDR: t('ipAddressRange')
     } as const;
 
-    const addRuleForm = useForm<z.infer<typeof addRuleSchema>>({
+    const addRuleForm = useForm({
         resolver: zodResolver(addRuleSchema),
         defaultValues: {
             action: "ACCEPT",

src/app/[orgId]/settings/resources/create/page.tsx

@@ -211,7 +211,7 @@ export default function Page() {
             ])
     ];
 
-    const baseForm = useForm<BaseResourceFormValues>({
+    const baseForm = useForm({
         resolver: zodResolver(baseResourceFormSchema),
         defaultValues: {
             name: "",
@@ -219,12 +219,12 @@ export default function Page() {
         }
     });
 
-    const httpForm = useForm<HttpResourceFormValues>({
+    const httpForm = useForm({
         resolver: zodResolver(httpResourceFormSchema),
         defaultValues: {}
     });
 
-    const tcpUdpForm = useForm<TcpUdpResourceFormValues>({
+    const tcpUdpForm = useForm({
         resolver: zodResolver(tcpUdpResourceFormSchema),
         defaultValues: {
             protocol: "tcp",
@@ -241,7 +241,7 @@ export default function Page() {
             port: "" as any as number,
             path: null,
             pathMatchType: null
-        } as z.infer<typeof addTargetSchema>
+        }
     });
 
     const watchedIp = addTargetForm.watch("ip");

src/app/[orgId]/settings/sites/[niceId]/general/page.tsx

@@ -64,7 +64,7 @@ export default function GeneralPage() {
     const router = useRouter();
     const t = useTranslations();
 
-    const form = useForm<GeneralFormValues>({
+    const form = useForm({
         resolver: zodResolver(GeneralFormSchema),
         defaultValues: {
             name: site?.name,

src/app/[orgId]/settings/sites/create/page.tsx

@@ -425,7 +425,7 @@ WantedBy=default.target`
         }
     };
 
-    const form = useForm<CreateSiteFormValues>({
+    const form = useForm({
         resolver: zodResolver(createSiteFormSchema),
         defaultValues: {
             name: "",

src/app/admin/api-keys/create/page.tsx

@@ -89,14 +89,14 @@ export default function Page() {
 
     type CopiedFormValues = z.infer<typeof copiedFormSchema>;
 
-    const form = useForm<CreateFormValues>({
+    const form = useForm({
         resolver: zodResolver(createFormSchema),
         defaultValues: {
             name: ""
         }
     });
 
-    const copiedForm = useForm<CopiedFormValues>({
+    const copiedForm = useForm({
         resolver: zodResolver(copiedFormSchema),
         defaultValues: {
             copied: true

src/app/admin/idp/[idpId]/general/page.tsx

@@ -74,7 +74,7 @@ export default function GeneralPage() {
 
     type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
 
-    const form = useForm<GeneralFormValues>({
+    const form = useForm({
         resolver: zodResolver(GeneralFormSchema),
         defaultValues: {
             name: "",

src/app/admin/idp/[idpId]/policies/page.tsx

@@ -102,7 +102,7 @@ export default function PoliciesPage() {
     type PolicyFormValues = z.infer<typeof policyFormSchema>;
     type DefaultMappingsValues = z.infer<typeof defaultMappingsSchema>;
 
-    const form = useForm<PolicyFormValues>({
+    const form = useForm({
         resolver: zodResolver(policyFormSchema),
         defaultValues: {
             orgId: "",
@@ -111,7 +111,7 @@ export default function PoliciesPage() {
         }
     });
 
-    const defaultMappingsForm = useForm<DefaultMappingsValues>({
+    const defaultMappingsForm = useForm({
         resolver: zodResolver(defaultMappingsSchema),
         defaultValues: {
             defaultRoleMapping: "",

src/app/admin/idp/create/page.tsx

@@ -79,7 +79,7 @@ export default function Page() {
         }
     ];
 
-    const form = useForm<CreateIdpFormValues>({
+    const form = useForm({
         resolver: zodResolver(createIdpFormSchema),
         defaultValues: {
             name: "",

src/app/admin/license/page.tsx

@@ -97,7 +97,7 @@ export default function LicensePage() {
         })
     });
 
-    const form = useForm<z.infer<typeof formSchema>>({
+    const form = useForm({
         resolver: zodResolver(formSchema),
         defaultValues: {
             licenseKey: "",

src/app/auth/initial-setup/page.tsx

@@ -51,7 +51,7 @@ export default function InitialSetupPage() {
     const [error, setError] = useState<string | null>(null);
     const [checking, setChecking] = useState(true);
 
-    const form = useForm<z.infer<typeof formSchema>>({
+    const form = useForm({
         resolver: zodResolver(formSchema),
         defaultValues: {
             setupToken: "",

src/app/auth/reset-password/ResetPasswordForm.tsx

@@ -102,7 +102,7 @@ export default function ResetPasswordForm({
         code: z.string().length(6, { message: t('pincodeInvalid') })
     });
 
-    const form = useForm<z.infer<typeof formSchema>>({
+    const form = useForm({
         resolver: zodResolver(formSchema),
         defaultValues: {
             email: emailParam || "",
@@ -112,14 +112,14 @@ export default function ResetPasswordForm({
         }
     });
 
-    const mfaForm = useForm<z.infer<typeof mfaSchema>>({
+    const mfaForm = useForm({
         resolver: zodResolver(mfaSchema),
         defaultValues: {
             code: ""
         }
     });
 
-    const requestForm = useForm<z.infer<typeof requestSchema>>({
+    const requestForm = useForm({
         resolver: zodResolver(requestSchema),
         defaultValues: {
             email: emailParam || ""

src/app/setup/page.tsx

@@ -50,7 +50,7 @@ export default function StepperForm() {
         subnet: z.string().min(1, { message: t("subnetRequired") })
     });
 
-    const orgForm = useForm<z.infer<typeof orgSchema>>({
+    const orgForm = useForm({
         resolver: zodResolver(orgSchema),
         defaultValues: {
             orgName: "",

src/components/IdpCreateWizard.tsx

@@ -84,7 +84,7 @@ export function IdpCreateWizard({ onSubmit, defaultValues, loading = false }: Id
         }
     ];
 
-    const form = useForm<CreateIdpFormValues>({
+    const form = useForm({
         resolver: zodResolver(createIdpFormSchema),
         defaultValues: {
             name: "",

src/components/LoginForm.tsx

@@ -80,7 +80,7 @@ export default function LoginForm({ redirect, onLogin, idps }: LoginFormProps) {
         code: z.string().length(6, { message: t("pincodeInvalid") })
     });
 
-    const form = useForm<z.infer<typeof formSchema>>({
+    const form = useForm({
         resolver: zodResolver(formSchema),
         defaultValues: {
             email: "",
@@ -88,7 +88,7 @@ export default function LoginForm({ redirect, onLogin, idps }: LoginFormProps) {
         }
     });
 
-    const mfaForm = useForm<z.infer<typeof mfaSchema>>({
+    const mfaForm = useForm({
         resolver: zodResolver(mfaSchema),
         defaultValues: {
             code: ""

src/components/ResetPasswordForm.tsx

@@ -102,7 +102,7 @@ export default function ResetPasswordForm({
         code: z.string().length(6, { message: t('pincodeInvalid') })
     });
 
-    const form = useForm<z.infer<typeof formSchema>>({
+    const form = useForm({
         resolver: zodResolver(formSchema),
         defaultValues: {
             email: emailParam || "",
@@ -112,14 +112,14 @@ export default function ResetPasswordForm({
         }
     });
 
-    const mfaForm = useForm<z.infer<typeof mfaSchema>>({
+    const mfaForm = useForm({
         resolver: zodResolver(mfaSchema),
         defaultValues: {
             code: ""
         }
     });
 
-    const requestForm = useForm<z.infer<typeof requestSchema>>({
+    const requestForm = useForm({
         resolver: zodResolver(requestSchema),
         defaultValues: {
             email: emailParam || ""

src/components/ResourceAuthPortal.tsx

@@ -135,28 +135,28 @@ export default function ResourceAuthPortal(props: ResourceAuthPortalProps) {
 
     const [activeTab, setActiveTab] = useState(getDefaultSelectedMethod());
 
-    const pinForm = useForm<z.infer<typeof pinSchema>>({
+    const pinForm = useForm({
         resolver: zodResolver(pinSchema),
         defaultValues: {
             pin: ""
         }
     });
 
-    const passwordForm = useForm<z.infer<typeof passwordSchema>>({
+    const passwordForm = useForm({
         resolver: zodResolver(passwordSchema),
         defaultValues: {
             password: ""
         }
     });
 
-    const requestOtpForm = useForm<z.infer<typeof requestOtpSchema>>({
+    const requestOtpForm = useForm({
         resolver: zodResolver(requestOtpSchema),
         defaultValues: {
             email: ""
         }
     });
 
-    const submitOtpForm = useForm<z.infer<typeof submitOtpSchema>>({
+    const submitOtpForm = useForm({
         resolver: zodResolver(submitOtpSchema),
         defaultValues: {
             email: "",

src/components/SecurityKeyForm.tsx

@@ -119,7 +119,7 @@ export default function SecurityKeyForm({
         code: z.string().optional()
     });
 
-    const registerForm = useForm<RegisterFormValues>({
+    const registerForm = useForm({
         resolver: zodResolver(registerSchema),
         defaultValues: {
             name: "",
@@ -128,7 +128,7 @@ export default function SecurityKeyForm({
         }
     });
 
-    const deleteForm = useForm<DeleteFormValues>({
+    const deleteForm = useForm({
         resolver: zodResolver(deleteSchema),
         defaultValues: {
             password: "",

src/components/SetResourcePasswordForm.tsx

@@ -39,10 +39,6 @@ const setPasswordFormSchema = z.object({
 
 type SetPasswordFormValues = z.infer<typeof setPasswordFormSchema>;
 
-const defaultValues: Partial<SetPasswordFormValues> = {
-    password: ""
-};
-
 type SetPasswordFormProps = {
     open: boolean;
     setOpen: (open: boolean) => void;
@@ -61,9 +57,11 @@ export default function SetResourcePasswordForm({
 
     const [loading, setLoading] = useState(false);
 
-    const form = useForm<SetPasswordFormValues>({
+    const form = useForm({
         resolver: zodResolver(setPasswordFormSchema),
-        defaultValues
+        defaultValues: {
+            password: ""
+        }
     });
 
     useEffect(() => {

src/components/SetResourcePincodeForm.tsx

@@ -44,10 +44,6 @@ const setPincodeFormSchema = z.object({
 
 type SetPincodeFormValues = z.infer<typeof setPincodeFormSchema>;
 
-const defaultValues: Partial<SetPincodeFormValues> = {
-    pincode: ""
-};
-
 type SetPincodeFormProps = {
     open: boolean;
     setOpen: (open: boolean) => void;
@@ -65,9 +61,11 @@ export default function SetResourcePincodeForm({
 
     const api = createApiClient(useEnvContext());
 
-    const form = useForm<SetPincodeFormValues>({
+    const form = useForm({
         resolver: zodResolver(setPincodeFormSchema),
-        defaultValues
+        defaultValues: {
+            pincode: ""
+        }
     });
 
     const t = useTranslations();

src/components/SignupForm.tsx

@@ -117,7 +117,7 @@ export default function SignupForm({
     const [passwordValue, setPasswordValue] = useState("");
     const [confirmPasswordValue, setConfirmPasswordValue] = useState("");
 
-    const form = useForm<z.infer<typeof formSchema>>({
+    const form = useForm({
         resolver: zodResolver(formSchema),
         defaultValues: {
             email: emailParam || "",

src/components/SupporterStatus.tsx

@@ -78,7 +78,7 @@ export default function SupporterStatus({ isCollapsed = false }: SupporterStatus
         key: z.string().nonempty({ message: "Supporter key is required" })
     });
 
-    const form = useForm<z.infer<typeof formSchema>>({
+    const form = useForm({
         resolver: zodResolver(formSchema),
         defaultValues: {
             githubUsername: "",

src/components/TwoFactorSetupForm.tsx

@@ -91,14 +91,14 @@ const TwoFactorSetupForm = forwardRef<
             code: z.string().length(6, { message: t("pincodeInvalid") })
         });
 
-        const enableForm = useForm<z.infer<typeof enableSchema>>({
+        const enableForm = useForm({
             resolver: zodResolver(enableSchema),
             defaultValues: {
                 password: initialPassword || ""
             }
         });
 
-        const confirmForm = useForm<z.infer<typeof confirmSchema>>({
+        const confirmForm = useForm({
             resolver: zodResolver(confirmSchema),
             defaultValues: {
                 code: ""

src/components/VerifyEmailForm.tsx

@@ -80,7 +80,7 @@ export default function VerifyEmailForm({
         })
     });
 
-    const form = useForm<z.infer<typeof FormSchema>>({
+    const form = useForm({
         resolver: zodResolver(FormSchema),
         defaultValues: {
             email: email,