@magda/typescript-common 3.0.0-alpha.0 → 3.0.0-alpha.1

package/dist/generated/registry/api.js

@@ -9,7 +9,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import request from 'request';
+import fetch, { Headers } from 'cross-fetch';
 let defaultBasePath = 'http://localhost/api/v0/registry/';
 // ===============================================
 // This file is autogenerated - Please do not edit
@@ -192,13 +192,117 @@ export class WebHookConfig {
     'includeAspectDefinitions';
     'dereference';
 }
+export function setRequestOptionsHeader(requestOptions, headerName, headerValue) {
+    if (headerValue === null || typeof headerValue === 'undefined') {
+        return;
+    }
+    if (!requestOptions?.headers) {
+        requestOptions.headers = new Headers();
+    }
+    if (requestOptions.headers instanceof Headers) {
+        requestOptions.headers.set(headerName, headerValue);
+    }
+    else {
+        requestOptions.headers[headerName] = headerValue;
+    }
+}
+export const isPlainObj = (value) => !!value && Object.getPrototypeOf(value) === Object.prototype;
+export const isTextMimeType = (contentType) => /text\/.*/i.test(contentType) || /[\/|\+]xml.*/i.test(contentType);
+export const isNotEmpty = (val) => val !== null && val !== undefined;
+export async function fetchWithRequestOptions(requestOptions) {
+    const { uri, qs, json, encoding, form, formData, ...fetchOptions } = requestOptions;
+    const url = new URL(uri);
+    if (qs && Object.keys(qs).length > 0) {
+        for (const key in qs) {
+            const value = qs[key];
+            url.searchParams.delete(key);
+            if (!isNotEmpty(value)) {
+                url.searchParams.append(key, '');
+                continue;
+            }
+            if (Array.isArray(value)) {
+                value.forEach((v) => url.searchParams.append(key, v));
+            }
+            else {
+                url.searchParams.append(key, value);
+            }
+        }
+    }
+    if (fetchOptions?.body) {
+        const body = fetchOptions.body;
+        const requireJsonStringify = isPlainObj(body) || Array.isArray(body);
+        if (json || requireJsonStringify) {
+            setRequestOptionsHeader(fetchOptions, 'Content-Type', 'application/json');
+        }
+        if (requireJsonStringify) {
+            fetchOptions.body = JSON.stringify(body);
+        }
+        else {
+            fetchOptions.body = body;
+        }
+    }
+    if (form && formData) {
+        throw new Error('Only one of form or formData can be set for request options');
+    }
+    if (fetchOptions?.body && (form || formData)) {
+        throw new Error('Only one of body or form or formData can be set for request options');
+    }
+    if (form) {
+        setRequestOptionsHeader(fetchOptions, 'Content-Type', 'application/x-www-form-urlencoded');
+        if (typeof form === 'string') {
+            fetchOptions.body = form;
+        }
+        else {
+            const params = new URLSearchParams();
+            for (const key in form) {
+                params.append(key, form[key]);
+            }
+            fetchOptions.body = params;
+        }
+    }
+    if (formData) {
+        const form = new FormData();
+        for (const key in formData) {
+            form.append(key, formData[key]);
+        }
+        fetchOptions.body = form;
+    }
+    const res = await fetch(url, fetchOptions);
+    let contentType = res.headers.get('Content-Type');
+    contentType = contentType ? contentType : '';
+    let body;
+    if (encoding === null) {
+        body = await res.blob();
+    }
+    else if (contentType === 'application/json') {
+        body = await res.json();
+    }
+    else if (isTextMimeType(contentType)) {
+        body = await res.text();
+    }
+    else {
+        if (typeof encoding === 'string' && encoding) {
+            const buffer = await res.arrayBuffer();
+            const decoder = new TextDecoder(encoding);
+            body = decoder.decode(buffer);
+        }
+        else {
+            body = await res.text();
+        }
+    }
+    if (res.ok) {
+        return { response: res, body };
+    }
+    else {
+        throw { response: res, body };
+    }
+}
 export class HttpBasicAuth {
     username;
     password;
     applyToRequest(requestOptions) {
-        requestOptions.auth = {
-            username: this.username, password: this.password
-        };
+        const basicAuthValue = Buffer.from(this.username + ':' + this.password, 'utf-8').toString('base64');
+        setRequestOptionsHeader(requestOptions, 'Authorization', 'Basic ' + basicAuthValue);
     }
 }
 export class ApiKeyAuth {
@@ -210,20 +314,21 @@ export class ApiKeyAuth {
         this.paramName = paramName;
     }
     applyToRequest(requestOptions) {
-        if (this.location == "query") {
+        if (this.location == 'query') {
+            if (!requestOptions.qs) {
+                requestOptions.qs = {};
+            }
             requestOptions.qs[this.paramName] = this.apiKey;
         }
-        else if (this.location == "header" && requestOptions && requestOptions.headers) {
-            requestOptions.headers[this.paramName] = this.apiKey;
+        else if (this.location == 'header') {
+            setRequestOptionsHeader(requestOptions, this.paramName, this.apiKey);
         }
     }
 }
 export class OAuth {
     accessToken;
     applyToRequest(requestOptions) {
-        if (requestOptions && requestOptions.headers) {
-            requestOptions.headers["Authorization"] = "Bearer " + this.accessToken;
-        }
+        setRequestOptionsHeader(requestOptions, 'Authorization', 'Bearer ' + this.accessToken);
     }
 }
 export class VoidAuth {
@@ -239,7 +344,6 @@ export var AspectDefinitionsApiApiKeys;
 export class AspectDefinitionsApi {
     basePath = defaultBasePath;
     defaultHeaders = {};
-    _useQuerystring = false;
     authentications = {
         'default': new VoidAuth(),
     };
@@ -255,9 +359,6 @@ export class AspectDefinitionsApi {
             }
         }
     }
-    set useQuerystring(value) {
-        this._useQuerystring = value;
-    }
     setApiKey(key, value) {
         this.authentications[AspectDefinitionsApiApiKeys[key]].apiKey = value;
     }
@@ -285,15 +386,18 @@ export class AspectDefinitionsApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling create.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: aspect,
         };
@@ -306,21 +410,7 @@ export class AspectDefinitionsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a list of all aspects
@@ -337,15 +427,18 @@ export class AspectDefinitionsApi {
         if (xMagdaTenantId === null || xMagdaTenantId === undefined) {
             throw new Error('Required parameter xMagdaTenantId was null or undefined when calling getAll.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -357,21 +450,7 @@ export class AspectDefinitionsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get an aspect by ID
@@ -394,15 +473,18 @@ export class AspectDefinitionsApi {
         if (id === null || id === undefined) {
             throw new Error('Required parameter id was null or undefined when calling getById.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -414,21 +496,7 @@ export class AspectDefinitionsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Modify an aspect by applying a JSON Patch
@@ -460,15 +528,18 @@ export class AspectDefinitionsApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling patchById.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'PATCH',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: aspectPatch,
         };
@@ -481,21 +552,7 @@ export class AspectDefinitionsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Modify an aspect by ID
@@ -527,15 +584,18 @@ export class AspectDefinitionsApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling putById.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'PUT',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: aspect,
         };
@@ -548,21 +608,7 @@ export class AspectDefinitionsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
 }
 export var RecordAspectsApiApiKeys;
@@ -571,7 +617,6 @@ export var RecordAspectsApiApiKeys;
 export class RecordAspectsApi {
     basePath = defaultBasePath;
     defaultHeaders = {};
-    _useQuerystring = false;
     authentications = {
         'default': new VoidAuth(),
     };
@@ -587,9 +632,6 @@ export class RecordAspectsApi {
             }
         }
     }
-    set useQuerystring(value) {
-        this._useQuerystring = value;
-    }
     setApiKey(key, value) {
         this.authentications[RecordAspectsApiApiKeys[key]].apiKey = value;
     }
@@ -624,15 +666,18 @@ export class RecordAspectsApi {
         if (xMagdaTenantId === null || xMagdaTenantId === undefined) {
             throw new Error('Required parameter xMagdaTenantId was null or undefined when calling deleteById.');
         }
-        headerParams['X-Magda-Session'] = xMagdaSession;
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'DELETE',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -644,21 +689,7 @@ export class RecordAspectsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a list of a record&#39;s aspects
@@ -697,15 +728,18 @@ export class RecordAspectsApi {
         if (limit !== undefined) {
             queryParameters['limit'] = limit;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -717,21 +751,7 @@ export class RecordAspectsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get the number of aspects that a record has
@@ -758,15 +778,18 @@ export class RecordAspectsApi {
         if (keyword !== undefined) {
             queryParameters['keyword'] = keyword;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -778,21 +801,7 @@ export class RecordAspectsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a record aspect by ID
@@ -821,15 +830,18 @@ export class RecordAspectsApi {
         if (aspectId === null || aspectId === undefined) {
             throw new Error('Required parameter aspectId was null or undefined when calling getById.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -841,21 +853,7 @@ export class RecordAspectsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Modify a record aspect by applying a JSON Patch
@@ -893,15 +891,18 @@ export class RecordAspectsApi {
         if (xMagdaTenantId === null || xMagdaTenantId === undefined) {
             throw new Error('Required parameter xMagdaTenantId was null or undefined when calling patchById.');
         }
-        headerParams['X-Magda-Session'] = xMagdaSession;
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'PATCH',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: aspectPatch,
         };
@@ -914,21 +915,7 @@ export class RecordAspectsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Modify a record aspect by ID
@@ -970,15 +957,18 @@ export class RecordAspectsApi {
         if (merge !== undefined) {
             queryParameters['merge'] = merge;
         }
-        headerParams['X-Magda-Session'] = xMagdaSession;
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'PUT',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: aspect,
         };
@@ -991,21 +981,7 @@ export class RecordAspectsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
 }
 export var RecordHistoryApiApiKeys;
@@ -1014,7 +990,6 @@ export var RecordHistoryApiApiKeys;
 export class RecordHistoryApi {
     basePath = defaultBasePath;
     defaultHeaders = {};
-    _useQuerystring = false;
     authentications = {
         'default': new VoidAuth(),
     };
@@ -1030,9 +1005,6 @@ export class RecordHistoryApi {
             }
         }
     }
-    set useQuerystring(value) {
-        this._useQuerystring = value;
-    }
     setApiKey(key, value) {
         this.authentications[RecordHistoryApiApiKeys[key]].apiKey = value;
     }
@@ -1085,15 +1057,18 @@ export class RecordHistoryApi {
         if (reversePageTokenOrder !== undefined) {
             queryParameters['reversePageTokenOrder'] = reversePageTokenOrder;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -1105,21 +1080,7 @@ export class RecordHistoryApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get the version of a record that existed after a given event was applied
@@ -1147,14 +1108,15 @@ export class RecordHistoryApi {
         if (eventId === null || eventId === undefined) {
             throw new Error('Required parameter eventId was null or undefined when calling version.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -1166,21 +1128,7 @@ export class RecordHistoryApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
 }
 export var RecordsApiApiKeys;
@@ -1189,7 +1137,6 @@ export var RecordsApiApiKeys;
 export class RecordsApi {
     basePath = defaultBasePath;
     defaultHeaders = {};
-    _useQuerystring = false;
     authentications = {
         'default': new VoidAuth(),
     };
@@ -1205,9 +1152,6 @@ export class RecordsApi {
             }
         }
     }
-    set useQuerystring(value) {
-        this._useQuerystring = value;
-    }
     setApiKey(key, value) {
         this.authentications[RecordsApiApiKeys[key]].apiKey = value;
     }
@@ -1235,15 +1179,18 @@ export class RecordsApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling create.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: record,
         };
@@ -1256,21 +1203,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Delete a record
@@ -1297,15 +1230,18 @@ export class RecordsApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling deleteById.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'DELETE',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -1317,21 +1253,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Remove items from records&#39; aspect data
@@ -1363,15 +1285,18 @@ export class RecordsApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling deleteRecordsAspectArrayItems.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'DELETE',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: requestData,
         };
@@ -1384,21 +1309,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a list of all records
@@ -1467,15 +1378,18 @@ export class RecordsApi {
         if (q !== undefined) {
             queryParameters['q'] = q;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -1487,21 +1401,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a list of all records as summaries
@@ -1538,15 +1438,18 @@ export class RecordsApi {
         if (q !== undefined) {
             queryParameters['q'] = q;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -1558,21 +1461,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a record by ID
@@ -1607,15 +1496,18 @@ export class RecordsApi {
         if (dereference !== undefined) {
             queryParameters['dereference'] = dereference;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -1627,21 +1519,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a record in full by ID
@@ -1664,15 +1542,18 @@ export class RecordsApi {
         if (xMagdaTenantId === null || xMagdaTenantId === undefined) {
             throw new Error('Required parameter xMagdaTenantId was null or undefined when calling getByIdInFull.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -1684,21 +1565,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a summary record by ID
@@ -1721,15 +1588,18 @@ export class RecordsApi {
         if (xMagdaTenantId === null || xMagdaTenantId === undefined) {
             throw new Error('Required parameter xMagdaTenantId was null or undefined when calling getByIdSummary.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -1741,21 +1611,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get the count of records matching the parameters. If no parameters are specified, the count will be approximate for performance reasons.
@@ -1788,15 +1644,18 @@ export class RecordsApi {
         if (q !== undefined) {
             queryParameters['q'] = q;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -1808,21 +1667,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a list tokens for paging through the records
@@ -1847,15 +1692,18 @@ export class RecordsApi {
         if (limit !== undefined) {
             queryParameters['limit'] = limit;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -1867,21 +1715,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Modify a record by applying a JSON Patch
@@ -1913,15 +1747,18 @@ export class RecordsApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling patchById.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'PATCH',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: recordPatch,
         };
@@ -1934,21 +1771,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Modify a list of records by applying the same JSON Patch
@@ -1974,15 +1797,18 @@ export class RecordsApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling patchRecords.');
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'PATCH',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: requestData,
         };
@@ -1995,21 +1821,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Modify a record by ID
@@ -2045,15 +1857,18 @@ export class RecordsApi {
         if (merge !== undefined) {
             queryParameters['merge'] = merge;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'PUT',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: record,
         };
@@ -2066,21 +1881,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Modify a list of records&#39;s aspect with same new data
@@ -2116,15 +1917,18 @@ export class RecordsApi {
         if (merge !== undefined) {
             queryParameters['merge'] = merge;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'PUT',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: requestData,
         };
@@ -2137,21 +1941,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Trim by source tag
@@ -2188,15 +1978,18 @@ export class RecordsApi {
         if (sourceId !== undefined) {
             queryParameters['sourceId'] = sourceId;
         }
-        headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaTenantId)) {
+            headerParams['X-Magda-Tenant-Id'] = xMagdaTenantId;
+        }
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'DELETE',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -2208,21 +2001,7 @@ export class RecordsApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
 }
 export var WebHooksApiApiKeys;
@@ -2231,7 +2010,6 @@ export var WebHooksApiApiKeys;
 export class WebHooksApi {
     basePath = defaultBasePath;
     defaultHeaders = {};
-    _useQuerystring = false;
     authentications = {
         'default': new VoidAuth(),
     };
@@ -2247,9 +2025,6 @@ export class WebHooksApi {
             }
         }
     }
-    set useQuerystring(value) {
-        this._useQuerystring = value;
-    }
     setApiKey(key, value) {
         this.authentications[WebHooksApiApiKeys[key]].apiKey = value;
     }
@@ -2278,14 +2053,15 @@ export class WebHooksApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling ack.');
         }
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: acknowledgement,
         };
@@ -2298,21 +2074,7 @@ export class WebHooksApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Create a new web hook
@@ -2333,14 +2095,15 @@ export class WebHooksApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling create.');
         }
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: hook,
         };
@@ -2353,21 +2116,7 @@ export class WebHooksApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Delete a web hook
@@ -2389,14 +2138,15 @@ export class WebHooksApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling deleteById.');
         }
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'DELETE',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -2408,21 +2158,7 @@ export class WebHooksApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a list of all web hooks
@@ -2438,14 +2174,15 @@ export class WebHooksApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling getAll.');
         }
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -2457,21 +2194,7 @@ export class WebHooksApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Get a web hook by ID
@@ -2493,14 +2216,15 @@ export class WebHooksApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling getById.');
         }
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
         };
         this.authentications.default.applyToRequest(requestOptions);
@@ -2512,21 +2236,7 @@ export class WebHooksApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
     /**
      * Modify a web hook by ID
@@ -2553,14 +2263,15 @@ export class WebHooksApi {
         if (xMagdaSession === null || xMagdaSession === undefined) {
             throw new Error('Required parameter xMagdaSession was null or undefined when calling putById.');
         }
-        headerParams['X-Magda-Session'] = xMagdaSession;
+        if (isNotEmpty(xMagdaSession)) {
+            headerParams['X-Magda-Session'] = xMagdaSession;
+        }
         let useFormData = false;
-        let requestOptions = {
+        const requestOptions = {
             method: 'PUT',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
-            useQuerystring: this._useQuerystring,
             json: true,
             body: hook,
         };
@@ -2573,21 +2284,7 @@ export class WebHooksApi {
                 requestOptions.form = formParams;
             }
         }
-        return new Promise((resolve, reject) => {
-            request(requestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    if (response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    }
-                    else {
-                        reject({ response: response, body: body });
-                    }
-                }
-            });
-        });
+        return fetchWithRequestOptions(requestOptions);
     }
 }
 //# sourceMappingURL=api.js.map