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

package/dist/generated/registry/api.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  *
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
@@ -10,140 +9,345 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebHooksApi = exports.WebHooksApiApiKeys = exports.RecordsApi = exports.RecordsApiApiKeys = exports.RecordHistoryApi = exports.RecordHistoryApiApiKeys = exports.RecordAspectsApi = exports.RecordAspectsApiApiKeys = exports.AspectDefinitionsApi = exports.AspectDefinitionsApiApiKeys = exports.VoidAuth = exports.OAuth = exports.ApiKeyAuth = exports.HttpBasicAuth = exports.WebHookConfig = exports.WebHookAcknowledgementResponse = exports.WebHookAcknowledgement = exports.WebHook = exports.RegistryEvent = exports.RecordSummary = exports.Record = exports.PutRecordsAspectRequest = exports.PatchRecordsRequest = exports.Operation = exports.MultipleDeleteResult = exports.JsonPatch = exports.JsValue = exports.JsObject = exports.EventsPage = exports.DeleteResult = exports.DeleteRecordsAspectArrayItemsRequest = exports.CountResponse = exports.AspectDefinition = exports.ApiError = void 0;
-const request = require("request");
+import fetch, { Headers } from 'cross-fetch';
 let defaultBasePath = 'http://localhost/api/v0/registry/';
 // ===============================================
 // This file is autogenerated - Please do not edit
 // ===============================================
 /* tslint:disable:no-unused-variable */
