Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Stop whitespace in prefixes and fixes validation on bytes #2893

Merged
merged 6 commits into from
Feb 13, 2025
Merged

fix: Stop whitespace in prefixes and fixes validation on bytes #2893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c9f899
Fix prefix both client and server
perkinsjr Feb 13, 2025
3aba8e2
Fix check
perkinsjr Feb 13, 2025
7284f0a
Merge branch 'main' into fix-prefix
perkinsjr Feb 13, 2025
2e67791
fix form validation for bytes and prefix
perkinsjr Feb 13, 2025
2c2726f
Add labels and ids
perkinsjr Feb 13, 2025
8f152c5
[autofix.ci] apply automated fixes
autofix-ci[bot] Feb 13, 2025
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
6 changes: 4 additions & 2 deletions apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/new/validation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ export const formSchema = z.object({
.default(16),
prefix: z
.string()
.trim()
.max(8, { message: "Please limit the prefix to under 8 characters." })
.max(8, { message: "Prefixes cannot be longer than 8 characters" })
.refine((prefix) => !prefix.includes(" "), {
message: "Prefixes cannot contain spaces.",
})
.optional(),
ownerId: z.string().trim().optional(),
name: z.string().trim().optional(),
Expand Down
95 changes: 55 additions & 40 deletions apps/dashboard/app/(app)/apis/[apiId]/settings/default-bytes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
CardHeader,
CardTitle,
} from "@/components/ui/card";
import { FormField } from "@/components/ui/form";
import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
Expand Down Expand Up @@ -36,7 +36,12 @@ type Props = {
export const DefaultBytes: React.FC<Props> = ({ keyAuth }) => {
const router = useRouter();
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
resolver: async (data, context, options) => {
return zodResolver(formSchema)(data, context, options);
},
mode: "all",
shouldFocusError: true,
delayError: 100,
defaultValues: {
defaultBytes: keyAuth.defaultBytes ?? undefined,
keyAuthId: keyAuth.id,
Expand Down Expand Up @@ -64,43 +69,53 @@ export const DefaultBytes: React.FC<Props> = ({ keyAuth }) => {
}

return (
<form onSubmit={form.handleSubmit(onSubmit)}>
<Card>
<CardHeader>
<CardTitle>Default Bytes</CardTitle>
<CardDescription>
Set default Bytes for the keys under this API. Default byte size must be between{" "}
<span className="font-bold">8 to 255</span>
</CardDescription>
</CardHeader>
<CardContent>
<div className="flex flex-col space-y-2">
<input type="hidden" name="keyAuthId" value={keyAuth.id} />
<label className="hidden sr-only">Default Bytes</label>
<FormField
control={form.control}
name="defaultBytes"
render={({ field }) => (
<Input
className="max-w-sm"
{...field}
autoComplete="off"
onChange={(e) => field.onChange(Number(e.target.value.replace(/\D/g, "")))}
/>
)}
/>
</div>
</CardContent>
<CardFooter className="justify-end">
<Button
variant="primary"
disabled={!form.formState.isValid || form.formState.isSubmitting}
type="submit"
>
{form.formState.isSubmitting ? <Loading /> : "Save"}
</Button>
</CardFooter>
</Card>
</form>
<Form {...form}>
<form onSubmit={form.handleSubmit(onSubmit)}>
<Card>
<CardHeader>
<CardTitle>Default Bytes</CardTitle>
<CardDescription>
Set default Bytes for the keys under this API. Default byte size must be between{" "}
<span className="font-bold">8 to 255</span>
</CardDescription>
</CardHeader>
<CardContent>
<div className="flex flex-col space-y-2">
<input type="hidden" name="keyAuthId" value={keyAuth.id} />
<label htmlFor="defaultBytes" className="hidden sr-only">
Default Bytes
</label>
<FormField
control={form.control}
name="defaultBytes"
render={({ field }) => (
<FormItem>
<FormControl>
<Input
id="defaultBytes"
className="max-w-sm"
{...field}
autoComplete="off"
onChange={(e) => field.onChange(Number(e.target.value.replace(/\D/g, "")))}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</div>
</CardContent>
<CardFooter className="justify-end">
<Button
variant="primary"
disabled={!form.formState.isValid || form.formState.isSubmitting}
type="submit"
>
{form.formState.isSubmitting ? <Loading /> : "Save"}
</Button>
</CardFooter>
</Card>
</form>
</Form>
);
};
100 changes: 65 additions & 35 deletions apps/dashboard/app/(app)/apis/[apiId]/settings/default-prefix.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
CardHeader,
CardTitle,
} from "@/components/ui/card";
import { FormField } from "@/components/ui/form";
import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
Expand All @@ -19,7 +19,12 @@ import { z } from "zod";

const formSchema = z.object({
keyAuthId: z.string(),
defaultPrefix: z.string(),
defaultPrefix: z
.string()
.max(8, { message: "Prefixes cannot be longer than 8 characters" })
.refine((prefix) => !prefix.includes(" "), {
message: "Prefixes cannot contain spaces.",
}),
});

type Props = {
Expand All @@ -32,7 +37,12 @@ type Props = {
export const DefaultPrefix: React.FC<Props> = ({ keyAuth }) => {
const router = useRouter();
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
resolver: async (data, context, options) => {
return zodResolver(formSchema)(data, context, options);
},
mode: "all",
shouldFocusError: true,
delayError: 100,
defaultValues: {
defaultPrefix: keyAuth.defaultPrefix ?? undefined,
keyAuthId: keyAuth.id,
Expand All @@ -50,44 +60,64 @@ export const DefaultPrefix: React.FC<Props> = ({ keyAuth }) => {
},
});
async function onSubmit(values: z.infer<typeof formSchema>) {
if (values.defaultPrefix.length > 8) {
return toast.error("Default prefix is too long, maximum length is 8 characters.");
}
if (values.defaultPrefix === keyAuth.defaultPrefix) {
return toast.error("Please provide a different prefix than already existing one as default");
}
await setDefaultPrefix.mutateAsync(values);
}

return (
<form onSubmit={form.handleSubmit(onSubmit)}>
<Card>
<CardHeader>
<CardTitle>Default Prefix</CardTitle>
<CardDescription>Set default prefix for the keys under this API.</CardDescription>
</CardHeader>
<CardContent>
<div className="flex flex-col space-y-2">
<input type="hidden" name="keyAuthId" value={keyAuth.id} />
<label className="hidden sr-only">Default Prefix</label>
<FormField
control={form.control}
name="defaultPrefix"
render={({ field }) => <Input className="max-w-sm" {...field} autoComplete="off" />}
/>
</div>
</CardContent>
<CardFooter className="justify-end">
<Button
variant="primary"
disabled={!form.formState.isValid || form.formState.isSubmitting}
type="submit"
loading={form.formState.isSubmitting}
>
Save
</Button>
</CardFooter>
</Card>
</form>
<Form {...form}>
<form onSubmit={form.handleSubmit(onSubmit)}>
<Card>
<CardHeader>
<CardTitle>Default Prefix</CardTitle>
<CardDescription>
Set default prefix for the keys under this API. Don't add a trailing underscore, we'll
do that automatically
</CardDescription>
</CardHeader>
<CardContent>
<div className="flex flex-col space-y-2">
<input type="hidden" name="keyAuthId" value={keyAuth.id} />
<label htmlFor="defaultPrefix" className="hidden sr-only">
Default Prefix
</label>
<FormField
control={form.control}
name="defaultPrefix"
render={({ field }) => (
<FormItem>
<FormControl>
<Input
id="defaultPrefix"
className="max-w-sm"
{...field}
onBlur={(e) => {
if (e.target.value === "") {
return;
}
}}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</div>
</CardContent>
<CardFooter className="justify-end">
<Button
variant="primary"
disabled={!form.formState.isValid || form.formState.isSubmitting}
type="submit"
loading={form.formState.isSubmitting}
>
Save
</Button>
</CardFooter>
</Card>
</form>
</Form>
);
};
7 changes: 6 additions & 1 deletion apps/dashboard/lib/trpc/routers/api/setDefaultPrefix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ export const setDefaultApiPrefix = t.procedure
.use(auth)
.input(
z.object({
defaultPrefix: z.string().max(8, "Prefix can be a maximum of 8 characters"),
defaultPrefix: z
.string()
.max(8, { message: "Prefixes cannot be longer than 8 characters" })
.refine((prefix) => !prefix.includes(" "), {
message: "Prefixes cannot contain spaces.",
}),
keyAuthId: z.string(),
}),
)
Expand Down
8 changes: 7 additions & 1 deletion apps/dashboard/lib/trpc/routers/key/create.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ export const createKey = t.procedure
.use(auth)
.input(
z.object({
prefix: z.string().optional(),
prefix: z
.string()
.max(8, { message: "Prefixes cannot be longer than 8 characters" })
.refine((prefix) => !prefix.includes(" "), {
message: "Prefixes cannot contain spaces.",
})
.optional(),
bytes: z.number().int().gte(16).default(16),
keyAuthId: z.string(),
ownerId: z.string().nullish(),
Expand Down
Loading