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

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2021-09-22 19:20:46 +03:00
parent 7e20856641
commit 6f0a2b5b96
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/k8s-api/index.ts
View File

@ -56,7 +56,7 @@ if (typeof window === "undefined") {
if (isClusterPageContext()) { if (isClusterPageContext()) {
apiKube = new KubeJsonApi({ apiKube = new KubeJsonApi({
serverAddress: `http://${window.location.host}:${window.location.port}`, serverAddress: `http://${window.location.host}`,
apiBase: apiKubePrefix, apiBase: apiKubePrefix,
debug: isDevelopment debug: isDevelopment
}); });

24
src/common/k8s-api/json-api.ts
View File

@ -21,7 +21,6 @@
// Base http-service / json-api class // Base http-service / json-api class
import { randomBytes } from "crypto";
import { merge } from "lodash"; import { merge } from "lodash";
import nodeFetch, { Response as NodeResponse, RequestInit as NodeRequestInit } from "node-fetch"; import nodeFetch, { Response as NodeResponse, RequestInit as NodeRequestInit } from "node-fetch";
import { stringify } from "querystring"; import { stringify } from "querystring";
@ -82,8 +81,17 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
return this.request<T>(path, params, { ...reqInit, method: "get" }); return this.request<T>(path, params, { ...reqInit, method: "get" });
} }
protected getRequestUrl(path: string, useSubdomain = false) {
if (window) {
return `${this.config.apiBase}${path}`;
} else {
return `${this.config.serverAddress}${this.config.apiBase}${path}`;
}
}
getResponse(path: string, params?: P, init: JsonRequestInit = {}): Promise<JsonResponse> { getResponse(path: string, params?: P, init: JsonRequestInit = {}): Promise<JsonResponse> {
let reqUrl = this.buildRequestUrl(path, true); let reqUrl = this.getRequestUrl(path, true);
const reqInit = merge({}, this.reqInit, init); const reqInit = merge({}, this.reqInit, init);
const { query } = params || {} as P; const { query } = params || {} as P;
@ -120,18 +128,8 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
return this.request<T>(path, params, { ...reqInit, method: "delete" }); return this.request<T>(path, params, { ...reqInit, method: "delete" });
} }
protected buildRequestUrl(path: string, useSubdomain = false) {
if (window) {
const subdomain = useSubdomain ? `${randomBytes(2).toString("hex")}.` : "";
return `http://${subdomain}${window.location.host}${this.config.apiBase}${path}`;
} else {
return `${this.config.serverAddress}${this.config.apiBase}${path}`;
}
}
protected async request<D>(path: string, params?: P, init: JsonRequestInit = {}) { protected async request<D>(path: string, params?: P, init: JsonRequestInit = {}) {
let reqUrl = this.buildRequestUrl(path); let reqUrl = this.getRequestUrl(path);
const reqInit = merge({}, this.reqInit, init); const reqInit = merge({}, this.reqInit, init);
const { data, query } = params || {} as P; const { data, query } = params || {} as P;