Fix issue and appease linter

This commit is contained in:
James Waters 2023-08-11 20:51:15 +01:00
parent 77b9408935
commit 3fa4e05468
3 changed files with 17 additions and 7 deletions

View File

@ -3,7 +3,7 @@ import { performance } from "perf_hooks";
import { getServiceItem } from "utils/config/service-helpers"; import { getServiceItem } from "utils/config/service-helpers";
import createLogger from "utils/logger"; import createLogger from "utils/logger";
import { httpProxy } from "utils/proxy/http"; import { httpProxy } from "utils/proxy/http";
import {importCookieHeader} from "../../utils/proxy/cookie-jar"; import {importCookieHeader} from "utils/proxy/cookie-jar";
const logger = createLogger("ping"); const logger = createLogger("ping");

View File

@ -39,10 +39,20 @@ export function addCookieToJar(url, headers) {
} }
export function importCookieHeader(url, cookieHeader) { export function importCookieHeader(url, cookieHeader) {
for (const cookiePair of cookieHeader.split(';')) { const cookies = cookieHeader.split(';')
const [key, value] = cookiePair.trim().split('=') for (let i = 0; i < cookies.length; i += 1) {
cookieJar.setCookieSync(new Cookie({ const [key, value] = cookies[i].trim().split('=')
key, value
}), url.toString(), { ignoreError: true }); // If there's an existing cookie with a matching key for this url,
// we want to update it
const existingCookie = cookieJar.getCookiesSync(url).find(existing => existing.key === key)
if (existingCookie) {
existingCookie.value = value;
} else {
// Otherwise we add a new cookie
cookieJar.setCookieSync(new Cookie({
key, value
}), url.toString(), { ignoreError: false });
}
} }
} }

View File

@ -4,7 +4,7 @@ import validateWidgetData from "utils/proxy/validate-widget-data";
import { httpProxy } from "utils/proxy/http"; import { httpProxy } from "utils/proxy/http";
import createLogger from "utils/logger"; import createLogger from "utils/logger";
import widgets from "widgets/widgets"; import widgets from "widgets/widgets";
import {importCookieHeader} from "../cookie-jar"; import {importCookieHeader} from "utils/proxy/cookie-jar";
const logger = createLogger("genericProxyHandler"); const logger = createLogger("genericProxyHandler");