mirror of
https://github.com/fosrl/pangolin.git
synced 2026-09-22 02:28:26 +02:00
Fixed copilot issue.
This commit is contained in:
@@ -24,7 +24,10 @@ import {
|
|||||||
import { registry } from "@server/openApi";
|
import { registry } from "@server/openApi";
|
||||||
import { OpenAPITags } from "@server/openApi";
|
import { OpenAPITags } from "@server/openApi";
|
||||||
import { createCertificate } from "#dynamic/routers/certificates/createCertificate";
|
import { createCertificate } from "#dynamic/routers/certificates/createCertificate";
|
||||||
import { validateAndConstructDomain, checkWildcardDomainConflict } from "@server/lib/domainUtils";
|
import {
|
||||||
|
validateAndConstructDomain,
|
||||||
|
checkWildcardDomainConflict
|
||||||
|
} from "@server/lib/domainUtils";
|
||||||
import { build } from "@server/build";
|
import { build } from "@server/build";
|
||||||
import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
|
import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
|
||||||
import { tierMatrix } from "@server/lib/billing/tierMatrix";
|
import { tierMatrix } from "@server/lib/billing/tierMatrix";
|
||||||
@@ -58,6 +61,10 @@ const updateHttpResourceBodySchema = z
|
|||||||
tlsServerName: z.string().nullable().optional(),
|
tlsServerName: z.string().nullable().optional(),
|
||||||
setHostHeader: z.string().nullable().optional(),
|
setHostHeader: z.string().nullable().optional(),
|
||||||
skipToIdpId: z.int().positive().nullable().optional(),
|
skipToIdpId: z.int().positive().nullable().optional(),
|
||||||
|
headers: z
|
||||||
|
.array(z.strictObject({ name: z.string(), value: z.string() }))
|
||||||
|
.nullable()
|
||||||
|
.optional(), // deprecated alias for requestHeaders
|
||||||
requestHeaders: z
|
requestHeaders: z
|
||||||
.array(z.strictObject({ name: z.string(), value: z.string() }))
|
.array(z.strictObject({ name: z.string(), value: z.string() }))
|
||||||
.nullable()
|
.nullable()
|
||||||
@@ -117,6 +124,7 @@ const updateHttpResourceBodySchema = z
|
|||||||
(data) => {
|
(data) => {
|
||||||
const validHeaderName = /^[a-zA-Z0-9!#$%&'*+\-.^_`|~]+$/;
|
const validHeaderName = /^[a-zA-Z0-9!#$%&'*+\-.^_`|~]+$/;
|
||||||
const allHeaders = [
|
const allHeaders = [
|
||||||
|
...(data.headers ?? []),
|
||||||
...(data.requestHeaders ?? []),
|
...(data.requestHeaders ?? []),
|
||||||
...(data.responseHeaders ?? [])
|
...(data.responseHeaders ?? [])
|
||||||
];
|
];
|
||||||
@@ -130,6 +138,7 @@ const updateHttpResourceBodySchema = z
|
|||||||
(data) => {
|
(data) => {
|
||||||
const validHeaderValue = /^[\t\x20-\x7E]*$/;
|
const validHeaderValue = /^[\t\x20-\x7E]*$/;
|
||||||
const allHeaders = [
|
const allHeaders = [
|
||||||
|
...(data.headers ?? []),
|
||||||
...(data.requestHeaders ?? []),
|
...(data.requestHeaders ?? []),
|
||||||
...(data.responseHeaders ?? [])
|
...(data.responseHeaders ?? [])
|
||||||
];
|
];
|
||||||
@@ -143,6 +152,7 @@ const updateHttpResourceBodySchema = z
|
|||||||
(data) => {
|
(data) => {
|
||||||
const templatePattern = /\{\{[^}]+\}\}/;
|
const templatePattern = /\{\{[^}]+\}\}/;
|
||||||
const allHeaders = [
|
const allHeaders = [
|
||||||
|
...(data.headers ?? []),
|
||||||
...(data.requestHeaders ?? []),
|
...(data.requestHeaders ?? []),
|
||||||
...(data.responseHeaders ?? [])
|
...(data.responseHeaders ?? [])
|
||||||
];
|
];
|
||||||
@@ -470,10 +480,18 @@ async function updateHttpResource(
|
|||||||
}
|
}
|
||||||
|
|
||||||
let requestHeaders = undefined;
|
let requestHeaders = undefined;
|
||||||
if (updateData.requestHeaders) {
|
const mergedRequestHeaders = [
|
||||||
requestHeaders = JSON.stringify(updateData.requestHeaders);
|
...(updateData.headers ?? []),
|
||||||
} else if (updateData.requestHeaders === null) {
|
...(updateData.requestHeaders ?? [])
|
||||||
requestHeaders = null;
|
];
|
||||||
|
if (
|
||||||
|
updateData.headers !== undefined ||
|
||||||
|
updateData.requestHeaders !== undefined
|
||||||
|
) {
|
||||||
|
requestHeaders =
|
||||||
|
mergedRequestHeaders.length > 0
|
||||||
|
? JSON.stringify(mergedRequestHeaders)
|
||||||
|
: null;
|
||||||
}
|
}
|
||||||
|
|
||||||
let responseHeaders = undefined;
|
let responseHeaders = undefined;
|
||||||
|
|||||||
Reference in New Issue
Block a user