From ee11bc5600013b704e403015246bc09d1a8e7e40 Mon Sep 17 00:00:00 2001
From: Panu Horsmalahti <phorsmalahti@mirantis.com>
Date: Thu, 21 Oct 2021 16:48:46 +0300
Subject: [PATCH] Add this.getRequestOptions default

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>
---
 src/common/k8s-api/json-api.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/k8s-api/json-api.ts b/src/common/k8s-api/json-api.ts
index bb734b12ae..15bad9864a 100644
--- a/src/common/k8s-api/json-api.ts
+++ b/src/common/k8s-api/json-api.ts
@@ -69,13 +69,13 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
     this.config = Object.assign({}, JsonApi.configDefault, config);
     this.reqInit = merge({}, JsonApi.reqInitDefault, reqInit);
     this.parseResponse = this.parseResponse.bind(this);
-    this.getRequestOptions = config.getRequestOptions;
+    this.getRequestOptions = config.getRequestOptions ?? (() => Promise.resolve({}));
   }
 
   public onData = new EventEmitter<[D, Response]>();
   public onError = new EventEmitter<[JsonApiErrorParsed, Response]>();
   
-  private getRequestOptions?: JsonApiConfig["getRequestOptions"];
+  private getRequestOptions: JsonApiConfig["getRequestOptions"];
 
   get<T = D>(path: string, params?: P, reqInit: RequestInit = {}) {
     return this.request<T>(path, params, { ...reqInit, method: "get" });
@@ -86,7 +86,7 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
     const reqInit: RequestInit = merge(
       {},
       this.reqInit,
-      this.getRequestOptions ? (await this.getRequestOptions()) : {},
+      await this.getRequestOptions(),
       init
     );
     const { query } = params || {} as P;
@@ -125,7 +125,7 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
     const reqInit: RequestInit = merge(
       {},
       this.reqInit,
-      this.getRequestOptions ? (await this.getRequestOptions()) : {},
+      await this.getRequestOptions(),
       init
     );
     const { data, query } = params || {} as P;