Skip to content
Merged
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
12 changes: 12 additions & 0 deletions src/app/api/directory/route.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,16 @@ describe("GET /api/directory", () => {
"title.ilike.%100\\%\\_demo\\,\\(v1\\.2\\)\\*%,description.ilike.%100\\%\\_demo\\,\\(v1\\.2\\)\\*%"
);
});

it("defaults partially numeric page params instead of accepting parseInt prefixes", async () => {
const chain = chainResult({ data: [], error: null, count: 0 });
mockFrom.mockReturnValue(chain);

const res = await GET(makeRequest({ page: "3abc" }));
const body = await res.json();

expect(res.status).toBe(200);
expect(chain.range).toHaveBeenCalledWith(0, 19);
expect(body.page).toBe(1);
});
});
11 changes: 7 additions & 4 deletions src/app/api/directory/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
escapePostgrestSearchValue,
sanitizeSearchParams,
} from "@/lib/security/sanitize";
import { parsePaginationParam } from "@/lib/api-pagination";

const LNBITS_INVOICE_KEY = process.env.LNBITS_INVOICE_KEY || "";
const MAX_DIRECTORY_PAGE = 10_000;
Expand All @@ -38,10 +39,12 @@ export async function GET(request: NextRequest) {
const url = new URL(request.url);
const search = sanitizeSearchParams(url, "search");
const tag = sanitizeSearchParams(url, "tag");
const parsedPage = parseInt(url.searchParams.get("page") || "1", 10);
const page = Number.isFinite(parsedPage) && parsedPage > 0
? Math.min(parsedPage, MAX_DIRECTORY_PAGE)
: 1;
const page = parsePaginationParam(
url.searchParams.get("page"),
1,
1,
MAX_DIRECTORY_PAGE
);
const limit = 20;
const offset = (page - 1) * limit;

Expand Down
12 changes: 12 additions & 0 deletions src/app/api/prompts/route.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,16 @@ describe("GET /api/prompts", () => {
"title.ilike.%ai\\%\\,foo\\_\\(v1\\)\\.%,description.ilike.%ai\\%\\,foo\\_\\(v1\\)\\.%,tagline.ilike.%ai\\%\\,foo\\_\\(v1\\)\\.%"
);
});

it("defaults partially numeric page params instead of accepting parseInt prefixes", async () => {
const query = makePromptQuery();
mockFrom.mockReturnValue(query);

const response = await GET(makeGetRequest({ page: "4abc" }));
const body = await response.json();

expect(response.status).toBe(200);
expect(query.range).toHaveBeenCalledWith(0, 19);
expect(body.page).toBe(1);
});
});
4 changes: 2 additions & 2 deletions src/app/api/prompts/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { getAuthContext } from "@/lib/auth/get-user";
import { createServiceClient } from "@/lib/supabase/service";
import { promptListingSchema, slugify } from "@/lib/prompts/validation";
import { scanPrompt } from "@/lib/prompts/security-scan";
import { parsePaginationParam } from "@/lib/api-pagination";

function escapePostgrestSearch(value: string) {
return value
Expand All @@ -26,8 +27,7 @@ export async function GET(request: NextRequest) {
const category = url.searchParams.get("category") || "";
const tag = url.searchParams.get("tag") || "";
const sort = url.searchParams.get("sort") || "newest";
const parsedPage = parseInt(url.searchParams.get("page") || "1", 10);
const page = Number.isFinite(parsedPage) && parsedPage > 0 ? parsedPage : 1;
const page = parsePaginationParam(url.searchParams.get("page"), 1, 1, 100_000);
const limit = 20;
const offset = (page - 1) * limit;

Expand Down
1 change: 1 addition & 0 deletions src/lib/pagination.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ describe("parsePageParam", () => {
expect(parsePageParam("-1")).toBe(1);
expect(parsePageParam("0")).toBe(1);
expect(parsePageParam("abc")).toBe(1);
expect(parsePageParam("2abc")).toBe(1);
expect(parsePageParam("Infinity")).toBe(1);
expect(parsePageParam("-Infinity")).toBe(1);
});
Expand Down
7 changes: 5 additions & 2 deletions src/lib/pagination.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ export function parsePageParam(
value: string | null | undefined,
maxPage = DEFAULT_MAX_PAGE
) {
const parsed = parseInt(value || "1", 10);
const raw = value?.trim();
if (!raw) return 1;

const parsed = Number(raw);
return Number.isFinite(parsed)
? Math.min(Math.max(parsed, 1), maxPage)
? Math.min(Math.max(Math.trunc(parsed), 1), maxPage)
: 1;
}