-class ApiError {
+export class ApiError {
+    'message';
 }
-exports.ApiError = ApiError;
 /**
 * A type of aspect in the registry, unique for a tenant.
 */
-class AspectDefinition {
+export class AspectDefinition {
+    /**
+    * The identifier for the aspect type.
+    */
+    'id';
+    /**
+    * The name of the aspect.
+    */
+    'name';
+    /**
+    * The JSON Schema of this aspect.
+    */
+    'jsonSchema';
 }
-exports.AspectDefinition = AspectDefinition;
-class CountResponse {
+export class CountResponse {
+    'count';
 }
-exports.CountResponse = CountResponse;
-class DeleteRecordsAspectArrayItemsRequest {
+export class DeleteRecordsAspectArrayItemsRequest {
+    'recordIds';
+    'jsonPath';
+    'items';
 }
-exports.DeleteRecordsAspectArrayItemsRequest = DeleteRecordsAspectArrayItemsRequest;
-class DeleteResult {
+export class DeleteResult {
+    'deleted';
 }
-exports.DeleteResult = DeleteResult;
 /**
 * A page of events.
 */
-class EventsPage {
+export class EventsPage {
+    /**
+    * Whether there are more events available.
+    */
+    'hasMore';
+    /**
+    * A token to be used to get the next page of events.
+    */
+    'nextPageToken';
+    /**
+    * The events in this page.
+    */
+    'events';
 }
-exports.EventsPage = EventsPage;
-class JsObject {
+export class JsObject {
+    'fields';
 }
-exports.JsObject = JsObject;
-class JsValue {
+export class JsValue {
 }
-exports.JsValue = JsValue;
-class JsonPatch {
+export class JsonPatch {
+    'ops';
 }
-exports.JsonPatch = JsonPatch;
-class MultipleDeleteResult {
+export class MultipleDeleteResult {
+    'count';
 }
-exports.MultipleDeleteResult = MultipleDeleteResult;
-class Operation {
+export class Operation {
 }
-exports.Operation = Operation;
-class PatchRecordsRequest {
+export class PatchRecordsRequest {
+    'recordIds';
+    'jsonPath';
 }
-exports.PatchRecordsRequest = PatchRecordsRequest;
-class PutRecordsAspectRequest {
+export class PutRecordsAspectRequest {
+    'recordIds';
+    'data';
 }
-exports.PutRecordsAspectRequest = PutRecordsAspectRequest;
 /**
 * A record in the registry, usually including data for one or more aspects, unique for a tenant.
 */
-class Record {
+export class Record {
+    /**
+    * The identifier of the record
+    */
+    'id';
+    /**
+    * The name of the record
+    */
+    'name';
+    /**
+    * The aspects included in this record
+    */
+    'aspects';
+    /**
+    * A tag representing the action by the source of this record (e.g. an id for a individual crawl of a data portal).
+    */
+    'sourceTag';
+    /**
+    * The identifier of a tenant
+    */
+    'tenantId';
 }
-exports.Record = Record;
 /**
 * A summary of a record in the registry.  Summaries specify which aspects are available, but do not include data for any aspects.
 */
-class RecordSummary {
+export class RecordSummary {
+    /**
+    * The identifier of the record
+    */
+    'id';
+    /**
+    * The name of the record
+    */
+    'name';
+    /**
+    * The list of aspect IDs for which this record has data
+    */
+    'aspects';
+    /**
+    * The identifier of the tenant
+    */
+    'tenantId';
 }
-exports.RecordSummary = RecordSummary;
-class RegistryEvent {
+export class RegistryEvent {
+    'id';
+    'eventTime';
+    'eventType';
+    'userId';
+    'data';
+    'tenantId';
 }
-exports.RegistryEvent = RegistryEvent;
-class WebHook {
+export class WebHook {
+    'id';
+    'name';
+    'active';
+    'lastEvent';
+    'url';
+    'eventTypes';
+    'isWaitingForResponse';
+    'config';
+    'enabled';
+    'lastRetryTime';
+    'retryCount';
+    'isRunning';
+    'isProcessing';
+    'ownerId';
+    'creatorId';
+    'editorId';
+    'createTime';
+    'editTime';
 }
-exports.WebHook = WebHook;
 /**
 * Asynchronously acknowledges receipt of a web hook notification.
 */
-class WebHookAcknowledgement {
+export class WebHookAcknowledgement {
+    /**
+    * True if the web hook was received successfully and the listener is ready for further notifications.  False if the web hook was not received and the same notification should be repeated.
+    */
+    'succeeded';
+    /**
+    * The ID of the last event received by the listener.  This should be the value of the `lastEventId` property of the web hook payload that is being acknowledged.  This value is ignored if `succeeded` is false.
+    */
+    'lastEventIdReceived';
+    /**
+    * Should the webhook be active or inactive?
+    */
+    'active';
 }
-exports.WebHookAcknowledgement = WebHookAcknowledgement;
 /**
 * The response to an asynchronous web hook acknowledgement.
 */
-class WebHookAcknowledgementResponse {
+export class WebHookAcknowledgementResponse {
+    /**
+    * The ID of the last event successfully received by the listener.  Further notifications will start after this event.
+    */
+    'lastEventIdReceived';
+}
+export class WebHookConfig {
+    'aspects';
+    'optionalAspects';
+    'includeEvents';
+    'includeRecords';
+    '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;
+    }
 }
-exports.WebHookAcknowledgementResponse = WebHookAcknowledgementResponse;
-class WebHookConfig {
+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 };
+    }
 }
-exports.WebHookConfig = WebHookConfig;
-class HttpBasicAuth {
+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);
     }
 }
-exports.HttpBasicAuth = HttpBasicAuth;
-class ApiKeyAuth {
+export class ApiKeyAuth {
+    location;
+    paramName;
+    apiKey;
     constructor(location, paramName) {
         this.location = location;
         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);
         }
     }
 }
-exports.ApiKeyAuth = ApiKeyAuth;
-class OAuth {
+export class OAuth {
+    accessToken;
     applyToRequest(requestOptions) {
-        if (requestOptions && requestOptions.headers) {
-            requestOptions.headers["Authorization"] = "Bearer " + this.accessToken;
-        }
+        setRequestOptionsHeader(requestOptions, 'Authorization', 'Bearer ' + this.accessToken);
     }
 }
-exports.OAuth = OAuth;
-class VoidAuth {
+export class VoidAuth {
+    username;
+    password;
     applyToRequest(_) {
         // Do nothing
     }
 }
-exports.VoidAuth = VoidAuth;
-var AspectDefinitionsApiApiKeys;
+export var AspectDefinitionsApiApiKeys;
 (function (AspectDefinitionsApiApiKeys) {
-})(AspectDefinitionsApiApiKeys = exports.AspectDefinitionsApiApiKeys || (exports.AspectDefinitionsApiApiKeys = {}));
-class AspectDefinitionsApi {
+})(AspectDefinitionsApiApiKeys || (AspectDefinitionsApiApiKeys = {}));
+export class AspectDefinitionsApi {
+    basePath = defaultBasePath;
+    defaultHeaders = {};
+    authentications = {
+        'default': new VoidAuth(),
+    };
     constructor(basePathOrUsername, password, basePath) {
-        this.basePath = defaultBasePath;
-        this.defaultHeaders = {};
-        this._useQuerystring = false;
-        this.authentications = {
-            'default': new VoidAuth(),
-        };
         if (password) {
             if (basePath) {
                 this.basePath = basePath;
@@ -155,9 +359,6 @@ class AspectDefinitionsApi {
             }
         }
     }
-    set useQuerystring(value) {
-        this._useQuerystring = value;
-    }
     setApiKey(key, value) {
         this.authentications[AspectDefinitionsApiApiKeys[key]].apiKey = value;
     }
@@ -185,15 +386,18 @@ 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,
         };
@@ -206,21 +410,7 @@ 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
@@ -237,15 +427,18 @@ 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);
@@ -257,21 +450,7 @@ 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
@@ -294,15 +473,18 @@ 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);
@@ -314,21 +496,7 @@ 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
@@ -360,15 +528,18 @@ 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,
         };
@@ -381,21 +552,7 @@ 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
@@ -427,15 +584,18 @@ 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,
         };
@@ -448,35 +608,19 @@ 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);
     }
 }
-exports.AspectDefinitionsApi = AspectDefinitionsApi;
-var RecordAspectsApiApiKeys;
+export var RecordAspectsApiApiKeys;
 (function (RecordAspectsApiApiKeys) {
-})(RecordAspectsApiApiKeys = exports.RecordAspectsApiApiKeys || (exports.RecordAspectsApiApiKeys = {}));
-class RecordAspectsApi {
+})(RecordAspectsApiApiKeys || (RecordAspectsApiApiKeys = {}));
+export class RecordAspectsApi {
+    basePath = defaultBasePath;
+    defaultHeaders = {};
+    authentications = {
+        'default': new VoidAuth(),
+    };
     constructor(basePathOrUsername, password, basePath) {
-        this.basePath = defaultBasePath;
-        this.defaultHeaders = {};
-        this._useQuerystring = false;
-        this.authentications = {
-            'default': new VoidAuth(),
-        };
         if (password) {
             if (basePath) {
                 this.basePath = basePath;
@@ -488,9 +632,6 @@ class RecordAspectsApi {
             }
         }
     }
-    set useQuerystring(value) {
-        this._useQuerystring = value;
-    }
     setApiKey(key, value) {
         this.authentications[RecordAspectsApiApiKeys[key]].apiKey = value;
     }
@@ -525,15 +666,18 @@ 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);
@@ -545,21 +689,7 @@ 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
@@ -598,15 +728,18 @@ 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);
@@ -618,21 +751,7 @@ 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
@@ -659,15 +778,18 @@ 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);
@@ -679,21 +801,7 @@ 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
@@ -722,15 +830,18 @@ 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);
@@ -742,21 +853,7 @@ 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
@@ -794,15 +891,18 @@ 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,
         };
@@ -815,21 +915,7 @@ 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
@@ -871,15 +957,18 @@ 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,
         };
@@ -892,35 +981,19 @@ 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);
     }
 }
