Skip to content

fix(api): refactor color parameter validations to use transforms and fallbacks #6127

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

Closed
hardik-bhalekar wants to merge 1 commit into from
+25 −29
Closed

fix(api): refactor color parameter validations to use transforms and fallbacks #6127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions app/api/streak/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,12 @@ export async function GET(request: Request) {
theme: themeName,
bg: isAutoTheme ? selectedTheme.bg : bg || selectedTheme.bg,
bgType,
bgStart,
bgEnd,
bgStart: bgStart ?? selectedTheme.bg,
bgEnd: bgEnd ?? selectedTheme.bg,
bgAngle,
text: isAutoTheme ? selectedTheme.text : text || selectedTheme.text,
accent: isAutoTheme ? selectedTheme.accent : accent || selectedTheme.accent,
border,
border: border ?? selectedTheme.accent,
radius,
speed: validatedSpeed,
scale,
Expand Down
48 changes: 22 additions & 26 deletions lib/validations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,16 +208,8 @@ const baseStreakParamsSchema = z.object({
return normalized;
}
const matchedKey = Object.keys(themes).find((key) => key.toLowerCase() === normalized);
return matchedKey || val;
return matchedKey || 'dark';
})
.refine(
(val) => {
return val === 'auto' || val === 'random' || Object.hasOwn(themes, val);
},
{
message: `Invalid theme. Supported themes: ${['auto', 'random', ...Object.keys(themes)].join(', ')}`,
}
)
.default('dark'),
bg: z
.string()
Expand All @@ -234,17 +226,25 @@ const baseStreakParamsSchema = z.object({
bgStart: z
.string()
.optional()
.refine((val) => !val || /^[0-9a-fA-F]{3,4}$|^[0-9a-fA-F]{6,8}$/.test(val.replace('#', '')), {
message: 'bgStart must be a valid hex color',
})
.transform((val) => (val ? sanitizeHexColor(val, '0d1117') : undefined)),
.transform((val) => {
if (!val) return undefined;
const cleanVal = val.replace(/^#/, '');
if (/^[0-9a-fA-F]{3,4}$|^[0-9a-fA-F]{6,8}$/.test(cleanVal)) {
return sanitizeHexColor(val, '0d1117');
}
return undefined;
}),
bgEnd: z
.string()
.optional()
.refine((val) => !val || /^[0-9a-fA-F]{3,4}$|^[0-9a-fA-F]{6,8}$/.test(val.replace('#', '')), {
message: 'bgEnd must be a valid hex color',
})
.transform((val) => (val ? sanitizeHexColor(val, '0d1117') : undefined)),
.transform((val) => {
if (!val) return undefined;
const cleanVal = val.replace(/^#/, '');
if (/^[0-9a-fA-F]{3,4}$|^[0-9a-fA-F]{6,8}$/.test(cleanVal)) {
return sanitizeHexColor(val, '0d1117');
}
return undefined;
}),
bgAngle: z
.string()
.optional()
Expand Down Expand Up @@ -507,17 +507,13 @@ const baseStreakParamsSchema = z.object({
border: z
.string()
.optional()
.refine(
(val) => {
if (val === undefined || val === '') return true;
const cleanVal = val.replace(/^#/, '');
return /^[0-9a-fA-F]{3,4}$|^[0-9a-fA-F]{6,8}$/.test(cleanVal);
},
{ message: 'border must be a valid hex color (with or without #)' }
)
.transform((val) => {
if (!val) return undefined;
return sanitizeHexColor(val, '58a6ff');
const cleanVal = val.replace(/^#/, '');
if (/^[0-9a-fA-F]{3,4}$|^[0-9a-fA-F]{6,8}$/.test(cleanVal)) {
return sanitizeHexColor(val, '58a6ff');
}
return undefined;
}),
});

Expand Down
Loading