From 7e511b5dc9805fc79acb79f3cc9e860c693591ca Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Fri, 11 Mar 2022 09:43:26 +0200
Subject: [PATCH] Fix merge conflicts

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 src/main/router.test.ts | 6 +++---
 src/main/router.ts      | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/router.test.ts b/src/main/router.test.ts
index ed5bcc266d..18621b1764 100644
--- a/src/main/router.test.ts
+++ b/src/main/router.test.ts
@@ -80,7 +80,7 @@ describe("router", () => {
         path: "/some-path",
         payload: "some-payload",
         query: expect.any(URLSearchParams),
-        raw: { req: requestStub },
+        raw: { req: requestStub, res: responseStub },
       });
     });
 
@@ -133,8 +133,8 @@ describe("router", () => {
         expect(responseStub.setHeader.mock.calls).toEqual([["Content-Type", "text/plain"]]);
       });
 
-      it('resolves with "422" status code', () => {
-        expect(responseStub.statusCode).toBe(422);
+      it('resolves with "500" status code', () => {
+        expect(responseStub.statusCode).toBe(500);
       });
 
       it("resolves with error", () => {
diff --git a/src/main/router.ts b/src/main/router.ts
index 7bad7ae51c..bcdae79a04 100644
--- a/src/main/router.ts
+++ b/src/main/router.ts
@@ -11,10 +11,13 @@ import path from "path";
 import type { Cluster } from "../common/cluster/cluster";
 import type { LensApiResultContentType } from "./router-content-types";
 import { contentTypes } from "./router-content-types";
+
+// TODO: Import causes side effect, sets value for __static
 import "../common/vars";
 
 export interface RouterRequestOpts {
   req: http.IncomingMessage;
+  res: http.ServerResponse;
   cluster: Cluster;
   params: RouteParams;
   url: URL;
@@ -64,7 +67,7 @@ export class Router {
     const routeFound = !matchingRoute.isBoom;
 
     if (routeFound) {
-      const request = await this.getRequest({ req, cluster, url, params: matchingRoute.params });
+      const request = await this.getRequest({ req, res, cluster, url, params: matchingRoute.params });
 
       await matchingRoute.route(request, res);
 
@@ -75,7 +78,7 @@ export class Router {
   }
 
   protected async getRequest(opts: RouterRequestOpts): Promise<LensApiRequest> {
-    const { req, url, cluster, params } = opts;
+    const { req, res, url, cluster, params } = opts;
 
     const { payload } = await this.dependencies.parseRequest(req, null, {
       parse: true,
@@ -127,7 +130,7 @@ const handleRoute = (route: Route<unknown>) => async (request: LensApiRequest, r
     result = await route.handler(request);
   } catch(error) {
     const mappedResult = contentTypes.txt.resultMapper({
-      statusCode: 422,
+      statusCode: 500,
       error: error.toString(),
     });