-exports.RecordAspectsApi = RecordAspectsApi;
-var RecordHistoryApiApiKeys;
+export var RecordHistoryApiApiKeys;
 (function (RecordHistoryApiApiKeys) {
-})(RecordHistoryApiApiKeys = exports.RecordHistoryApiApiKeys || (exports.RecordHistoryApiApiKeys = {}));
-class RecordHistoryApi {
+})(RecordHistoryApiApiKeys || (RecordHistoryApiApiKeys = {}));
+export class RecordHistoryApi {
+    basePath = defaultBasePath;
+    defaultHeaders = {};
+    authentications = {
+        'default': new VoidAuth(),
+    };
     constructor(basePathOrUsername, password, basePath) {
-        this.basePath = defaultBasePath;
-        this.defaultHeaders = {};
-        this._useQuerystring = false;
-        this.authentications = {
-            'default': new VoidAuth(),
-        };
         if (password) {
             if (basePath) {
                 this.basePath = basePath;
@@ -932,9 +1005,6 @@ class RecordHistoryApi {
             }
         }
     }
-    set useQuerystring(value) {
-        this._useQuerystring = value;
-    }
     setApiKey(key, value) {
         this.authentications[RecordHistoryApiApiKeys[key]].apiKey = value;
     }
@@ -987,15 +1057,18 @@ 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);
@@ -1007,21 +1080,7 @@ 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
@@ -1049,14 +1108,15 @@ 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);
@@ -1068,35 +1128,19 @@ 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);
     }
 }
