calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-01-29 06:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix z.coerce.number

Browse Source
This commit is contained in:
Lokowitz
2025-11-16 14:29:19 +00:00
parent 7db99a7dd5
commit 58cf471bc4
21 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/lib/validators.ts
View File

@@ -2,11 +2,11 @@ import z from "zod";
import ipaddr from "ipaddr.js";
export function isValidCIDR(cidr: string): boolean {
return z.string().cidr().safeParse(cidr).success;
return z.cidrv4().safeParse(cidr).success || z.cidrv6().safeParse(cidr).success;
}
export function isValidIP(ip: string): boolean {
return z.string().ip().safeParse(ip).success;
return z.ipv4().safeParse(ip).success || z.ipv6().safeParse(ip).success;
}
export function isValidUrlGlobPattern(pattern: string): boolean {

2
server/private/routers/loginPage/deleteLoginPage.ts
View File

@@ -25,7 +25,7 @@ import { DeleteLoginPageResponse } from "@server/routers/loginPage/types";
const paramsSchema = z
.object({
orgId: z.string(),
loginPageId: z.coerce.number()
loginPageId: z.coerce.number<number>()
})
.strict();

4
server/private/routers/loginPage/loadLoginPage.ts
View File

@@ -23,8 +23,8 @@ import { fromError } from "zod-validation-error";
import { LoadLoginPageResponse } from "@server/routers/loginPage/types";
const querySchema = z.object({
resourceId: z.coerce.number().int().positive().optional(),
idpId: z.coerce.number().int().positive().optional(),
resourceId: z.coerce.number<number>().int().positive().optional(),
idpId: z.coerce.number<number>().int().positive().optional(),
orgId: z.string().min(1).optional(),
fullDomain: z.string().min(1)
});

2
server/private/routers/loginPage/updateLoginPage.ts
View File

@@ -31,7 +31,7 @@ import { UpdateLoginPageResponse } from "@server/routers/loginPage/types";
const paramsSchema = z
.object({
orgId: z.string(),
loginPageId: z.coerce.number()
loginPageId: z.coerce.number<number>()
})
.strict();

2
server/private/routers/orgIdp/deleteOrgIdp.ts
View File

@@ -26,7 +26,7 @@ import { OpenAPITags, registry } from "@server/openApi";
const paramsSchema = z
.object({
orgId: z.string().optional(), // Optional; used with org idp in saas
idpId: z.coerce.number()
idpId: z.coerce.number<number>()
})
.strict();

2
server/private/routers/orgIdp/getOrgIdp.ts
View File

@@ -30,7 +30,7 @@ import { GetOrgIdpResponse } from "@server/routers/orgIdp/types";
const paramsSchema = z
.object({
orgId: z.string().nonempty(),
idpId: z.coerce.number()
idpId: z.coerce.number<number>()
})
.strict();

2
server/private/routers/orgIdp/updateOrgOidcIdp.ts
View File

@@ -31,7 +31,7 @@ import { TierId } from "@server/lib/billing/tiers";
const paramsSchema = z
.object({
orgId: z.string().nonempty(),
idpId: z.coerce.number()
idpId: z.coerce.number<number>()
})
.strict();

2
server/routers/idp/createIdpOrgPolicy.ts
View File

@@ -12,7 +12,7 @@ import { eq, and } from "drizzle-orm";
import { idp, idpOrg } from "@server/db";
const paramsSchema = z.strictObject({
idpId: z.coerce.number(),
idpId: z.coerce.number<number>(),
orgId: z.string()
});

2
server/routers/idp/deleteIdp.ts
View File

@@ -13,7 +13,7 @@ import { OpenAPITags, registry } from "@server/openApi";
const paramsSchema = z
.object({
orgId: z.string().optional(), // Optional; used with org idp in saas
idpId: z.coerce.number()
idpId: z.coerce.number<number>()
})
.strict();

2
server/routers/idp/deleteIdpOrgPolicy.ts
View File

@@ -11,7 +11,7 @@ import { eq, and } from "drizzle-orm";
import { OpenAPITags, registry } from "@server/openApi";
const paramsSchema = z.strictObject({
idpId: z.coerce.number(),
idpId: z.coerce.number<number>(),
orgId: z.string()
});

2
server/routers/idp/generateOidcUrl.ts
View File

@@ -19,7 +19,7 @@ import { TierId } from "@server/lib/billing/tiers";
const paramsSchema = z
.object({
idpId: z.coerce.number()
idpId: z.coerce.number<number>()
})
.strict();

2
server/routers/idp/getIdp.ts
View File

@@ -14,7 +14,7 @@ import { decrypt } from "@server/lib/crypto";
const paramsSchema = z
.object({
idpId: z.coerce.number()
idpId: z.coerce.number<number>()
})
.strict();

2
server/routers/idp/listIdpOrgPolicies.ts
View File

@@ -11,7 +11,7 @@ import { fromError } from "zod-validation-error";
import { OpenAPITags, registry } from "@server/openApi";
const paramsSchema = z.object({
idpId: z.coerce.number()
idpId: z.coerce.number<number>()
});
const querySchema = z.strictObject({

2
server/routers/idp/updateIdpOrgPolicy.ts
View File

@@ -11,7 +11,7 @@ import { eq, and } from "drizzle-orm";
import { idp, idpOrg } from "@server/db";
const paramsSchema = z.strictObject({
idpId: z.coerce.number(),
idpId: z.coerce.number<number>(),
orgId: z.string()
});

2
server/routers/idp/updateOidcIdp.ts
View File

@@ -14,7 +14,7 @@ import config from "@server/lib/config";
const paramsSchema = z
.object({
idpId: z.coerce.number()
idpId: z.coerce.number<number>()
})
.strict();

4
server/routers/idp/validateOidcCallback.ts
View File

@@ -40,7 +40,7 @@ const ensureTrailingSlash = (url: string): string => {
const paramsSchema = z
.object({
idpId: z.coerce.number()
idpId: z.coerce.number<number>()
})
.strict();
@@ -51,7 +51,7 @@ const bodySchema = z.object({
});
const querySchema = z.object({
loginPageId: z.coerce.number().optional()
loginPageId: z.coerce.number<number>().optional()
});
export type ValidateOidcUrlCallbackResponse = {

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

@@ -122,7 +122,7 @@ const addTargetSchema = z
.object({
ip: z.string().refine(isTargetValid),
method: z.string().nullable(),
port: z.coerce.number().int().positive(),
port: z.coerce.number<number>().int().positive(),
siteId: z.int()
.positive({
error: "You must select a site for a target."

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

@@ -93,7 +93,7 @@ const addRuleSchema = z.object({
action: z.enum(["ACCEPT", "DROP", "PASS"]),
match: z.string(),
value: z.string(),
priority: z.coerce.number().int().optional()
priority: z.coerce.number<number>().int().optional()
});
type LocalRule = ArrayElement<ListResourceRulesResponse["rules"]> & {

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

@@ -136,7 +136,7 @@ const addTargetSchema = z
.object({
ip: z.string().refine(isTargetValid),
method: z.string().nullable(),
port: z.coerce.number().int().positive(),
port: z.coerce.number<number>().int().positive(),
siteId: z.int().positive(),
path: z.string().optional().nullable(),
pathMatchType: z

2
src/components/CreateShareLinkForm.tsx
View File

@@ -108,7 +108,7 @@ export default function CreateShareLinkForm({
resourceName: z.string(),
resourceUrl: z.string(),
timeUnit: z.string(),
timeValue: z.coerce.number().int().positive().min(1),
timeValue: z.coerce.number<number>().int().positive().min(1),
title: z.string().optional()
});

4
src/components/GenerateLicenseKeyForm.tsx
View File

@@ -81,8 +81,8 @@ export default function GenerateLicenseKeyForm({
jobTitle: z.string().min(1),
primaryUse: z.string().min(1),
industry: z.string().min(1),
prospectiveUsers: z.coerce.number().optional(),
prospectiveSites: z.coerce.number().optional(),
prospectiveUsers: z.coerce.number<number>().optional(),
prospectiveSites: z.coerce.number<number>().optional(),
companyName: z.string().min(1),
countryOfResidence: z.string().min(1),
stateProvinceRegion: z.string().min(1),