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

Review fixes.

Browse Source 
Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>
This commit is contained in:
Panu Horsmalahti 2021-10-21 15:12:12 +03:00
parent 6d64f10fae
commit 6e08008630
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
public onData = new EventEmitter<[D, Response]>(); public onData = new EventEmitter<[D, Response]>();
public onError = new EventEmitter<[JsonApiErrorParsed, Response]>(); public onError = new EventEmitter<[JsonApiErrorParsed, Response]>();
private getRequestOptions?: () => Promise<RequestInit>; private getRequestOptions?: JsonApiConfig["getRequestOptions"];
get<T = D>(path: string, params?: P, reqInit: RequestInit = {}) { get<T = D>(path: string, params?: P, reqInit: RequestInit = {}) {
return this.request<T>(path, params, { ...reqInit, method: "get" }); return this.request<T>(path, params, { ...reqInit, method: "get" });

12
src/common/k8s-api/kube-api.ts
View File

@ -135,13 +135,6 @@ export function forCluster<T extends KubeObject>(cluster: ILocalKubeApiConfig, k
export function forRemoteCluster<T extends KubeObject>(config: IRemoteKubeApiConfig, kubeClass: KubeObjectConstructor<T>): KubeApi<T> { export function forRemoteCluster<T extends KubeObject>(config: IRemoteKubeApiConfig, kubeClass: KubeObjectConstructor<T>): KubeApi<T> {
const reqInit: RequestInit = {}; const reqInit: RequestInit = {};
const token = config.user.token;
if (token && !isFunction(token)) {
reqInit.headers = {
"Authorization": `Bearer ${token}`
};
}
const agentOptions: AgentOptions = {}; const agentOptions: AgentOptions = {};
@ -165,14 +158,15 @@ export function forRemoteCluster<T extends KubeObject>(config: IRemoteKubeApiCon
reqInit.agent = new Agent(agentOptions); reqInit.agent = new Agent(agentOptions);
} }
const token = config.user.token;
const request = new KubeJsonApi({ const request = new KubeJsonApi({
serverAddress: config.cluster.server, serverAddress: config.cluster.server,
apiBase: "", apiBase: "",
debug: isDevelopment, debug: isDevelopment,
...(isFunction(token) ? { ...(token ? {
getRequestOptions: async () => ({ getRequestOptions: async () => ({
headers: { headers: {
"Authorization": `Bearer ${await token()}` "Authorization": `Bearer ${isFunction(token) ? await token() : token}`
} }
}) })
} : {}) } : {})