-exports.RecordHistoryApi = RecordHistoryApi;
-var RecordsApiApiKeys;
+export var RecordsApiApiKeys;
 (function (RecordsApiApiKeys) {
-})(RecordsApiApiKeys = exports.RecordsApiApiKeys || (exports.RecordsApiApiKeys = {}));
-class RecordsApi {
+})(RecordsApiApiKeys || (RecordsApiApiKeys = {}));
+export class RecordsApi {
+    basePath = defaultBasePath;
+    defaultHeaders = {};
+    authentications = {
+        'default': new VoidAuth(),
+    };
     constructor(basePathOrUsername, password, basePath) {
-        this.basePath = defaultBasePath;
-        this.defaultHeaders = {};
-        this._useQuerystring = false;
-        this.authentications = {
-            'default': new VoidAuth(),
-        };
         if (password) {
             if (basePath) {
                 this.basePath = basePath;
@@ -1108,9 +1152,6 @@ class RecordsApi {
             }
         }
     }
-    set useQuerystring(value) {
-        this._useQuerystring = value;
-    }
     setApiKey(key, value) {
         this.authentications[RecordsApiApiKeys[key]].apiKey = value;
     }
@@ -1138,15 +1179,18 @@ 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,
         };
@@ -1159,21 +1203,7 @@ 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
@@ -1200,15 +1230,18 @@ 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);
@@ -1220,21 +1253,7 @@ 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
@@ -1266,15 +1285,18 @@ 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,
         };
@@ -1287,21 +1309,7 @@ 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
@@ -1370,15 +1378,18 @@ 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);
@@ -1390,21 +1401,7 @@ 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
@@ -1441,15 +1438,18 @@ 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);
@@ -1461,21 +1461,7 @@ 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
@@ -1510,15 +1496,18 @@ 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);
@@ -1530,21 +1519,7 @@ 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
@@ -1567,15 +1542,18 @@ 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);
@@ -1587,21 +1565,7 @@ 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
@@ -1624,15 +1588,18 @@ 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);
@@ -1644,21 +1611,7 @@ 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.
@@ -1691,15 +1644,18 @@ 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);
@@ -1711,21 +1667,7 @@ 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
@@ -1750,15 +1692,18 @@ 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);
@@ -1770,21 +1715,7 @@ 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
@@ -1816,15 +1747,18 @@ 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,
         };
@@ -1837,21 +1771,7 @@ 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
@@ -1877,15 +1797,18 @@ 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,
         };
@@ -1898,21 +1821,7 @@ 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
@@ -1948,15 +1857,18 @@ 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,
         };
@@ -1969,21 +1881,7 @@ 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
@@ -2019,15 +1917,18 @@ 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,
         };
@@ -2040,21 +1941,7 @@ 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
@@ -2091,15 +1978,18 @@ 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);
@@ -2111,35 +2001,19 @@ 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);
     }
 }
-exports.RecordsApi = RecordsApi;
-var WebHooksApiApiKeys;
+export var WebHooksApiApiKeys;
 (function (WebHooksApiApiKeys) {
-})(WebHooksApiApiKeys = exports.WebHooksApiApiKeys || (exports.WebHooksApiApiKeys = {}));
-class WebHooksApi {
+})(WebHooksApiApiKeys || (WebHooksApiApiKeys = {}));
+export class WebHooksApi {
+    basePath = defaultBasePath;
+    defaultHeaders = {};
+    authentications = {
+        'default': new VoidAuth(),
+    };
     constructor(basePathOrUsername, password, basePath) {
-        this.basePath = defaultBasePath;
-        this.defaultHeaders = {};
-        this._useQuerystring = false;
-        this.authentications = {
-            'default': new VoidAuth(),
-        };
         if (password) {
             if (basePath) {
                 this.basePath = basePath;
@@ -2151,9 +2025,6 @@ class WebHooksApi {
             }
         }
     }
-    set useQuerystring(value) {
-        this._useQuerystring = value;
-    }
     setApiKey(key, value) {
         this.authentications[WebHooksApiApiKeys[key]].apiKey = value;
     }
@@ -2182,14 +2053,15 @@ 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,
         };
@@ -2202,21 +2074,7 @@ 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
@@ -2237,14 +2095,15 @@ 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,
         };
@@ -2257,21 +2116,7 @@ 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
@@ -2293,14 +2138,15 @@ 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);
@@ -2312,21 +2158,7 @@ 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
@@ -2342,14 +2174,15 @@ 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);
@@ -2361,21 +2194,7 @@ 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
@@ -2397,14 +2216,15 @@ 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);
@@ -2416,21 +2236,7 @@ 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
@@ -2457,14 +2263,15 @@ 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,
         };
@@ -2477,22 +2284,7 @@ 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);
     }
 }
-exports.WebHooksApi = WebHooksApi;
 //# sourceMappingURL=api.js.map