diff --git a/src/main/router.test.ts b/src/main/router.test.ts index b7e5afb0b2..4f1a508166 100644 --- a/src/main/router.test.ts +++ b/src/main/router.test.ts @@ -82,7 +82,6 @@ describe("router", () => { payload: "some-payload", query: expect.any(URLSearchParams), raw: { req: requestStub }, - response: responseStub, }); }); diff --git a/src/main/router.ts b/src/main/router.ts index 6d2818907e..8fa4e30139 100644 --- a/src/main/router.ts +++ b/src/main/router.ts @@ -15,7 +15,6 @@ import "../common/vars"; export interface RouterRequestOpts { req: http.IncomingMessage; - res: http.ServerResponse; cluster: Cluster; params: RouteParams; url: URL; @@ -36,7 +35,6 @@ export interface LensApiRequest

{ payload: P; params: RouteParams; cluster: Cluster; - response: http.ServerResponse; query: URLSearchParams; raw: { req: http.IncomingMessage; @@ -66,9 +64,9 @@ export class Router { const routeFound = !matchingRoute.isBoom; if (routeFound) { - const request = await this.getRequest({ req, res, cluster, url, params: matchingRoute.params }); + const request = await this.getRequest({ req, cluster, url, params: matchingRoute.params }); - await matchingRoute.route(request); + await matchingRoute.route(request, res); return true; } @@ -77,7 +75,7 @@ export class Router { } protected async getRequest(opts: RouterRequestOpts): Promise { - const { req, res, url, cluster, params } = opts; + const { req, url, cluster, params } = opts; const { payload } = await this.dependencies.parseRequest(req, null, { parse: true, @@ -90,7 +88,6 @@ export class Router { raw: { req, res, }, - response: res, query: url.searchParams, payload, params, @@ -121,10 +118,10 @@ export interface Route { handler: RouteHandler; } -const handleRoute = (route: Route) => async (request: LensApiRequest) => { +const handleRoute = (route: Route) => async (request: LensApiRequest, response: http.ServerResponse) => { let result: LensApiResult | void; - const writeServerResponse = writeServerResponseFor(request.response); + const writeServerResponse = writeServerResponseFor(response); try { result = await route.handler(request);