hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge conflicts

Browse Source 
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-03-11 09:43:26 +02:00
parent 514e5461d5
commit 7e511b5dc9
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/router.test.ts
View File

@ -80,7 +80,7 @@ describe("router", () => {
path: "/some-path", path: "/some-path",
payload: "some-payload", payload: "some-payload",
query: expect.any(URLSearchParams), 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"]]); expect(responseStub.setHeader.mock.calls).toEqual([["Content-Type", "text/plain"]]);
}); });
it('resolves with "422" status code', () => { it('resolves with "500" status code', () => {
expect(responseStub.statusCode).toBe(422); expect(responseStub.statusCode).toBe(500);
}); });
it("resolves with error", () => { it("resolves with error", () => {

9
src/main/router.ts
View File

@ -11,10 +11,13 @@ import path from "path";
import type { Cluster } from "../common/cluster/cluster"; import type { Cluster } from "../common/cluster/cluster";
import type { LensApiResultContentType } from "./router-content-types"; import type { LensApiResultContentType } from "./router-content-types";
import { contentTypes } from "./router-content-types"; import { contentTypes } from "./router-content-types";
// TODO: Import causes side effect, sets value for __static
import "../common/vars"; import "../common/vars";
export interface RouterRequestOpts { export interface RouterRequestOpts {
req: http.IncomingMessage; req: http.IncomingMessage;
res: http.ServerResponse;
cluster: Cluster; cluster: Cluster;
params: RouteParams; params: RouteParams;
url: URL; url: URL;
@ -64,7 +67,7 @@ export class Router {
const routeFound = !matchingRoute.isBoom; const routeFound = !matchingRoute.isBoom;
if (routeFound) { 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); await matchingRoute.route(request, res);
@ -75,7 +78,7 @@ export class Router {
} }
protected async getRequest(opts: RouterRequestOpts): Promise<LensApiRequest> { 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, { const { payload } = await this.dependencies.parseRequest(req, null, {
parse: true, parse: true,
@ -127,7 +130,7 @@ const handleRoute = (route: Route<unknown>) => async (request: LensApiRequest, r
result = await route.handler(request); result = await route.handler(request);
} catch(error) { } catch(error) {
const mappedResult = contentTypes.txt.resultMapper({ const mappedResult = contentTypes.txt.resultMapper({
statusCode: 422, statusCode: 500,
error: error.toString(), error: error.toString(),
}); });