Skip to content
Closed

bbbv #352

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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!,
Expand Down
6 changes: 3 additions & 3 deletions src/app/[orgId]/settings/access/users/create/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand All @@ -170,7 +170,7 @@ export default function Page() {
}
});

const googleAzureForm = useForm<z.infer<typeof googleAzureFormSchema>>({
const googleAzureForm = useForm({
resolver: zodResolver(googleAzureFormSchema),
defaultValues: {
email: "",
Expand All @@ -179,7 +179,7 @@ export default function Page() {
}
});

const genericOidcForm = useForm<z.infer<typeof genericOidcFormSchema>>({
const genericOidcForm = useForm({
resolver: zodResolver(genericOidcFormSchema),
defaultValues: {
username: "",
Expand Down
4 changes: 2 additions & 2 deletions src/app/[orgId]/settings/api-keys/create/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/app/[orgId]/settings/clients/create/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export default function Page() {
}
};

const form = useForm<CreateClientFormValues>({
const form = useForm({
resolver: zodResolver(createClientFormSchema),
defaultValues: {
name: "",
Expand Down
2 changes: 1 addition & 1 deletion src/app/[orgId]/settings/general/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [] }
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -274,23 +274,23 @@ export default function ReverseProxyTargets(props: {
}
};

const tlsSettingsForm = useForm<TlsSettingsValues>({
const tlsSettingsForm = useForm({
resolver: zodResolver(tlsSettingsSchema),
defaultValues: {
ssl: resource.ssl,
tlsServerName: resource.tlsServerName || ""
}
});

const proxySettingsForm = useForm<ProxySettingsValues>({
const proxySettingsForm = useForm({
resolver: zodResolver(proxySettingsSchema),
defaultValues: {
setHostHeader: resource.setHostHeader || "",
headers: resource.headers
}
});

const targetsSettingsForm = useForm<TargetsSettingsValues>({
const targetsSettingsForm = useForm({
resolver: zodResolver(targetsSettingsSchema),
defaultValues: {
stickySession: resource.stickySession
Expand Down
2 changes: 1 addition & 1 deletion src/app/[orgId]/settings/resources/[niceId]/rules/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions src/app/[orgId]/settings/resources/create/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -211,20 +211,20 @@ export default function Page() {
])
];

const baseForm = useForm<BaseResourceFormValues>({
const baseForm = useForm({
resolver: zodResolver(baseResourceFormSchema),
defaultValues: {
name: "",
http: true
}
});

const httpForm = useForm<HttpResourceFormValues>({
const httpForm = useForm({
resolver: zodResolver(httpResourceFormSchema),
defaultValues: {}
});

const tcpUdpForm = useForm<TcpUdpResourceFormValues>({
const tcpUdpForm = useForm({
resolver: zodResolver(tcpUdpResourceFormSchema),
defaultValues: {
protocol: "tcp",
Expand All @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/app/[orgId]/settings/sites/create/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ WantedBy=default.target`
}
};

const form = useForm<CreateSiteFormValues>({
const form = useForm({
resolver: zodResolver(createSiteFormSchema),
defaultValues: {
name: "",
Expand Down
4 changes: 2 additions & 2 deletions src/app/admin/api-keys/create/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/app/admin/idp/[idpId]/general/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand Down
4 changes: 2 additions & 2 deletions src/app/admin/idp/[idpId]/policies/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand All @@ -111,7 +111,7 @@ export default function PoliciesPage() {
}
});

const defaultMappingsForm = useForm<DefaultMappingsValues>({
const defaultMappingsForm = useForm({
resolver: zodResolver(defaultMappingsSchema),
defaultValues: {
defaultRoleMapping: "",
Expand Down
2 changes: 1 addition & 1 deletion src/app/admin/idp/create/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default function Page() {
}
];

const form = useForm<CreateIdpFormValues>({
const form = useForm({
resolver: zodResolver(createIdpFormSchema),
defaultValues: {
name: "",
Expand Down
2 changes: 1 addition & 1 deletion src/app/admin/license/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export default function LicensePage() {
})
});

const form = useForm<z.infer<typeof formSchema>>({
const form = useForm({
resolver: zodResolver(formSchema),
defaultValues: {
licenseKey: "",
Expand Down
2 changes: 1 addition & 1 deletion src/app/auth/initial-setup/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand Down
6 changes: 3 additions & 3 deletions src/app/auth/reset-password/ResetPasswordForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 || "",
Expand All @@ -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 || ""
Expand Down
2 changes: 1 addition & 1 deletion src/app/setup/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand Down
2 changes: 1 addition & 1 deletion src/components/IdpCreateWizard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export function IdpCreateWizard({ onSubmit, defaultValues, loading = false }: Id
}
];

const form = useForm<CreateIdpFormValues>({
const form = useForm({
resolver: zodResolver(createIdpFormSchema),
defaultValues: {
name: "",
Expand Down
4 changes: 2 additions & 2 deletions src/components/LoginForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ 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: "",
password: ""
}
});

const mfaForm = useForm<z.infer<typeof mfaSchema>>({
const mfaForm = useForm({
resolver: zodResolver(mfaSchema),
defaultValues: {
code: ""
Expand Down
6 changes: 3 additions & 3 deletions src/components/ResetPasswordForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 || "",
Expand All @@ -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 || ""
Expand Down
Loading
Loading